svn commit: r680021 - in /synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms: JMSListener.java JMSUtils.java

[veithen]

Author: veithen
Date: Sat Jul 26 10:40:07 2008
New Revision: 680021

URL: http://svn.apache.org/viewvc?rev=680021&view=rev
Log:
Corrected two issues with the EPRs generated by JMSListener:
* The transport.jms.ConnectionFactoryJNDIName appeared twice in the EPR.
* The EPR didn't contain the destination type, making it invalid for topics.

Modified:
    
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java
    
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java

Modified: 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java?rev=680021&r1=680020&r2=680021&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSListener.java
 Sat Jul 26 10:40:07 2008
@@ -160,9 +160,9 @@
 
         // compute service EPR and keep for later use
         String destinationName = 
JMSUtils.getJNDIDestinationNameForService(service);
-        serviceNameToEPRMap.put(service.getName(), JMSUtils.getEPR(cf, 
destinationName));
-
         String destinationType = 
JMSUtils.getDestinationTypeForService(service);
+        serviceNameToEPRMap.put(service.getName(),
+                JMSUtils.getEPR(cf, destinationType, destinationName));
         
         log.info("Starting to listen on destination : " + destinationName + " 
of type "
                 + destinationType + " for service " + service.getName());

Modified: 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java?rev=680021&r1=680020&r2=680021&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSUtils.java
 Sat Jul 26 10:40:07 2008
@@ -197,11 +197,10 @@
      * @return the EPR as a String
      */
     // TODO: duplicate code (see JMSConnectionFactory#getEPRForDestination)
-    static String getEPR(JMSConnectionFactory cf, String destination) {
+    static String getEPR(JMSConnectionFactory cf, String destinationType, 
String destination) {
         StringBuffer sb = new StringBuffer();
         sb.append(JMSConstants.JMS_PREFIX).append(destination);
-        sb.append("?").append(JMSConstants.CONFAC_JNDI_NAME_PARAM).
-                append("=").append(cf.getConnFactoryJNDIName());
+        
sb.append("?").append(JMSConstants.DEST_PARAM_TYPE).append("=").append(destinationType);
         for (Map.Entry<String,String> entry : 
cf.getJndiProperties().entrySet()) {
             
sb.append("&").append(entry.getKey()).append("=").append(entry.getValue());
         }