servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r781898 - in /servicemix/smx4/features/trunk: ./ examples/cxf-camel-nmr/ examples/cxf-jaxrs/ examples/cxf-nmr/ examples/cxf-osgi/ examples/cxf-ws-addressing/ examples/itests/cxf-handler-cfg/ examples/itests/cxf-http-osgi/ examples/itests/cx...
Date Fri, 05 Jun 2009 03:06:02 GMT
Author: ffang
Date: Fri Jun  5 03:06:02 2009
New Revision: 781898

URL: http://svn.apache.org/viewvc?rev=781898&view=rev
Log:
[SMX4-296]upgrade to cxf 2.2.2

Modified:
    servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml Fri Jun  5 03:06:02 2009
@@ -68,7 +68,7 @@
                           org.springframework.beans.factory.config, *
                         </Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxfcamel</Private-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-jaxrs/pom.xml Fri Jun  5 03:06:02 2009
@@ -78,7 +78,7 @@
                                 org.springframework.beans.factory.config,
                                 org.apache.servicemix.examples.cxf.jaxrs
                         </Import-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                         <Export-Package>org.apache.servicemix.examples.cxf.jaxrs
                         </Export-Package>
                         <DynamicImport-Package>javax.ws.rs.*</DynamicImport-Package>

Modified: servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml Fri Jun  5 03:06:02 2009
@@ -57,7 +57,7 @@
                            org.apache.servicemix.nmr.api,org.apache.servicemix.nmr.api.event,org.apache.servicemix.nmr.api.internal
                         </Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Fri Jun  5 03:06:02 2009
@@ -68,7 +68,7 @@
                             org.springframework.beans.factory.config
                         </Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                         <!--
                         <DynamicImport-Package>*</DynamicImport-Package>
                         -->

Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/pom.xml Fri Jun  5 03:06:02
2009
@@ -104,7 +104,7 @@
                             org.apache.servicemix.util,
                             org.springframework.beans.factory.config
                         </Import-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                         <Export-Package>org.apache.servicemix.examples.cxf.wsaddressing,

                         	org.apache.hello_world_soap_http, 
                         	org.apache.hello_world_soap_http.types,

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/pom.xml Fri Jun  5 03:06:02
2009
@@ -98,7 +98,7 @@
                             org.apache.servicemix.cxf.transport.http_osgi,
                             org.springframework.beans.factory.config
                         </Import-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                         <Export-Package>org.apache.springcfg.handlers.types,org.apache.springcfg.handlers,org.apache.servicemix.examples.cxf.springcfghandler</Export-Package>
                      </instructions>
                 </configuration>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml Fri Jun  5 03:06:02
2009
@@ -96,7 +96,7 @@
                         </Import-Package>
                         <!--<Private-Package>org.apache.servicemix.examples.cxf</Private-Package>-->
                         <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml Fri Jun  5 03:06:02
2009
@@ -106,7 +106,7 @@
                             javax.jms
                         </Import-Package>
                         <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml Fri Jun  5 03:06:02
2009
@@ -98,7 +98,7 @@
                             org.apache.servicemix.nmr.api.internal
                         </Import-Package>
                         <Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/pom.xml Fri Jun 
5 03:06:02 2009
@@ -98,7 +98,7 @@
                             org.apache.servicemix.cxf.transport.http_osgi,
                             org.springframework.beans.factory.config
                         </Import-Package>
-                        <Require-Bundle>org.apache.cxf.cxf-bundle</Require-Bundle>
+                        <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
                         <Export-Package>org.apache.handlers.types, org.apache.handlers,org.apache.servicemix.examples.cxf.soaphandler</Export-Package>
                      </instructions>
                 </configuration>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Fri Jun  5 03:06:02 2009
@@ -301,7 +301,7 @@
         in.close();
         bos.close();
         System.out.println(bos.toString());
-        assertEquals("{\"Customer\":{\"id\":123,\"name\":\"John\"}}",
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Customer><id>123</id><name>John</name></Customer>",
                      bos.toString());
     }
 }

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=781898&r1=781897&r2=781898&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Jun  5 03:06:02 2009
@@ -83,7 +83,7 @@
       <commons.logging.version>1.1.1</commons.logging.version>
       <commons.net.version>1.4.1_1</commons.net.version>
       <commons.pool.version>1.4</commons.pool.version>
-      <cxf.version>2.2</cxf.version>
+      <cxf.version>2.2.2</cxf.version>
       <dom4j.version>1.6_1</dom4j.version>
       <drools.version>4.0.7_1</drools.version>
       <depends.maven.plugin.version>1.1</depends.maven.plugin.version>



Mime
View raw message