You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2009/06/19 07:07:10 UTC
svn commit: r786371 - in /servicemix/smx4/features/trunk: ./
camel/servicemix-camel/
examples/cxf-ws-addressing/src/main/resources/META-INF/spring/
examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/
examples/...
Author: ffang
Date: Fri Jun 19 05:07:10 2009
New Revision: 786371
URL: http://svn.apache.org/viewvc?rev=786371&view=rev
Log:
fix test failure
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml
servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml
servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.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/camel/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml?rev=786371&r1=786370&r2=786371&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/pom.xml Fri Jun 19 05:07:10 2009
@@ -238,38 +238,5 @@
</plugins>
</build>
- <!-- IBM JDK configuration. -->
- <profiles>
- <profile>
- <id>ibmjdk</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.version}</version>
- <dependencies>
- <!-- needed to add this to get around the following error on IBM's JDK
- org.apache.xerces.impl.dv.DVFactoryException: DTD factory class
- org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not extend
- from DTDDVFactory.
- -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml?rev=786371&r1=786370&r2=786371&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/META-INF/spring/beans.xml Fri Jun 19 05:07:10 2009
@@ -56,7 +56,7 @@
xmlns:e="http://apache.org/hello_world_soap_http"
xmlns:s="http://apache.org/hello_world_soap_http"
wsdlLocation="wsdl/hello_world_addr.wsdl"
- address="http://localhost:8181/cxf/SoapContext/SoapPort">
+ address="http://localhost:8080/cxf/SoapContext/SoapPort">
</jaxws:client>
<osgi:service id="testWSAddressing" ref="client"
Modified: servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml?rev=786371&r1=786370&r2=786371&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-ws-addressing/src/main/resources/org/apache/servicemix/examples/cxf/wsaddressing/request.xml Fri Jun 19 05:07:10 2009
@@ -2,7 +2,7 @@
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
<soap:Header>
<MessageID xmlns="http://www.w3.org/2005/08/addressing">urn:uuid:123456789</MessageID>
- <To xmlns="http://www.w3.org/2005/08/addressing">http://localhost:8181/SoapContext/SoapPort</To>
+ <To xmlns="http://www.w3.org/2005/08/addressing">http://localhost:8080/SoapContext/SoapPort</To>
<ReplyTo xmlns="http://www.w3.org/2005/08/addressing">
<Address>http://www.w3.org/2005/08/addressing/anonymous</Address>
</ReplyTo>
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml?rev=786371&r1=786370&r2=786371&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-handler-cfg/src/main/resources/META-INF/spring/beans.xml Fri Jun 19 05:07:10 2009
@@ -55,7 +55,7 @@
xmlns:e="http://apache.org/springcfg/handlers"
xmlns:s="http://apache.org/springcfg/handlers"
wsdlLocation="wsdl/addNumbers.wsdl"
- address="http://localhost:8181/cxf/SpringConfigHandler">
+ address="http://localhost:8080/cxf/SpringConfigHandler">
<jaxws:handlers>
<bean class="org.apache.servicemix.examples.cxf.springcfghandler.ModifyNumberHandler"/>
</jaxws:handlers>
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml?rev=786371&r1=786370&r2=786371&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml Fri Jun 19 05:07:10 2009
@@ -49,7 +49,7 @@
xmlns:e="http://cxf.examples.servicemix.apache.org/"
xmlns:s="http://cxf.examples.servicemix.apache.org/"
wsdlLocation="wsdl/hello_world.wsdl"
- address="http://localhost:8181/cxf/HelloWorld"/>
+ address="http://localhost:8080/cxf/HelloWorld"/>
<osgi:service id="testHelloWorld" ref="client"
interface="org.apache.servicemix.examples.cxf.HelloWorld"/>
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml?rev=786371&r1=786370&r2=786371&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-soap-handler-osgi/src/main/resources/META-INF/spring/beans.xml Fri Jun 19 05:07:10 2009
@@ -49,7 +49,7 @@
xmlns:e="http://apache.org/handlers"
xmlns:s="http://apache.org/handlers"
wsdlLocation="wsdl/addNumbers.wsdl"
- address="http://localhost:8181/cxf/SoapHandler"/>
+ address="http://localhost:8080/cxf/SoapHandler"/>
<osgi:service id="testHelloWorld" ref="client"
interface="org.apache.handlers.AddNumbers"/>
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=786371&r1=786370&r2=786371&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 19 05:07:10 2009
@@ -290,7 +290,7 @@
Thread.sleep(5000);
waitOnContextCreation("cxf-jaxrs");
- URL url = new URL("http://localhost:8181/cxf/crm/customerservice/customers/123");
+ URL url = new URL("http://localhost:8080/cxf/crm/customerservice/customers/123");
InputStream in = url.openStream();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=786371&r1=786370&r2=786371&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Fri Jun 19 05:07:10 2009
@@ -829,6 +829,41 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>ibmjdk</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>IBM Corporation</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <!--
+ Need to add a xerces dependency to cxf-codegen-plugin
+ when using the ibm jdk to work around error:
+ org.apache.xerces.impl.dv.DVFactoryException:
+ DTD factory class
+ org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl
+ does not extend from DTDDVFactory.
+ Can remove this when we upgrade to a cxf.version which
+ includes this in the cxf-codegen-plugin pom.
+ -->
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>