Author: davidb
Date: Fri Apr 17 12:46:18 2009
New Revision: 765974
URL: http://svn.apache.org/viewvc?rev=765974&view=rev
Log:
Fix for CXF-2028
Upgraded to CXF 2.2.1-SNAPSHOT, this should also pave the way for a DOSGi 1.0 release.
Removed the SPIActivator from the Single-Bundle activator as it caused problems with the Spring-DM
system test harness and isn't needed any more.
Removed:
cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/SPIActivator.java
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
cxf/dosgi/trunk/distribution/single-bundle/pom.xml
cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
cxf/dosgi/trunk/felix/profiles/pom.xml
cxf/dosgi/trunk/parent/pom.xml
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=765974&r1=765973&r2=765974&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Fri Apr 17 12:46:18 2009
@@ -161,11 +161,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wss4j</artifactId>
- <version>${wss4j.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>${jaxbimpl.bundle.version}</version>
</dependency>
Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=765974&r1=765973&r2=765974&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml Fri Apr
17 12:46:18 2009
@@ -18,7 +18,6 @@
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
- <bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT.dir/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=765974&r1=765973&r2=765974&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Fri Apr 17 12:46:18 2009
@@ -160,11 +160,6 @@
<version>${xmlsec.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wss4j</artifactId>
- <version>${wss4j.bundle.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>${jaxbimpl.bundle.version}</version>
@@ -198,6 +193,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
Modified: cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java?rev=765974&r1=765973&r2=765974&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
(original)
+++ cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
Fri Apr 17 12:46:18 2009
@@ -102,10 +102,6 @@
}
void startEmbeddedActivators(BundleContext ctx) throws Exception {
- SPIActivator sba = new SPIActivator();
- sba.start(ctx);
- activators.add(sba);
-
for (String s : getActivators()) {
try {
Class<?> clazz = getClass().getClassLoader().loadClass(s);
Modified: cxf/dosgi/trunk/felix/profiles/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/pom.xml?rev=765974&r1=765973&r2=765974&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/pom.xml (original)
+++ cxf/dosgi/trunk/felix/profiles/pom.xml Fri Apr 17 12:46:18 2009
@@ -130,12 +130,6 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wss4j</artifactId>
- <version>${wss4j.bundle.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>${jaxbimpl.bundle.version}</version>
Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=765974&r1=765973&r2=765974&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Fri Apr 17 12:46:18 2009
@@ -14,8 +14,11 @@
<packaging>pom</packaging>
<name>Distributed OSGI Reference Implementation Parent</name>
+ <!-- Some versions of libraries used are different to the ones from CXF, this is
+ generally caused by the fact that not all versions are available yet as
+ OSGi bundles. -->
<properties>
- <cxf.version>2.2</cxf.version>
+ <cxf.version>2.2.1-SNAPSHOT</cxf.version>
<felix.version>1.4.1</felix.version>
<spring.version>2.5.6</spring.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
@@ -24,17 +27,16 @@
<servicemix.specs.version>1.1.1</servicemix.specs.version>
<log4j.version>1.2.15</log4j.version>
- <jetty.version>6.1.9</jetty.version>
- <xmlschema.bundle.version>1.4.2_1</xmlschema.bundle.version>
+ <jetty.version>6.1.16</jetty.version>
+ <xmlschema.bundle.version>1.4.3_1</xmlschema.bundle.version> <!--
CXF uses 1.4.4 -->
<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>
- <wss4j.bundle.version>1.5.4_1</wss4j.bundle.version>
+ <wsdl4j.bundle.version>1.6.1_1</wsdl4j.bundle.version> <!-- CXF uses
1.6.2 -->
<xmlsec.bundle.version>1.3.0_1</xmlsec.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>
- <slf4j.version>1.5.0</slf4j.version>
+ <woodstox.bundle.version>3.2.7_1</woodstox.bundle.version> <!-- CXF
uses 3.2.8 -->
+ <jaxbimpl.bundle.version>2.1.6_1</jaxbimpl.bundle.version> <!-- CXF
uses 2.1.9 -->
+ <slf4j.version>1.5.6</slf4j.version>
<felix.plugin.version>1.4.0</felix.plugin.version>
</properties>
|