Author: sergeyb
Date: Tue Dec 30 06:47:16 2008
New Revision: 730137
URL: http://svn.apache.org/viewvc?rev=730137&view=rev
Log:
DOSGI : update to CXF 2.2-SNAPSHOT in preparation for a move
Removed:
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookSyncTest.java
Modified:
cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
cxf/sandbox/dosgi/felix/profiles/pom.xml
cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt
cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt
cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt
cxf/sandbox/dosgi/parent/pom.xml
cxf/sandbox/dosgi/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
cxf/sandbox/dosgi/systests/pom.xml
Modified: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml Tue Dec 30 06:47:16 2008
@@ -74,6 +74,11 @@
<artifactId>com.springsource.org.jdom</artifactId>
<version>1.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.jaxen</groupId>
+ <artifactId>com.springsource.org.jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -141,49 +146,52 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <version>${xmlschema.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+ <version>${neethi.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
- <version>${servicemix.kernel.version}</version>
- </dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>${wsdl4j.bundle.version}</version>
+ </dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
- <version>${servicemix.feature.version}</version>
- </dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxbimpl.bundle.version}</version>
+ </dependency>
+
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.bundle.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
- <version>${woodstox.bundle.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>${woodstox.bundle.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-minimal</artifactId>
Modified: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/pom.xml?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/pom.xml Tue Dec 30 06:47:16
2008
@@ -74,6 +74,11 @@
<artifactId>com.springsource.org.jdom</artifactId>
<version>1.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.jaxen</groupId>
+ <artifactId>com.springsource.org.jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -141,49 +146,52 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <version>${xmlschema.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+ <version>${neethi.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
- <version>${servicemix.kernel.version}</version>
- </dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>${wsdl4j.bundle.version}</version>
+ </dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
- <version>${servicemix.feature.version}</version>
- </dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxbimpl.bundle.version}</version>
+ </dependency>
+
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.bundle.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
- <version>${woodstox.bundle.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>${woodstox.bundle.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-minimal</artifactId>
Modified: cxf/sandbox/dosgi/felix/profiles/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/pom.xml?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/pom.xml (original)
+++ cxf/sandbox/dosgi/felix/profiles/pom.xml Tue Dec 30 06:47:16 2008
@@ -38,7 +38,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jaxen</groupId>
+ <artifactId>com.springsource.org.jaxen</artifactId>
<version>1.1.1</version>
</dependency>
@@ -66,12 +73,12 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
@@ -109,42 +116,37 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <version>${xmlschema.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+ <version>${neethi.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>${wsdl4j.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxbimpl.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
- <version>${servicemix.kernel.version}</version>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.bundle.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant-1.7.0</artifactId>
- <version>${servicemix.kernel.version}</version>
- </dependency>
-
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
Modified: cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt
(original)
+++ cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt Tue
Dec 30 06:47:16 2008
@@ -12,6 +12,8 @@
start
file:${maven.repo.local}/org/jdom/com.springsource.org.jdom/1.0.0/com.springsource.org.jdom-1.0.0.jar
+start
file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
+
start
file:${maven.repo.local}/org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar
start
file:${maven.repo.local}/org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar
@@ -38,21 +40,21 @@
start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.0/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.0-${servicemix.specs.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.0/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.0-${servicemix.specs.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl-2.0.3/${servicemix.feature.version}/org.apache.servicemix.bundles.jaxb-impl-2.0.3-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxbimpl.bundle.version}/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1/${servicemix.feature.version}/org.apache.servicemix.bundles.wsdl4j-1.6.1-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema-1.3.2/${servicemix.feature.version}/org.apache.servicemix.bundles.xmlschema-1.3.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.bundle.version}/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm-2.2.3/${servicemix.kernel.version}/org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver-1.2/${servicemix.feature.version}/org.apache.servicemix.bundles.xmlresolver-1.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.neethi-2.0.2/${servicemix.feature.version}/org.apache.servicemix.bundles.neethi-2.0.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.woodstox/${woodstox.bundle.version}/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar
Modified: cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt
(original)
+++ cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt Tue
Dec 30 06:47:16 2008
@@ -12,6 +12,8 @@
start
file:${maven.repo.local}/org/jdom/com.springsource.org.jdom/1.0.0/com.springsource.org.jdom-1.0.0.jar
+start
file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
+
start
file:${maven.repo.local}/org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar
start
file:${maven.repo.local}/org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar
@@ -38,21 +40,21 @@
start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.0/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.0-${servicemix.specs.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.0/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.0-${servicemix.specs.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl-2.0.3/${servicemix.feature.version}/org.apache.servicemix.bundles.jaxb-impl-2.0.3-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxbimpl.bundle.version}/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1/${servicemix.feature.version}/org.apache.servicemix.bundles.wsdl4j-1.6.1-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema-1.3.2/${servicemix.feature.version}/org.apache.servicemix.bundles.xmlschema-1.3.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.bundle.version}/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm-2.2.3/${servicemix.kernel.version}/org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver-1.2/${servicemix.feature.version}/org.apache.servicemix.bundles.xmlresolver-1.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.neethi-2.0.2/${servicemix.feature.version}/org.apache.servicemix.bundles.neethi-2.0.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.woodstox/${woodstox.bundle.version}/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar
Modified: cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt
(original)
+++ cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt Tue
Dec 30 06:47:16 2008
@@ -12,6 +12,8 @@
start
file:${maven.repo.local}/org/jdom/com.springsource.org.jdom/1.0.0/com.springsource.org.jdom-1.0.0.jar
+start
file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
+
start
file:${maven.repo.local}/org/springframework/spring-core/${spring.version}/spring-core-${spring.version}.jar
start
file:${maven.repo.local}/org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar
@@ -38,21 +40,21 @@
start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.0/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.0-${servicemix.specs.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.0/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.0-${servicemix.specs.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix.specs.version}/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl-2.0.3/${servicemix.feature.version}/org.apache.servicemix.bundles.jaxb-impl-2.0.3-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxbimpl.bundle.version}/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1/${servicemix.feature.version}/org.apache.servicemix.bundles.wsdl4j-1.6.1-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema-1.3.2/${servicemix.feature.version}/org.apache.servicemix.bundles.xmlschema-1.3.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.bundle.version}/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm-2.2.3/${servicemix.kernel.version}/org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver-1.2/${servicemix.feature.version}/org.apache.servicemix.bundles.xmlresolver-1.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver.bundle.version}/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar
-start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.neethi-2.0.2/${servicemix.feature.version}/org.apache.servicemix.bundles.neethi-2.0.2-${servicemix.feature.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.neethi/${neethi.bundle.version}/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.woodstox/${woodstox.bundle.version}/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar
Modified: cxf/sandbox/dosgi/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/parent/pom.xml?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/parent/pom.xml (original)
+++ cxf/sandbox/dosgi/parent/pom.xml Tue Dec 30 06:47:16 2008
@@ -16,15 +16,21 @@
<properties>
- <cxf.version>2.0.8</cxf.version>
+ <cxf.version>2.2-SNAPSHOT</cxf.version>
<spring.version>2.5.5</spring.version>
<spring.osgi.version>1.1.2</spring.osgi.version>
-
- <servicemix.kernel.version>1.0.0-rc1</servicemix.kernel.version>
- <servicemix.feature.version>4.0-m1</servicemix.feature.version>
- <servicemix.specs.version>1.0.0</servicemix.specs.version>
- <servicemix.nmr.version>1.0-m1</servicemix.nmr.version>
-
+
+ <servicemix.specs.version>1.1.1</servicemix.specs.version>
+
+ <jetty.version>6.1.9</jetty.version>
+ <xmlschema.bundle.version>1.4.2_1</xmlschema.bundle.version>
+ <xmlresolver.bundle.version>1.2_1</xmlresolver.bundle.version>
+ <neethi.bundle.version>2.0.4_1</neethi.bundle.version>
+ <wsdl4j.bundle.version>1.6.1_1</wsdl4j.bundle.version>
+ <asm.bundle.version>2.2.3_1</asm.bundle.version>
+ <woodstox.bundle.version>3.2.7_1</woodstox.bundle.version>
+ <jaxbimpl.bundle.version>2.1.6_1</jaxbimpl.bundle.version>
+
<felix.plugin.version>1.4.0</felix.plugin.version>
</properties>
Modified:
cxf/sandbox/dosgi/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
---
cxf/sandbox/dosgi/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
(original)
+++
cxf/sandbox/dosgi/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
Tue Dec 30 06:47:16 2008
@@ -79,7 +79,7 @@
+ " " + greeting.getValue());
}
} catch (GreeterException ex) {
- System.out.println("GreeterException : " +
ex.getMessage());
+ System.out.println("GreeterException : " + ex.toString());
}
}
}
Modified:
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
---
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
(original)
+++
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
Tue Dec 30 06:47:16 2008
@@ -67,7 +67,8 @@
getBundle("org.apache.commons",
"com.springsource.org.apache.commons.logging"),
getBundle("org.jdom", "com.springsource.org.jdom"),
-
+ getBundle("org.jaxen", "com.springsource.org.jaxen"),
+
getBundle("org.mortbay.jetty", "jetty"),
getBundle("org.mortbay.jetty", "jetty-util"),
@@ -75,16 +76,16 @@
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.stax-api-1.0"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.0"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.0"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.1"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.1"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j-1.6.1"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver-1.2"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi-2.0.2"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm-2.2.3"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl-2.0.3"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema-1.3.2"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema"),
getBundle("org.apache.cxf", "cxf-bundle-minimal"),
getBundle("org.apache.cxf", "cxf-dosgi-ri-dsw-cxf"),
getBundle("org.apache.cxf",
"cxf-dosgi-ri-samples-greeter-interface")
Modified:
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
---
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
(original)
+++
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
Tue Dec 30 06:47:16 2008
@@ -68,6 +68,7 @@
getBundle("org.apache.commons",
"com.springsource.org.apache.commons.logging"),
getBundle("org.jdom", "com.springsource.org.jdom"),
+ getBundle("org.jaxen", "com.springsource.org.jaxen"),
getBundle("org.mortbay.jetty", "jetty"),
getBundle("org.mortbay.jetty", "jetty-util"),
@@ -76,16 +77,16 @@
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.stax-api-1.0"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.0"),
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.0"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.1"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.1"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j-1.6.1"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver-1.2"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi-2.0.2"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm-2.2.3"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl-2.0.3"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema-1.3.2"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxb-impl"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlschema"),
getBundle("org.apache.cxf", "cxf-bundle-minimal"),
getBundle("org.apache.cxf",
"cxf-dosgi-ri-samples-greeter-interface")
};
Modified: cxf/sandbox/dosgi/systests/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/pom.xml?rev=730137&r1=730136&r2=730137&view=diff
==============================================================================
--- cxf/sandbox/dosgi/systests/pom.xml (original)
+++ cxf/sandbox/dosgi/systests/pom.xml Tue Dec 30 06:47:16 2008
@@ -36,8 +36,8 @@
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
<osgi.test.platform>org.springframework.osgi.test.platform.FelixPlatform</osgi.test.platform>
- <jetty.version>6.1.9</jetty.version>
- <woodstox.bundle.version>3.2.7_1</woodstox.bundle.version>
+ <servicemix.kernel.version>1.0.0</servicemix.kernel.version>
+
<servicemix.depends.plugin.version>1.0.0-rc1</servicemix.depends.plugin.version>
</properties>
<dependencies>
@@ -45,9 +45,6 @@
<dependency>
<groupId>org.apache.servicemix.kernel.testing</groupId>
<artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
-<!--
- <version>1.1.0-SNAPSHOT</version>
--->
<version>1.0.0</version>
<scope>test</scope>
<exclusions>
@@ -162,9 +159,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.jaxen</groupId>
+ <artifactId>com.springsource.org.jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
@@ -188,12 +191,12 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
@@ -231,34 +234,34 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId>
+ <version>${xmlschema.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.neethi</artifactId>
+ <version>${neethi.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>${wsdl4j.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
- <version>${servicemix.feature.version}</version>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxbimpl.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
- <version>${servicemix.kernel.version}</version>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.bundle.version}</version>
</dependency>
<dependency>
@@ -277,7 +280,7 @@
<plugin>
<groupId>org.apache.servicemix.kernel.testing</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>${servicemix.kernel.version}</version>
+ <version>${servicemix.depends.plugin.version}</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -299,9 +302,14 @@
</property>
<property>
- <name>spring.validation.mode</name>
+
<name>org.apache.cxf.spring.validation.mode</name>
<value>VALIDATION_NONE</value>
</property>
+
+ <property>
+ <name>org.apache.cxf.nofastinfoset</name>
+ <value>true</value>
+ </property>
<!--
<property>
<name>felix.config.properties</name>
