svn commit: r1294625 - /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Author: sagara
Date: Tue Feb 28 12:46:26 2012
New Revision: 1294625
URL: http://svn.apache.org/viewvc?rev=1294625&view=rev
Log:
Applied patch for TRANSPORTS-35.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java?rev=1294625&r1=1294624&r2=1294625&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Tue Feb 28 12:46:26 2012
@@ -144,6 +144,9 @@ public class ServiceTaskManager {
/** The JMS Connection shared between multiple polling tasks - when
enabled (reccomended) */
private Connection sharedConnection = null;
+/** Is this error triggers a JMS onException ?*/
+private volatile boolean isOnExceptionError = false;
+
/**
* Start or re-start the Task Manager by shutting down any existing worker
tasks and
* re-creating them. However, if this is STM is PAUSED, a start request is
ignored.
@@ -464,9 +467,13 @@ public class ServiceTaskManager {
synchronized(pollingTasks) {
pollingTasks.remove(this);
}
-
-// My time is up, so if I am going away, create another
-scheduleNewTaskIfAppropriate();
+
+// if this is a JMS onException,
ServiceTaskManager#onException will schedule
+// a new polling task
+if (!isOnExceptionError) {
+// My time is up, so if I am going away, create another
+scheduleNewTaskIfAppropriate();
+}
}
}
@@ -592,6 +599,8 @@ public class ServiceTaskManager {
*/
public void onException(JMSException j) {
+isOnExceptionError = true;
+
if (!isSTMActive()) {
requestShutdown();
return;
@@ -631,9 +640,9 @@ public class ServiceTaskManager {
}
if (!connected) {
+retryDuration = (long) (retryDuration *
reconnectionProgressionFactor);
log.error("Reconnection attempt : " + (r++) + " for
service : " + serviceName +
" failed. Next retry in " + (retryDuration/1000) +
"seconds");
-retryDuration = (long) (retryDuration *
reconnectionProgressionFactor);
if (retryDuration > maxReconnectDuration) {
retryDuration = maxReconnectDuration;
}
@@ -641,6 +650,10 @@ public class ServiceTaskManager {
try {
Thread.sleep(retryDuration);
} catch (InterruptedException ignore) {}
+} else {
+isOnExceptionError = false;
+log.info("Reconnection attempt: " + r + " for service: " +
serviceName +
+" was successful!");
}
} while (!isSTMActive() || getConnectedTaskCount() <
concurrentConsumers);
svn commit: r1294631 - /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
Author: sagara
Date: Tue Feb 28 13:13:46 2012
New Revision: 1294631
URL: http://svn.apache.org/viewvc?rev=1294631&view=rev
Log:
Applied patch for TRANSPORTS-47.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java?rev=1294631&r1=1294630&r2=1294631&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
Tue Feb 28 13:13:46 2012
@@ -192,23 +192,19 @@ public class JMSMessageReceiver {
msgContext.setProperty(BaseConstants.USER_TRANSACTION, ut);
}
-try {
-jmsListener.handleIncomingMessage(
+jmsListener.handleIncomingMessage(
msgContext,
JMSUtils.getTransportHeaders(message),
soapAction,
contentTypeInfo.getContentType());
-} finally {
-
-Object o = msgContext.getProperty(BaseConstants.SET_ROLLBACK_ONLY);
-if (o != null) {
-if ((o instanceof Boolean && ((Boolean) o)) ||
+Object o = msgContext.getProperty(BaseConstants.SET_ROLLBACK_ONLY);
+if (o != null) {
+if ((o instanceof Boolean && ((Boolean) o)) ||
(o instanceof String && Boolean.valueOf((String) o))) {
-return false;
-}
+return false;
}
-return true;
}
+return true;
}
}
svn commit: r1294635 - in /axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail: MailConstants.java MailTransportListener.java
Author: sagara
Date: Tue Feb 28 13:22:34 2012
New Revision: 1294635
URL: http://svn.apache.org/viewvc?rev=1294635&view=rev
Log:
Applied patch for TRANSPORTS-27.
Modified:
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
Modified:
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java?rev=1294635&r1=1294634&r2=1294635&view=diff
==
---
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java
(original)
+++
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailConstants.java
Tue Feb 28 13:22:34 2012
@@ -97,5 +97,8 @@ public class MailConstants {
/** @see org.apache.axis2.transport.mail.WSMimeMessage */
public static final String MAIL_HEADER_X_MESSAGE_ID= "X-Message-ID";
public static final String TRANSPORT_MAIL_CUSTOM_HEADERS =
"transport.mail.custom.headers";
-
+
+public static final String MAIL_SENT_DATE = "sent-date";
+public static final String MAIL_RECEIVED_DATE = "received-date";
+
}
Modified:
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java?rev=1294635&r1=1294634&r2=1294635&view=diff
==
---
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
(original)
+++
axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
Tue Feb 28 13:22:34 2012
@@ -494,6 +494,15 @@ public class MailTransportListener exten
// save original mail message id message context MessageID
msgContext.setMessageID(outInfo.getRequestMessageID());
+//Set the Sent date and received date.
+if(message.getSentDate() != null) {
+Calendar sentDate = Calendar.getInstance();
+sentDate.setTime(message.getSentDate());
+msgContext.setProperty(MailConstants.MAIL_SENT_DATE,sentDate);
+}
+
+
msgContext.setProperty(MailConstants.MAIL_RECEIVED_DATE,Calendar.getInstance());
+
// set the message payload to the message context
InputStream in = messagePart.getInputStream();
try {
svn commit: r1294640 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
Author: sagara
Date: Tue Feb 28 13:33:21 2012
New Revision: 1294640
URL: http://svn.apache.org/viewvc?rev=1294640&view=rev
Log:
Applied patch for TRANSPORTS-36.
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
Modified:
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java?rev=1294640&r1=1294639&r2=1294640&view=diff
==
---
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
(original)
+++
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
Tue Feb 28 13:33:21 2012
@@ -85,8 +85,9 @@ public class BaseUtils {
if (serviceName != null) {
try {
AxisService service = axisCfg.getService(serviceName);
-axisCfg.getFaultyServices().put(service.getName(), msg);
-
+if (service != null) {
+axisCfg.getFaultyServices().put(service.getName(), msg);
+}
} catch (AxisFault axisFault) {
log.warn("Error marking service : " + serviceName + " as
faulty", axisFault);
}
svn commit: r1294650 - in /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms: JMSMessageReceiver.java JMSSender.java
Author: sagara
Date: Tue Feb 28 13:44:20 2012
New Revision: 1294650
URL: http://svn.apache.org/viewvc?rev=1294650&view=rev
Log:
Applied patch for TRANSPORTS-43.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
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/JMSMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java?rev=1294650&r1=1294649&r2=1294650&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java
Tue Feb 28 13:44:20 2012
@@ -156,7 +156,12 @@ public class JMSMessageReceiver {
// set the JMS Message ID as the Message ID of the MessageContext
try {
msgContext.setMessageID(message.getJMSMessageID());
-msgContext.setProperty(JMSConstants.JMS_COORELATION_ID,
message.getJMSMessageID());
+String jmsCorrelationID = message.getJMSCorrelationID();
+if (jmsCorrelationID != null && jmsCorrelationID.length() > 0) {
+msgContext.setProperty(JMSConstants.JMS_COORELATION_ID,
jmsCorrelationID);
+} else {
+msgContext.setProperty(JMSConstants.JMS_COORELATION_ID,
message.getJMSMessageID());
+}
} catch (JMSException ignore) {}
String soapAction = JMSUtils.getProperty(message,
BaseConstants.SOAPACTION);
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=1294650&r1=1294649&r2=1294650&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 Feb 28 13:44:20 2012
@@ -226,7 +226,12 @@ public class JMSSender extends AbstractT
} catch (JMSException ignore) {}
try {
-correlationId = message.getJMSMessageID();
+String jmsCorrelationID = message.getJMSCorrelationID();
+if (jmsCorrelationID != null && jmsCorrelationID.length() > 0)
{
+correlationId = jmsCorrelationID;
+} else {
+correlationId = message.getJMSMessageID();
+}
} catch(JMSException ignore) {}
// We assume here that the response uses the same message property
to
svn commit: r1294659 - in /axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample: ./ XMPPSampleClient.java axis2.xml
Author: sagara
Date: Tue Feb 28 13:56:04 2012
New Revision: 1294659
URL: http://svn.apache.org/viewvc?rev=1294659&view=rev
Log:
Applied patch for TRANSPORTS-44.
Added:
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/XMPPSampleClient.java
(with props)
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml
(with props)
Added:
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/XMPPSampleClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/XMPPSampleClient.java?rev=1294659&view=auto
==
---
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/XMPPSampleClient.java
(added)
+++
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/XMPPSampleClient.java
Tue Feb 28 13:56:04 2012
@@ -0,0 +1,54 @@
+package org.apache.axis2.transport.xmpp.sample;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.transport.xmpp.util.XMPPConstants;
+import org.apache.axis2.util.XMLPrettyPrinter;
+
+public class XMPPSampleClient {
+public static void main(String[] args) {
+ invokeTimeService();
+ }
+
+ private static void invokeTimeService() {
+ String endPointUrl = "xmpp://synapse.dem...@gmail.com/" +
"TimeService";
+
+ EndpointReference targetEPR = new
EndpointReference(endPointUrl);
+ try {
+ConfigurationContext ctx =
+ConfigurationContextFactory.createConfigurationContextFromURIs(
+XMPPSampleClient.class.getResource("axis2.xml"), null);
+
+ OMElement payload = getPayload();
+ Options options = new Options();
+ options.setProperty(XMPPConstants.XMPP_SERVER_TYPE,
XMPPConstants.XMPP_SERVER_TYPE_GOOGLETALK);
+ options.setProperty(XMPPConstants.XMPP_SERVER_URL,
XMPPConstants.GOOGLETALK_URL);
+ options.setProperty(XMPPConstants.XMPP_SERVER_USERNAME,
"synapse.demo.0");
+ options.setProperty(XMPPConstants.XMPP_SERVER_PASSWORD,
"mailpassword");
+
+ options.setTo(targetEPR);
+ options.setAction("urn:getServerTime");
+ ServiceClient sender = new ServiceClient(ctx,null);
+
+ sender.setOptions(options);
+ OMElement result = sender.sendReceive(payload);
+ XMLPrettyPrinter.prettify(result, System.out);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static OMElement getPayload() {
+ OMFactory fac = OMAbstractFactory.getOMFactory();
+ OMNamespace omNs = fac.createOMNamespace(
+
"http://example.xmpp.transports.axis2.org/example1";, "example1");
+return fac.createOMElement("getServerTime", omNs);
+ }
+}
Propchange:
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/XMPPSampleClient.java
--
svn:eol-style = native
Added:
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml?rev=1294659&view=auto
==
---
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml
(added)
+++
axis/axis2/java/transports/trunk/modules/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml
Tue Feb 28 13:56:04 2012
@@ -0,0 +1,541 @@
+
+
+
+
+
+
+true
+false
+false
+false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3
+
+
+
+false
+
+
+
+
+
+false
+
+admin
+axis2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+false
+
+
+false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
svn commit: r1294660 - in /axis/axis2/java/transports/trunk/src/site: site.xml xdoc/docs_index.xml xdoc/index.xml xdoc/xmpp.xml
Author: sagara Date: Tue Feb 28 13:56:57 2012 New Revision: 1294660 URL: http://svn.apache.org/viewvc?rev=1294660&view=rev Log: Applied patch for TRANSPORTS-45. Modified: axis/axis2/java/transports/trunk/src/site/site.xml axis/axis2/java/transports/trunk/src/site/xdoc/docs_index.xml axis/axis2/java/transports/trunk/src/site/xdoc/index.xml axis/axis2/java/transports/trunk/src/site/xdoc/xmpp.xml Modified: axis/axis2/java/transports/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/site.xml?rev=1294660&r1=1294659&r2=1294660&view=diff == --- axis/axis2/java/transports/trunk/src/site/site.xml (original) +++ axis/axis2/java/transports/trunk/src/site/site.xml Tue Feb 28 13:56:57 2012 @@ -57,7 +57,7 @@ - + Modified: axis/axis2/java/transports/trunk/src/site/xdoc/docs_index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/xdoc/docs_index.xml?rev=1294660&r1=1294659&r2=1294660&view=diff == --- axis/axis2/java/transports/trunk/src/site/xdoc/docs_index.xml (original) +++ axis/axis2/java/transports/trunk/src/site/xdoc/docs_index.xml Tue Feb 28 13:56:57 2012 @@ -38,7 +38,7 @@ E-Mail Transport SMS Transport TCP Transport - + XMPP Transport Modified: axis/axis2/java/transports/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/xdoc/index.xml?rev=1294660&r1=1294659&r2=1294660&view=diff == --- axis/axis2/java/transports/trunk/src/site/xdoc/index.xml (original) +++ axis/axis2/java/transports/trunk/src/site/xdoc/index.xml Tue Feb 28 13:56:57 2012 @@ -48,7 +48,7 @@ SMS Transport UDP Transport XMPP Transport - + XMPP Transport Modified: axis/axis2/java/transports/trunk/src/site/xdoc/xmpp.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/xdoc/xmpp.xml?rev=1294660&r1=1294659&r2=1294660&view=diff == --- axis/axis2/java/transports/trunk/src/site/xdoc/xmpp.xml (original) +++ axis/axis2/java/transports/trunk/src/site/xdoc/xmpp.xml Tue Feb 28 13:56:57 2012 @@ -22,5 +22,57 @@ XMPP transport + +The XMPP transport allows to send and receive chat messages. + + + ++ + + + +Following transport specific service parameters are used: + + +Parameter +Required +Description + + +transport.xmpp.ServerUrl +Yes +The server url of the XMPP server + + +transport.xmpp.ServerAccountUserName +Yes +The user name of the XMPP account + + +transport.xmpp.ServerAccountPassword +Yes +The password for the XMPP account. + + +transport.xmpp.ServerType +Yes +The type of XMPP server + + + + + + ++ +talk.google.com +axis2.xmpp.account1 +apacheaxis2 +transport.xmpp.ServerType.GoogleTalk ++ + + - \ No newline at end of file +
svn commit: r1294677 - /axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
Author: azeez
Date: Tue Feb 28 14:54:23 2012
New Revision: 1294677
URL: http://svn.apache.org/viewvc?rev=1294677&view=rev
Log:
Auto localMemberPort increment was not working, if the specified port was not
available. This commit fixes the bug.
Modified:
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
Modified:
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java?rev=1294677&r1=1294676&r2=1294677&view=diff
==
---
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
(original)
+++
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
Tue Feb 28 14:54:23 2012
@@ -153,13 +153,13 @@ public class WkaBasedMembershipScheme im
try {
if (localPort != null) {
port = Integer.parseInt(((String)
localPort.getValue()).trim());
-port = getLocalPort(new ServerSocket(),
localMember.getHostname(), port, 4000, 100);
+port = getLocalPort(new ServerSocket(),
localMember.getHostname(), port, 4000, 1000);
} else { // In cases where the localport needs to be automatically
figured out
-port = getLocalPort(new ServerSocket(),
localMember.getHostname(), -1, 4000, 100);
+port = getLocalPort(new ServerSocket(),
localMember.getHostname(), -1, 4000, 1000);
}
} catch (IOException e) {
String msg =
-"Could not allocate the specified port or a port in the
range 4000-4100 " +
+"Could not allocate the specified port or a port in the
range 4000-5000 " +
"for local host " + localMember.getHostname() +
". Check whether the IP address specified or inferred for
the local " +
"member is correct.";
@@ -224,7 +224,7 @@ public class WkaBasedMembershipScheme im
return true;
} catch (IOException e) {
String msg = e.getMessage();
-if (msg.indexOf("Connection refused") == -1 &&
msg.indexOf("connect timed out") == -1) {
+if (!msg.contains("Connection refused") &&
!msg.contains("connect timed out")) {
log.error("Cannot connect to member " +
member.getHostName() + ":" + member.getPort(),
e);
}
@@ -258,7 +258,7 @@ public class WkaBasedMembershipScheme im
} catch (InterruptedException ignored) {
ignored.printStackTrace();
}
-getLocalPort(socket, hostname, portstart, retries, -1);
+portstart = getLocalPort(socket, hostname, portstart, retries,
-1);
}
}
return portstart;
svn commit: r1294991 - in /axis/axis2/java/core/trunk/modules: integration/test-resources/BaseDataTypes.wsdl kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Author: sagara Date: Wed Feb 29 07:18:33 2012 New Revision: 1294991 URL: http://svn.apache.org/viewvc?rev=1294991&view=rev Log: Fixed AXIS2-5253. Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java Modified: axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl?rev=1294991&r1=1294990&r2=1294991&view=diff == --- axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl (original) +++ axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl Wed Feb 29 07:18:33 2012 @@ -961,199 +961,199 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=1294991&r1=1294990&r2=1294991&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java (original) +++ axis/axis2/java/core/trunk
svn commit: r1294993 - in /axis/axis2/java/core/branches/1_6: ./ modules/integration/test-resources/BaseDataTypes.wsdl modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Author: sagara Date: Wed Feb 29 07:25:07 2012 New Revision: 1294993 URL: http://svn.apache.org/viewvc?rev=1294993&view=rev Log: Merged r1294991 to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 29 07:25:07 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,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,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1 214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511 +/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,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,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1 214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991 Modified: axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl?rev=1294993&r1=1294992&r2=1294993&view=diff == --- axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl (original) +++ axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl Wed Feb 29 07:25:07 2012 @@ -961,199 +961,199 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
