Author: upul
Date: Wed Jan 16 01:54:45 2008
New Revision: 612402
URL: http://svn.apache.org/viewvc?rev=612402&view=rev
Log:
jms sender using common connection factory settings sample added to axis2.xml
Modified:
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
webservices/synapse/branches/1.1.1/repository/conf/axis2.xml
Modified:
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java?rev=612402&r1=612401&r2=612402&view=diff
==============================================================================
---
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
(original)
+++
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/jms/JMSConnectionFactory.java
Wed Jan 16 01:54:45 2008
@@ -473,24 +473,33 @@
JMSOutTransportInfo trpInfo = (JMSOutTransportInfo) o;
Map trpProps = trpInfo.getProperties();
- if (trpProps.get(JMSConstants.CONFAC_JNDI_NAME_PARAM).equals(
- jndiProperties.get(JMSConstants.CONFAC_JNDI_NAME_PARAM))
+ if (equals(trpProps.get(JMSConstants.CONFAC_JNDI_NAME_PARAM),
jndiProperties.get(JMSConstants.CONFAC_JNDI_NAME_PARAM))
&&
- trpProps.get(Context.INITIAL_CONTEXT_FACTORY).equals(
- jndiProperties.get(Context.INITIAL_CONTEXT_FACTORY))
+ equals(trpProps.get(Context.INITIAL_CONTEXT_FACTORY),
jndiProperties.get(Context.INITIAL_CONTEXT_FACTORY))
&&
- trpProps.get(Context.PROVIDER_URL).equals(
- jndiProperties.get(Context.PROVIDER_URL))
+ equals(trpProps.get(Context.PROVIDER_URL),
jndiProperties.get(Context.PROVIDER_URL))
&&
- trpProps.get(Context.SECURITY_PRINCIPAL).equals(
- jndiProperties.get(Context.SECURITY_PRINCIPAL))
+ equals(trpProps.get(Context.SECURITY_PRINCIPAL),
jndiProperties.get(Context.SECURITY_PRINCIPAL))
&&
- trpProps.get(Context.SECURITY_CREDENTIALS).equals(
- jndiProperties.get(Context.SECURITY_CREDENTIALS))) {
+ equals(trpProps.get(Context.SECURITY_CREDENTIALS),
jndiProperties.get(Context.SECURITY_CREDENTIALS))) {
return true;
}
}
return false;
+ }
+
+ /**
+ * Prevents NullPointerException when s1 is null.
+ * If both values are null this returns true
+ */
+ private boolean equals(Object s1, Object s2) {
+ if(s1 == s2) {
+ return true;
+ } else if(s1 != null && s1.equals(s2)) {
+ return true;
+ } else {
+ return false;
+ }
}
// -------------------- getters and setters and trivial methods
--------------------
Modified: webservices/synapse/branches/1.1.1/repository/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/repository/conf/axis2.xml?rev=612402&r1=612401&r2=612402&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/repository/conf/axis2.xml (original)
+++ webservices/synapse/branches/1.1.1/repository/conf/axis2.xml Wed Jan 16
01:54:45 2008
@@ -238,8 +238,27 @@
<!--<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter>
supports Strict|AllowAll|DefaultAndLocalhost or the default if
none specified -->
</transportSender>
- <transportSender name="jms"
- class="org.apache.synapse.transport.jms.JMSSender"/>
+
+ <transportSender name="jms"
class="org.apache.synapse.transport.jms.JMSSender">
+ <!-- <parameter name="myTopicConnectionFactory">
+ <parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory">
+ <parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="default">
+ <parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ </parameter> -->
+ </transportSender>
+
<transportSender name="vfs"
class="org.apache.synapse.transport.vfs.VFSTransportSender"/>
<!-- ================================================= -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
