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 2006/12/21 16:25:43 UTC

svn commit: r489385 - 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: antelder
Date: Thu Dec 21 07:25:42 2006
New Revision: 489385

URL: http://svn.apache.org/viewvc?view=rev&rev=489385
Log:
Formating. No code changes

Modified:
    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/JMSBindingException.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.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/OperationAndDataBinding.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java
    incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSProxyTestCase.java

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=489385&r1=489384&r2=489385
==============================================================================
--- 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 Thu Dec 21 07:25:42 2006
@@ -27,171 +27,179 @@
  */
 
 public class JMSBinding extends Binding {
-	
-	public final static int DESTINATION_TYPE_QUEUE = 0;
-	public final static int DESTINATION_TYPE_TOPIC = 1;
-	
-	private int destinationType = DESTINATION_TYPE_QUEUE;
-	
-	private String destinationName;
-
-	// Topic or Query factory name
-	private String connectionFactoryName;
-
-	private String activationSpecName;
-
-	private String initialContextFactoryName; // "org.apache.activemq.jndi.ActiveMQInitialContextFactory"
-
-	private String jNDIProviderURL; // "tcp://hostname:61616"
-
-	// Maps to javax.jms.DeliveryMode
-	private int deliveryMode = DeliveryMode.NON_PERSISTENT;
-
-	private int timeToLive = 1000 ; // in mili seconds
-
-	private int priority;
-
-	private String replyTo;
-	
-	private String jmsResourceFactoryName;
-	
-	private String operationSelectorName;
-	
-	private String operationSelectorPropertyName = DEFAULT_OPERATION_PROP_NAME;
-
-        private String correlationScheme;
-        private String responseDestinationName;
-
-        private String requestOperationAndDatabindingName = DEFAULT_ODB_CLASSNAME;
-        private String responseOperationAndDatabindingName = DEFAULT_ODB_CLASSNAME;
-
-        private boolean xmlFormat;
-        
-        public static final String DEFAULT_ODB_CLASSNAME = DefaultOperationAndDataBinding.class.getName();
-        public static final String DEFAULT_OPERATION_PROP_NAME = "scaOperationName";
-
-	public JMSBinding(int destinationType, String destinationName, String connectionFactoryName, String activationSpecName, String initialContextFactoryName, String providerURL, int deliveryMode, int timeToLive, int priority, String replyTo) {
-		super();
-		this.destinationType = destinationType;
-		this.destinationName = destinationName;
-		this.connectionFactoryName = connectionFactoryName;
-		this.activationSpecName = activationSpecName;
-		this.initialContextFactoryName = initialContextFactoryName;
-		this.jNDIProviderURL = providerURL;
-		this.deliveryMode = deliveryMode;
-		this.timeToLive = timeToLive;
-		this.priority = priority;
-		this.replyTo = replyTo;
-	}
-
-	public JMSBinding(){
-		super();
-	}
-
-	public String getActivationSpecName() {
-		return activationSpecName;
-	}
-
-	public void setActivationSpecName(String activationSpecName) {
-		this.activationSpecName = activationSpecName;
-	}
-
-	public String getConnectionFactoryName() {
-		return connectionFactoryName;
-	}
-
-	public void setConnectionFactoryName(String connectionFactoryName) {
-		this.connectionFactoryName = connectionFactoryName;
-	}
-
-	public int getDeliveryMode() {
-		return deliveryMode;
-	}
-
-	public void setDeliveryMode(int deliveryMode) {
-		this.deliveryMode = deliveryMode;
-	}
-
-	public String getDestinationName() {
-		return destinationName;
-	}
-
-	public void setDestinationName(String destinationName) {
-		this.destinationName = destinationName;
-	}
-
-	public String getInitialContextFactoryName() {
-		return initialContextFactoryName;
-	}
-
-	public void setInitialContextFactoryName(String initialContextFactoryName) {
-		this.initialContextFactoryName = initialContextFactoryName;
-	}
-
-	public String getJNDIProviderURL() {
-		return jNDIProviderURL;
-	}
-
-	public void setJNDIProviderURL(String providerURL) {
-		jNDIProviderURL = providerURL;
-	}
-
-	public int getPriority() {
-		return priority;
-	}
-
-	public void setPriority(int priority) {
-		this.priority = priority;
-	}
-
-	public String getReplyTo() {
-		return replyTo;
-	}
-
-	public void setReplyTo(String replyTo) {
-		this.replyTo = replyTo;
-	}
-
-	public int getTimeToLive() {
-		return timeToLive;
-	}
-
-	public void setTimeToLive(int timeToLive) {
-		this.timeToLive = timeToLive;
-	}
-
-	public int getDestinationType() {
-		return destinationType;
-	}
-
-	public void setDestinationType(int destinationType) {
-		this.destinationType = destinationType;
-	}
-
-	public String getJmsResourceFactoryName() {
-		return jmsResourceFactoryName;
-	}
-
-	public void setJmsResourceFactoryName(String jmsResourceFactoryName) {
-		this.jmsResourceFactoryName = jmsResourceFactoryName;
-	}
-
-	public String getOperationSelectorName() {
-		return operationSelectorName;
-	}
-
-	public void setOperationSelectorName(String operationSelectorName) {
-		this.operationSelectorName = operationSelectorName;
-	}
-
-	public String getOperationSelectorPropertyName() {
-		return operationSelectorPropertyName;
-	}
-
-	public void setOperationSelectorPropertyName(
-			String operationSelectorPropertyName) {
-		this.operationSelectorPropertyName = operationSelectorPropertyName;
-	}
+
+    public final static int DESTINATION_TYPE_QUEUE = 0;
+    public final static int DESTINATION_TYPE_TOPIC = 1;
+
+    private int destinationType = DESTINATION_TYPE_QUEUE;
+
+    private String destinationName;
+
+    // Topic or Query factory name
+    private String connectionFactoryName;
+
+    private String activationSpecName;
+
+    private String initialContextFactoryName; // "org.apache.activemq.jndi.ActiveMQInitialContextFactory"
+
+    private String jNDIProviderURL; // "tcp://hostname:61616"
+
+    // Maps to javax.jms.DeliveryMode
+    private int deliveryMode = DeliveryMode.NON_PERSISTENT;
+
+    private int timeToLive = 1000; // in mili seconds
+
+    private int priority;
+
+    private String replyTo;
+
+    private String jmsResourceFactoryName;
+
+    private String operationSelectorName;
+
+    private String operationSelectorPropertyName = DEFAULT_OPERATION_PROP_NAME;
+
+    private String correlationScheme;
+    private String responseDestinationName;
+
+    private String requestOperationAndDatabindingName = DEFAULT_ODB_CLASSNAME;
+    private String responseOperationAndDatabindingName = DEFAULT_ODB_CLASSNAME;
+
+    private boolean xmlFormat;
+
+    public static final String DEFAULT_ODB_CLASSNAME = DefaultOperationAndDataBinding.class.getName();
+    public static final String DEFAULT_OPERATION_PROP_NAME = "scaOperationName";
+
+    public JMSBinding(int destinationType,
+                      String destinationName,
+                      String connectionFactoryName,
+                      String activationSpecName,
+                      String initialContextFactoryName,
+                      String providerURL,
+                      int deliveryMode,
+                      int timeToLive,
+                      int priority,
+                      String replyTo) {
+        super();
+        this.destinationType = destinationType;
+        this.destinationName = destinationName;
+        this.connectionFactoryName = connectionFactoryName;
+        this.activationSpecName = activationSpecName;
+        this.initialContextFactoryName = initialContextFactoryName;
+        this.jNDIProviderURL = providerURL;
+        this.deliveryMode = deliveryMode;
+        this.timeToLive = timeToLive;
+        this.priority = priority;
+        this.replyTo = replyTo;
+    }
+
+    public JMSBinding() {
+        super();
+    }
+
+    public String getActivationSpecName() {
+        return activationSpecName;
+    }
+
+    public void setActivationSpecName(String activationSpecName) {
+        this.activationSpecName = activationSpecName;
+    }
+
+    public String getConnectionFactoryName() {
+        return connectionFactoryName;
+    }
+
+    public void setConnectionFactoryName(String connectionFactoryName) {
+        this.connectionFactoryName = connectionFactoryName;
+    }
+
+    public int getDeliveryMode() {
+        return deliveryMode;
+    }
+
+    public void setDeliveryMode(int deliveryMode) {
+        this.deliveryMode = deliveryMode;
+    }
+
+    public String getDestinationName() {
+        return destinationName;
+    }
+
+    public void setDestinationName(String destinationName) {
+        this.destinationName = destinationName;
+    }
+
+    public String getInitialContextFactoryName() {
+        return initialContextFactoryName;
+    }
+
+    public void setInitialContextFactoryName(String initialContextFactoryName) {
+        this.initialContextFactoryName = initialContextFactoryName;
+    }
+
+    public String getJNDIProviderURL() {
+        return jNDIProviderURL;
+    }
+
+    public void setJNDIProviderURL(String providerURL) {
+        jNDIProviderURL = providerURL;
+    }
+
+    public int getPriority() {
+        return priority;
+    }
+
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+
+    public String getReplyTo() {
+        return replyTo;
+    }
+
+    public void setReplyTo(String replyTo) {
+        this.replyTo = replyTo;
+    }
+
+    public int getTimeToLive() {
+        return timeToLive;
+    }
+
+    public void setTimeToLive(int timeToLive) {
+        this.timeToLive = timeToLive;
+    }
+
+    public int getDestinationType() {
+        return destinationType;
+    }
+
+    public void setDestinationType(int destinationType) {
+        this.destinationType = destinationType;
+    }
+
+    public String getJmsResourceFactoryName() {
+        return jmsResourceFactoryName;
+    }
+
+    public void setJmsResourceFactoryName(String jmsResourceFactoryName) {
+        this.jmsResourceFactoryName = jmsResourceFactoryName;
+    }
+
+    public String getOperationSelectorName() {
+        return operationSelectorName;
+    }
+
+    public void setOperationSelectorName(String operationSelectorName) {
+        this.operationSelectorName = operationSelectorName;
+    }
+
+    public String getOperationSelectorPropertyName() {
+        return operationSelectorPropertyName;
+    }
+
+    public void setOperationSelectorPropertyName(String operationSelectorPropertyName) {
+        this.operationSelectorPropertyName = operationSelectorPropertyName;
+    }
 
     public void setCorrelationScheme(String correlationScheme) {
         this.correlationScheme = correlationScheme;
@@ -207,18 +215,19 @@
     public void setResponseDestinationName(String name) {
         this.responseDestinationName = name;
     }
+
     public String getResponseDestinationName() {
         return responseDestinationName;
     }
 
     public void setResponseDestinationType(int destination_type_queue2) {
         // TODO Auto-generated method stub
-        
+
     }
 
     public void setCreateResponseDestination(String create) {
         // TODO Auto-generated method stub
-        
+
     }
 
     public void setRequestOperationAndDatabindingName(String name) {
@@ -240,7 +249,7 @@
     public boolean isXMLFormat() {
         return xmlFormat;
     }
-    
+
     public void setXMLFormat(boolean b) {
         this.xmlFormat = b;
     }

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=489385&r1=489384&r2=489385
==============================================================================
--- 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 Thu Dec 21 07:25:42 2006
@@ -35,29 +35,29 @@
 
 /**
  * Builds a Service or Reference for JMS binding.
- *
+ * 
  * @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
  */
 
 public class JMSBindingBuilder extends BindingBuilderExtension<JMSBinding> {
 
-	private static final String DEFAULT_JMS_RESOURCE_FACTORY = "org.apache.tuscany.binding.jms.SimpleJMSResourceFactory";
-	private static final String DEFAULT_OPERATION_SELECTOR = "org.apache.tuscany.binding.jms.DefaultOperationSelector";
-	private static final String OM_DATA_BINDING = OMElement.class.getName();
-	
+    private static final String DEFAULT_JMS_RESOURCE_FACTORY =
+        "org.apache.tuscany.binding.jms.SimpleJMSResourceFactory";
+    private static final String DEFAULT_OPERATION_SELECTOR = "org.apache.tuscany.binding.jms.DefaultOperationSelector";
+    private static final String OM_DATA_BINDING = OMElement.class.getName();
+
     protected Class<JMSBinding> getBindingType() {
         return JMSBinding.class;
     }
 
-    @SuppressWarnings({"unchecked"})
+    @SuppressWarnings( {"unchecked"})
     public Service build(CompositeComponent parent,
-                           BoundServiceDefinition<JMSBinding> serviceDefinition,
-                           DeploymentContext deploymentContext){
-
+                         BoundServiceDefinition<JMSBinding> serviceDefinition,
+                         DeploymentContext deploymentContext) {
 
         JMSBinding jmsBinding = serviceDefinition.getBinding();
         Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
-        
+
         ServiceContract serviceContract = serviceDefinition.getServiceContract();
         jmsBinding.setXMLFormat(serviceContract instanceof WSDLServiceContract);
 
@@ -66,81 +66,89 @@
         if (serviceContract instanceof WSDLServiceContract) {
             serviceContract.setDataBinding(OM_DATA_BINDING);
         }
-        
-        OperationAndDataBinding requestODB = getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
-        OperationAndDataBinding responseODB = getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
-        
-        Service service = new JMSService(serviceDefinition.getName(),parent, wireService, jmsBinding, jmsResourceFactory, requestODB, responseODB, interfaze);
+
+        OperationAndDataBinding requestODB =
+            getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
+        OperationAndDataBinding responseODB =
+            getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
+
+        Service service =
+            new JMSService(serviceDefinition.getName(), parent, wireService, jmsBinding, jmsResourceFactory,
+                           requestODB, responseODB, interfaze);
         service.setBindingServiceContract(serviceContract);
-        
+
         return service;
     }
 
-	@SuppressWarnings({"unchecked"})
+    @SuppressWarnings( {"unchecked"})
     public Reference build(CompositeComponent parent,
-                              BoundReferenceDefinition<JMSBinding> referenceDefinition,
-                              DeploymentContext deploymentContext) {
-    	
+                           BoundReferenceDefinition<JMSBinding> referenceDefinition,
+                           DeploymentContext deploymentContext) {
+
         String name = referenceDefinition.getName();
         Class<?> interfaze = referenceDefinition.getServiceContract().getInterfaceClass();
         ServiceContract serviceContract;
-		try {
-			serviceContract = (ServiceContract)referenceDefinition.getServiceContract().clone();
-		} catch (CloneNotSupportedException e) {
-			throw new JMSBindingRuntimeException("Couldn't clone the Service Contract",e);
-		}
+        try {
+            serviceContract = (ServiceContract)referenceDefinition.getServiceContract().clone();
+        } catch (CloneNotSupportedException e) {
+            throw new JMSBindingRuntimeException("Couldn't clone the Service Contract", e);
+        }
         serviceContract.setDataBinding(OM_DATA_BINDING);
-        
+
         JMSBinding jmsBinding = referenceDefinition.getBinding();
         JMSResourceFactory jmsResourceFactory = getJMSResourceFactory(jmsBinding);
 
-                Destination requestDest;
-                Destination replyDest = null;
-                try {
-                    requestDest = jmsResourceFactory.lookupDestination(jmsBinding.getDestinationName());
-                    if (jmsBinding.getResponseDestinationName() != null) {
-                        replyDest = jmsResourceFactory.lookupDestination(jmsBinding.getResponseDestinationName());
-                    }
-                } catch (NamingException e) {
-                    throw new JMSBindingRuntimeException(e);
-                }
-        
-        OperationAndDataBinding requestODB = getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
-        OperationAndDataBinding responseODB = getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
-                
-        Reference reference = new JMSReference(name,parent,wireService, jmsBinding, jmsResourceFactory, requestODB, responseODB, interfaze, requestDest, replyDest);
+        Destination requestDest;
+        Destination replyDest = null;
+        try {
+            requestDest = jmsResourceFactory.lookupDestination(jmsBinding.getDestinationName());
+            if (jmsBinding.getResponseDestinationName() != null) {
+                replyDest = jmsResourceFactory.lookupDestination(jmsBinding.getResponseDestinationName());
+            }
+        } catch (NamingException e) {
+            throw new JMSBindingRuntimeException(e);
+        }
+
+        OperationAndDataBinding requestODB =
+            getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
+        OperationAndDataBinding responseODB =
+            getRequestOperationAndDatabinding(jmsBinding, deploymentContext.getClassLoader());
+
+        Reference reference =
+            new JMSReference(name, parent, wireService, jmsBinding, jmsResourceFactory, requestODB, responseODB,
+                             interfaze, requestDest, replyDest);
         reference.setBindingServiceContract(serviceContract);
         return reference;
 
     }
-        
+
     private JMSResourceFactory getJMSResourceFactory(JMSBinding jmsBinding) {
-    	String className = jmsBinding.getJmsResourceFactoryName();   
-    	if (className != null && !className.equals("")){
-			try {
-	    		Class factoryClass = Class.forName(className != null ? className : DEFAULT_JMS_RESOURCE_FACTORY);
-				Constructor constructor = factoryClass.getDeclaredConstructor(new Class[]{JMSBinding.class});
-				return (JMSResourceFactory) constructor.newInstance(jmsBinding);
-			} catch (ClassNotFoundException e) {
-				throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory",e);
-			} catch (SecurityException e) {
-				throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory",e);
-			} catch (NoSuchMethodException e) {
-				throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory",e);
-			} catch (IllegalArgumentException e) {
-				throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory",e);
-			} catch (InstantiationException e) {
-				throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory",e);
-			} catch (IllegalAccessException e) {
-				throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory",e);
-			} catch (InvocationTargetException e) {
-				throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory",e);
-			}
-    	}else{
-    		return new SimpleJMSResourceFactory(jmsBinding);
-    	}	
-		
-	}
+        String className = jmsBinding.getJmsResourceFactoryName();
+        if (className != null && !className.equals("")) {
+            try {
+                Class factoryClass = Class.forName(className != null ? className : DEFAULT_JMS_RESOURCE_FACTORY);
+                Constructor constructor = factoryClass.getDeclaredConstructor(new Class[] {JMSBinding.class});
+                return (JMSResourceFactory)constructor.newInstance(jmsBinding);
+            } catch (ClassNotFoundException e) {
+                throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+            } catch (SecurityException e) {
+                throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+            } catch (NoSuchMethodException e) {
+                throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+            } catch (IllegalArgumentException e) {
+                throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+            } catch (InstantiationException e) {
+                throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+            } catch (IllegalAccessException e) {
+                throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+            } catch (InvocationTargetException e) {
+                throw new JMSBindingRuntimeException("Error loading the JMSResourceFactory", e);
+            }
+        } else {
+            return new SimpleJMSResourceFactory(jmsBinding);
+        }
+
+    }
 
     protected OperationAndDataBinding getRequestOperationAndDatabinding(JMSBinding jmsBinding, ClassLoader cl) {
         String className = jmsBinding.getRequestOperationAndDatabindingName();

Modified: 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=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingException.java Thu Dec 21 07:25:42 2006
@@ -21,20 +21,20 @@
 
 public class JMSBindingException extends TuscanyException {
 
-	public JMSBindingException() {
-		super();
-	}
+    public JMSBindingException() {
+        super();
+    }
 
-	public JMSBindingException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
+    public JMSBindingException(String arg0, Throwable arg1) {
+        super(arg0, arg1);
+    }
 
-	public JMSBindingException(String arg0) {
-		super(arg0);
-	}
+    public JMSBindingException(String arg0) {
+        super(arg0);
+    }
 
-	public JMSBindingException(Throwable arg0) {
-		super(arg0);
-	}
+    public JMSBindingException(Throwable arg0) {
+        super(arg0);
+    }
 
 }

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader.java Thu Dec 21 07:25:42 2006
@@ -20,8 +20,6 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.osoa.sca.annotations.Scope;
-
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMXMLParserWrapper;
@@ -34,65 +32,68 @@
 import org.apache.tuscany.spi.loader.LoaderRegistry;
 import org.apache.tuscany.spi.loader.LoaderUtil;
 import org.apache.tuscany.spi.model.ModelObject;
+import org.osoa.sca.annotations.Scope;
 
 /**
  * Loader for handling <binding.jms> elements.
- *
+ * 
  * @version $Rev: 449970 $ $Date: 2006-09-26 06:05:35 -0400 (Tue, 26 Sep 2006) $
  */
 @Scope("COMPOSITE")
 public class JMSBindingLoader extends LoaderExtension<JMSBinding> {
-    public static final QName BINDING_JMS = new QName(
-        "http://tuscany.apache.org/xmlns/binding/jms/1.0-SNAPSHOT", "binding.jms");
+    public static final QName BINDING_JMS =
+        new QName("http://tuscany.apache.org/xmlns/binding/jms/1.0-SNAPSHOT", "binding.jms");
 
-    public JMSBindingLoader(@Autowire LoaderRegistry registry) {
+    public JMSBindingLoader(@Autowire
+    LoaderRegistry registry) {
         super(registry);
     }
 
     public QName getXMLType() {
         return BINDING_JMS;
     }
-    
-    
+
     /**
-	 * FIXME 21.10.2006 rajith 
-	 * The spec has changed quite a bit since I started the implementation, especially during the last 2 weeks.
-	 * I will wait till a draft version is published before I make any changes 
-	 *
-	 */
+     * FIXME 21.10.2006 rajith The spec has changed quite a bit since I started
+     * the implementation, especially during the last 2 weeks. I will wait till
+     * a draft version is published before I make any changes
+     */
     public JMSBinding load(CompositeComponent parent,
-    		               ModelObject modelObject,
+                           ModelObject modelObject,
                            XMLStreamReader reader,
                            DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
-    	
-    	OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(), reader);
+
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(), reader);
         OMElement omElement = builder.getDocumentElement();
-        
-        //OMElement connectionOM = omElement.getFirstChildWithName(new QName("connection.jms"));
+
+        // OMElement connectionOM = omElement.getFirstChildWithName(new
+        // QName("connection.jms"));
         OMElement connectionOM = omElement;
-        
-        
-    	String activationSpecName =  connectionOM.getAttributeValue(new QName("activationSpecName"));
+
+        String activationSpecName = connectionOM.getAttributeValue(new QName("activationSpecName"));
         String destinationName = connectionOM.getAttributeValue(new QName("destinationName"));
-		String connectionFactoryName = connectionOM.getAttributeValue(new QName("connectionFactoryName")) ;
-		String initialContextFactoryName = connectionOM.getAttributeValue(new QName("initialContextFactoryName")) ;
-		String jNDIProviderURL = connectionOM.getAttributeValue(new QName("providerURL")) ;
-		String deliveryMode = connectionOM.getAttributeValue(new QName(null, "deliveryMode")) ;
-		String timeToLive = connectionOM.getAttributeValue(new QName(null, "timeToLive")) ;
-		String priority = connectionOM.getAttributeValue(new QName(null, "priority")) ;
-		String replyTo = connectionOM.getAttributeValue(new QName(null, "replyTo")) ;			
-		String jmsResourceFactoryName = connectionOM.getAttributeValue(new QName(null, "jmsResourceFactory")) ;
-			
-		LoaderUtil.skipToEndElement(reader);
-						
-		//builder = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(), reader);		
-		//OMElement opSecOM = builder.getDocumentElement();
-			//omElement.getFirstChildWithName(new QName("operationSelector"));		
-		String operationSelector = ""; //opSecOM.getAttributeValue(new QName("name"));
-		//OMElement opSecPropertyOM = opSecOM.getFirstChildWithName(new QName("property"));
-		String jmsOpSecPropertyName = ""; // = opSecPropertyOM.getText();
-		       
-        
+        String connectionFactoryName = connectionOM.getAttributeValue(new QName("connectionFactoryName"));
+        String initialContextFactoryName = connectionOM.getAttributeValue(new QName("initialContextFactoryName"));
+        String jNDIProviderURL = connectionOM.getAttributeValue(new QName("providerURL"));
+        String deliveryMode = connectionOM.getAttributeValue(new QName(null, "deliveryMode"));
+        String timeToLive = connectionOM.getAttributeValue(new QName(null, "timeToLive"));
+        String priority = connectionOM.getAttributeValue(new QName(null, "priority"));
+        String replyTo = connectionOM.getAttributeValue(new QName(null, "replyTo"));
+        String jmsResourceFactoryName = connectionOM.getAttributeValue(new QName(null, "jmsResourceFactory"));
+
+        LoaderUtil.skipToEndElement(reader);
+
+        // builder =
+        // OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
+        // reader);
+        // OMElement opSecOM = builder.getDocumentElement();
+        // omElement.getFirstChildWithName(new QName("operationSelector"));
+        String operationSelector = ""; // opSecOM.getAttributeValue(new
+                                        // QName("name"));
+        // OMElement opSecPropertyOM = opSecOM.getFirstChildWithName(new
+        // QName("property"));
+        String jmsOpSecPropertyName = ""; // = opSecPropertyOM.getText();
+
         JMSBinding binding = new JMSBinding();
         binding.setActivationSpecName(activationSpecName);
         binding.setConnectionFactoryName(connectionFactoryName);
@@ -102,31 +103,31 @@
         binding.setReplyTo(replyTo);
         binding.setJmsResourceFactoryName(jmsResourceFactoryName);
         binding.setOperationSelectorName(operationSelector);
-        
-        if (deliveryMode != null && deliveryMode.trim().equals("")){
-        	try{
-        		binding.setDeliveryMode(Integer.parseInt(deliveryMode));
-        	}catch (Exception e){
-        		
-        	}
-        }             
-        
-        if (priority != null && priority.trim().equals("")){
-        	try{
-        		binding.setPriority(Integer.parseInt(priority));
-        	}catch (Exception e){
-        		
-        	}
+
+        if (deliveryMode != null && deliveryMode.trim().equals("")) {
+            try {
+                binding.setDeliveryMode(Integer.parseInt(deliveryMode));
+            } catch (Exception e) {
+
+            }
         }
-        
-        if (timeToLive != null && timeToLive.trim().equals("")){
-        	try{
-        		binding.setTimeToLive(Integer.parseInt(timeToLive));
-        	}catch (Exception e){
-        		
-        	}
+
+        if (priority != null && priority.trim().equals("")) {
+            try {
+                binding.setPriority(Integer.parseInt(priority));
+            } catch (Exception e) {
+
+            }
         }
-        
+
+        if (timeToLive != null && timeToLive.trim().equals("")) {
+            try {
+                binding.setTimeToLive(Integer.parseInt(timeToLive));
+            } catch (Exception e) {
+
+            }
+        }
+
         return binding;
-    }	
+    }
 }

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961.java Thu Dec 21 07:25:42 2006
@@ -128,7 +128,7 @@
 
     protected void parseResponse(XMLStreamReader reader, JMSBinding jmsBinding) {
         // TODO Auto-generated method stub
-        
+
     }
 
     protected void parseResourceAdapter(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
@@ -139,7 +139,8 @@
         // TODO Auto-generated method stub
     }
 
-    protected void parseOperationAndDataBinding(XMLStreamReader reader, JMSBinding jmsBinding) throws XMLStreamException {
+    protected void parseOperationAndDataBinding(XMLStreamReader reader, JMSBinding jmsBinding)
+        throws XMLStreamException {
         String name = reader.getAttributeValue(null, "name");
         String use = reader.getAttributeValue(null, "use");
         if (name != null && name.length() > 0) {

Modified: 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=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSBindingRuntimeException.java Thu Dec 21 07:25:42 2006
@@ -20,20 +20,20 @@
 
 public class JMSBindingRuntimeException extends TuscanyRuntimeException {
 
-	public JMSBindingRuntimeException() {
-		super();
-	}
+    public JMSBindingRuntimeException() {
+        super();
+    }
 
-	public JMSBindingRuntimeException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
+    public JMSBindingRuntimeException(String arg0, Throwable arg1) {
+        super(arg0, arg1);
+    }
 
-	public JMSBindingRuntimeException(String arg0) {
-		super(arg0);
-	}
+    public JMSBindingRuntimeException(String arg0) {
+        super(arg0);
+    }
 
-	public JMSBindingRuntimeException(Throwable 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/JMSResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/JMSResourceFactory.java Thu Dec 21 07:25:42 2006
@@ -25,16 +25,14 @@
 import javax.naming.NamingException;
 
 public interface JMSResourceFactory {
-	
-	public abstract Connection getConnection() throws NamingException,
-			JMSException;
 
-	public abstract Session createSession() throws JMSException,
-			NamingException;
+    public abstract Connection getConnection() throws NamingException, JMSException;
 
-	public abstract void startConnection() throws JMSException, NamingException;
+    public abstract Session createSession() throws JMSException, NamingException;
 
-	public abstract void closeConnection() throws JMSException, NamingException;
+    public abstract void startConnection() throws JMSException, NamingException;
 
-        public abstract Destination lookupDestination(String jndiName) throws NamingException;
+    public abstract void closeConnection() throws JMSException, NamingException;
+
+    public abstract Destination lookupDestination(String jndiName) throws NamingException;
 }

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=489385&r1=489384&r2=489385
==============================================================================
--- 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 Thu Dec 21 07:25:42 2006
@@ -89,7 +89,7 @@
 
         requestMsg.setJMSDeliveryMode(jmsBinding.getDeliveryMode());
         requestMsg.setJMSPriority(jmsBinding.getPriority());
-        
+
         requestOperationAndDataBinding.setOperationName(operationName, requestMsg);
         requestMsg.setJMSReplyTo(replyToDest);
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationAndDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationAndDataBinding.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationAndDataBinding.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/OperationAndDataBinding.java Thu Dec 21 07:25:42 2006
@@ -22,7 +22,8 @@
 import javax.jms.Session;
 
 /**
- * Interface for a component that does operation selection and message payload databinding
+ * Interface for a component that does operation selection and message payload
+ * databinding
  */
 public interface OperationAndDataBinding {
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/main/java/org/apache/tuscany/binding/jms/SimpleJMSResourceFactory.java Thu Dec 21 07:25:42 2006
@@ -30,80 +30,85 @@
 import javax.naming.NamingException;
 
 public class SimpleJMSResourceFactory implements JMSResourceFactory {
-		
-	private JMSBinding jmsBinding;
-	private Connection con;
-	private Context context;
-	private boolean isConnectionStarted;
-
-	public  SimpleJMSResourceFactory(JMSBinding jmsBinding){
-		this.jmsBinding = jmsBinding;
-	}
-	
-	/* 
-	 * This is a simple implementation where a connection is created per binding
-	 * Ideally the resource factory should be able to leverage the host environment
-	 * to provide connection pooling if it can.
-	 * 
-	 * For ex If Tuscany is running inside an AppServer
-	 * Then we could leverage the JMS resources it provides
-	 *
-	 * @see org.apache.tuscany.binding.jms.JMSResourceFactory#getConnection()
-	 */
-	public Connection getConnection() throws NamingException, JMSException{
-		if (con == null){
-			createConnection();			
-		}
-		return con;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession()
-	 */
-	public Session createSession() throws JMSException, NamingException{
-		return getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tuscany.binding.jms.JMSResourceFactory#startConnection()
-	 */
-	public void startConnection() throws JMSException, NamingException{
-		if(!isConnectionStarted){
-			getConnection().start();
-			isConnectionStarted = true;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tuscany.binding.jms.JMSResourceFactory#closeConnection()
-	 */
-	public void closeConnection() throws JMSException, NamingException{
-		if(con != null){	
-			con.close();
-		}
-	}
-	
-	private void createConnection() throws NamingException, JMSException {
-		if(context == null){
-			createInitialContext();
-		}
-		ConnectionFactory conFac = (ConnectionFactory)context.lookup(jmsBinding.getConnectionFactoryName());
-		con = conFac.createConnection();		
-	}
-	
-	private void createInitialContext() throws NamingException{
-		Properties props = new Properties();
-    	props.setProperty(Context.INITIAL_CONTEXT_FACTORY,jmsBinding.getInitialContextFactoryName().trim());
-    	props.setProperty(Context.PROVIDER_URL,jmsBinding.getJNDIProviderURL().trim());
-    	
-    	context = new InitialContext(props);
-	}
-
-	public Destination lookupDestination(String jndiName) throws NamingException {
-                if(context == null){
-                        createInitialContext();
-                }
-		return (Destination)context.lookup(jndiName);
-	}
+
+    private JMSBinding jmsBinding;
+    private Connection con;
+    private Context context;
+    private boolean isConnectionStarted;
+
+    public SimpleJMSResourceFactory(JMSBinding jmsBinding) {
+        this.jmsBinding = jmsBinding;
+    }
+
+    /*
+     * This is a simple implementation where a connection is created per binding
+     * Ideally the resource factory should be able to leverage the host
+     * environment to provide connection pooling if it can. For ex If Tuscany is
+     * running inside an AppServer Then we could leverage the JMS resources it
+     * provides
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#getConnection()
+     */
+    public Connection getConnection() throws NamingException, JMSException {
+        if (con == null) {
+            createConnection();
+        }
+        return con;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#createSession()
+     */
+    public Session createSession() throws JMSException, NamingException {
+        return getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#startConnection()
+     */
+    public void startConnection() throws JMSException, NamingException {
+        if (!isConnectionStarted) {
+            getConnection().start();
+            isConnectionStarted = true;
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.tuscany.binding.jms.JMSResourceFactory#closeConnection()
+     */
+    public void closeConnection() throws JMSException, NamingException {
+        if (con != null) {
+            con.close();
+        }
+    }
+
+    private void createConnection() throws NamingException, JMSException {
+        if (context == null) {
+            createInitialContext();
+        }
+        ConnectionFactory conFac = (ConnectionFactory)context.lookup(jmsBinding.getConnectionFactoryName());
+        con = conFac.createConnection();
+    }
+
+    private void createInitialContext() throws NamingException {
+        Properties props = new Properties();
+        props.setProperty(Context.INITIAL_CONTEXT_FACTORY, jmsBinding.getInitialContextFactoryName().trim());
+        props.setProperty(Context.PROVIDER_URL, jmsBinding.getJNDIProviderURL().trim());
+
+        context = new InitialContext(props);
+    }
+
+    public Destination lookupDestination(String jndiName) throws NamingException {
+        if (context == null) {
+            createInitialContext();
+        }
+        return (Destination)context.lookup(jndiName);
+    }
 
 }

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingLoader0961TestCase.java Thu Dec 21 07:25:42 2006
@@ -11,7 +11,7 @@
 import org.apache.tuscany.spi.loader.LoaderException;
 
 public class JMSBindingLoader0961TestCase extends TestCase {
-    
+
     private JMSBindingLoader0961 loader;
 
     public void testMinimal() throws LoaderException, XMLStreamException {
@@ -22,7 +22,8 @@
     }
 
     public void testCorrelationScheme() throws LoaderException, XMLStreamException {
-        XMLStreamReader reader = createReader("<binding.jms correlationScheme=\"RequestMsgIDToCorrelID\"></binding.jms>");
+        XMLStreamReader reader =
+            createReader("<binding.jms correlationScheme=\"RequestMsgIDToCorrelID\"></binding.jms>");
         JMSBinding jmsBinding = loader.load(null, null, reader, null);
         assertEquals("RequestMsgIDToCorrelID", jmsBinding.getCorrelationScheme());
 

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java Thu Dec 21 07:25:42 2006
@@ -41,20 +41,24 @@
     private IntroService introService;
     private BrokerContainer broker;
 
-    protected static final String REQUEST_XML = "<ns:getGreetings xmlns:ns=\"http://helloworld\"><ns:name>petra</ns:name></ns:getGreetings>";
-    protected static final String REPLY_XML = "<ns1:getGreetingsResponse xmlns:ns1=\"http://helloworld\"><ns1:getGreetingsReturn>Hello petra</ns1:getGreetingsReturn></ns1:getGreetingsResponse>";
+    protected static final String REQUEST_XML =
+        "<ns:getGreetings xmlns:ns=\"http://helloworld\"><ns:name>petra</ns:name></ns:getGreetings>";
+    protected static final String REPLY_XML =
+        "<ns1:getGreetingsResponse xmlns:ns1=\"http://helloworld\"><ns1:getGreetingsReturn>Hello petra</ns1:getGreetingsReturn></ns1:getGreetingsResponse>";
 
-    public void testJMSBinding() throws InvocationTargetException, SAXException, IOException, ParserConfigurationException, NamingException, JMSException {
+    public void testJMSBinding() throws InvocationTargetException, SAXException, IOException,
+        ParserConfigurationException, NamingException, JMSException {
         String reply = introService.greet("Rajith");
         assertEquals("Hello Rajith", reply);
 
-        // TODO: the rest should be in a seperate test method but that doesn't work as you get broker conflicts
+        // TODO: the rest should be in a seperate test method but that doesn't
+        // work as you get broker conflicts
         JMSTargetInvoker invoker = createJMSInvoker();
-        Object[] response = (Object[])invoker.invokeTarget(new Object[]{REQUEST_XML}, (short)0);
+        Object[] response = (Object[])invoker.invokeTarget(new Object[] {REQUEST_XML}, (short)0);
 
         Diff diff = XMLUnit.compareXML(REPLY_XML, response[0].toString());
         assertTrue(diff.toString(), diff.similar());
-    
+
     }
 
     private JMSTargetInvoker createJMSInvoker() throws NamingException, JMSException {

Modified: incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSProxyTestCase.java?view=diff&rev=489385&r1=489384&r2=489385
==============================================================================
--- incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSProxyTestCase.java (original)
+++ incubator/tuscany/java/sca/services/bindings/binding.jms/src/test/java/org/apache/tuscany/binding/jms/JMSProxyTestCase.java Thu Dec 21 07:25:42 2006
@@ -31,14 +31,14 @@
 import org.easymock.EasyMock;
 
 public class JMSProxyTestCase extends TestCase {
-    
+
     /**
      * Tests the jms response msg has correlation id set to the request msg id
      */
     public void testOnMessageRequestMsgIDToCorrelID() throws NamingException, JMSException {
 
         String id = "123";
-        
+
         MessageProducer producer = EasyMock.createNiceMock(MessageProducer.class);
 
         Session session = EasyMock.createNiceMock(Session.class);
@@ -56,21 +56,24 @@
         EasyMock.expect(jmsResourceFactory.createSession()).andReturn(session);
 
         OperationAndDataBinding odb = EasyMock.createMock(OperationAndDataBinding.class);
-        EasyMock.expect(odb.createJMSMessage(EasyMock.eq(session), EasyMock.isA(Exception.class))).andReturn(responseJMSMsg);
+        EasyMock.expect(odb.createJMSMessage(EasyMock.eq(session), EasyMock.isA(Exception.class)))
+            .andReturn(responseJMSMsg);
         EasyMock.replay(odb);
 
         JMSProxy jmsProxy = new JMSProxy(null, jmsResourceFactory, null, odb, null);
 
         Message requestJMSMsg = EasyMock.createMock(Message.class);
-        EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(new Destination(){});
-        
+        EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(new Destination() {
+        });
+
         EasyMock.expect(requestJMSMsg.getJMSDeliveryMode()).andReturn(1);
         EasyMock.expect(requestJMSMsg.getJMSExpiration()).andReturn(1L);
         EasyMock.expect(requestJMSMsg.getJMSPriority()).andReturn(1);
 
-        EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(new Destination(){});
+        EasyMock.expect(requestJMSMsg.getJMSReplyTo()).andReturn(new Destination() {
+        });
         EasyMock.expect(requestJMSMsg.getJMSMessageID()).andReturn(id);
-        
+
         producer.send(EasyMock.isA(Message.class));
         EasyMock.replay(producer);
 



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