Author: davsclaus
Date: Thu Jul 16 06:39:08 2009
New Revision: 794550
URL: http://svn.apache.org/viewvc?rev=794550&view=rev
Log:
MR-217: Avoid using port 9090 as it clashes on AIX.
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/trunk/components/camel-cxf/src/test/resources/mtom.wsdl
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
camel/trunk/components/camel-tagsoup/pom.xml
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
Thu Jul 16 06:39:08 2009
@@ -25,7 +25,7 @@
public class CometdProducerConsumerInteractiveMain {
- private static final String URI =
"cometd://127.0.0.1:9090/service/test?resourceBase=./src/test/resources/webapp&"
+ private static final String URI =
"cometd://127.0.0.1:9091/service/test?resourceBase=./src/test/resources/webapp&"
+
"timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
private static final String URIS =
"cometds://127.0.0.1:9443/service/test?resourceBase=./src/test/resources/webapp&"
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMtomConsumerTest.java
Thu Jul 16 06:39:08 2009
@@ -40,7 +40,7 @@
public class CxfMtomConsumerTest extends CamelTestSupport {
- 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/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Thu Jul 16 06:39:08 2009
@@ -83,7 +83,7 @@
public void setUp() throws Exception {
template = context.createProducerTemplate();
- relayEndpoint =
Endpoint.publish("http://localhost:9090/HeaderService/";, new
HeaderTesterImpl());
+ relayEndpoint =
Endpoint.publish("http://localhost:9091/HeaderService/";, new
HeaderTesterImpl());
noRelayEndpoint =
Endpoint.publish("http://localhost:7070/HeaderService/";, new
HeaderTesterImpl(false));
}
Modified: camel/trunk/components/camel-cxf/src/test/resources/mtom.wsdl
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/mtom.wsdl?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/mtom.wsdl (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/mtom.wsdl Thu Jul 16
06:39:08 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/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
Thu Jul 16 06:39:08 2009
@@ -49,7 +49,7 @@
</cxf:cxfEndpoint>
<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/trunk/components/camel-tagsoup/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-tagsoup/pom.xml?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
--- camel/trunk/components/camel-tagsoup/pom.xml (original)
+++ camel/trunk/components/camel-tagsoup/pom.xml Thu Jul 16 06:39:08 2009
@@ -64,4 +64,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>
\ No newline at end of file
Modified:
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/camel/transport/CamelTransportExample.java
Thu Jul 16 06:39:08 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/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
Thu Jul 16 06:39:08 2009
@@ -31,7 +31,7 @@
<camelContext id="dest_context"
xmlns="http://camel.apache.org/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/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java?rev=794550&r1=794549&r2=794550&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
Thu Jul 16 06:39:08 2009
@@ -54,7 +54,7 @@
// must setup policy for each route due CAMEL-1475 bug
.policy(required)
// send a request to http and get the response
- .to("http://localhost:9090/sender";)
+ .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)
@@ -77,7 +77,7 @@
// this is our http route that will fail the first 2 attempts
// before it sends an ok response
- from("jetty:http://localhost:9090/sender";).process(new Processor() {
+ from("jetty:http://localhost:9091/sender";).process(new Processor() {
public void process(Exchange exchange) throws Exception {
if (counter++ < 2) {
exchange.getOut().setBody(nok);
