svn commit: r1329571 - in /axis/axis2/java/core/branches/AXIS2-4318/modules: parent/ transport/http/ transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/ transport/http/test/org/apache
Author: sagara
Date: Tue Apr 24 07:06:32 2012
New Revision: 1329571
URL: http://svn.apache.org/viewvc?rev=1329571&view=rev
Log:
AXIS2-4318 - Applied patch AXIS2-4318_02.patch.
Added:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
(with props)
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
(with props)
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/parent/pom.xml
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HttpTransportPropertiesImpl.java
Modified: axis/axis2/java/core/branches/AXIS2-4318/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/parent/pom.xml?rev=1329571&r1=1329570&r2=1329571&view=diff
==
--- axis/axis2/java/core/branches/AXIS2-4318/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-4318/modules/parent/pom.xml Tue Apr 24
07:06:32 2012
@@ -90,6 +90,7 @@
1.0.1
1.0
4.0
+4.0
5.0
1.5rc3
2.2.4
@@ -724,6 +725,11 @@
${httpcore.version}
+org.apache.httpcomponents
+httpclient
+${httpclient.version}
+
+
commons-fileupload
commons-fileupload
${commons.fileupload.version}
Modified:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml?rev=1329571&r1=1329570&r2=1329571&view=diff
==
--- axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml
(original)
+++ axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml Tue
Apr 24 07:06:32 2012
@@ -106,8 +106,16 @@
httpcore
+org.apache.httpcomponents
+httpclient
+
+
commons-httpclient
commons-httpclient
+
+org.apache.httpcomponents
+httpclient
+
Added:
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java?rev=1329571&view=auto
==
---
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
(added)
+++
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
Tue Apr 24 07:06:32 2012
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.axis2.transport.http.impl.httpclient4;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HTTPTransportConstants;
+import org.apache.axis2.transport.http.HTTPTransportSender;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+public class HTTPClient4TransportSender extends CommonsHTTPTransportSender
implements
+
HTTPTransportSender {
+
+private static final Log log =
LogFactory.getLog(HTTPClient4TransportSen
svn commit: r1329591 - in /axis/axis2/java/core/trunk/modules: clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java kernel/src/org/apache/axis2/clustering/ClusteringAgent.java
Author: azeez
Date: Tue Apr 24 08:34:47 2012
New Revision: 1329591
URL: http://svn.apache.org/viewvc?rev=1329591&view=rev
Log:
Ability to elect a coordinator for the cluster
Modified:
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/ClusteringAgent.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/Member.java
Modified:
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java?rev=1329591&r1=1329590&r2=1329591&view=diff
==
---
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
(original)
+++
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
Tue Apr 24 08:34:47 2012
@@ -56,6 +56,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.group.Response;
import org.apache.catalina.tribes.group.RpcChannel;
+import org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator;
import org.apache.catalina.tribes.transport.MultiPointSender;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.commons.logging.Log;
@@ -101,6 +102,8 @@ public class TribesClusteringAgent imple
private RpcInitializationRequestHandler rpcInitRequestHandler;
private MembershipScheme membershipScheme;
+private NonBlockingCoordinator coordinator;
+
/**
* The mode in which this member operates such as "loadBalance" or
"application"
*/
@@ -152,6 +155,10 @@ public class TribesClusteringAgent imple
return configurationManager;
}
+public boolean isCoordinator(){
+return coordinator.isCoordinator();
+}
+
/**
* Initialize the cluster.
*
@@ -163,6 +170,8 @@ public class TribesClusteringAgent imple
primaryMembershipManager = new MembershipManager(configurationContext);
channel = new Axis2GroupChannel();
+coordinator = new NonBlockingCoordinator();
+channel.addInterceptor(coordinator);
channel.setHeartbeat(true);
channelSender = new ChannelSender(channel, primaryMembershipManager,
synchronizeAllMembers());
axis2ChannelListener =
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/ClusteringAgent.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/ClusteringAgent.java?rev=1329591&r1=1329590&r2=1329591&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/ClusteringAgent.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/ClusteringAgent.java
Tue Apr 24 08:34:47 2012
@@ -185,6 +185,12 @@ public interface ClusteringAgent extends
*/
Set getDomains();
+/**
+ * Checks whether this member is the coordinator for the cluster
+ *
+ * @return true if this member is the coordinator, and false otherwise
+ */
+boolean isCoordinator();
/**
* Send a message to all members in this member's primary cluster
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/Member.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/Member.java?rev=1329591&r1=1329590&r2=1329591&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/Member.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/clustering/Member.java
Tue Apr 24 08:34:47 2012
@@ -83,7 +83,7 @@ public class Member {
/**
* Check whether this member is suspended
- * @return true if this member is still suspended, false oterwise
+ * @return true if this member is still suspended, false otherwise
*/
public boolean isSuspended() {
if (suspendedTime == -1) {
svn commit: r1329711 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Author: azeez
Date: Tue Apr 24 13:41:40 2012
New Revision: 1329711
URL: http://svn.apache.org/viewvc?rev=1329711&view=rev
Log:
If an exception, like a security exception occurs during calling module &
service shutdown, we should continue calling shutdown on other modules &
services, without throwing an exception and halting the entire cleanup &
ConfigurationContext termination flow
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=1329711&r1=1329710&r2=1329711&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Tue Apr 24 13:41:40 2012
@@ -744,7 +744,11 @@ public class ConfigurationContext extend
AxisModule axisModule = (AxisModule) moduleitr.next();
Module module = axisModule.getModule();
if (module != null) {
-module.shutdown(this);
+try {
+module.shutdown(this);
+} catch (Exception e) {
+log.warn("Could not shutdown module " +
module.getClass().getName(), e);
+}
}
}
}
@@ -760,7 +764,11 @@ public class ConfigurationContext extend
AxisService axisService = (AxisService) services.next();
ServiceLifeCycle serviceLifeCycle =
axisService.getServiceLifeCycle();
if (serviceLifeCycle != null) {
-serviceLifeCycle.shutDown(this, axisService);
+try {
+serviceLifeCycle.shutDown(this, axisService);
+} catch (Exception e) {
+log.warn("Could not shutdown service " +
axisService.getName(), e);
+}
}
}
}
svn commit: r1330129 - in /axis/axis2/java/core/site: ./ api/ api/org/apache/axis2/ api/org/apache/axis2/addressing/ api/org/apache/axis2/addressing/class-use/ api/org/apache/axis2/addressing/i18n/ ap
Author: sagara Date: Wed Apr 25 06:40:23 2012 New Revision: 1330129 URL: http://svn.apache.org/viewvc?rev=1330129&view=rev Log: Updated Site for 1.6.2 release. [This commit notification would consist of 148 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
