Author: marrs
Date: Tue Nov 17 19:16:40 2009
New Revision: 881448

URL: http://svn.apache.org/viewvc?rev=881448&view=rev
Log:
Changed the property to not stop bundles that are unaffected by an update.

Modified:
    incubator/ace/trunk/core/conf/dev-gateway/platform.properties

Modified: incubator/ace/trunk/core/conf/dev-gateway/platform.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-gateway/platform.properties?rev=881448&r1=881447&r2=881448&view=diff
==============================================================================
--- incubator/ace/trunk/core/conf/dev-gateway/platform.properties (original)
+++ incubator/ace/trunk/core/conf/dev-gateway/platform.properties Tue Nov 17 19:16:40 2009
@@ -1,4 +1,5 @@
 -Dorg.apache.ace.configurator.CONFIG_DIR=conf
+-Dorg.apache.felix.deploymentadmin.stopunaffectedbundle=false
 -Dorg.osgi.framework.storage=cache
 -Dorg.apache.felix.http.nio=true
 -Dorg.apache.felix.http.enable=true
@@ -11,4 +12,4 @@
 -Dorg.apache.felix.https.keystore.key.password=secret
 -Dorg.apache.felix.https.truststore=/tmp/truststore
 -Dorg.apache.felix.https.truststore.password=secret
--Dorg.apache.felix.https.clientcertificate=needs
\ No newline at end of file
+-Dorg.apache.felix.https.clientcertificate=needs

Author: cziegeler
Date: Wed Nov 11 19:49:07 2009
New Revision: 835034

URL: http://svn.apache.org/viewvc?rev=835034&view=rev
Log:
Remove empty folder and add top-level eclipse stuff to svn:ignore

Removed:
    incubator/ace/trunk/gateway/src/net/
    incubator/ace/trunk/server/src/net/
    incubator/ace/trunk/test/src/net/
Modified:
    incubator/ace/trunk/   (props changed)

Propchange: incubator/ace/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 11 19:49:07 2009
@@ -0,0 +1,7 @@
+.settings
+
+bin
+
+.classpath
+
+.project

Author: cziegeler
Date: Wed Nov 11 19:23:57 2009
New Revision: 835024

URL: http://svn.apache.org/viewvc?rev=835024&view=rev
Log:
Remove empty folder.

Removed:
    incubator/ace/trunk/core/src/net/

Author: marrs
Date: Mon Oct 26 09:38:59 2009
New Revision: 829739

URL: http://svn.apache.org/viewvc?rev=829739&view=rev
Log:
Bugfix, NPE when the default directory was not specified, made a mistake in the checking code.

Modified:
    incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java?rev=829739&r1=829738&r2=829739&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java
Mon Oct 26 09:38:59 2009
@@ -349,14 +349,15 @@
             m_baseDirectory = baseDirectory;
 
             String defaultDirectoryName = (String) settings.get(DEFAULT_DIRECTORY_NAME);
-            File defaultDirectory = new File(defaultDirectoryName);
-            if (!defaultDirectory.exists() || !defaultDirectory.isDirectory()) {
-                // fallback to using the base directory
-                m_defaultDirectory = baseDirectory;
-            }
-            else {
-                m_defaultDirectory = defaultDirectory;
+            if (defaultDirectoryName != null) {
+                File defaultDirectory = new File(defaultDirectoryName);
+                if (defaultDirectory.exists() && defaultDirectory.isDirectory())
{
+                    m_defaultDirectory = defaultDirectory;
+                    return;
+                }
             }
+            // fallback to using the base directory
+            m_defaultDirectory = baseDirectory;
         }
     }
 

Author: marrs
Date: Mon Oct 26 09:09:31 2009
New Revision: 829731

URL: http://svn.apache.org/viewvc?rev=829731&view=rev
Log:
Added a configurable default directory for targets that have no specific versions as described
in ACE-60.

Modified:
    incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java

Modified: incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java?rev=829731&r1=829730&r2=829731&view=diff
==============================================================================
--- incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java
(original)
+++ incubator/ace/trunk/server/src/org/apache/ace/deployment/provider/filebased/FileBasedProvider.java
Mon Oct 26 09:09:31 2009
@@ -55,9 +55,13 @@
  * org.osgi.framework.Version format.
  */
 public class FileBasedProvider implements DeploymentProvider, ManagedService {
+    /** Directory where all the target ID folders are located. */
     private static final String DIRECTORY_NAME = "BaseDirectoryName";
+    /** Fallback directory for all targets that have no specific versions. Defaults to BaseDirectoryName
if not specified. */
+    private static final String DEFAULT_DIRECTORY_NAME = "DefaultDirectoryName";
     private static final int OSGI_R4_MANIFEST_VERSION = 2;
     private volatile File m_baseDirectory;
+    private volatile File m_defaultDirectory;
     private volatile LogService m_log;
     private final Semaphore m_disk = new Semaphore(1, true);
 
@@ -77,8 +81,7 @@
             versionDirectory = findMatchingVersionDirectory(gatewayDirectory, version);
         }
         else {
-            // shared folder from m_baseDirectory
-            versionDirectory = findMatchingVersionDirectory(m_baseDirectory, version);
+            versionDirectory = findMatchingVersionDirectory(m_defaultDirectory, version);
         }
         List<ArtifactData> bundleData = new ArrayList<ArtifactData>();
 
@@ -287,8 +290,8 @@
             getVersions(gatewayId, versionList, gatewayDirectory);
         }
         else {
-            // try from m_baseDirectory
-            getVersions(gatewayId, versionList, m_baseDirectory);
+            // try the default
+            getVersions(gatewayId, versionList, m_defaultDirectory);
         }
 
         // now sort the list of versions and convert all values to strings.
@@ -344,6 +347,16 @@
                 throw new ConfigurationException(DIRECTORY_NAME, "The directory called '"
+ baseDirectoryName + "' " + (baseDirectory.exists() ? "is no directory." : "doesn't exist."));
             }
             m_baseDirectory = baseDirectory;
+
+            String defaultDirectoryName = (String) settings.get(DEFAULT_DIRECTORY_NAME);
+            File defaultDirectory = new File(defaultDirectoryName);
+            if (!defaultDirectory.exists() || !defaultDirectory.isDirectory()) {
+                // fallback to using the base directory
+                m_defaultDirectory = baseDirectory;
+            }
+            else {
+                m_defaultDirectory = defaultDirectory;
+            }
         }
     }