You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/05/22 19:36:31 UTC
svn commit: r777632 - in /tuscany/branches/sca-java-1.5/modules:
binding-jms-runtime/
binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/
host-jms-asf/ host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/
Author: antelder
Date: Fri May 22 17:36:30 2009
New Revision: 777632
URL: http://svn.apache.org/viewvc?rev=777632&view=rev
Log:
Merge TUSCANY-3057 JMS fix from 1.x to 1.5
Modified:
tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/ (props changed)
tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java (props changed)
tuscany/branches/sca-java-1.5/modules/host-jms-asf/ (props changed)
tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java (contents, props changed)
Propchange: tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 22 17:36:30 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-jms-runtime:671193
+/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime:777627
Modified: tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java?rev=777632&r1=777631&r2=777632&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java (original)
+++ tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java Fri May 22 17:36:30 2009
@@ -220,5 +220,9 @@
public MessageFactory getMessageFactory() {
return messageFactory;
}
+
+ public JMSResourceFactory getResourceFactory() {
+ return jmsResourceFactory;
+ }
}
Propchange: tuscany/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 22 17:36:30 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java:777627
Propchange: tuscany/branches/sca-java-1.5/modules/host-jms-asf/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 22 17:36:30 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/host-jms-asf:671193
+/tuscany/branches/sca-java-1.x/modules/host-jms-asf:777627
Modified: tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java?rev=777632&r1=777631&r2=777632&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java (original)
+++ tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java Fri May 22 17:36:30 2009
@@ -60,13 +60,13 @@
private Destination destination;
- public ASFListener(MessageListener listener, String serviceName, boolean isCallbackService, JMSBinding jmsBinding, WorkScheduler workScheduler) {
+ public ASFListener(MessageListener listener, String serviceName, boolean isCallbackService, JMSBinding jmsBinding, WorkScheduler workScheduler, JMSResourceFactory rf) {
this.listener = listener;
this.serviceName = serviceName;
this.isCallbackService = isCallbackService;
this.jmsBinding = jmsBinding;
this.workScheduler = workScheduler;
- this.jmsResourceFactory = new JMSResourceFactoryImpl(jmsBinding.getConnectionFactoryName(), jmsBinding.getResponseConnectionFactoryName(), jmsBinding.getInitialContextFactoryName(), jmsBinding.getJndiURL());
+ this.jmsResourceFactory = rf;
}
public void start() {
@@ -84,6 +84,7 @@
try {
consumer.close();
jmsResourceFactory.closeConnection();
+ jmsResourceFactory.closeResponseConnection();
} catch (Exception e) {
// if using an embedded broker then when shutting down Tuscany the broker may get closed
// before this stop method is called. I can't see how to detect that so for now just
Modified: tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java?rev=777632&r1=777631&r2=777632&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java (original)
+++ tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java Fri May 22 17:36:30 2009
@@ -22,10 +22,11 @@
import javax.jms.MessageListener;
import javax.naming.NamingException;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
-import org.apache.tuscany.sca.host.jms.JMSServiceListenerDetails;
+import org.apache.tuscany.sca.binding.jms.provider.JMSBindingServiceBindingProvider;
+import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
import org.apache.tuscany.sca.host.jms.JMSServiceListener;
+import org.apache.tuscany.sca.host.jms.JMSServiceListenerDetails;
import org.apache.tuscany.sca.host.jms.JMSServiceListenerFactory;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
import org.apache.tuscany.sca.work.WorkScheduler;
@@ -38,16 +39,15 @@
this.workScheduler = workScheduler;
}
- public JMSServiceListener createJMSServiceListener(String serviceName, boolean isCallbackService, JMSBinding jmsBinding, MessageListener listener) {
- return new ASFListener(listener, serviceName, isCallbackService, jmsBinding, workScheduler);
- }
-
public JMSServiceListener createJMSServiceListener(JMSServiceListenerDetails jmsSLD) {
try {
- MessageListener listener = new ServiceInvoker(jmsSLD.getJmsBinding(), jmsSLD.getService(), jmsSLD.getTargetBinding(), jmsSLD.getMessageFactory());
+ JMSResourceFactory rf = ((JMSBindingServiceBindingProvider)jmsSLD).getResourceFactory();
+
+ MessageListener listener = new ServiceInvoker(jmsSLD.getJmsBinding(), jmsSLD.getService(), jmsSLD.getTargetBinding(), jmsSLD.getMessageFactory(), rf);
RuntimeComponentService service = jmsSLD.getService();
- return new ASFListener(listener, service.getName(), service.isCallback(), jmsSLD.getJmsBinding(), workScheduler);
+
+ return new ASFListener(listener, service.getName(), service.isCallback(), jmsSLD.getJmsBinding(), workScheduler, rf);
} catch (NamingException e) {
throw new JMSBindingException(e);
Modified: tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java?rev=777632&r1=777631&r2=777632&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java (original)
+++ tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java Fri May 22 17:36:30 2009
@@ -55,9 +55,9 @@
private RuntimeComponentService service;
private MessageFactory messageFactory;
- public ServiceInvoker(JMSBinding jmsBinding, RuntimeComponentService service, Binding targetBinding, MessageFactory messageFactory) throws NamingException {
+ public ServiceInvoker(JMSBinding jmsBinding, RuntimeComponentService service, Binding targetBinding, MessageFactory messageFactory, JMSResourceFactory rf) throws NamingException {
this.jmsBinding = jmsBinding;
- this.jmsResourceFactory = new JMSResourceFactoryImpl(jmsBinding.getConnectionFactoryName(), jmsBinding.getResponseConnectionFactoryName(), jmsBinding.getInitialContextFactoryName(), jmsBinding.getJndiURL());
+ this.jmsResourceFactory = rf;
this.service = service;
this.targetBinding = targetBinding;
this.messageFactory = messageFactory;
Propchange: tuscany/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 22 17:36:30 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java:777627