Author: antelder
Date: Thu Feb 21 05:35:58 2008
New Revision: 629777
URL: http://svn.apache.org/viewvc?rev=629777&view=rev
Log:
Clean up unused code and support using the service name as the default
destination name
Modified:
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
Modified:
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java?rev=629777&r1=629776&r2=629777&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
Thu Feb 21 05:35:58 2008
@@ -218,10 +218,6 @@
}
}
- public void stop() throws NamingException, JMSException {
- jmsResourceFactory.closeConnection();
- }
-
protected Message sendRequest(Object payload, Session session, Destination
replyToDest) throws JMSException {
Message requestMsg =
requestMessageProcessor.insertPayloadIntoJMSMessage(session, payload);
Modified:
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java?rev=629777&r1=629776&r2=629777&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
Thu Feb 21 05:35:58 2008
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jms.JMSException;
+
import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
import org.apache.tuscany.sca.binding.jms.impl.JMSBindingConstants;
import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
@@ -131,12 +133,9 @@
public void stop() {
try {
- for (JMSBindingInvoker invoker : jmsBindingInvokers) {
- invoker.stop();
-
- }
- } catch (Exception e) {
- throw new JMSBindingException("Error stopping
JMSReferenceBinding", e);
+ jmsResourceFactory.closeConnection();
+ } catch (JMSException e) {
+ throw new JMSBindingException(e);
}
}
Modified:
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java?rev=629777&r1=629776&r2=629777&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
Thu Feb 21 05:35:58 2008
@@ -46,7 +46,6 @@
private RuntimeComponentService service;
private JMSBinding jmsBinding;
private JMSResourceFactory jmsResourceFactory;
- private Object broker;
private MessageConsumer consumer;
private WorkScheduler workScheduler;
private boolean running;
@@ -61,12 +60,9 @@
jmsResourceFactory = new
JMSResourceFactory(binding.getConnectionFactoryName(),
binding.getInitialContextFactoryName(), binding.getJndiURL());
- // if the default destination queue names is set
- // set the destinate queue name to the reference name
- // so that any wires can be assured a unique endpoint.
if
(jmsBinding.getDestinationName().equals(JMSBindingConstants.DEFAULT_DESTINATION_NAME))
{
- // jmsBinding.setDestinationName(service.getName());
- throw new JMSBindingException("No destination specified for
service " + service.getName());
+ // use the SCA service name as the default destination name
+ jmsBinding.setDestinationName(service.getName());
}
if (jmsBinding.getXMLFormat()) {
@@ -101,7 +97,6 @@
public void start() {
this.running = true;
- this.broker = jmsResourceFactory.startBroker();
try {
registerListerner();
@@ -115,9 +110,6 @@
try {
consumer.close();
jmsResourceFactory.closeConnection();
- if(this.broker!=null) {
- jmsResourceFactory.stopBroker(this.broker);
- }
} catch (Exception e) {
throw new JMSBindingException("Error stopping JMSServiceBinding",
e);
}
@@ -137,6 +129,8 @@
jmsResourceFactory.startConnection();
} catch (javax.jms.IllegalStateException e) {
+
+ // setMessageListener not allowed in JEE container so use Tuscany
threads
jmsResourceFactory.startConnection();
workScheduler.scheduleWork(new Runnable() {
Modified:
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java?rev=629777&r1=629776&r2=629777&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
Thu Feb 21 05:35:58 2008
@@ -94,36 +94,9 @@
*
* @see org.apache.tuscany.binding.jms.JMSResourceFactory#closeConnection()
*/
- public void closeConnection() throws JMSException, NamingException {
+ public void closeConnection() throws JMSException {
if (connection != null) {
connection.close();
- }
- }
-
- public Object startBroker() {
-// if (isEmbedded()) {
-// // ensure the broker has been started
-// return ActiveMQModuleActivator.startBroker(jndiURL);
-// }
- return null;
- }
-
- public void stopBroker(Object broker) {
-// if(broker instanceof ActiveMQBroker) {
-// ((ActiveMQBroker) broker).stop();
-// }
- }
-
- /**
- * TODO: need to find a way to determine whether or not need to start the
embedded broker
- * for now it always starts it if the activemq icf is being used with our
default jndiurl
- */
- protected boolean isEmbedded() {
- try {
- getConnection();
- return false;
- } catch (Exception e) {
- return true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
