You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2006/11/11 00:25:39 UTC

svn commit: r473574 - in /incubator/tuscany/java/sca/services/bindings/binding.jms/src: main/java/org/apache/tuscany/binding/jms/ test/java/org/apache/tuscany/binding/jms/

Author: rajith
Date: Fri Nov 10 15:25:37 2006
New Revision: 473574

URL: http://svn.apache.org/viewvc?view=rev&rev=473574
Log:
Added error handling and cleaned up the code a bit

Added:
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java
Modified:
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationSelector.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationSelector.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/GreetingService.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationSelector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationSelector.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationSelector.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/DefaultOperationSelector.java Fri Nov 10 15:25:37 2006
@@ -30,20 +30,21 @@
 		this.jmsBinding = jmsBinding;
 	}
 
-	public String getOperationName(Message message) {
+	public String getOperationName(Message message) throws JMSBindingException {
 		try {
 			return message.getStringProperty(getPropertyName());
 		} catch (JMSException e) {
-			e.printStackTrace();
-			return null;
+			throw new JMSBindingException(
+					"Error retriving operation name from message", e);
 		}
 	}
 
-	public void setOperationName(String operationName,Message message) {
+	public void setOperationName(String operationName,Message message) throws JMSBindingException {
 		try {
 			message.setStringProperty(getPropertyName(),operationName);
 		} catch (JMSException e) {
-			e.printStackTrace();
+			throw new JMSBindingException(
+					"Error setting the operation name as a message header", e);
 		}		
 	}
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBinding.java Fri Nov 10 15:25:37 2006
@@ -66,7 +66,7 @@
 		this.connectionFactoryName = connectionFactoryName;
 		this.activationSpecName = activationSpecName;
 		this.initialContextFactoryName = initialContextFactoryName;
-		jNDIProviderURL = providerURL;
+		this.jNDIProviderURL = providerURL;
 		this.deliveryMode = deliveryMode;
 		this.timeToLive = timeToLive;
 		this.priority = priority;

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingBuilder.java Fri Nov 10 15:25:37 2006
@@ -29,8 +29,6 @@
 import org.apache.tuscany.spi.model.BoundServiceDefinition;
 import org.apache.tuscany.spi.model.ServiceContract;
 
-import commonj.sdo.helper.TypeHelper;
-
 /**
  * Builds a Service or Reference for JMS binding.
  *
@@ -50,7 +48,7 @@
     @SuppressWarnings({"unchecked"})
     public Service build(CompositeComponent parent,
                            BoundServiceDefinition<JMSBinding> serviceDefinition,
-                           DeploymentContext deploymentContext) {
+                           DeploymentContext deploymentContext){
 
     	JMSBinding jmsBinding = serviceDefinition.getBinding();
         Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
@@ -58,8 +56,15 @@
         ServiceContract serviceContract =  serviceDefinition.getServiceContract();
         serviceContract.setDataBinding(OM_DATA_BINDING);
         
-        JMSResourceFactory jmsResourceFactory = getJMSResourceFactory(jmsBinding);
-        OperationSelector opSec = getOperationSelector(jmsBinding);
+        JMSResourceFactory jmsResourceFactory;
+        OperationSelector opSec;
+		try {
+			jmsResourceFactory = getJMSResourceFactory(jmsBinding);
+			opSec = getOperationSelector(jmsBinding);
+		} catch (JMSBindingException e) {
+			throw new JMSBindingRuntimeException("Error building JMS Service",e);
+		}
+        
         
         Service service = new JMSService(serviceDefinition.getName(),parent, wireService, jmsBinding, jmsResourceFactory,opSec,interfaze);
         service.setBindingServiceContract(serviceContract);
@@ -78,8 +83,14 @@
         serviceContract.setDataBinding(OM_DATA_BINDING);
         
         JMSBinding jmsBinding = referenceDefinition.getBinding();
-        JMSResourceFactory jmsResourceFactory = getJMSResourceFactory(jmsBinding);
-        OperationSelector opSec = getOperationSelector(jmsBinding);
+        JMSResourceFactory jmsResourceFactory;
+		OperationSelector opSec;
+		try {
+			jmsResourceFactory = getJMSResourceFactory(jmsBinding);
+			opSec = getOperationSelector(jmsBinding);
+		} catch (JMSBindingException e) {
+			throw new JMSBindingRuntimeException("Error building JMS reference",e);
+		}
         
         Reference reference = new JMSReference(name,parent,wireService, jmsBinding, jmsResourceFactory,opSec,interfaze);
         reference.setBindingServiceContract(serviceContract);
@@ -87,7 +98,7 @@
 
     }
 
-    private JMSResourceFactory getJMSResourceFactory(JMSBinding jmsBinding) {
+    private JMSResourceFactory getJMSResourceFactory(JMSBinding jmsBinding) throws JMSBindingException {
     	String className = jmsBinding.getJmsResourceFactoryName();   
     	if (className != null && !className.equals("")){
 			try {
@@ -95,21 +106,20 @@
 				Constructor constructor = factoryClass.getDeclaredConstructor(new Class[]{JMSBinding.class});
 				return (JMSResourceFactory) constructor.newInstance(jmsBinding);
 			} catch (ClassNotFoundException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the JMSResourceFactory",e);
 			} catch (SecurityException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the JMSResourceFactory",e);
 			} catch (NoSuchMethodException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the JMSResourceFactory",e);
 			} catch (IllegalArgumentException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the JMSResourceFactory",e);
 			} catch (InstantiationException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the JMSResourceFactory",e);
 			} catch (IllegalAccessException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the JMSResourceFactory",e);
 			} catch (InvocationTargetException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the JMSResourceFactory",e);
 			}
-			return new SimpleJMSResourceFactory(jmsBinding);
     	}else{
     		return new SimpleJMSResourceFactory(jmsBinding);
     	}	
@@ -117,7 +127,7 @@
 	}
     
 
-	private OperationSelector getOperationSelector(JMSBinding jmsBinding) {
+	private OperationSelector getOperationSelector(JMSBinding jmsBinding) throws JMSBindingException {
 		String className = jmsBinding.getOperationSelectorName();    	
 		
 		if (className != null && !className.equals("")){
@@ -126,21 +136,20 @@
 				Constructor constructor = factoryClass.getDeclaredConstructor(new Class[]{JMSBinding.class});
 				return (OperationSelector) constructor.newInstance(jmsBinding);
 			} catch (ClassNotFoundException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the OperationSelector",e);
 			} catch (SecurityException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the OperationSelector",e);
 			} catch (NoSuchMethodException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the OperationSelector",e);
 			} catch (IllegalArgumentException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the OperationSelector",e);
 			} catch (InstantiationException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the OperationSelector",e);
 			} catch (IllegalAccessException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the OperationSelector",e);
 			} catch (InvocationTargetException e) {
-				e.printStackTrace();
+				throw new JMSBindingException("Error loading the OperationSelector",e);
 			}
-			return new DefaultOperationSelector(jmsBinding);
 		}else{
 			return new DefaultOperationSelector(jmsBinding);
 		}

Added: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java?view=auto&rev=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java (added)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java Fri Nov 10 15:25:37 2006
@@ -0,0 +1,40 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
+
+package org.apache.tuscany.binding.jms;
+
+import org.apache.tuscany.api.TuscanyException;
+
+public class JMSBindingException extends TuscanyException {
+
+	public JMSBindingException() {
+		super();
+	}
+
+	public JMSBindingException(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+	}
+
+	public JMSBindingException(String arg0) {
+		super(arg0);
+	}
+
+	public JMSBindingException(Throwable arg0) {
+		super(arg0);
+	}
+
+}

Added: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java?view=auto&rev=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java (added)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java Fri Nov 10 15:25:37 2006
@@ -0,0 +1,39 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
+package org.apache.tuscany.binding.jms;
+
+import org.apache.tuscany.api.TuscanyRuntimeException;
+
+public class JMSBindingRuntimeException extends TuscanyRuntimeException {
+
+	public JMSBindingRuntimeException() {
+		super();
+	}
+
+	public JMSBindingRuntimeException(String arg0, Throwable arg1) {
+		super(arg0, arg1);
+	}
+
+	public JMSBindingRuntimeException(String arg0) {
+		super(arg0);
+	}
+
+	public JMSBindingRuntimeException(Throwable arg0) {
+		super(arg0);
+	}
+
+}

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSProxy.java Fri Nov 10 15:25:37 2006
@@ -27,7 +27,6 @@
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
-import javax.naming.Context;
 import javax.naming.NamingException;
 
 import org.apache.tuscany.spi.model.Operation;
@@ -39,15 +38,12 @@
 public class JMSProxy implements MessageListener{
 	
 	protected Method operationMethod;
-    private JMSBinding jmsBinding;
-    private Context context;
-	private JMSResourceFactory jmsResourceFactory; 
+    private JMSResourceFactory jmsResourceFactory; 
 	private OperationSelector operationSelector;
 	private InboundWire inboundWire;;
     
-	public JMSProxy(InboundWire inboundWire,JMSResourceFactory jmsResourceFactory, JMSBinding jmsBinding,OperationSelector operationSelector) throws NamingException{		
+	public JMSProxy(InboundWire inboundWire,JMSResourceFactory jmsResourceFactory,OperationSelector operationSelector) throws NamingException{		
 		
-		this.jmsBinding = jmsBinding;	
 		this.jmsResourceFactory = jmsResourceFactory;
 		this.operationSelector = operationSelector;
 		this.inboundWire = inboundWire;
@@ -55,32 +51,37 @@
 
 	public void onMessage(Message msg){
 		
-		String operationName = operationSelector.getOperationName(msg);
-		Operation op = (Operation) inboundWire.getServiceContract().getOperations().get(operationName);
 		
-        try {            
-		        	
+        try{        
+			        	
+			String operationName = operationSelector.getOperationName(msg);
+			Operation op = (Operation) inboundWire.getServiceContract().getOperations().get(operationName);
+			
 		    InvocationChain chain = inboundWire.getInvocationChains().get(op);
-	        Interceptor headInterceptor = chain.getHeadInterceptor();		    
+		    Interceptor headInterceptor = chain.getHeadInterceptor();		    
 		    
-	        org.apache.tuscany.spi.wire.Message tuscanyMsg = new MessageImpl();
-	        tuscanyMsg.setBody(new Object[]{((TextMessage)msg).getText()});
-	        tuscanyMsg.setTargetInvoker(chain.getTargetInvoker());
-	        org.apache.tuscany.spi.wire.Message tuscanyResMsg = null;
-	        
-	        // again over here I expect the data binding interecptors to convert the 
-	        // XML string into objects
-	        if (headInterceptor != null){
-	        	tuscanyResMsg = headInterceptor.invoke(tuscanyMsg);
-	        }
+		    org.apache.tuscany.spi.wire.Message tuscanyMsg = new MessageImpl();
+		    tuscanyMsg.setBody(new Object[]{((TextMessage)msg).getText()});
+		    tuscanyMsg.setTargetInvoker(chain.getTargetInvoker());
+		    org.apache.tuscany.spi.wire.Message tuscanyResMsg = null;
+		    
+		    // again over here I expect the data binding interecptors to convert the 
+		    // XML string into objects
+		    if (headInterceptor != null){
+		    	tuscanyResMsg = headInterceptor.invoke(tuscanyMsg);
+		    }
 		    	        
 		    // if result is null then the method can be assumed as oneway
 		    if (tuscanyResMsg != null && tuscanyResMsg.getBody() != null){
 		    	sendReply(msg,operationName, (String)tuscanyResMsg.getBody());
 		    }
-		} catch (Exception e) {
-			// need to do proper error handling
-			e.printStackTrace();
+		    
+		} catch (JMSBindingException e) {
+			throw new JMSBindingRuntimeException(e);
+		} catch (JMSException e) {
+			throw new JMSBindingRuntimeException(e);
+		} catch (NamingException e) {
+			throw new JMSBindingRuntimeException(e);
 		}
 	}
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSReference.java Fri Nov 10 15:25:37 2006
@@ -18,8 +18,6 @@
  */
 package org.apache.tuscany.binding.jms;
 
-import javax.naming.NamingException;
-
 import org.apache.tuscany.spi.component.CompositeComponent;
 import org.apache.tuscany.spi.extension.ReferenceExtension;
 import org.apache.tuscany.spi.model.Operation;
@@ -52,10 +50,6 @@
 	}
 
     public TargetInvoker createTargetInvoker(ServiceContract contract, Operation operation) {
-		try {
-			return new JMSTargetInvoker(jmsResourceFactory, jmsBinding, operation.getName(),operationSelector);
-		} catch (NamingException e) {
-			throw new RuntimeException("Unable to create JMS resources for the invocation",e);
-		}
+    	return new JMSTargetInvoker(jmsResourceFactory, jmsBinding, operation.getName(),operationSelector);
     }
 }

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSService.java Fri Nov 10 15:25:37 2006
@@ -58,8 +58,7 @@
         try {
 			registerListerner();
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			throw new JMSBindingRuntimeException("Error starting JMSService",e);
 		}
     }
 
@@ -69,8 +68,7 @@
     		consumer.close();
     		jmsResourceFactory.closeConnection();
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			throw new JMSBindingRuntimeException("Error stopping JMSService",e);
 		}
     	
     	super.stop();
@@ -82,7 +80,7 @@
         Destination destination = session.createQueue(jmsBinding.getDestinationName());
         
         consumer = session.createConsumer(destination);
-        consumer.setMessageListener(new JMSProxy(getInboundWire(),jmsResourceFactory,jmsBinding,operationSelector));
+        consumer.setMessageListener(new JMSProxy(getInboundWire(),jmsResourceFactory,operationSelector));
         
         jmsResourceFactory.startConnection();
         

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSTargetInvoker.java Fri Nov 10 15:25:37 2006
@@ -43,7 +43,7 @@
 	private JMSResourceFactory jmsResourceFactory;
     private OperationSelector operationSelector;
     
-    public JMSTargetInvoker(JMSResourceFactory jmsResourceFactory,JMSBinding jmsBinding, String operationName, OperationSelector operationSelector) throws NamingException {
+    public JMSTargetInvoker(JMSResourceFactory jmsResourceFactory,JMSBinding jmsBinding, String operationName, OperationSelector operationSelector){
         this.jmsBinding = jmsBinding;
         this.jmsResourceFactory = jmsResourceFactory;
         this.operationName = operationName;
@@ -95,7 +95,7 @@
     public void setCacheable(boolean cacheable) {
     }
     
-    private Object sendReceiveMessage(Object payload) throws JMSException, NamingException{
+    private Object sendReceiveMessage(Object payload) throws JMSException, NamingException, JMSBindingException{
     	
     	Session session = jmsResourceFactory.createSession();
     	
@@ -118,12 +118,8 @@
         
         MessageConsumer consumer = session.createConsumer(replyDest);
         jmsResourceFactory.startConnection();
-        javax.jms.Message reply = consumer.receive(jmsBinding.getTimeToLive());
-        
-        System.out.println("Reply " + reply);
-        
-        consumer.close();
-        
+        javax.jms.Message reply = consumer.receive(jmsBinding.getTimeToLive());        
+        consumer.close();        
         session.close();
         
         return ((javax.jms.TextMessage)reply).getText();

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationSelector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationSelector.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationSelector.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationSelector.java Fri Nov 10 15:25:37 2006
@@ -23,8 +23,8 @@
  */
 public interface OperationSelector {
 	
-	public String getOperationName(javax.jms.Message message);
+	public String getOperationName(javax.jms.Message message) throws JMSBindingException;
 	
-	public void setOperationName(String operationName,javax.jms.Message message);
+	public void setOperationName(String operationName,javax.jms.Message message) throws JMSBindingException;
 	
 }

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/GreetingService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/GreetingService.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/GreetingService.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/GreetingService.java Fri Nov 10 15:25:37 2006
@@ -18,6 +18,9 @@
  */
 package org.apache.tuscany.binding.jms;
 
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
 public interface GreetingService {
 
 	String greet(String name);

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java?view=diff&rev=473574&r1=473573&r2=473574
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCase.java Fri Nov 10 15:25:37 2006
@@ -56,7 +56,6 @@
 		try {
 			test.setUp();
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		test.testJMSBinding();



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org