Author: davsclaus
Date: Thu Jul 16 07:01:39 2009
New Revision: 794557
URL: http://svn.apache.org/viewvc?rev=794557&view=rev
Log:
Merged revisions 794550 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r794550 | davsclaus | 2009-07-16 08:39:08 +0200 (Thu, 16 Jul 2009) | 1 line
MR-217: Avoid using port 9090 as it clashes on AIX.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/mtom.wsdl
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/message_headers_relay.xml
camel/branches/camel-1.x/components/camel-tagsoup/pom.xml
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 07:01:39 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
Thu Jul 16 07:01:39 2009
@@ -38,7 +38,7 @@
public class CxfMtomConsumerTest extends ContextTestSupport {
- protected static final String MTOM_ENDPOINT_ADDRESS =
"http://localhost:9090/jaxws-mtom/hello";
+ protected static final String MTOM_ENDPOINT_ADDRESS =
"http://localhost:9091/jaxws-mtom/hello";
protected static final String MTOM_ENDPOINT_URI = "cxf://" +
MTOM_ENDPOINT_ADDRESS
+ "?serviceClass=org.apache.camel.component.cxf.HelloImpl";
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Thu Jul 16 07:01:39 2009
@@ -88,7 +88,7 @@
protected void startTargetCxfService() {
Object impl = new HeaderTesterImpl();
- String address = "http://localhost:9090/HeaderService/";
+ String address = "http://localhost:9091/HeaderService/";
EndpointImpl endpoint = (EndpointImpl) Endpoint.publish(address, impl);
relayServer = endpoint.getServer();
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/mtom.wsdl
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/resources/mtom.wsdl?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/test/resources/mtom.wsdl
(original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/test/resources/mtom.wsdl
Thu Jul 16 07:01:39 2009
@@ -98,7 +98,7 @@
<wsdl:service name="HelloService">
<wsdl:port name="HelloPort" binding="tns:HelloBinding">
- <soap:address
location="http://localhost:9090/jaxws-mtom/hello"></soap:address>
+ <soap:address
location="http://localhost:9091/jaxws-mtom/hello"></soap:address>
</wsdl:port>
</wsdl:service>
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/message_headers_relay.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/message_headers_relay.xml?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/message_headers_relay.xml
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/message_headers_relay.xml
Thu Jul 16 07:01:39 2009
@@ -50,7 +50,7 @@
<cxf:cxfEndpoint id="serviceRelayEndpoint"
- address="http://localhost:9090/HeaderService/"
+ address="http://localhost:9091/HeaderService/"
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortRelay"
serviceName="tns:HeaderService"
Modified: camel/branches/camel-1.x/components/camel-tagsoup/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-tagsoup/pom.xml?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-tagsoup/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-tagsoup/pom.xml Thu Jul 16
07:01:39 2009
@@ -73,4 +73,43 @@
</dependency>
</dependencies>
+ <!--
+ The default xalan TransformerFactory when using the ibm jdk is
+ org.apache.xalan.processor.TransformerFactoryImpl which seems
+ to add in duplicate namespace declarations, causing the tests
+ to fail. To work around this issue when we detect we are using
+ the ibm jdk, we set the TransformerFactory system property to
+ use the xsltc TransformerFactory as this allows the tests to pass
+ and this is the factory which is used by the sun jdk by default.
+ -->
+ <profiles>
+ <profile>
+ <id>ibmjdk</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>IBM Corporation</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <failIfNoTests>false</failIfNoTests>
+ <systemProperties>
+ <property>
+ <name>javax.xml.transform.TransformerFactory</name>
+
<value>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified:
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
---
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
(original)
+++
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
Thu Jul 16 07:01:39 2009
@@ -31,7 +31,7 @@
// start the endpoints
server.start();
// set the client's service access point
- Client client = new
Client("http://localhost:9090/GreeterContext/GreeterPort");
+ Client client = new
Client("http://localhost:9091/GreeterContext/GreeterPort");
// invoking the services
client.invoke();
Modified:
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
---
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
(original)
+++
camel/branches/camel-1.x/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
Thu Jul 16 07:01:39 2009
@@ -32,7 +32,7 @@
<camelContext id="dest_context"
xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from
uri="jetty:http://localhost:9090/GreeterContext/GreeterPort"/>
+ <from
uri="jetty:http://localhost:9091/GreeterContext/GreeterPort"/>
<loadBalance ref="roundRobinRef">
<to uri="direct:EndpointA"/>
<to uri="direct:EndpointB"/>
Modified:
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java?rev=794557&r1=794556&r2=794557&view=diff
==============================================================================
---
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
(original)
+++
camel/branches/camel-1.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
Thu Jul 16 07:01:39 2009
@@ -53,8 +53,9 @@
from(data)
// send a request to http and get the response
- .to("http://localhost:8080/sender")
- // convert the response to String so we can work with it
+ .to("http://localhost:9091/sender")
+ // convert the response to String so we can work with it and avoid
streams only be readable once
+ // as the http component will return data as a stream
.convertBodyTo(String.class)
// do a choice if the response is okay or not
.choice()
@@ -74,8 +75,8 @@
.end();
// this is our http route that will fail the first 2 attempts
- // before it sends a ok response
- from("jetty:http://localhost:8080/sender").process(new Processor() {
+ // before it sends an ok response
+ from("jetty:http://localhost:9091/sender").process(new Processor() {
public void process(Exchange exchange) throws Exception {
if (counter++ < 2) {
exchange.getOut().setBody(nok);