Author: ravi
Date: Mon Oct 3 07:34:00 2016
New Revision: 1763120
URL: http://svn.apache.org/viewvc?rev=1763120&view=rev
Log:
Fixing build break in integration tests. Start Active MQ broker on port 62626
instead of deafult port due to port binding issue on build servers
Added:
synapse/trunk/java/modules/integration/src/test/resources/extras/synapse_sample_251.xml
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample250.java
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/axis2Server/axis2_jms.xml
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/synapse/axis2_jms.xml
synapse/trunk/java/modules/integration/src/test/resources/sample250.xml
synapse/trunk/java/modules/integration/src/test/resources/sample251.xml
Modified:
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample250.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample250.java?rev=1763120&r1=1763119&r2=1763120&view=diff
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample250.java
(original)
+++
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample250.java
Mon Oct 3 07:34:00 2016
@@ -11,6 +11,7 @@ public class Sample250 extends SynapseTe
}
public void testPlaceOrder() throws Exception {
+ System.setProperty("java.naming.provider.url",
"tcp://localhost:62626");
Axis2BackEndServerController axis2Server = getAxis2Server();
if (axis2Server == null) {
fail("Failed to load the Axis2BackEndServerController");
Modified:
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/axis2Server/axis2_jms.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/axis2Server/axis2_jms.xml?rev=1763120&r1=1763119&r2=1763120&view=diff
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/axis2Server/axis2_jms.xml
(original)
+++
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/axis2Server/axis2_jms.xml
Mon Oct 3 07:34:00 2016
@@ -170,21 +170,21 @@
<transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
<parameter name="myTopicConnectionFactory">
<parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:62626</parameter>
<parameter
name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
<parameter name="transport.jms.ConnectionFactoryType"
locked="false">topic</parameter>
</parameter>
<parameter name="myQueueConnectionFactory">
<parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:62626</parameter>
<parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
<parameter name="transport.jms.ConnectionFactoryType"
locked="false">queue</parameter>
</parameter>
<parameter name="default">
<parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:62626</parameter>
<parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
<parameter name="transport.jms.ConnectionFactoryType"
locked="false">queue</parameter>
</parameter>
Modified:
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/synapse/axis2_jms.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/synapse/axis2_jms.xml?rev=1763120&r1=1763119&r2=1763120&view=diff
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/synapse/axis2_jms.xml
(original)
+++
synapse/trunk/java/modules/integration/src/test/resources/axis2Xml/synapse/axis2_jms.xml
Mon Oct 3 07:34:00 2016
@@ -200,21 +200,21 @@
<transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
<parameter name="myTopicConnectionFactory">
<parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:62626</parameter>
<parameter
name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
<parameter name="transport.jms.ConnectionFactoryType"
locked="false">topic</parameter>
</parameter>
<parameter name="myQueueConnectionFactory">
<parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:62626</parameter>
<parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
<parameter name="transport.jms.ConnectionFactoryType"
locked="false">queue</parameter>
</parameter>
<parameter name="default">
<parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:62626</parameter>
<parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
<parameter name="transport.jms.ConnectionFactoryType"
locked="false">queue</parameter>
</parameter>
Added:
synapse/trunk/java/modules/integration/src/test/resources/extras/synapse_sample_251.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/resources/extras/synapse_sample_251.xml?rev=1763120&view=auto
==============================================================================
---
synapse/trunk/java/modules/integration/src/test/resources/extras/synapse_sample_251.xml
(added)
+++
synapse/trunk/java/modules/integration/src/test/resources/extras/synapse_sample_251.xml
Mon Oct 3 07:34:00 2016
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<!-- Switching from http/s to JMS -->
+<definitions xmlns="http://ws.apache.org/ns/synapse">
+
+ <proxy name="StockQuoteProxy" transports="http">
+ <target>
+ <endpoint>
+ <address
+
uri="jms:/SimpleStockQuoteService?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&java.naming.provider.url=tcp://localhost:62626&transport.jms.DestinationType=queue"/>
+ </endpoint>
+ <inSequence>
+ <property action="set" name="OUT_ONLY" value="true"/>
+ </inSequence>
+ <outSequence>
+ <send/>
+ </outSequence>
+ </target>
+ <publishWSDL
uri="file:repository/conf/sample/resources/proxy/sample_proxy_1.wsdl"/>
+ </proxy>
+
+</definitions>
Modified:
synapse/trunk/java/modules/integration/src/test/resources/sample250.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/resources/sample250.xml?rev=1763120&r1=1763119&r2=1763120&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/resources/sample250.xml
(original)
+++ synapse/trunk/java/modules/integration/src/test/resources/sample250.xml Mon
Oct 3 07:34:00 2016
@@ -9,7 +9,7 @@
</synapseConfig>
<backEndServerConfig>
<jmsBroker id='0'>
- <providerURL>tcp://localhost:61616</providerURL>
+ <providerURL>tcp://localhost:62626</providerURL>
<initialNamingFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</initialNamingFactory>
</jmsBroker>
<axis2Server id='1'>
Modified:
synapse/trunk/java/modules/integration/src/test/resources/sample251.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/resources/sample251.xml?rev=1763120&r1=1763119&r2=1763120&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/resources/sample251.xml
(original)
+++ synapse/trunk/java/modules/integration/src/test/resources/sample251.xml Mon
Oct 3 07:34:00 2016
@@ -5,11 +5,11 @@
<!--if we don't specify the optional values, framework will use
defaults-->
<axis2Repo>modules/integration/target/test_repos/synapse</axis2Repo>
<axis2Xml>modules/integration/target/test_repos/synapse/conf/axis2_jms.xml</axis2Xml>
- <synapseXml>repository/conf/sample/synapse_sample_251.xml</synapseXml>
+
<synapseXml>modules/integration/src/test/resources/extras/synapse_sample_251.xml</synapseXml>
</synapseConfig>
<backEndServerConfig>
<jmsBroker id='0'>
- <providerURL>tcp://localhost:61616</providerURL>
+ <providerURL>tcp://localhost:62626</providerURL>
<initialNamingFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</initialNamingFactory>
</jmsBroker>
<axis2Server id='1'>