You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/07 23:24:52 UTC

svn commit: r354877 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java integration/test/org/apache/axis2/integration/UtilsJMSServer.java

Author: dims
Date: Wed Dec  7 14:24:47 2005
New Revision: 354877

URL: http://svn.apache.org/viewcvs?rev=354877&view=rev
Log:
set default to "ConnectionFactory"


Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java?rev=354877&r1=354876&r2=354877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/jms/JNDIVendorAdapter.java Wed Dec  7 14:24:47 2005
@@ -38,6 +38,7 @@
     public final static String _CONNECTION_FACTORY_JNDI_NAME = "ConnectionFactoryJNDIName";
     public final static String CONNECTION_FACTORY_JNDI_NAME = JMSConstants.JMS_PROPERTY_PREFIX +
                                                                 _CONNECTION_FACTORY_JNDI_NAME;
+    public final static String CONNECTION_FACTORY_JNDI_VALUE = "ConnectionFactory";
 
     public final static String _DESTINATION = "Destination";
     public final static String DESTINATION = JMSConstants.JMS_PROPERTY_PREFIX +
@@ -69,7 +70,7 @@
             throw new IllegalArgumentException("noCFProps");
         String jndiName = (String) cfProps.get(CONNECTION_FACTORY_JNDI_NAME);
         if (jndiName == null || jndiName.trim().length() == 0)
-            throw new IllegalArgumentException("noCFName");
+            jndiName = CONNECTION_FACTORY_JNDI_VALUE;
 
         Hashtable environment = new Hashtable(cfProps);
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java?rev=354877&r1=354876&r2=354877&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java Wed Dec  7 14:24:47 2005
@@ -66,7 +66,6 @@
             String password = null;
             boolean doThreads = true;
                 
-            cfMap.put(JNDIVendorAdapter.CONNECTION_FACTORY_JNDI_NAME, "ConnectionFactory");
             cfMap.put(JNDIVendorAdapter.CONTEXT_FACTORY, "org.activemq.jndi.ActiveMQInitialContextFactory");
             cfMap.put(JNDIVendorAdapter.PROVIDER_URL, "tcp://localhost:61616");