Author: hiranya
Date: Thu Aug 20 07:35:27 2009
New Revision: 806071
URL: http://svn.apache.org/viewvc?rev=806071&view=rev
Log:
Changing Axis2 and AXIOM versions to SNAPSHOT and 1.2.9-SNAPSHOT respectively.
Some minor code changes were done to cope up with the Axis2 clustering API
changes that were done recently in Axis2 trunk. Kudos to Azeez for helping me
out with these clustering code changes.
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/core/axis2/ExtensionDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.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/util/Replicator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediator.java
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=806071&r1=806070&r2=806071&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
Thu Aug 20 07:35:27 2009
@@ -18,9 +18,9 @@
*/
package org.apache.synapse.core.axis2;
-import org.apache.axis2.clustering.ClusterManager;
-import org.apache.axis2.clustering.LoadBalanceEventHandler;
+import org.apache.axis2.clustering.ClusteringAgent;
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 LoadBalanceEventHandler lbEventHandler;
+ private GroupManagementAgent groupMgtAgent;
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
- ClusterManager clusterManager =
configCtx.getAxisConfiguration().getClusterManager();
- if(clusterManager == null){
+ ClusteringAgent clusteringAgent =
configCtx.getAxisConfiguration().getClusteringAgent();
+ if(clusteringAgent == 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);
}
- lbEventHandler = clusterManager.getLoadBalanceEventHandler(lbDomain);
- if(lbEventHandler == null){
+ groupMgtAgent = clusteringAgent.getGroupManagementAgent(lbDomain);
+ if(groupMgtAgent == 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(lbEventHandler.getMembers());
+ algorithm.setApplicationMembers(groupMgtAgent.getMembers());
return algorithm.getNextApplicationMember(context);
}
-}
+}
\ No newline at end of file
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ExtensionDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ExtensionDeployer.java?rev=806071&r1=806070&r2=806071&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ExtensionDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ExtensionDeployer.java
Thu Aug 20 07:35:27 2009
@@ -89,8 +89,9 @@
try {
boolean isDirectory = deploymentFileData.getFile().isDirectory();
deploymentFileData.setClassLoader(isDirectory,
getClass().getClassLoader(),
- (File)cfgCtx.getAxisConfiguration().getParameterValue(
- Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ (File) cfgCtx.getAxisConfiguration().getParameterValue(
+ Constants.Configuration.ARTIFACTS_TEMP_DIR),
+ cfgCtx.getAxisConfiguration().isChildFirstClassLoading());
DeploymentClassLoader urlCl
= (DeploymentClassLoader)deploymentFileData.getClassLoader();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=806071&r1=806070&r2=806071&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Thu Aug 20 07:35:27 2009
@@ -620,7 +620,7 @@
AxisService as =
axisConfig.getServiceForActivation(this.getName());
as.setActive(true);
- axisConfig.notifyObservers(AxisEvent.SERVICE_START, as);
+ axisConfig.notifyObservers(new AxisEvent(AxisEvent.SERVICE_START,
as), as);
this.setRunning(true);
auditInfo("Started the proxy service : " + name);
} else {
@@ -651,7 +651,7 @@
AxisService as = axisConfig.getService(this.getName());
if (as != null) {
as.setActive(false);
- axisConfig.notifyObservers(AxisEvent.SERVICE_STOP, as);
+ axisConfig.notifyObservers(new
AxisEvent(AxisEvent.SERVICE_STOP, as), as);
}
this.setRunning(false);
auditInfo("Stopped the proxy service : " + name);
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=806071&r1=806070&r2=806071&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
Thu Aug 20 07:35:27 2009
@@ -19,7 +19,7 @@
package org.apache.synapse.endpoints;
-import org.apache.axis2.clustering.ClusterManager;
+import org.apache.axis2.clustering.ClusteringAgent;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.transport.base.BaseConstants;
import org.apache.commons.logging.Log;
@@ -145,8 +145,8 @@
((Axis2SynapseEnvironment)
synapseEnvironment).getAxis2ConfigurationContext();
if (!initialized) {
// The check for clustering environment
- ClusterManager clusterManager =
cc.getAxisConfiguration().getClusterManager();
- if (clusterManager != null && clusterManager.getContextManager()
!= null) {
+ ClusteringAgent clusteringAgent =
cc.getAxisConfiguration().getClusteringAgent();
+ if (clusteringAgent != null && clusteringAgent.getStateManager()
!= null) {
isClusteringEnabled = Boolean.TRUE;
} else {
isClusteringEnabled = Boolean.FALSE;
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=806071&r1=806070&r2=806071&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
Thu Aug 20 07:35:27 2009
@@ -21,7 +21,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.context.Replicator;
+import org.apache.axis2.clustering.state.Replicator;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.saaj.util.SAAJUtil;
import org.apache.synapse.ManagedLifecycle;
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=806071&r1=806070&r2=806071&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
Thu Aug 20 07:35:27 2009
@@ -49,7 +49,7 @@
}
configCtx.removePropertyNonReplicable(key);
- org.apache.axis2.clustering.context.Replicator.replicate(
+ org.apache.axis2.clustering.state.Replicator.replicate(
configCtx, new String[]{key});
if (log.isDebugEnabled()) {
@@ -81,7 +81,7 @@
}
configCtx.setNonReplicableProperty(key, value);
- org.apache.axis2.clustering.context.Replicator.replicate(
+ org.apache.axis2.clustering.state.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=806071&r1=806070&r2=806071&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
Thu Aug 20 07:35:27 2009
@@ -20,8 +20,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.clustering.ClusteringFault;
-import org.apache.axis2.clustering.ClusterManager;
-import org.apache.axis2.clustering.context.Replicator;
+
+import org.apache.axis2.clustering.ClusteringAgent;
+import org.apache.axis2.clustering.state.Replicator;
+
import org.apache.axis2.context.ConfigurationContext;
import org.apache.neethi.PolicyEngine;
import org.apache.synapse.Mediator;
@@ -119,9 +121,9 @@
//To ensure check for clustering environment only happens one time
if ((throttle == null && !isResponse) || (isResponse
&& concurrentAccessController == null)) {
- ClusterManager clusterManager =
cc.getAxisConfiguration().getClusterManager();
- if (clusterManager != null &&
- clusterManager.getContextManager() != null) {
+ ClusteringAgent clusteringAgent =
cc.getAxisConfiguration().getClusteringAgent();
+ if (clusteringAgent != null &&
+ clusteringAgent.getStateManager() != null) {
isClusteringEnable = true;
}
}
