cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1139830 [2/2] - in /cxf/dosgi/trunk: ./ discovery/distributed/cxf-discovery/ discovery/distributed/zookeeper-server-config/ discovery/distributed/zookeeper-server/ discovery/distributed/zookeeper-wrapper/ discovery/local/ discovery/local/s...
Date Sun, 26 Jun 2011 16:13:54 GMT
Modified: cxf/dosgi/trunk/felix/profiles/src/main/resources/client_bundles.txt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/src/main/resources/client_bundles.txt?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/src/main/resources/client_bundles.txt (original)
+++ cxf/dosgi/trunk/felix/profiles/src/main/resources/client_bundles.txt Sun Jun 26 16:13:52 2011
@@ -1,16 +1,16 @@
 start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.2/geronimo-activation_1.1_spec-1.0.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.2/geronimo-javamail_1.4_spec-1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.2/geronimo-ws-metadata_2.0_spec-1.1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.3/geronimo-ws-metadata_2.0_spec-1.1.3.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_2.5_spec/1.1.2/geronimo-servlet_2.5_spec-1.1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar
 
 start file:${maven.repo.local}/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar
 
-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/jdom/com.springsource.org.jdom/1.1.0/com.springsource.org.jdom-1.1.0.jar
 
 start file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
 
@@ -24,15 +24,17 @@ start file:${maven.repo.local}/org/aopal
 
 start file:${maven.repo.local}/org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar
 
+start file:${maven.repo.local}/org/springframework/spring-expression/${spring.version}/spring-expression-${spring.version}.jar
+
+start file:${maven.repo.local}/org/springframework/spring-asm/${spring.version}/spring-asm-${spring.version}.jar
+
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar
 
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar
 
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar
 
-start file:${maven.repo.local}/org/mortbay/jetty/jetty-util/${jetty.version}/jetty-util-${jetty.version}.jar
-
-start file:${maven.repo.local}/org/mortbay/jetty/jetty/${jetty.version}/jetty-${jetty.version}.jar
+start file:${maven.repo.local}/org/eclipse/jetty/aggregate/jetty-all-server/${jetty.version}/jetty-all-server-${jetty.version}.jar
 
 start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.locator/${servicemix.specs.version}/org.apache.servicemix.specs.locator-${servicemix.specs.version}.jar
 
@@ -52,15 +54,21 @@ start file:${maven.repo.local}/org/apach
 
 start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.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/sws/xmlschema/xmlschema-core/${xmlschema.bundle.version}/xmlschema-core-${xmlschema.bundle.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/${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/${neethi.bundle.version}/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar
+start file:${maven.repo.local}/org/apache/neethi/neethi/${neethi.bundle.version}/neethi-${neethi.bundle.version}.jar
+
+start file:${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar
+
+start file:${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/${woodstox.bundle.version}/woodstox-core-asl-${woodstox.bundle.version}.jar
+
+start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/1.5.2_4/org.apache.servicemix.bundles.joda-time-1.5.2_4.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
+start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.opensaml/2.4.1_1/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar
 
 start file:${maven.repo.local}/org/apache/cxf/cxf-bundle-minimal/${cxf.version}/cxf-bundle-minimal-${cxf.version}.jar
 

Modified: cxf/dosgi/trunk/felix/profiles/src/main/resources/dosgi_bundles.txt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/src/main/resources/dosgi_bundles.txt?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/src/main/resources/dosgi_bundles.txt (original)
+++ cxf/dosgi/trunk/felix/profiles/src/main/resources/dosgi_bundles.txt Sun Jun 26 16:13:52 2011
@@ -1,16 +1,16 @@
 start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.2/geronimo-activation_1.1_spec-1.0.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.2/geronimo-javamail_1.4_spec-1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.2/geronimo-ws-metadata_2.0_spec-1.1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.3/geronimo-ws-metadata_2.0_spec-1.1.3.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_2.5_spec/1.1.2/geronimo-servlet_2.5_spec-1.1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar
 
 start file:${maven.repo.local}/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar
 
-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/jdom/com.springsource.org.jdom/1.1.0/com.springsource.org.jdom-1.1.0.jar
 
 start file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
 
@@ -24,15 +24,17 @@ start file:${maven.repo.local}/org/aopal
 
 start file:${maven.repo.local}/org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar
 
+start file:${maven.repo.local}/org/springframework/spring-expression/${spring.version}/spring-expression-${spring.version}.jar
+
+start file:${maven.repo.local}/org/springframework/spring-asm/${spring.version}/spring-asm-${spring.version}.jar
+
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar
 
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar
 
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar
 
-start file:${maven.repo.local}/org/mortbay/jetty/jetty-util/${jetty.version}/jetty-util-${jetty.version}.jar
-
-start file:${maven.repo.local}/org/mortbay/jetty/jetty/${jetty.version}/jetty-${jetty.version}.jar
+start file:${maven.repo.local}/org/eclipse/jetty/aggregate/jetty-all-server/${jetty.version}/jetty-all-server-${jetty.version}.jar
 
 start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.locator/${servicemix.specs.version}/org.apache.servicemix.specs.locator-${servicemix.specs.version}.jar
 
@@ -52,15 +54,21 @@ start file:${maven.repo.local}/org/apach
 
 start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.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/sws/xmlschema/xmlschema-core/${xmlschema.bundle.version}/xmlschema-core-${xmlschema.bundle.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/${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/${neethi.bundle.version}/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar
+start file:${maven.repo.local}/org/apache/neethi/neethi/${neethi.bundle.version}/neethi-${neethi.bundle.version}.jar
+
+start file:${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar
+
+start file:${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/${woodstox.bundle.version}/woodstox-core-asl-${woodstox.bundle.version}.jar
+
+start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/1.5.2_4/org.apache.servicemix.bundles.joda-time-1.5.2_4.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
+start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.opensaml/2.4.1_1/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar
 
 start file:${maven.repo.local}/org/apache/cxf/cxf-bundle-minimal/${cxf.version}/cxf-bundle-minimal-${cxf.version}.jar
 

Modified: cxf/dosgi/trunk/felix/profiles/src/main/resources/server_bundles.txt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/src/main/resources/server_bundles.txt?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/src/main/resources/server_bundles.txt (original)
+++ cxf/dosgi/trunk/felix/profiles/src/main/resources/server_bundles.txt Sun Jun 26 16:13:52 2011
@@ -1,16 +1,16 @@
 start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.2/geronimo-activation_1.1_spec-1.0.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.1/geronimo-activation_1.1_spec-1.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.2/geronimo-javamail_1.4_spec-1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.7.1/geronimo-javamail_1.4_spec-1.7.1.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.2/geronimo-ws-metadata_2.0_spec-1.1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.3/geronimo-ws-metadata_2.0_spec-1.1.3.jar
 
-start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_2.5_spec/1.1.2/geronimo-servlet_2.5_spec-1.1.2.jar
+start file:${maven.repo.local}/org/apache/geronimo/specs/geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar
 
 start file:${maven.repo.local}/org/apache/commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar
 
-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/jdom/com.springsource.org.jdom/1.1.0/com.springsource.org.jdom-1.1.0.jar
 
 start file:${maven.repo.local}/org/jaxen/com.springsource.org.jaxen/1.1.1/com.springsource.org.jaxen-1.1.1.jar
 
@@ -24,15 +24,17 @@ start file:${maven.repo.local}/org/aopal
 
 start file:${maven.repo.local}/org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar
 
+start file:${maven.repo.local}/org/springframework/spring-expression/${spring.version}/spring-expression-${spring.version}.jar
+
+start file:${maven.repo.local}/org/springframework/spring-asm/${spring.version}/spring-asm-${spring.version}.jar
+
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-io/${spring.osgi.version}/spring-osgi-io-${spring.osgi.version}.jar
 
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-core/${spring.osgi.version}/spring-osgi-core-${spring.osgi.version}.jar
 
 start file:${maven.repo.local}/org/springframework/osgi/spring-osgi-extender/${spring.osgi.version}/spring-osgi-extender-${spring.osgi.version}.jar
 
-start file:${maven.repo.local}/org/mortbay/jetty/jetty-util/${jetty.version}/jetty-util-${jetty.version}.jar
-
-start file:${maven.repo.local}/org/mortbay/jetty/jetty/${jetty.version}/jetty-${jetty.version}.jar
+start file:${maven.repo.local}/org/eclipse/jetty/aggregate/jetty-all-server/${jetty.version}/jetty-all-server-${jetty.version}.jar
 
 start file:${maven.repo.local}/org/apache/servicemix/specs/org.apache.servicemix.specs.locator/${servicemix.specs.version}/org.apache.servicemix.specs.locator-${servicemix.specs.version}.jar
 
@@ -52,15 +54,21 @@ start file:${maven.repo.local}/org/apach
 
 start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.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/sws/xmlschema/xmlschema-core/${xmlschema.bundle.version}/xmlschema-core-${xmlschema.bundle.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/${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/${neethi.bundle.version}/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar
+start file:${maven.repo.local}/org/apache/neethi/neethi/${neethi.bundle.version}/neethi-${neethi.bundle.version}.jar
+
+start file:${maven.repo.local}/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar
+
+start file:${maven.repo.local}/org/codehaus/woodstox/woodstox-core-asl/${woodstox.bundle.version}/woodstox-core-asl-${woodstox.bundle.version}.jar
+
+start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/1.5.2_4/org.apache.servicemix.bundles.joda-time-1.5.2_4.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
+start file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.opensaml/2.4.1_1/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar
 
 start file:${maven.repo.local}/org/apache/cxf/cxf-bundle-minimal/${cxf.version}/cxf-bundle-minimal-${cxf.version}.jar
 

Modified: cxf/dosgi/trunk/felix/shell.tui/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/shell.tui/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/shell.tui/pom.xml (original)
+++ cxf/dosgi/trunk/felix/shell.tui/pom.xml Sun Jun 26 16:13:52 2011
@@ -77,8 +77,8 @@
           <instructions>
             <Private-Package>org.apache.felix.shell.tui.*</Private-Package>
             <Bundle-Activator>org.apache.felix.shell.tui.Activator</Bundle-Activator>
-            <Bundle-DocURL>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</Bundle-DocURL>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-DocURL>http://oscar-osgi.sf.net/obr2/${project.artifactId}/</Bundle-DocURL>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Import-Service>org.apache.felix.shell.ShellService</Import-Service>
           </instructions>

Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Sun Jun 26 16:13:52 2011
@@ -18,31 +18,37 @@
          generally caused by the fact that not all versions are available yet as 
          OSGi bundles. -->
     <properties>
-        <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>
+        <!-- portable text resource processing -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <osgi.version>4.2.0</osgi.version>
+
+        <cxf.version>2.4.1</cxf.version>
+        <cxf.build-utils.version>2.3.2</cxf.build-utils.version>
+        <felix.version>3.0.8</felix.version>
+        <spring.version>3.0.5.RELEASE</spring.version>
+        <spring.osgi.version>1.2.1</spring.osgi.version>
         <zookeeper.version>3.2.1</zookeeper.version>
 
         <remote.service.admin.interfaces.version>1.0.0</remote.service.admin.interfaces.version>
 
-        <servicemix.specs.version>1.3.0</servicemix.specs.version>
+        <servicemix.specs.version>1.8.0</servicemix.specs.version>
 
-        <servlet.version>2.5</servlet.version>
+        <servlet.version>3.0</servlet.version>
         <log4j.version>1.2.15</log4j.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> <!-- 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> 
+        <jetty.version>7.4.2.v20110526</jetty.version>
+        <xmlschema.bundle.version>2.0</xmlschema.bundle.version>
+        <xmlresolver.bundle.version>1.2_4</xmlresolver.bundle.version>          
+        <neethi.bundle.version>3.0.0</neethi.bundle.version>
+        <wsdl4j.bundle.version>1.6.2_5</wsdl4j.bundle.version> <!-- CXF uses 1.6.2 -->
+        <xmlsec.bundle.version>1.4.5_1</xmlsec.bundle.version>
+        <asm.bundle.version>3.3_2</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 -->
+        <woodstox.bundle.version>4.1.1</woodstox.bundle.version> <!-- CXF 2.4.1 uses 4.1.1 -->
+        <jaxbimpl.bundle.version>2.1.13_2</jaxbimpl.bundle.version> <!-- CXF 2.4.1 uses 2.1.13_2 -->
         <slf4j.version>1.5.0</slf4j.version>
 
-        <felix.plugin.version>1.4.0</felix.plugin.version>
+        <felix.plugin.version>2.3.4</felix.plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -82,17 +88,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-2</version>
+                    <version>2.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.2</version>
+                    <version>2.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.0.2</version>
+                    <version>2.3.2</version>
                     <configuration>
                         <source>1.5</source>
                         <target>1.5</target>
@@ -103,7 +109,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>1.6</version>
                     <dependencies>
                         <dependency>
                             <groupId>ant</groupId>
@@ -115,22 +121,23 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0</version>
+                    <version>2.2</version>
                 </plugin>
 
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0</version>
+                    <version>1.2</version>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.cxf</groupId>
+                            <groupId>org.apache.cxf.build-utils</groupId>
                             <artifactId>cxf-buildtools</artifactId>
-                            <version>${project.version}</version>
+                            <version>${cxf.build-utils.version}</version>
                         </dependency>
                 </dependencies>
                 <executions>
@@ -157,13 +164,14 @@
 
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0</version>
+                <version>1.2</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.cxf</groupId>
+                        <groupId>org.apache.cxf.build-utils</groupId>
                         <artifactId>cxf-buildtools</artifactId>
-                        <version>${cxf.version}</version>
+                        <version>${cxf.build-utils.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>

Modified: cxf/dosgi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/pom.xml (original)
+++ cxf/dosgi/trunk/pom.xml Sun Jun 26 16:13:52 2011
@@ -39,11 +39,6 @@
         <maven>2.0.9</maven>
     </prerequisites>
 
-    <properties>
-        <jetty.version>6.1.9</jetty.version>
-        <woodstox.bundle.version>3.2.7_1</woodstox.bundle.version> 
-    </properties>
-
     <distributionManagement>
         <repository>
             <id>apache.releases.https</id>
@@ -122,7 +117,7 @@
                     <plugin>
                         <inherited>true</inherited>
                         <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>2.6</version>
                         <configuration>
                             <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
                             <updateReleaseInfo>true</updateReleaseInfo>
@@ -131,7 +126,7 @@
                     <!-- We want to sign the artifact, the POM, and all attached artifacts -->
                     <plugin>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0-alpha-4</version>
+                        <version>1.3</version>
                         <executions>
                             <execution>
                                 <goals>

Modified: cxf/dosgi/trunk/samples/discovery/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/client/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/client/pom.xml Sun Jun 26 16:13:52 2011
@@ -58,7 +58,7 @@
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
             <Bundle-Description>This bundle contains the client-side implementation of the Distributed OSGi Discovery sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.consumer.Activator</Bundle-Activator>
             <Import-Package>
               org.apache.cxf.dosgi.samples.discovery, 

Modified: cxf/dosgi/trunk/samples/discovery/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/impl/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/impl/pom.xml Sun Jun 26 16:13:52 2011
@@ -58,7 +58,7 @@
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
             <Bundle-Description>This bundle contains the server-side implementation of the Distributed OSGi Discovery sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.impl.Activator</Bundle-Activator>
             <Import-Package>
               org.apache.cxf.dosgi.samples.discovery,

Modified: cxf/dosgi/trunk/samples/discovery/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/interface/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/interface/pom.xml Sun Jun 26 16:13:52 2011
@@ -40,7 +40,7 @@
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
             <Bundle-Description>This bundle contains the interfaces of the Distributed OSGi Discovery sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package />
             <Export-Package>org.apache.cxf.dosgi.samples.discovery</Export-Package> 
           </instructions>

Modified: cxf/dosgi/trunk/samples/ds/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/client/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/client/pom.xml Sun Jun 26 16:13:52 2011
@@ -53,7 +53,7 @@
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
             <Bundle-Description>This bundle contains the client-side implementation of the Distributed OSGi with Declarative Services sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.apache.cxf.dosgi.samples.ds.consumer.Activator</Bundle-Activator>
             <Import-Package>*</Import-Package> 
             <Private-Package>org.apache.cxf.dosgi.samples.ds.consumer</Private-Package> 

Modified: cxf/dosgi/trunk/samples/ds/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/impl/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/impl/pom.xml Sun Jun 26 16:13:52 2011
@@ -47,7 +47,7 @@
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
             <Bundle-Description>This bundle contains the server-side implementation of the Distributed OSGi with Declarative Services sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package>org.apache.cxf.dosgi.samples.ds</Import-Package> 
             <Private-Package>org.apache.cxf.dosgi.samples.ds.impl</Private-Package> 
             <Service-Component>OSGI-INF/component.xml</Service-Component>

Modified: cxf/dosgi/trunk/samples/ds/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/interface/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/interface/pom.xml Sun Jun 26 16:13:52 2011
@@ -40,7 +40,7 @@
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
             <Bundle-Description>This bundle contains the interfaces of the Distributed OSGi with Declarative Services sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package />
             <Export-Package>org.apache.cxf.dosgi.samples.ds</Export-Package> 
           </instructions>

Modified: cxf/dosgi/trunk/samples/greeter/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/client/pom.xml Sun Jun 26 16:13:52 2011
@@ -65,7 +65,7 @@
                     <instructions>
                         <Bundle-Name>CXF Distributed OSGi Greeter Demo Client Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation the Distributed OSGi Greeter Demo Client</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.client.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
                         <Private-Package>${bundle.private.package}</Private-Package> 

Modified: cxf/dosgi/trunk/samples/greeter/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/impl/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/impl/pom.xml Sun Jun 26 16:13:52 2011
@@ -65,7 +65,7 @@
                     <instructions>
                         <Bundle-Name>CXF Distributed OSGi Greeter Demo Service Implementation Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation of the CXF Distributed OSGi Greeter Demo Implementation Bundle</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.impl.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
                         <Private-Package>${bundle.private.package}</Private-Package> 

Modified: cxf/dosgi/trunk/samples/greeter/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/interface/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/interface/pom.xml Sun Jun 26 16:13:52 2011
@@ -59,7 +59,7 @@
                     <instructions>
                         <Bundle-Name>CXF Distributed OSGi Greeter Demo Interface Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation of the CXF Distributed OSGi Greeter Demo Interfaces</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>${bundle.import.package}</Import-Package>
                         <Export-Package>${bundle.export.package}</Export-Package> 
                     </instructions>

Modified: cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml Sun Jun 26 16:13:52 2011
@@ -65,7 +65,7 @@
                     <instructions>
                         <Bundle-Name>CXF Distributed OSGi Greeter Rest Demo Client Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation the Distributed OSGi Greeter Rest Demo Client</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.client.rest.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
                         <Private-Package>${bundle.private.package}</Private-Package> 

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml Sun Jun 26 16:13:52 2011
@@ -65,7 +65,7 @@
                     <instructions>
                         <Bundle-Name>CXF Distributed OSGi Greeter Demo Service Rest Implementation Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation of the CXF Distributed OSGi Greeter Rest Demo Implementation Bundle</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.samples.greeter.impl.rest.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>
                         <Private-Package>${bundle.private.package}</Private-Package> 

Modified: cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml Sun Jun 26 16:13:52 2011
@@ -64,7 +64,7 @@
                     <instructions>
                         <Bundle-Name>CXF Distributed OSGi Greeter Rest Demo Interface Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation of the CXF Distributed OSGi Greeter Rest Demo Interfaces</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>${bundle.import.package}</Import-Package>
                         <Export-Package>${bundle.export.package}</Export-Package> 
                     </instructions>

Modified: cxf/dosgi/trunk/samples/security_filter/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/security_filter/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/security_filter/pom.xml (original)
+++ cxf/dosgi/trunk/samples/security_filter/pom.xml Sun Jun 26 16:13:52 2011
@@ -45,9 +45,9 @@
           </exclusions>
       </dependency> 
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>${servlet.version}</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
+        <version>1.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
@@ -65,7 +65,7 @@
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
             <Bundle-Description>This bundle contains an example Distributed OSGi endpoint that passes requests through a security filter.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Private-Package>org.apache.cxf.dosgi.samples.security</Private-Package>
             <Bundle-Activator>org.apache.cxf.dosgi.samples.security.Activator</Bundle-Activator>
           </instructions>

Modified: cxf/dosgi/trunk/samples/spring_dm/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/client/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/client/pom.xml Sun Jun 26 16:13:52 2011
@@ -47,7 +47,7 @@
           <instructions>
             <Bundle-Name>CXF Distributed OSGi Spring-DM Sample Client Bundle</Bundle-Name>
             <Bundle-Description>This bundle contains the client-side implementation of the Distributed OSGi with Spring-DM sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package> 
             <Private-Package>org.apache.cxf.dosgi.samples.springdm.client</Private-Package> 
           </instructions>

Modified: cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml Sun Jun 26 16:13:52 2011
@@ -47,7 +47,7 @@
           <instructions>
             <Bundle-Name>CXF Distributed OSGi Spring-DM Sample Implementation Bundle</Bundle-Name>
             <Bundle-Description>This bundle contains the server-side implementation of the Distributed OSGi with Spring-DM sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package>org.apache.cxf.dosgi.samples.springdm</Import-Package> 
             <Private-Package>org.apache.cxf.dosgi.samples.springdm.impl</Private-Package> 
           </instructions>

Modified: cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml Sun Jun 26 16:13:52 2011
@@ -40,7 +40,7 @@
           <instructions>
             <Bundle-Name>CXF Distributed OSGi Spring-DM Sample Interface Bundle</Bundle-Name>
             <Bundle-Description>This bundle contains the interfaces of the Distributed OSGi with Spring-DM sample.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package />
             <Export-Package>org.apache.cxf.dosgi.samples.springdm</Export-Package> 
           </instructions>

Modified: cxf/dosgi/trunk/systests/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/common/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/common/pom.xml (original)
+++ cxf/dosgi/trunk/systests/common/pom.xml Sun Jun 26 16:13:52 2011
@@ -36,7 +36,7 @@
     <topDirectoryLocation>../..</topDirectoryLocation>
     <bundle.import.package>*</bundle.import.package>
     <bundle.export.package>
-      org.apache.cxf.dosgi.systests.common;version="${pom.version}"
+      org.apache.cxf.dosgi.systests.common;version="${project.version}"
     </bundle.export.package>
   </properties>
   
@@ -95,7 +95,7 @@
           <instructions>
             <Bundle-Name>CXF DOSGi System Tests Common Bundle</Bundle-Name>
             <Bundle-Description>This bundle contains common classes used by the system tests.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Import-Package>${bundle.import.package}</Import-Package>
             <Export-Package>${bundle.export.package}</Export-Package> 

Modified: cxf/dosgi/trunk/systests/common_rest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests/common_rest/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests/common_rest/pom.xml (original)
+++ cxf/dosgi/trunk/systests/common_rest/pom.xml Sun Jun 26 16:13:52 2011
@@ -36,7 +36,7 @@
     <topDirectoryLocation>../..</topDirectoryLocation>
     <bundle.import.package>*</bundle.import.package>
     <bundle.export.package>
-      org.apache.cxf.dosgi.systests.common.rest;version="${pom.version}" 
+      org.apache.cxf.dosgi.systests.common.rest;version="${project.version}" 
     </bundle.export.package>
   </properties>
   
@@ -97,7 +97,7 @@
           <instructions>
             <Bundle-Name>CXF DOSGi System Tests Rest Common Bundle</Bundle-Name>
             <Bundle-Description>This bundle contains common classes used by the system rest tests.</Bundle-Description>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Import-Package>${bundle.import.package}</Import-Package>
             <Export-Package>${bundle.export.package}</Export-Package> 

Modified: cxf/dosgi/trunk/systests2/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/common/pom.xml Sun Jun 26 16:13:52 2011
@@ -37,9 +37,15 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>${osgi.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-tinybundles</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -51,13 +57,13 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-impl</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-interface</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -75,9 +81,10 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Bundle-Name>Bundle containing common code for the CX DOSGi system tests</Bundle-Name>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <!-- The TinyBundles are only used during the 'configure' stage and are therefore not
                              needed at runtime.

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java Sun Jun 26 16:13:52 2011
@@ -97,14 +97,24 @@ public abstract class AbstractTestImport
             ServiceReference ref = waitService(String.class.getName(), "(testResult=test1)");
             Assert.assertEquals("HiOSGi", ref.getProperty("result"));
         } finally {
-            server.stop(); 
+            if(server != null) {
+                server.stop();
+            } 
             Thread.currentThread().setContextClassLoader(cl);
         }
     }
     
     private ServiceReference waitService(String cls, String filter) throws Exception {        
         ServiceReference[] refs = null;
-        for (int i=0; i < 20; i++) {
+        
+        String timeoutStr = System.getProperty("org.apache.cxf.dosgi.test.serviceWaitTimeout", "20");
+        
+        int timeout = Integer.valueOf(timeoutStr);
+        if(timeout <= 0) {
+            timeout = Integer.MAX_VALUE;
+        }
+        
+        for (int i=0; i < timeout; i++) {
             refs = getBundleContext().getServiceReferences(cls, filter);
             if (refs != null && refs.length > 0) {
                 return refs[0];

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java Sun Jun 26 16:13:52 2011
@@ -37,6 +37,7 @@ public class MyServiceTracker extends Se
     public Object addingService(ServiceReference reference) {
         Object svc = super.addingService(reference);
         if (svc instanceof GreeterService) {
+            System.out.println("[client] Got a GreeterService...");
             invokeGreeter((GreeterService) svc);
         }
         return svc;
@@ -47,16 +48,23 @@ public class MyServiceTracker extends Se
     }
 
     private void invokeGreeter(GreeterService svc) {
-        Map<GreetingPhrase, String> result = svc.greetMe("OSGi");
-        for (Map.Entry<GreetingPhrase, String> e : result.entrySet()) {
-            GreetingPhrase key = e.getKey();
-            invocationResult.append(key.getPhrase());
-            invocationResult.append(e.getValue());
+        try {
+            Map<GreetingPhrase, String> result = svc.greetMe("OSGi");
+            for (Map.Entry<GreetingPhrase, String> e : result.entrySet()) {
+                GreetingPhrase key = e.getKey();
+                invocationResult.append(key.getPhrase());
+                invocationResult.append(e.getValue());
+            }
+
+            Hashtable<String, Object> props = new Hashtable<String, Object>();
+            props.put("result", invocationResult.toString());
+            props.put("testResult", "test1");
+
+            System.out.println("[client] Successfully invoked remote service. Registering test response service...");
+            context.registerService(String.class.getName(), "test1", props);
+        } catch(Exception x) {
+            System.err.println("[client] Error during remote service invocation:");
+            x.printStackTrace(System.err);
         }
-        
-        Hashtable<String, Object> props = new Hashtable<String, Object>();
-        props.put("result", invocationResult.toString());
-        props.put("testResult", "test1");
-        context.registerService(String.class.getName(), "test1", props);
     }    
 }
\ No newline at end of file

Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java (original)
+++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java Sun Jun 26 16:13:52 2011
@@ -33,6 +33,7 @@ public class StartServiceTracker extends
 
     @Override
     public Object addingService(ServiceReference reference) {
+        System.out.println("Test object available, so starting the service client tracker...");
         tracker.open();
         return super.addingService(reference);
     }

Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Sun Jun 26 16:13:52 2011
@@ -17,44 +17,51 @@
     <packaging>jar</packaging>
 
     <name>Distributed OSGi System Tests Multi-Bundle</name>
+    
+    <properties>
+        <!-- this is temporary! -->
+        <!--
+        <maven.test.skip>true</maven.test.skip>
+        -->
+    </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-default</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-tinybundles</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.1.0</version>
+            <version>${osgi.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>4.1.0</version>
+            <version>${osgi.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.systests</groupId>
             <artifactId>cxf-dosgi-ri-systests2-common</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -73,31 +80,37 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>           
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-impl</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-interface</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jcl</artifactId>
+            <version>1.5.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -137,6 +150,19 @@
                     </options>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <!--
+                        <org.apache.cxf.dosgi.test.debug.port>5005</org.apache.cxf.dosgi.test.debug.port>
+                        <org.apache.cxf.dosgi.test.serviceWaitTimeout>180</org.apache.cxf.dosgi.test.serviceWaitTimeout>
+                        -->
+                        <java.util.logging.config.file>${project.build.directory}/test-classes/logging.properties</java.util.logging.config.file>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java Sun Jun 26 16:13:52 2011
@@ -44,7 +44,7 @@ public class MultiBundleTools {
     }
     
     private static int getDistroBundles(File mdRoot, String pomVersion, Map<Integer, String> bundles, boolean discovery) throws Exception {
-        File distroDir = new File(mdRoot, "target/cxf-dosgi-ri-multibundle-distribution-" + pomVersion + ".dir");
+        File distroDir = new File(mdRoot, "target/cxf-dosgi-ri-multibundle-distribution-" + pomVersion + "-dir");
         Properties p = new Properties();
         File confDir = new File(distroDir, "apache-cxf-dosgi-ri-" + pomVersion + "/conf");
         p.load(new FileInputStream(new File(confDir, "felix.config.properties.append")));

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=1139830&r1=1139829&r2=1139830&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 Sun Jun 26 16:13:52 2011
@@ -29,6 +29,7 @@ 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.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.BundleContext;
@@ -58,11 +59,19 @@ public class TestImportService extends A
         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));
-        
+
+        opts.add(CoreOptions.systemProperty("java.util.logging.config.file").value(System.getProperty("java.util.logging.config.file")));
+
         // For debugging...
-        // opts.add(PaxRunnerOptions.vmOption( "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" ));
-        // opts.add(CoreOptions.waitForFrameworkStartup());
+        final String debugPort = System.getProperty("org.apache.cxf.dosgi.test.debug.port");
+        if(debugPort != null) {
+            opts.add(PaxRunnerOptions.vmOption( "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=" + debugPort ));
+            opts.add(CoreOptions.waitForFrameworkStartup());
+        }
         // end debugging section.
+
+        // service wait timeout (this should also be increased for debugging)...
+        opts.add(CoreOptions.systemProperty("org.apache.cxf.dosgi.test.serviceWaitTimeout").value(System.getProperty("org.apache.cxf.dosgi.test.serviceWaitTimeout", "20")));
         
         return CoreOptions.options(opts.toArray(new Option[opts.size()]));
     }

Modified: cxf/dosgi/trunk/systests2/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/single-bundle/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/single-bundle/pom.xml Sun Jun 26 16:13:52 2011
@@ -22,46 +22,46 @@
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-default</artifactId>
-            <version>1.2.0</version>
+            <version>1.2.4</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-tinybundles</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.1.0</version>
+            <version>${osgi.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>4.1.0</version>
+            <version>${osgi.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.systests</groupId>
             <artifactId>cxf-dosgi-ri-systests2-common</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-singlebundle-distribution</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>           
             <exclusions>
                 <exclusion>
@@ -79,31 +79,31 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>           
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-impl</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>
             <artifactId>cxf-dosgi-ri-samples-greeter-interface</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
+            <version>1.1.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>



Mime
View raw message