Author: slaws
Date: Sun Mar 8 12:14:40 2009
New Revision: 751406
URL: http://svn.apache.org/viewvc?rev=751406&view=rev
Log:
Only create a transport description for the JMS transport if JMS is configured
to be in use.
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java?rev=751406&r1=751405&r2=751406&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
Sun Mar 8 12:14:40 2009
@@ -328,6 +328,10 @@
jmsSender = new JMSSender();
ListenerManager listenerManager =
configContext.getListenerManager();
TransportInDescription trsIn =
configContext.getAxisConfiguration().getTransportIn(Constants.TRANSPORT_JMS);
+
+ if (trsIn == null){
+ trsIn = new
TransportInDescription(Constants.TRANSPORT_JMS);
+ }
// get JMS transport parameters from the computed URL
Map<String, String> jmsProps =
JMSUtils.getProperties(endpointURL);
@@ -482,6 +486,13 @@
Definition definition = wsBinding.getWSDLDocument();
QName serviceQName = wsBinding.getService().getQName();
Definition def = getDefinition(definition, serviceQName);
+
+ // TUSCANY-2824 fix the target namespace of the definition to be the
same as
+ // that for the port. Without this Axis fails during policy application
+ // when it tries to match binding operation names to port type
operation
+ // names
+
//def.setTargetNamespace(port.getBinding().getPortType().getQName().getNamespaceURI());
+
final WSDLToAxisServiceBuilder builder = new
WSDL11ToAxisServiceBuilder(def, serviceQName, port.getName());
builder.setServerSide(true);
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml?rev=751406&r1=751405&r2=751406&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
Sun Mar 8 12:14:40 2009
@@ -201,7 +201,7 @@
</transportReceiver>
<!-- Added by Tuscany -->
- <transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
+ <!-- transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener"-->
<!-- These configuation parameters now come from the binding.ws uri
or from a policy set
<parameter name="myTopicConnectionFactory">
@@ -222,7 +222,7 @@
<parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
</parameter>
-->
- </transportReceiver>
+ <!-- /transportReceiver-->
<!-- ================================================= -->
<!-- Non-blocking http/s Transport Listener -->
Modified:
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java?rev=751406&r1=751405&r2=751406&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
Sun Mar 8 12:14:40 2009
@@ -43,13 +43,13 @@
scaDomain = SCADomain.newInstance("helloworldwsjms.composite");
}
- protected void startBroker() throws Exception {
- jmsBroker = new BrokerService();
- jmsBroker.setPersistent(false);
- jmsBroker.setUseJmx(false);
- jmsBroker.addConnector("tcp://localhost:61619");
- jmsBroker.start();
- }
+ protected void startBroker() throws Exception {
+ jmsBroker = new BrokerService();
+ jmsBroker.setPersistent(false);
+ jmsBroker.setUseJmx(false);
+ jmsBroker.addConnector("tcp://localhost:61619");
+ jmsBroker.start();
+ }
@Test
public void testServiceCall() throws IOException {
