svn commit: r1297425 - in /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms: JMSEndpoint.java JMSUtils.java
Author: sagara Date: Tue Mar 6 11:17:18 2012 New Revision: 1297425 URL: http://svn.apache.org/viewvc?rev=1297425&view=rev Log: Applied patch for TRANSPORTS-16. Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java?rev=1297425&r1=1297424&r2=1297425&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java (original) +++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java Tue Mar 6 11:17:18 2012 @@ -228,7 +228,7 @@ public class JMSEndpoint extends Protoco } } else { log.debug("JMS reply destination type not given. default queue"); -destinationType = JMSConstants.QUEUE; +replyDestinationType = JMSConstants.DESTINATION_TYPE_QUEUE; } jndiReplyDestinationName = ParamUtils.getOptionalParam(service, Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=1297425&r1=1297424&r2=1297425&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java (original) +++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java Tue Mar 6 11:17:18 2012 @@ -709,7 +709,7 @@ public class JMSUtils extends BaseUtils } catch (NameNotFoundException e) { try { return JMSUtils.lookup(context, Destination.class, - (JMSConstants.DESTINATION_TYPE_TOPIC.equals(destinationType) ? + (JMSConstants.DESTINATION_TYPE_TOPIC.equalsIgnoreCase(destinationType) ? "dynamicTopics/" : "dynamicQueues/") + destinationName); } catch (NamingException x) { log.warn("Cannot locate destination : " + destinationName);
svn commit: r1297433 - /axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
Author: sagara Date: Tue Mar 6 11:43:35 2012 New Revision: 1297433 URL: http://svn.apache.org/viewvc?rev=1297433&view=rev Log: Fixed TRANSPORTS-33. Modified: axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java Modified: axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java?rev=1297433&r1=1297432&r2=1297433&view=diff == --- axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java (original) +++ axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java Tue Mar 6 11:43:35 2012 @@ -502,4 +502,15 @@ public class MailTransportSender extends } return message.getMessageID(); } + +@Override +public void stop() { +super.stop(); +metrics.reset(); +smtpUsername = null; +smtpPassword = null; +smtpBccAddresses = null; +smtpFromAddress = null; +session = null; +} }
svn commit: r1297438 - /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
Author: sagara Date: Tue Mar 6 12:20:36 2012 New Revision: 1297438 URL: http://svn.apache.org/viewvc?rev=1297438&view=rev Log: Applied patch for TRANSPORTS-34. Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=1297438&r1=1297437&r2=1297438&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java (original) +++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java Tue Mar 6 12:20:36 2012 @@ -88,7 +88,11 @@ public class JMSSender extends AbstractT if (jmsConnectionFactoryName != null) { return connFacManager.getJMSConnectionFactory(jmsConnectionFactoryName); } else { -return connFacManager.getJMSConnectionFactory(props); +JMSConnectionFactory fac = connFacManager.getJMSConnectionFactory(props); +if (fac == null) { +fac = connFacManager.getJMSConnectionFactory(JMSConstants.DEFAULT_CONFAC_NAME); +} +return fac; } } else { return null;
svn commit: r1297451 - /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
Author: sagara Date: Tue Mar 6 12:37:32 2012 New Revision: 1297451 URL: http://svn.apache.org/viewvc?rev=1297451&view=rev Log: Applied patch for TRANSPORTS-48. Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java?rev=1297451&r1=1297450&r2=1297451&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java (original) +++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java Tue Mar 6 12:37:32 2012 @@ -332,8 +332,12 @@ public class JMSOutTransportInfo impleme } else if (JMSConstants.DESTINATION_TYPE_TOPIC.equals(destinationType)) { destType = JMSConstants.TOPIC; tConFac = (TopicConnectionFactory) connectionFactory; -} - +} else{ + //treat jmsdestination type=queue(default is queue) +destType = JMSConstants.QUEUE; + qConFac = (QueueConnectionFactory) connectionFactory; +} + Connection connection = null; if (user != null && pass != null) { if (qConFac != null) {
svn commit: r1297455 - /axis/axis2/java/transports/trunk/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
Author: sagara Date: Tue Mar 6 12:54:11 2012 New Revision: 1297455 URL: http://svn.apache.org/viewvc?rev=1297455&view=rev Log: Applied patch for TRANSPORTS-8. Modified: axis/axis2/java/transports/trunk/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java Modified: axis/axis2/java/transports/trunk/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java?rev=1297455&r1=1297454&r2=1297455&view=diff == --- axis/axis2/java/transports/trunk/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java (original) +++ axis/axis2/java/transports/trunk/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java Tue Mar 6 12:54:11 2012 @@ -26,11 +26,19 @@ import org.apache.axis2.engine.AxisEngin import org.apache.axis2.context.MessageContext; import org.apache.axis2.transport.OutTransportInfo; import org.apache.axis2.transport.TransportUtils; +import org.apache.axis2.transport.MessageFormatter; import org.apache.axis2.transport.base.AbstractTransportSender; +import org.apache.axis2.transport.base.BaseUtils; import org.apache.axiom.soap.SOAPEnvelope; +import org.apache.axiom.om.OMOutputFormat; import java.io.IOException; -import java.net.*; +import java.io.OutputStream; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.SocketAddress; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Map; import java.util.HashMap; @@ -48,10 +56,15 @@ public class TCPTransportSender extends Socket socket = openTCPConnection(targetEPR, timeout); msgContext.setProperty(TCPConstants.TCP_OUTPUT_SOCKET, socket); +String contentType = params.get("contentType"); +if (contentType == null) { +contentType = TCPConstants.TCP_DEFAULT_CONTENT_TYPE; +} + try { -TransportUtils.writeMessage(msgContext, socket.getOutputStream()); +writeOut(msgContext, socket, contentType); if (!msgContext.getOptions().isUseSeparateListener() && !msgContext.isServerSide()){ -waitForReply(msgContext, socket, params.get("contentType")); +waitForReply(msgContext, socket, contentType); } } catch (IOException e) { handleException("Error while sending a TCP request", e); @@ -60,7 +73,7 @@ public class TCPTransportSender extends } else if (outTransportInfo != null && (outTransportInfo instanceof TCPOutTransportInfo)) { TCPOutTransportInfo outInfo = (TCPOutTransportInfo) outTransportInfo; try { -TransportUtils.writeMessage(msgContext, outInfo.getSocket().getOutputStream()); +writeOut(msgContext, outInfo.getSocket(), outInfo.getContentType()); } catch (IOException e) { handleException("Error while sending a TCP response", e); } finally { @@ -69,6 +82,17 @@ public class TCPTransportSender extends } } +private void writeOut(MessageContext msgContext, Socket socket, + String contentType) throws IOException { +MessageFormatter messageFormatter = TransportUtils.getMessageFormatter(msgContext); +OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext); +format.setContentType(contentType); +byte[] payload = messageFormatter.getBytes(msgContext, format); +OutputStream out = socket.getOutputStream(); +out.write(payload); +out.flush(); +} + @Override public void cleanup(MessageContext msgContext) throws AxisFault { Object socketObj = msgContext.getProperty(TCPConstants.TCP_OUTPUT_SOCKET); @@ -85,10 +109,6 @@ public class TCPTransportSender extends return; } -if (contentType == null) { -contentType = TCPConstants.TCP_DEFAULT_CONTENT_TYPE; -} - try { MessageContext responseMsgCtx = createResponseMessageContext(msgContext); SOAPEnvelope envelope = TransportUtils.createSOAPMessage(msgContext,
svn commit: r1297460 - /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
Author: sagara Date: Tue Mar 6 13:06:27 2012 New Revision: 1297460 URL: http://svn.apache.org/viewvc?rev=1297460&view=rev Log: Applied patch for TRANSPORTS-30. Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java?rev=1297460&r1=1297459&r2=1297460&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java (original) +++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java Tue Mar 6 13:06:27 2012 @@ -106,7 +106,7 @@ public class JMSConnectionFactory { } /** - * Digest, the cache value iff specified + * Digest the cache value if specified */ private void digestCacheLevel() { @@ -119,6 +119,8 @@ public class JMSConnectionFactory { this.cacheLevel = JMSConstants.CACHE_CONNECTION; } else if ("session".equals(val)){ this.cacheLevel = JMSConstants.CACHE_SESSION; +} else if ("consumer".equals(val)) { +this.cacheLevel = JMSConstants.CACHE_CONSUMER; } else if ("producer".equals(val)) { this.cacheLevel = JMSConstants.CACHE_PRODUCER; } else if (val != null) {
svn commit: r1297744 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
Author: veithen Date: Tue Mar 6 21:55:40 2012 New Revision: 1297744 URL: http://svn.apache.org/viewvc?rev=1297744&view=rev Log: Compensate for the change in r1297699 in Axiom. Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java?rev=1297744&r1=1297743&r2=1297744&view=diff == --- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java (original) +++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java Tue Mar 6 21:55:40 2012 @@ -293,4 +293,9 @@ public abstract class NodeImplEx extends return saajSOAPElement; } } + +// TODO: the existence of this method probably indicates a problem in TextImplEx +public org.w3c.dom.Node getParentNode() { +return null; +} }
svn commit: r1297758 - in /axis/axis2/java/core/branches/1_6: ./ modules/saaj/ modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
Author: veithen Date: Tue Mar 6 22:20:03 2012 New Revision: 1297758 URL: http://svn.apache.org/viewvc?rev=1297758&view=rev Log: Merged r1297744 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed) axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 6 22:20:03 2012 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1 205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348 +/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1 205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744 Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 6 22:20:03 2012 @@ -1 +1 @@ -/axis/axis2/java/core/trunk/modules/saaj:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203 424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296062 +/axis/axis2/java/core/trunk/modules/saaj:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,
svn commit: r1297765 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
Author: veithen Date: Tue Mar 6 22:32:41 2012 New Revision: 1297765 URL: http://svn.apache.org/viewvc?rev=1297765&view=rev Log: Removed unused code. Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=1297765&r1=1297764&r2=1297765&view=diff == --- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java (original) +++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java Tue Mar 6 22:32:41 2012 @@ -21,7 +21,6 @@ package org.apache.axis2.saaj; import org.apache.axiom.om.OMNode; import org.apache.axiom.om.impl.dom.ChildNode; -import org.apache.axiom.om.impl.dom.DocumentImpl; import org.apache.axiom.om.impl.dom.NodeImpl; import org.apache.axiom.om.impl.dom.TextImpl; import org.apache.axiom.soap.SOAPFactory; @@ -30,7 +29,6 @@ import org.apache.axiom.soap.impl.dom.so import org.apache.axiom.soap.impl.dom.soap11.SOAP11HeaderImpl; import org.apache.axiom.soap.impl.dom.soap12.SOAP12Factory; import org.apache.axiom.soap.impl.dom.soap12.SOAP12HeaderImpl; -import org.w3c.dom.Document; import org.w3c.dom.Node; import javax.xml.soap.Name; @@ -52,10 +50,6 @@ public class SOAPEnvelopeImpl extends SO omSOAPEnvelope = envelope; } -public void setOwnerDocument(Document document) { -super.setOwnerDocument((DocumentImpl)document); -} - public org.apache.axiom.soap.SOAPEnvelope getOMEnvelope() { return omSOAPEnvelope; }