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 2010/02/12 11:49:44 UTC
svn commit: r909350 - in /servicemix/smx4/features/trunk: ./ assembly/
assembly/src/main/filtered-resources/ examples/itests/tests/
examples/itests/tests/src/test/java/org/apache/servicemix/examples/
Author: gnodet
Date: Fri Feb 12 10:49:44 2010
New Revision: 909350
URL: http://svn.apache.org/viewvc?rev=909350&view=rev
Log:
Upgrade pax-web-extender to the newer version (which is now part of pax-web)
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=909350&r1=909349&r2=909350&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Fri Feb 12 10:49:44 2010
@@ -612,14 +612,14 @@
<version>${pax.web.version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.web-extender</groupId>
- <artifactId>pax-web-ex-war</artifactId>
- <version>${pax.web.extender.version}</version>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-extender-war</artifactId>
+ <version>${pax.web.version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.web-extender</groupId>
- <artifactId>pax-web-ex-whiteboard</artifactId>
- <version>${pax.web.extender.version}</version>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-extender-whiteboard</artifactId>
+ <version>${pax.web.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=909350&r1=909349&r2=909350&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Fri Feb 12 10:49:44 2010
@@ -35,8 +35,8 @@
</feature>
<feature name="web" version="${version}">
<feature version="${version}">web-core</feature>
- <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-war/${pax.web.extender.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-whiteboard/${pax.web.extender.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
<bundle>mvn:org.apache.servicemix.war/org.apache.servicemix.war.deployer/${version}</bundle>
</feature>
@@ -83,7 +83,7 @@
<feature name="cxf-osgi" version="${version}">
<feature version="${cxf.version}">cxf</feature>
<feature version="${version}">web-core</feature>
- <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-whiteboard/${pax.web.extender.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
</feature>
<feature name="cxf-jaxrs" version="${version}">
<feature version="${version}">cxf-osgi</feature>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=909350&r1=909349&r2=909350&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Fri Feb 12 10:49:44 2010
@@ -371,9 +371,9 @@
<version>${pax.web.version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.web-extender</groupId>
- <artifactId>pax-web-ex-whiteboard</artifactId>
- <version>${pax.web.extender.version}</version>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-extender-whiteboard</artifactId>
+ <version>${pax.web.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=909350&r1=909349&r2=909350&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java Fri Feb 12 10:49:44 2010
@@ -112,7 +112,7 @@
getBundle("org.ops4j.pax.web", "pax-web-spi"),
getBundle("org.ops4j.pax.web", "pax-web-runtime"),
getBundle("org.ops4j.pax.web", "pax-web-jetty"),
- getBundle("org.ops4j.pax.web-extender", "pax-web-ex-whiteboard"),
+ getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
getBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=909350&r1=909349&r2=909350&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Fri Feb 12 10:49:44 2010
@@ -136,7 +136,7 @@
getBundle("org.ops4j.pax.web", "pax-web-spi"),
getBundle("org.ops4j.pax.web", "pax-web-runtime"),
getBundle("org.ops4j.pax.web", "pax-web-jetty"),
- getBundle("org.ops4j.pax.web-extender", "pax-web-ex-whiteboard"),
+ getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
getBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=909350&r1=909349&r2=909350&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Feb 12 10:49:44 2010
@@ -175,7 +175,6 @@
<pax.logging.version>1.4</pax.logging.version>
<pax.url.version>1.1.2</pax.url.version>
<pax.web.version>0.7.2</pax.web.version>
- <pax.web.extender.version>0.5.0</pax.web.extender.version>
<propertyset.version>1.3_3</propertyset.version>
<qpid.version>1.0-incubating-M2.1_1</qpid.version>
<quartz.version>1.6.1_3</quartz.version>