Author: gnodet
Date: Fri Mar 28 07:26:38 2008
New Revision: 642240
URL: http://svn.apache.org/viewvc?rev=642240&view=rev
Log:
SMX4KNL-27: Include an implementation of the Preferences service
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=642240&r1=642239&r2=642240&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Fri Mar 28 07:26:38 2008
@@ -149,6 +149,11 @@
<artifactId>org.apache.felix.configadmin</artifactId>
<version>${felix.configadmin.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.prefs</artifactId>
+ <version>${felix.prefs.version}</version>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=642240&r1=642239&r2=642240&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Mar 28 07:26:38 2008
@@ -137,6 +137,7 @@
<!-- OBR + GShell command -->
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
+ <include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=642240&r1=642239&r2=642240&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Mar 28 07:26:38 2008
@@ -129,6 +129,7 @@
<!-- OBR + GShell command -->
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
+ <include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.ops4j.pax.url:pax-url-mvn</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=642240&r1=642239&r2=642240&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties Fri Mar 28 07:26:38 2008
@@ -29,6 +29,7 @@
org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
pax-logging-api-${pax.logging.version}.jar=20
pax-logging-service-${pax.logging.version}.jar=20
+org.apache.felix.prefs-${felix.prefs.version}.jar=10
#
# The rest of the services..
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties?rev=642240&r1=642239&r2=642240&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties Fri Mar 28 07:26:38 2008
@@ -29,6 +29,7 @@
org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
pax-logging-api-${pax.logging.version}.jar=20
pax-logging-service-${pax.logging.version}.jar=20
+org.apache.felix.prefs-${felix.prefs.version}.jar=10
#
# The rest of the services..
@@ -37,7 +38,6 @@
org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${pom.version}.jar=50
org.apache.servicemix.bundles.cglib-${cglib.version}-${pom.version}.jar=50
org.apache.servicemix.bundles.mina-${mina.version}-${pom.version}.jar=50
-org.apache.servicemix.bundles.xstream-${xstream.version}-${pom.version}.jar=50
geronimo-stax-api_1.0_spec-${geronimo.stax.version}.jar=50
spring-aop-${spring.version}.jar=50
spring-beans-${spring.version}.jar=50
@@ -48,7 +48,7 @@
spring-osgi-io-${spring.osgi.version}.jar=50
org.apache.servicemix.kernel.spring-${pom.version}.jar=50
org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
-pax-runner-handler-mvn-${pax.runner.version}.jar=50
+pax-url-mvn-${pax.url.version}.jar=50
org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=642240&r1=642239&r2=642240&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Fri Mar 28 07:26:38 2008
@@ -73,6 +73,7 @@
<felix.osgi.version>1.0.0</felix.osgi.version>
<felix.compendium.version>1.0.0</felix.compendium.version>
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
+ <felix.prefs.version>1.0.2</felix.prefs.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.stax.version>1.0.1</geronimo.stax.version>
<gshell.version>1.0-alpha-2-SNAPSHOT</gshell.version>