Sorry that should have said CXF 2.2.9. The commit is good, the message has the typo.
Unfortunately no svn commit --amend yet... David On 16 July 2010 13:46, <dav...@apache.org> wrote: > Author: davidb > Date: Fri Jul 16 12:46:10 2010 > New Revision: 964787 > > URL: http://svn.apache.org/viewvc?rev=964787&view=rev > Log: > Move DOSGi to CXF 2.0.9 > - This commit includes Sergey's work to pick up CXF 2.0.9 > - It moves the CXF bundle to the end of the list of bundles > - And adds the proper start levels to the system tests > > 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/parent/pom.xml > > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java > > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java > > Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml > URL: > http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=964787&r1=964786&r2=964787&view=diff > ============================================================================== > --- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original) > +++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Fri Jul 16 12:46:10 2010 > @@ -63,6 +63,17 @@ > <artifactId>com.springsource.org.apache.commons.logging</artifactId> > <version>1.1.1</version> > </dependency> > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>com.springsource.slf4j.api</artifactId> > + <version>1.5.10</version> > + </dependency> > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>com.springsource.slf4j.jcl</artifactId> > + <version>1.5.10</version> > + </dependency> > + > <dependency> > <groupId>org.jdom</groupId> > <artifactId>com.springsource.org.jdom</artifactId> > @@ -180,7 +191,11 @@ > <artifactId>org.apache.servicemix.bundles.woodstox</artifactId> > <version>${woodstox.bundle.version}</version> > </dependency> > - > + <dependency> > + <groupId>org.apache.servicemix.bundles</groupId> > + <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId> > + <version>${commons.pool.bundle.version}</version> > + </dependency> > <dependency> > <groupId>org.apache.cxf</groupId> > <artifactId>cxf-bundle-minimal</artifactId> > > 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=964787&r1=964786&r2=964787&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 Jul 16 12:46:10 2010 > @@ -10,6 +10,8 @@ > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-context-${spring.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle> > + > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.api-1.5.10.jar</bundle> > + > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.jcl-1.5.10.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-aop-${spring.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle> > @@ -23,12 +25,13 @@ > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar</bundle> > - > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle> > + > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.commons-pool-${commons.pool.bundle.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jsr311-api-1.0-${servicemix.specs.version}.jar</bundle> > + > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle> > > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-local-${pom.version}.jar</bundle> > > <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${pom.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=964787&r1=964786&r2=964787&view=diff > ============================================================================== > --- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original) > +++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Fri Jul 16 12:46:10 > 2010 > @@ -64,6 +64,16 @@ > <artifactId>com.springsource.org.apache.commons.logging</artifactId> > <version>1.1.1</version> > </dependency> > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>com.springsource.slf4j.api</artifactId> > + <version>1.5.10</version> > + </dependency> > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>com.springsource.slf4j.jcl</artifactId> > + <version>1.5.10</version> > + </dependency> > <dependency> > <groupId>org.jdom</groupId> > <artifactId>com.springsource.org.jdom</artifactId> > @@ -178,6 +188,12 @@ > > <dependency> > <groupId>org.apache.servicemix.bundles</groupId> > + <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId> > + <version>${commons.pool.bundle.version}</version> > + </dependency> > + > + <dependency> > + <groupId>org.apache.servicemix.bundles</groupId> > <artifactId>org.apache.servicemix.bundles.woodstox</artifactId> > <version>${woodstox.bundle.version}</version> > </dependency> > > Modified: cxf/dosgi/trunk/parent/pom.xml > URL: > http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=964787&r1=964786&r2=964787&view=diff > ============================================================================== > --- cxf/dosgi/trunk/parent/pom.xml (original) > +++ cxf/dosgi/trunk/parent/pom.xml Fri Jul 16 12:46:10 2010 > @@ -18,7 +18,7 @@ > generally caused by the fact that not all versions are available yet > as > OSGi bundles. --> > <properties> > - <cxf.version>2.2.5</cxf.version> > + <cxf.version>2.2.9</cxf.version> > <felix.version>1.8.0</felix.version> > <spring.version>2.5.6</spring.version> > <spring.osgi.version>1.2.0</spring.osgi.version> > @@ -37,6 +37,7 @@ > <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> > + <commons.pool.bundle.version>1.5.4_1</commons.pool.bundle.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.0</slf4j.version> > > Modified: > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java > URL: > http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java?rev=964787&r1=964786&r2=964787&view=diff > ============================================================================== > --- > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java > (original) > +++ > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java > Fri Jul 16 12:46:10 2010 > @@ -48,15 +48,20 @@ public class TestExportService extends A > // Run this test under Felix. > opts.add(CoreOptions.frameworks(CoreOptions.felix())); > > - > opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value("" > + startLevel)); > > opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject()); > for(Map.Entry<Integer, String> entry : bundles.entrySet()) { > > opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey())); > } > - > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject()); > - > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject()); > - > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject()); > + > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject().startLevel(++startLevel)); > + > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject().startLevel(++startLevel)); > + > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject().startLevel(++startLevel)); > + > opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value("" > + startLevel)); > > + // For debugging... > + // opts.add(PaxRunnerOptions.vmOption( > "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=6006" )); > + // opts.add(CoreOptions.waitForFrameworkStartup()); > + // end debugging section. > + > return CoreOptions.options(opts.toArray(new Option[opts.size()])); > } > > > Modified: > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java > URL: > http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=964787&r1=964786&r2=964787&view=diff > ============================================================================== > --- > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java > (original) > +++ > cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java > Fri Jul 16 12:46:10 2010 > @@ -29,8 +29,6 @@ import org.junit.runner.RunWith; > import org.ops4j.pax.exam.CoreOptions; > import org.ops4j.pax.exam.Inject; > import org.ops4j.pax.exam.Option; > -import org.ops4j.pax.exam.container.def.PaxRunnerOptions; > -import org.ops4j.pax.exam.container.def.options.VMOption; > import org.ops4j.pax.exam.junit.Configuration; > import org.ops4j.pax.exam.junit.JUnit4TestRunner; > import org.osgi.framework.BundleContext; > @@ -50,16 +48,16 @@ public class TestImportService extends A > // Run this test under Felix. > opts.add(CoreOptions.frameworks(CoreOptions.felix())); > > - > opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value("" > + startLevel)); > > opts.add(CoreOptions.mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").versionAsInProject()); > for(Map.Entry<Integer, String> entry : bundles.entrySet()) { > > opts.add(CoreOptions.bundle(entry.getValue()).startLevel(entry.getKey())); > } > - > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject()); > + > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.samples").artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject().startLevel(++startLevel)); > > // This bundle contains the common system testing code > - > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject()); > + > opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject().startLevel(++startLevel)); > opts.add(CoreOptions.provision(getTestClientBundle())); > + > opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value("" > + startLevel)); > > // For debugging... > // opts.add(PaxRunnerOptions.vmOption( > "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" )); > > >
