You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by as...@apache.org on 2009/03/01 09:11:46 UTC
svn commit: r748973 - in /synapse/trunk/java: ./
modules/core/src/main/java/org/apache/synapse/core/axis2/
modules/core/src/main/java/org/apache/synapse/endpoints/
modules/core/src/main/java/org/apache/synapse/mediators/builtin/
modules/core/src/main/j...
Author: asankha
Date: Sun Mar 1 08:11:45 2009
New Revision: 748973
URL: http://svn.apache.org/viewvc?rev=748973&view=rev
Log:
update versions to Axis2 1.5-beta-2 (to be loaded from a temporary M2 repo)
Update other dependencies to latest versions (e.g. HttpCore, Axiom etc)
Apply patch from Azeez for clustering enhancements
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/Replicator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java Sun Mar 1 08:11:45 2009
@@ -18,9 +18,9 @@
*/
package org.apache.synapse.core.axis2;
-import org.apache.axis2.clustering.ClusteringAgent;
+import org.apache.axis2.clustering.ClusterManager;
+import org.apache.axis2.clustering.LoadBalanceEventHandler;
import org.apache.axis2.clustering.Member;
-import org.apache.axis2.clustering.management.GroupManagementAgent;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,7 +38,7 @@
private static final Log log = LogFactory.getLog(Axis2LoadBalanceMembershipHandler.class);
private String lbDomain;
- private GroupManagementAgent groupMgtAgent;
+ private LoadBalanceEventHandler lbEventHandler;
private ConfigurationContext configCtx;
private LoadbalanceAlgorithm algorithm;
@@ -59,15 +59,15 @@
this.configCtx = configCtx;
// The following code does the bridging between Axis2 and Synapse load balancing
- ClusteringAgent clusteringAgent = configCtx.getAxisConfiguration().getClusteringAgent();
- if(clusteringAgent == null){
+ ClusterManager clusterManager = configCtx.getAxisConfiguration().getClusterManager();
+ if(clusterManager == null){
String msg = "In order to enable load balancing across an Axis2 cluster, " +
"the cluster entry should be enabled in the axis2.xml file";
log.error(msg);
throw new SynapseException(msg);
}
- groupMgtAgent = clusteringAgent.getGroupManagementAgent(lbDomain);
- if(groupMgtAgent == null){
+ lbEventHandler = clusterManager.getLoadBalanceEventHandler(lbDomain);
+ if(lbEventHandler == null){
String msg =
"A LoadBalanceEventHandler has not been specified in the axis2.xml " +
"file for the domain " + lbDomain;
@@ -87,7 +87,7 @@
* @return The current member
*/
public Member getNextApplicationMember(AlgorithmContext context) {
- algorithm.setApplicationMembers(groupMgtAgent.getMembers());
+ algorithm.setApplicationMembers(lbEventHandler.getMembers());
return algorithm.getNextApplicationMember(context);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java Sun Mar 1 08:11:45 2009
@@ -19,23 +19,22 @@
package org.apache.synapse.endpoints;
+import org.apache.axis2.clustering.ClusterManager;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.FaultHandler;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.commons.util.MBeanRegistrar;
import org.apache.synapse.audit.statistics.StatisticsReporter;
-import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.synapse.commons.util.MBeanRegistrar;
import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.clustering.ClusteringAgent;
import java.util.List;
import java.util.Stack;
-
/**
* An abstract base class for all Endpoint implementations
*/
@@ -133,8 +132,8 @@
public synchronized void init(ConfigurationContext cc) {
if (!initialized) {
// The check for clustering environment
- ClusteringAgent clusteringAgent = cc.getAxisConfiguration().getClusteringAgent();
- if (clusteringAgent != null && clusteringAgent.getStateManager() != null) {
+ ClusterManager clusterManager = cc.getAxisConfiguration().getClusterManager();
+ if (clusterManager != null && clusterManager.getContextManager() != null) {
isClusteringEnabled = Boolean.TRUE;
} else {
isClusteringEnabled = Boolean.FALSE;
@@ -193,7 +192,7 @@
/**
* Is this a leaf level endpoint? or parent endpoint that has children?
- * @return true if this is a leaf endpoint
+ * @return
*/
public boolean isLeafEndpoint() {
return children == null || children.size() == 0;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java Sun Mar 1 08:11:45 2009
@@ -21,7 +21,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.state.Replicator;
+import org.apache.axis2.clustering.context.Replicator;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.saaj.util.SAAJUtil;
import org.apache.synapse.ManagedLifecycle;
@@ -100,7 +100,6 @@
}
// if maxMessageSize is specified check for the message size before processing
-
if (maxMessageSize > 0) {
FixedByteArrayOutputStream fbaos = new FixedByteArrayOutputStream(maxMessageSize);
try {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java Sun Mar 1 08:11:45 2009
@@ -19,11 +19,17 @@
package org.apache.synapse.mediators.builtin;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.endpoints.Endpoint;
+import org.apache.synapse.endpoints.SALoadbalanceEndpoint;
import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.clustering.ClusterManager;
+
+import java.util.List;
/**
* SendMediator sends a message using specified semantics. If it contains an endpoint it will
@@ -56,12 +62,12 @@
if (synLog.isTraceOrDebugEnabled()) {
StringBuffer sb = new StringBuffer();
- sb.append("Sending ").append(synCtx.isResponse() ? "response" : "request").
- append(" message using implicit message properties..");
- sb.append("\nSending To: ").append(synCtx.getTo() != null ?
- synCtx.getTo().getAddress() : "null");
- sb.append("\nSOAPAction: ").append(synCtx.getWSAAction() != null ?
- synCtx.getWSAAction() : "null");
+ sb.append("Sending " + (synCtx.isResponse() ? "response" : "request")
+ + " message using implicit message properties..");
+ sb.append("\nSending To: " + (synCtx.getTo() != null ?
+ synCtx.getTo().getAddress() : "null"));
+ sb.append("\nSOAPAction: " + (synCtx.getWSAAction() != null ?
+ synCtx.getWSAAction() : "null"));
synLog.traceOrDebug(sb.toString());
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/Replicator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/Replicator.java?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/Replicator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/Replicator.java Sun Mar 1 08:11:45 2009
@@ -49,7 +49,7 @@
}
configCtx.removePropertyNonReplicable(key);
- org.apache.axis2.clustering.state.Replicator.replicate(
+ org.apache.axis2.clustering.context.Replicator.replicate(
configCtx, new String[]{key});
if (log.isDebugEnabled()) {
@@ -81,7 +81,7 @@
}
configCtx.setNonReplicableProperty(key, value);
- org.apache.axis2.clustering.state.Replicator.replicate(
+ org.apache.axis2.clustering.context.Replicator.replicate(
configCtx, new String[]{key});
if (log.isDebugEnabled()) {
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java Sun Mar 1 08:11:45 2009
@@ -30,9 +30,9 @@
import org.apache.synapse.core.axis2.Axis2MessageContext;
import org.apache.synapse.mediators.AbstractMediator;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.clustering.state.Replicator;
+import org.apache.axis2.clustering.context.Replicator;
import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.ClusteringAgent;
+import org.apache.axis2.clustering.ClusterManager;
import org.wso2.throttle.*;
@@ -120,9 +120,9 @@
//To ensure check for clustering environment only happens one time
if ((throttle == null && !isResponse) || (isResponse
&& concurrentAccessController == null)) {
- ClusteringAgent clusteringAgent = cc.getAxisConfiguration().getClusteringAgent();
- if (clusteringAgent != null &&
- clusteringAgent.getStateManager() != null) {
+ ClusterManager clusterManager = cc.getAxisConfiguration().getClusterManager();
+ if (clusterManager != null &&
+ clusterManager.getContextManager() != null) {
isClusteringEnable = true;
}
}
@@ -249,7 +249,7 @@
if (throttle != null && !isResponse && canAccess) {
canAccess = throttleByAccessRate(synCtx, axisMC, cc, synLog);
}
- // all the replication functionality of the access rate based throttling handles by itself
+ // all the replication functionality of the access rate based throttling handles by itself
// Just replicate the current state of ConcurrentAccessController
if (isClusteringEnable && concurrentAccessController != null) {
if (cc != null) {
@@ -274,7 +274,11 @@
handleException("Unable to find onAccept sequence with key : "
+ onAcceptSeqKey, synCtx);
}
- } else return onAcceptMediator == null || onAcceptMediator.mediate(synCtx);
+ } else if (onAcceptMediator != null) {
+ return onAcceptMediator.mediate(synCtx);
+ } else {
+ return true;
+ }
} else {
if (onRejectSeqKey != null) {
@@ -285,7 +289,11 @@
handleException("Unable to find onReject sequence with key : "
+ onRejectSeqKey, synCtx);
}
- } else return onRejectMediator != null && onRejectMediator.mediate(synCtx);
+ } else if (onRejectMediator != null) {
+ return onRejectMediator.mediate(synCtx);
+ } else {
+ return false;
+ }
}
synLog.traceOrDebug("End : Throttle mediator");
Modified: synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java (original)
+++ synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2ServerManager.java Sun Mar 1 08:11:45 2009
@@ -25,7 +25,7 @@
import org.apache.axis2.util.CommandLineOption;
import org.apache.axis2.util.CommandLineOptionParser;
import org.apache.axis2.util.OptionsValidator;
-import org.apache.axis2.clustering.ClusteringAgent;
+//import org.apache.axis2.clustering.ClusteringAgent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,7 +39,7 @@
private static SampleAxis2ServerManager ourInstance = new SampleAxis2ServerManager();
- public final static int DEFAULT_PORT = 9000;
+ public static final int DEFAULT_PORT = 9000;
private ConfigurationContext configctx;
@@ -98,12 +98,12 @@
// Need to initialize the cluster manager at last since we are changing the servers
// HTTP/S ports above. In the axis2.xml file, we need to set the "AvoidInitiation" param
// to "true"
- ClusteringAgent clusteringAgent =
+ /*ClusteringAgent clusteringAgent =
configctx.getAxisConfiguration().getClusteringAgent();
if(clusteringAgent != null) {
clusteringAgent.setConfigurationContext(configctx);
clusteringAgent.init();
- }
+ }*/
// Finally start the transport listeners
listenerManager = new ListenerManager();
Modified: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Sun Mar 1 08:11:45 2009
@@ -172,7 +172,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-testkit</artifactId>
- <version>${axis2.version}</version>
+ <version>SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -231,7 +231,7 @@
<properties>
<aspectj.version>1.6.1</aspectj.version>
- <httpcore.nio.version>4.0-beta3</httpcore.nio.version>
+ <httpcore.nio.version>4.0</httpcore.nio.version>
<qfj.version>1.3.1</qfj.version>
</properties>
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=748973&r1=748972&r2=748973&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Sun Mar 1 08:11:45 2009
@@ -336,6 +336,14 @@
<artifactId>jaxen</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
</exclusion>
@@ -936,6 +944,17 @@
<updatePolicy>interval:10080</updatePolicy> <!-- i.e. refresh weekly -->
</snapshots>
</repository>
+ <repository>
+ <id>asankha</id>
+ <name>Asankha M2 Repository</name>
+ <url>http://people.apache.org/~asankha/repository</url>
+ <releases>
+ <updatePolicy>daily</updatePolicy>
+ </releases>
+ <snapshots>
+ <updatePolicy>interval:10080</updatePolicy> <!-- i.e. refresh weekly -->
+ </snapshots>
+ </repository>
</repositories>
<modules>
@@ -963,36 +982,36 @@
<commons.net.version>1.4.1</commons.net.version>
<jsch.version>0.1.31</jsch.version>
<oro.version>2.0.8</oro.version>
- <slf4j.version>1.3.0</slf4j.version>
+ <slf4j.version>1.5.6</slf4j.version>
<mina.version>1.1.0</mina.version>
<jms-1.1-spec.version>1.1</jms-1.1-spec.version>
<!-- Axis2 1.4 and its dependencies -->
- <axis2.version>SNAPSHOT</axis2.version>
+ <axis2.version>1.5-beta-2</axis2.version>
<axis2.transport.version>SNAPSHOT</axis2.transport.version>
- <axiom.version>SNAPSHOT</axiom.version>
- <xml_schema.version>1.4.2</xml_schema.version>
+ <axiom.version>1.2.8</axiom.version>
+ <xml_schema.version>1.4.3</xml_schema.version>
<xml_apis.version>1.3.04</xml_apis.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
- <commons.logging.version>1.1</commons.logging.version>
+ <commons.logging.version>1.1.1</commons.logging.version>
<!-- addressing, rampart, neethi -->
- <addressing.version>SNAPSHOT</addressing.version>
+ <addressing.version>1.5-beta-2</addressing.version>
<rampart.version>SNAPSHOT</rampart.version>
<mercury.version>0.91</mercury.version>
<neethi.version>2.0.4</neethi.version>
- <wss4j.version>1.5.4</wss4j.version>
+ <wss4j.version>SNAPSHOT</wss4j.version>
<opensaml.version>1.1</opensaml.version>
- <xmlsec.version>1.4.0</xmlsec.version>
- <bcprov.jdk15.version>132</bcprov.jdk15.version>
+ <xmlsec.version>1.4.2</xmlsec.version>
+ <bcprov.jdk15.version>140</bcprov.jdk15.version>
- <xerces.version>2.8.1</xerces.version>
- <xalan.version>2.7.0</xalan.version>
- <js.version>1.6R5</js.version>
+ <xerces.version>2.9.1</xerces.version>
+ <xalan.version>2.7.1</xalan.version>
+ <js.version>1.7R1</js.version>
<!-- startup, quartz -->
- <commons-collections.version>3.1</commons-collections.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
<quartz.version>1.6.0</quartz.version>
<geronimo-spec.version>1.1</geronimo-spec.version>
@@ -1003,9 +1022,9 @@
<JLex.version>0.0</JLex.version>
<!-- misc -->
<junit.version>3.8.2</junit.version>
- <log4j.version>1.2.13</log4j.version>
+ <log4j.version>1.2.15</log4j.version>
<xmlunit.version>1.1</xmlunit.version>
- <derby.version>10.1.1.0</derby.version>
+ <derby.version>10.4.2.0</derby.version>
<wrapper.version>3.2.3</wrapper.version>
<saxon.version>8.9</saxon.version>
<commons_io.version>1.4</commons_io.version>
@@ -1018,10 +1037,10 @@
<wso2eventing-api.version>1.1</wso2eventing-api.version>
<xbean.version>2.2.0</xbean.version>
<bsf.version>3.0-beta2</bsf.version>
- <groovy.version>1.0</groovy.version>
+ <groovy.version>1.1-rc-1</groovy.version>
<servlet-api.version>2.3</servlet-api.version>
<qpid.version>1.0-incubating-M3-615355</qpid.version>
- <commons-lang.version>2.1</commons-lang.version>
+ <commons-lang.version>2.4</commons-lang.version>
</properties>