Author: antelder
Date: Wed Feb 20 01:52:54 2008
New Revision: 629399

URL: http://svn.apache.org/viewvc?rev=629399&view=rev
Log:
Simplify jms itests removing mention of activemq from composites and use amq 
jndi.properties file

Modified:
    
incubator/tuscany/java/sca/itest/jms/src/main/resources/dynamic/client.composite
    incubator/tuscany/java/sca/itest/jms/src/main/resources/jndi.properties
    
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite
    
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite
    
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/client.composite
    
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/mpclient.composite
    
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/service.composite

Modified: 
incubator/tuscany/java/sca/itest/jms/src/main/resources/dynamic/client.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/jms/src/main/resources/dynamic/client.composite?rev=629399&r1=629398&r2=629399&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/jms/src/main/resources/dynamic/client.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/jms/src/main/resources/dynamic/client.composite
 Wed Feb 20 01:52:54 2008
@@ -27,7 +27,7 @@
 
     <reference name="serviceA" promote="HelloWorldClient/serviceA">
         <interface.java 
interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms 
initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
jndiURL="vm://localhost">
+        <binding.jms>
             <destination name="DestQueueA"/>
             <response>
                <destination create="always"/>  <!-- create always with no name 
will create a temporary queue -->

Modified: 
incubator/tuscany/java/sca/itest/jms/src/main/resources/jndi.properties
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/jms/src/main/resources/jndi.properties?rev=629399&r1=629398&r2=629399&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/jms/src/main/resources/jndi.properties 
(original)
+++ incubator/tuscany/java/sca/itest/jms/src/main/resources/jndi.properties Wed 
Feb 20 01:52:54 2008
@@ -20,19 +20,20 @@
 java.naming.factory.initial = 
org.apache.activemq.jndi.ActiveMQInitialContextFactory
 
 # use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&useJmx=false
+java.naming.provider.url = vm://localhost?broker.persistent=false
 
 # use the following property to specify the JNDI name the connection factory
 # should appear as. 
 #connectionFactoryNames = connectionFactory, queueConnectionFactory, 
topicConnectionFactry
+connectionFactoryNames = ConnectionFactory
 
 # register some queues in JNDI using the form
 # queue.[jndiName] = [physicalName]
-queue.MyQueue = example.MyQueue
-
+queue.RequestQueue = RequestQueue
+queue.ResponseQueue = ResponseQueue
 
 # register some topics in JNDI using the form
 # topic.[jndiName] = [physicalName]
-topic.MyTopic = example.MyTopic
+#topic.MyTopic = example.MyTopic
 
 # END SNIPPET: jndi

Modified: 
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite?rev=629399&r1=629398&r2=629399&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayClient.composite
 Wed Feb 20 01:52:54 2008
@@ -27,7 +27,7 @@
 
     <reference name="serviceA" promote="OneWayClient/serviceA">
         <interface.java 
interface="org.apache.tuscany.sca.binding.jms.OneWayService" />
-        <binding.jms 
initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
jndiURL="vm://localhost" >
+        <binding.jms>
             <destination name="DestQueueA"/>
         </binding.jms>  
     </reference>

Modified: 
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite?rev=629399&r1=629398&r2=629399&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/jms/src/main/resources/oneway/OneWayService.composite
 Wed Feb 20 01:52:54 2008
@@ -23,7 +23,7 @@
     <component name="OneWayService">
         <implementation.java 
class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
         <service name="OneWayService">
-            <binding.jms 
initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
jndiURL="vm://localhost?broker.persistent=false">
+            <binding.jms>
                <destination name="DestQueueA" create="always"/>
             </binding.jms>  
         </service> 

Modified: 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/client.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/client.composite?rev=629399&r1=629398&r2=629399&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/client.composite 
(original)
+++ 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/client.composite 
Wed Feb 20 01:52:54 2008
@@ -27,7 +27,7 @@
 
     <reference name="serviceA" promote="HelloWorldClient/serviceA">
         <interface.java 
interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms 
initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
jndiURL="vm://localhost">
+        <binding.jms>
             <destination name="DestQueueA"/>
             <response>
                <destination name="RespQueueA"/>

Modified: 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/mpclient.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/mpclient.composite?rev=629399&r1=629398&r2=629399&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/mpclient.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/mpclient.composite
 Wed Feb 20 01:52:54 2008
@@ -27,8 +27,7 @@
 
     <reference name="serviceA" promote="HelloWorldClient/serviceA">
         <interface.java 
interface="org.apache.tuscany.sca.binding.jms.HelloWorldService" />
-        <binding.jms 
initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
-                         jndiURL="vm://localhost" 
messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
+        <binding.jms 
messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
             <destination name="DestQueueA"/>
             <response>
                <destination name="RespQueueA"/>

Modified: 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/service.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/service.composite?rev=629399&r1=629398&r2=629399&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/service.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/jms/src/main/resources/simple/service.composite
 Wed Feb 20 01:52:54 2008
@@ -23,7 +23,7 @@
     <component name="HelloWorldService">
         <implementation.java 
class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
         <service name="HelloWorldService">
-            <binding.jms 
initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" 
jndiURL="vm://localhost?broker.persistent=false">
+            <binding.jms>
                <destination name="DestQueueA" create="always"/>
                <response>
                   <destination name="RespQueueA" create="always"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to