tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r608447 - in /incubator/tuscany/java/sca/modules/binding-jms: ./ src/main/java/org/apache/tuscany/sca/binding/jms/impl/ src/main/java/org/apache/tuscany/sca/binding/jms/provider/ src/test/java/org/apache/tuscany/sca/binding/jms/ src/test/ja...
Date Thu, 03 Jan 2008 11:02:40 GMT
Author: antelder
Date: Thu Jan  3 03:02:35 2008
New Revision: 608447

URL: http://svn.apache.org/viewvc?rev=608447&view=rev
Log:
Update jms binidng to use jms host

Added:
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
      - copied, changed from r608382, incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCase.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
      - copied, changed from r608382, incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCase.java
Removed:
    incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
    incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSTestCaseFIXME.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCase.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCase.java
Modified:
    incubator/tuscany/java/sca/modules/binding-jms/pom.xml
    incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
    incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
    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/JMSBindingListener.java
    incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.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/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCase.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactory.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueExist.java
    incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueNotExist.java

Modified: incubator/tuscany/java/sca/modules/binding-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/pom.xml?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/pom.xml Thu Jan  3 03:02:35 2008
@@ -63,7 +63,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jms-activemq</artifactId>
+            <artifactId>tuscany-host-jms</artifactId>
             <version>1.1-incubating-SNAPSHOT</version>
         </dependency>
 
@@ -82,94 +82,17 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
             <version>1.1-incubating-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>apache-activemq</artifactId>
-            <version>4.1.1</version>
-            <!--version>4.2-SNAPSHOT</version-->
-        </dependency>  
-
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.2</version>
             <scope>test</scope>
         </dependency>
         
-        <dependency>
-           <groupId>backport-util-concurrent</groupId>
-           <artifactId>backport-util-concurrent</artifactId>
-           <version>2.2</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>backport-util-concurrent</groupId>
-                   <artifactId>backport-util-concurrent</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>
-          
-        <dependency>
-           <groupId>commons-codec</groupId>
-           <artifactId>commons-codec</artifactId>
-           <version>1.3</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-codec</groupId>
-                   <artifactId>commons-codec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-collections</groupId>
-           <artifactId>commons-collections</artifactId>
-           <version>3.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-collections</groupId>
-                   <artifactId>commons-collections</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>        
-        
-        <dependency>
-           <groupId>commons-httpclient</groupId>
-           <artifactId>commons-httpclient</artifactId>
-           <version>3.0.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-httpclient</groupId>
-                   <artifactId>commons-httpclient</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>
-        
-        <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>1.1</version>
-           <exclusions>
-               <exclusion>
-                   <groupId>commons-logging</groupId>
-                   <artifactId>commons-logging</artifactId>
-               </exclusion>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>          
-
         <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
            <artifactId>geronimo-jms_1.1_spec</artifactId>

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
Thu Jan  3 03:02:35 2008
@@ -26,7 +26,7 @@
 
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessor;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 
 /**
  * Models a binding to a JMS resource.
@@ -411,9 +411,9 @@
         this.jmsResourceFactoryName = jmsResourceFactoryName;
     }
 
-    public JMSResourceFactory getJmsResourceFactory() {
-        return (JMSResourceFactory)instantiate(null, jmsResourceFactoryName);
-    }
+//    public JMSResourceFactory getJmsResourceFactory() {
+//        return (JMSResourceFactory)instantiate(null, jmsResourceFactoryName);
+//    }
 
     public void setRequestMessageProcessorName(String name) {
         this.requestMessageProcessorName = name;

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
Thu Jan  3 03:02:35 2008
@@ -25,7 +25,6 @@
 
 import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.binding.jms.provider.JMSMessageProcessorImpl;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;
 
 public interface JMSBindingConstants {
 
@@ -52,7 +51,7 @@
     public final static String DEFAULT_JNDI_URL = "tcp://localhost:61616";
     public final static int DEFAULT_TIME_TO_LIVE = 10000; // in milli seconds
     public final static int DEFAULT_PRIORITY = 1;
-    public final static String DEFAULT_RF_CLASSNAME = JMSResourceFactoryImpl.class.getName();
+    public final static String DEFAULT_RF_CLASSNAME = "org.apache.tuscany.sca.host.jms.activemq.JMSResourceFactoryImpl";
     public final static String DEFAULT_MP_CLASSNAME = JMSMessageProcessorImpl.class.getName();
     public final static String DEFAULT_OPERATION_PROP_NAME = "scaOperationName";
 

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=608447&r1=608446&r2=608447&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 Jan  3 03:02:35 2008
@@ -31,6 +31,7 @@
 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;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
 
@@ -51,13 +52,13 @@
     protected Destination requestDest;
     protected Destination replyDest;
 
-    public JMSBindingInvoker(JMSBinding jmsBinding, Operation operation) {
+    public JMSBindingInvoker(JMSBinding jmsBinding, Operation operation, JMSResourceFactory
jmsResourceFactory) {
 
         this.operation = operation;
         operationName = operation.getName();
 
         this.jmsBinding = jmsBinding;
-        jmsResourceFactory = jmsBinding.getJmsResourceFactory();
+        this.jmsResourceFactory = jmsResourceFactory;
         requestMessageProcessor = jmsBinding.getRequestMessageProcessor();
         responseMessageProcessor = jmsBinding.getResponseMessageProcessor();
         try {
@@ -239,6 +240,9 @@
             replyMsg = consumer.receive(jmsBinding.getTimeToLive());
         } finally {
             consumer.close();
+        }
+        if (replyMsg == null) {
+            throw new JMSBindingException("No reply message received on " + replyToDest +
" for message id " + requestMsgId);
         }
         return replyMsg;
     }

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingListener.java
Thu Jan  3 03:02:35 2008
@@ -32,6 +32,7 @@
 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;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
Thu Jan  3 03:02:35 2008
@@ -20,7 +20,9 @@
 package org.apache.tuscany.sca.binding.jms.provider;
 
 import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
+import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.jms.JMSHost;
 import org.apache.tuscany.sca.provider.BindingProviderFactory;
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -35,19 +37,25 @@
  */
 public class JMSBindingProviderFactory implements BindingProviderFactory<JMSBinding>
{
 
+    private JMSHost jmsHost;
+
     public JMSBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+        jmsHost = extensionPoints.getExtensionPoint(JMSHost.class);
+        if (jmsHost == null) {
+            throw new JMSBindingException("No JMSHost extension point registered");
+        }
     }
 
     public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
                                                                    RuntimeComponentReference
reference,
                                                                    JMSBinding binding) {
-        return new JMSBindingReferenceBindingProvider(component, reference, binding);
+        return new JMSBindingReferenceBindingProvider(component, reference, binding, jmsHost);
     }
 
     public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
                                                                RuntimeComponentService service,
                                                                JMSBinding binding) {
-        return new JMSBindingServiceBindingProvider(component, service, binding);
+        return new JMSBindingServiceBindingProvider(component, service, binding, jmsHost);
     }
 
     public Class<JMSBinding> getModelType() {

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=608447&r1=608446&r2=608447&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 Jan  3 03:02:35 2008
@@ -25,6 +25,8 @@
 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;
+import org.apache.tuscany.sca.host.jms.JMSHost;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.apache.tuscany.sca.interfacedef.Interface;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.interfacedef.Operation;
@@ -43,12 +45,14 @@
     private RuntimeComponentReference reference;
     private JMSBinding jmsBinding;
     private List<JMSBindingInvoker> jmsBindingInvokers = new ArrayList<JMSBindingInvoker>();
+    private JMSResourceFactory jmsResourceFactory;
 
     public JMSBindingReferenceBindingProvider(RuntimeComponent component,
                                               RuntimeComponentReference reference,
-                                              JMSBinding binding) {
+                                              JMSBinding binding, JMSHost jmsHost) {
         this.reference = reference;
         this.jmsBinding = binding;
+        jmsResourceFactory = jmsHost.createJMSResourceFactory(binding.getConnectionFactoryName(),
binding.getInitialContextFactoryName(), binding.getJndiURL());
 
         if (jmsBinding.getXMLFormat()) {
             setXMLDataBinding(reference);
@@ -113,7 +117,7 @@
                     jmsBinding.setResponseDestinationName(reference.getName());
                 }    
         */        
-        JMSBindingInvoker invoker = new JMSBindingInvoker(jmsBinding, operation);
+        JMSBindingInvoker invoker = new JMSBindingInvoker(jmsBinding, operation, jmsResourceFactory);
         jmsBindingInvokers.add(invoker);
         return invoker;
     }

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=608447&r1=608446&r2=608447&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 Jan  3 03:02:35 2008
@@ -28,6 +28,8 @@
 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;
+import org.apache.tuscany.sca.host.jms.JMSHost;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.apache.tuscany.sca.interfacedef.Interface;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -48,11 +50,12 @@
 
     public JMSBindingServiceBindingProvider(RuntimeComponent component,
                                             RuntimeComponentService service,
-                                            JMSBinding binding) {
+                                            JMSBinding binding, JMSHost jmsHost) {
         this.service = service;
         this.jmsBinding = binding;
 
-        jmsResourceFactory = jmsBinding.getJmsResourceFactory();
+        jmsResourceFactory = jmsHost.createJMSResourceFactory(binding.getConnectionFactoryName(),
binding.getInitialContextFactoryName(), binding.getJndiURL());
+        jmsResourceFactory.startBroker();
 
         // if the default destination queue names is set
         // set the destinate queue name to the reference name

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCase.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCase.java
Thu Jan  3 03:02:35 2008
@@ -25,7 +25,7 @@
 
 import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
 import org.apache.tuscany.sca.binding.jms.provider.JMSBindingListener;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.apache.tuscany.sca.interfacedef.Interface;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.interfacedef.Operation;

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactory.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactory.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactory.java
Thu Jan  3 03:02:35 2008
@@ -26,7 +26,7 @@
 import javax.jms.Session;
 import javax.naming.NamingException;
 
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.easymock.EasyMock;
 
 /**

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueExist.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueExist.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueExist.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueExist.java
Thu Jan  3 03:02:35 2008
@@ -44,4 +44,7 @@
         EasyMock.replay(d);
         return d;
     }
+
+    public void startBroker() {
+    }
 }

Modified: incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueNotExist.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueNotExist.java?rev=608447&r1=608446&r2=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueNotExist.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/mock/MockJMSResourceFactoryQueueNotExist.java
Thu Jan  3 03:02:35 2008
@@ -41,4 +41,7 @@
     public Destination lookupDestination(String jndiName) throws NamingException {
         return null;
     }
+
+    public void startBroker() {
+    }
 }

Copied: incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
(from r608382, incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java?p2=incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java&p1=incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCase.java&r1=608382&r2=608447&rev=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceQueueCreateModeTestCaseFIXME.java
Thu Jan  3 03:02:35 2008
@@ -24,6 +24,8 @@
 import org.apache.tuscany.sca.binding.jms.impl.JMSBindingException;
 import org.apache.tuscany.sca.binding.jms.mock.MockJMSResourceFactoryQueueExist;
 import org.apache.tuscany.sca.binding.jms.mock.MockJMSResourceFactoryQueueNotExist;
+import org.apache.tuscany.sca.host.jms.JMSHost;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
 import org.junit.Test;
@@ -39,7 +41,7 @@
  * </ul>
  * See the SCA JMS Binding specification for more information.
  */
-public class JMSBindingReferenceQueueCreateModeTestCase {
+public class JMSBindingReferenceQueueCreateModeTestCaseFIXME {
 
     /**
      * Test creating a request queue in "never" mode where the queue does not exist. We are
expecting an exception
@@ -296,7 +298,7 @@
 
         // Try and create the JMS Binding Invoker for the JMS Binding
         try {
-            new JMSBindingInvoker(jmsBinding, operation);
+            new JMSBindingInvoker(jmsBinding, operation, null);
 
             // Check whether we were expecting an exception
             if (expectingRequestException || expectingResponseException) {

Copied: incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
(from r608382, incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java?p2=incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java&p1=incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCase.java&r1=608382&r2=608447&rev=608447&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceQueueCreateModeTestCaseFIXME.java
Thu Jan  3 03:02:35 2008
@@ -25,6 +25,8 @@
 import org.apache.tuscany.sca.binding.jms.mock.MockJMSResourceFactoryQueueExist;
 import org.apache.tuscany.sca.binding.jms.mock.MockJMSResourceFactoryQueueNotExist;
 import org.apache.tuscany.sca.core.assembly.RuntimeComponentServiceImpl;
+import org.apache.tuscany.sca.host.jms.JMSHost;
+import org.apache.tuscany.sca.host.jms.JMSResourceFactory;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
 import org.junit.Test;
 
@@ -39,7 +41,7 @@
  * </ul>
  * See the SCA JMS Binding specification for more information.
  */
-public class JMSBindingServiceQueueCreateModeTestCase {
+public class JMSBindingServiceQueueCreateModeTestCaseFIXME {
     /**
      * Test creating a queue in "never" mode where the queue does not exist. We are expecting
an exception
      */
@@ -138,10 +140,15 @@
         RuntimeComponentService service = new RuntimeComponentServiceImpl();
         service.setName(serviceName);
 
+        JMSHost jmsHost = new JMSHost(){
+            public JMSResourceFactory createJMSResourceFactory(String connectionFactoryName,
String initialContextFactoryName, String jndiURL) {
+                return null;
+            }};
+        
         // Try and create the JMS Binding Service for the JMS Binding
         try {
             JMSBindingServiceBindingProvider jmsService =
-                new JMSBindingServiceBindingProvider(null, service, jmsBinding);
+                new JMSBindingServiceBindingProvider(null, service, jmsBinding, jmsHost);
             jmsService.start();
 
             // Check whether we were expecting an exception



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


Mime
View raw message