incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1104153 - in /incubator/ace/trunk: ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java ace-features/src/main/resources/features.xml pom/pom.xml
Date Tue, 17 May 2011 11:17:32 GMT
Author: jbonofre
Date: Tue May 17 11:17:31 2011
New Revision: 1104153

URL: http://svn.apache.org/viewvc?rev=1104153&view=rev
Log:
ACE Configurator now creates the CONFIG_DIR folder if it doesn't exist.
Change the default value for the CONFIG_DIR folder.
Update the ACE features.

Modified:
    incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
    incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java
    incubator/ace/trunk/ace-features/src/main/resources/features.xml
    incubator/ace/trunk/pom/pom.xml

Modified: incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java?rev=1104153&r1=1104152&r2=1104153&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
(original)
+++ incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Activator.java
Tue May 17 11:17:31 2011
@@ -31,7 +31,7 @@ public class Activator extends Dependenc
     public void init(BundleContext context, DependencyManager manager) throws Exception {
         manager.add(createComponent()
             .setImplementation(new Configurator(new File(
-                getProperty(context.getProperty(Activator.class.getPackage().getName() +
".CONFIG_DIR"), "conf")),
+                getProperty(context.getProperty(Activator.class.getPackage().getName() +
".CONFIG_DIR"), "etc/ace")),
                 getProperty(context.getProperty(Activator.class.getPackage().getName() +
".POLL_INTERVAL"), 2000),
                 getProperty(context.getProperty(Activator.class.getPackage().getName() +
".RECONFIG"), true)))
             .add(createServiceDependency()

Modified: incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java?rev=1104153&r1=1104152&r2=1104153&view=diff
==============================================================================
--- incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java
(original)
+++ incubator/ace/trunk/ace-configurator/src/main/java/org/apache/ace/configurator/Configurator.java
Tue May 17 11:17:31 2011
@@ -79,6 +79,10 @@ public class Configurator implements Run
      * values will not be overwritten, only new values (for a given pid) will be added.
      */
     public Configurator(File dir, long pollInterval, boolean reconfig) {
+        // create the config directory if it doesn't exist
+        if ((dir != null) && (!dir.exists())) {
+            dir.mkdirs();
+        }
         if ((dir == null) || !dir.isDirectory() || (pollInterval < 0)) {
             throw new IllegalArgumentException("Bad arguments; either not an existing directory
or an invalid interval.");
         }

Modified: incubator/ace/trunk/ace-features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-features/src/main/resources/features.xml?rev=1104153&r1=1104152&r2=1104153&view=diff
==============================================================================
--- incubator/ace/trunk/ace-features/src/main/resources/features.xml (original)
+++ incubator/ace/trunk/ace-features/src/main/resources/features.xml Tue May 17 11:17:31 2011
@@ -21,7 +21,8 @@
 
     <feature name="ace-common" version="${project.version}" resolver="(obr)">
         <feature>eventadmin</feature>
-        <!-- TODO add OSGi compendium dependency -->
+        <feature>http</feature>
+        <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
         <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager/${felix.dependencymanager.version}</bundle>
         <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager.shell/${felix.dependencymanager.version}</bundle>
         <bundle>mvn:org.apache.felix/org.apache.felix.deploymentadmin/${felix.deploymentadmin.version}</bundle>
@@ -30,13 +31,14 @@
         <bundle>mvn:org.apache.ace/org.apache.ace.log.servlet/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.consolelogger/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.range.api/${project.version}</bundle>
+        <bundle>mvn:org.apache.ace/org.apache.ace.repository.api/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.httplistener/${project.version}</bundle>
-        <bundle>mvn:org.apache.ace/org.apache.ace.resourceprocessor.useradmin/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.server.log.store/${project.version}</bundle>
-        <bundle>mvn:org.apache.ace/org.apache.ace.tageditor/${project.version}</bundle>
     </feature>
 
     <feature name="ace-client" version="${project.version}" resolver="(obr)">
+        <feature version="${project.version}">ace-common</feature>
+        <bundle>mvn:org.knopflerfish.bundle/useradmin/${knopflerfish.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.client.repository.api/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.client.repository.helper.base/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.client.repository.helper.bundle/${project.version}</bundle>
@@ -45,6 +47,7 @@
     </feature>
 
     <feature name="ace-configurator" version="${project.version}" resolver="(obr)">
+        <feature version="${project.version}">ace-common</feature>
         <bundle>mvn:org.apache.ace/org.apache.ace.configurator/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.configurator.serveruseradmin/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.configurator.useradmin.task/${project.version}</bundle>
@@ -58,6 +61,7 @@
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.provider.repositorybased/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.servlet/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.deployment.streamgenerator/${project.version}</bundle>
+        <bundle>mvn:org.apache.ace/org.apache.ace.resourceprocessor.useradmin/${project.version}</bundle>
     </feature>
 
     <feature name="ace-discovery" version="${project.version}" resolver="(obr)">
@@ -78,7 +82,6 @@
     </feature>
 
     <feature name="ace-repository" version="${project.version}" resolver="(obr)">
-        <bundle>mvn:org.apache.ace/org.apache.ace.repository.api/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.repository.impl/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.repository.servlet/${project.version}</bundle>
     </feature>
@@ -91,6 +94,7 @@
         <feature>war</feature>
         <bundle>mvn:com.vaadin/vaadin/${vaadin.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.webconsole.plugin/${project.version}</bundle>
+        <bundle>mvn:org.apache.ace/org.apache.ace.tageditor/${project.version}</bundle>
         <bundle>mvn:org.apache.ace/org.apache.ace.webui.vaadin/${project.version}</bundle>
     </feature>
 

Modified: incubator/ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom/pom.xml?rev=1104153&r1=1104152&r2=1104153&view=diff
==============================================================================
--- incubator/ace/trunk/pom/pom.xml (original)
+++ incubator/ace/trunk/pom/pom.xml Tue May 17 11:17:31 2011
@@ -137,6 +137,7 @@
         <felix.eventadmin.version>1.2.8</felix.eventadmin.version>
         <felix.framework.version>3.0.8</felix.framework.version>
         <felix.maven-bundle-plugin.version>2.3.4</felix.maven-bundle-plugin.version>
+        <felix.metatype.version>1.0.4</felix.metatype.version>
         <felix.prefs.version>1.0.4</felix.prefs.version>
         <felix.shell.version>1.4.2</felix.shell.version>
         <junit.version>4.4</junit.version>



Mime
View raw message