svn commit: r1000077 - in /synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse: endpoints/AbstractEndpoint.java mediators/builtin/CacheMediator.java util/Replicator.java

[ruwan]

Author: ruwan
Date: Wed Sep 22 16:37:30 2010
New Revision: 1000077

URL: http://svn.apache.org/viewvc?rev=1000077&view=rev
Log:
back porting the clustering API changes

Modified:
    
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
    
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
    
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/Replicator.java

Modified: 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=1000077&r1=1000076&r2=1000077&view=diff
==============================================================================
--- 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
 (original)
+++ 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
 Wed Sep 22 16:37:30 2010
@@ -19,7 +19,7 @@
 
 package org.apache.synapse.endpoints;
 
-import org.apache.axis2.clustering.ClusteringAgent;
+import org.apache.axis2.clustering.ClusterManager;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.transport.base.BaseConstants;
 import org.apache.axis2.description.AxisOperation;
@@ -177,8 +177,8 @@ public abstract class AbstractEndpoint e
                 ((Axis2SynapseEnvironment) 
synapseEnvironment).getAxis2ConfigurationContext();
         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;

Modified: 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java?rev=1000077&r1=1000076&r2=1000077&view=diff
==============================================================================
--- 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
 (original)
+++ 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
 Wed Sep 22 16:37:30 2010
@@ -24,7 +24,7 @@ import org.apache.axis2.transport.http.H
 import org.apache.axis2.saaj.util.IDGenerator;
 import org.apache.axis2.saaj.util.SAAJUtil;
 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.synapse.ManagedLifecycle;
 import org.apache.synapse.MessageContext;

Modified: 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/Replicator.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/Replicator.java?rev=1000077&r1=1000076&r2=1000077&view=diff
==============================================================================
--- 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/Replicator.java
 (original)
+++ 
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/Replicator.java
 Wed Sep 22 16:37:30 2010
@@ -49,7 +49,7 @@ public class Replicator {
                 }
 
                 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 @@ public class Replicator {
                 }
 
                 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()) {