You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/03/05 22:57:52 UTC
svn commit: r634042 - in /servicemix/smx4/nmr/trunk: jbi/itests/pom.xml
jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
pom.xml
Author: gnodet
Date: Wed Mar 5 13:57:49 2008
New Revision: 634042
URL: http://svn.apache.org/viewvc?rev=634042&view=rev
Log:
Remove references to the old preferences service
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=634042&r1=634041&r2=634042&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Wed Mar 5 13:57:49 2008
@@ -81,12 +81,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>org.apache.servicemix.preferences</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -131,6 +125,12 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.deployer</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.prefs</artifactId>
+ <version>${felix.prefs.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=634042&r1=634041&r2=634042&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java Wed Mar 5 13:57:49 2008
@@ -71,7 +71,7 @@
return new String[] {
getBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.0_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
- getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.preferences"),
+ getBundle("org.apache.felix", "org.apache.felix.prefs"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=634042&r1=634041&r2=634042&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Mar 5 13:57:49 2008
@@ -70,6 +70,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.activation.version>1.0.2</geronimo.activation.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.stax.version>1.0.1</geronimo.stax.version>
@@ -112,12 +113,6 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
- </repository>
- <!-- Staging repo -->
- <repository>
- <id>kernel-staging</id>
- <name>Kernel Staging Repository</name>
- <url>http://people.apache.org/~gnodet/staging/servicemix-kernel-1.0-m2</url>
</repository>
</repositories>