You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2007/03/23 08:05:10 UTC
svn commit: r521603 - in /webservices/axis2/trunk/java/modules:
clustering/src/org/apache/axis2/cluster/tribes/
clustering/test/org/apache/axis2/clustering/
kernel/src/org/apache/axis2/cluster/ kernel/src/org/apache/axis2/context/
Author: chamikara
Date: Fri Mar 23 00:05:09 2007
New Revision: 521603
URL: http://svn.apache.org/viewvc?view=rev&rev=521603
Log:
Added a shutdown method to the ClusterManager.
Removed the param ConfigurationContext from the clusterManager.init method.
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelSender.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/TribesClusterManager.java
webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusterManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelSender.java?view=diff&rev=521603&r1=521602&r2=521603
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelSender.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelSender.java Fri Mar 23 00:05:09 2007
@@ -34,9 +34,9 @@
log.debug("Group size " + group.length);
// send the message
- for (int i = 0; i < group.length; i++) {
- printMember(group[i]);
- }
+// for (int i = 0; i < group.length; i++) {
+// printMember(group[i]);
+// }
if (group.length > 0) {
try {
Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/TribesClusterManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/TribesClusterManager.java?view=diff&rev=521603&r1=521602&r2=521603
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/TribesClusterManager.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/TribesClusterManager.java Fri Mar 23 00:05:09 2007
@@ -32,10 +32,7 @@
import org.apache.axis2.cluster.tribes.info.TransientTribesChannelInfo;
import org.apache.axis2.cluster.tribes.info.TransientTribesMemberInfo;
import org.apache.axis2.cluster.tribes.util.TribesUtil;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ManagedChannel;
@@ -48,11 +45,13 @@
private TribesConfigurationManager configurationManager = null;
private TribesContextManager contextManager = null;
- private ConfigurationContext configContext = null;
private ContextUpdater updater;
private static long timeout = 1000L; // this should be configured in the axis2.xml
private HashMap parameters = null;
-
+ Channel channel = null;
+ TransientTribesChannelInfo channelInfo = null;
+ TransientTribesMemberInfo memberInfo = null;
+
private static final Log log = LogFactory.getLog(TribesClusterManager.class);
public TribesClusterManager () {
@@ -69,29 +68,21 @@
return configurationManager;
}
- public void init(ConfigurationContext configurationContext) throws ClusteringFault {
+ public void init() throws ClusteringFault {
log.debug("Initializing tribes");
- this.configContext = configurationContext;
ChannelSender sender = new ChannelSender ();
ChannelListener listener = new ChannelListener (configurationManager, contextManager);
- TransientTribesChannelInfo channelInfo = new TransientTribesChannelInfo();
- TransientTribesMemberInfo memberInfo = new TransientTribesMemberInfo();
-
- configurationContext.setProperty("MEMBER_INFO", memberInfo);
- configurationContext.setProperty("CHANNEL_INFO", channelInfo);
+ channelInfo = new TransientTribesChannelInfo();
+ memberInfo = new TransientTribesMemberInfo();
contextManager.setSender(sender);
configurationManager.setSender(sender);
- contextManager.setConfigurationContext(configurationContext);
- configurationManager.setConfigurationContext(configurationContext);
-
-
try {
ManagedChannel channel = new GroupChannel();
-
+ this.channel = channel;
channel.addChannelListener (listener);
channel.addChannelListener(channelInfo);
channel.addMembershipListener(memberInfo);
@@ -110,26 +101,24 @@
listener.setUpdater(updater);
listener.setContextManager(contextManager);
-// registerTribesInfoService(configurationContext);
-
} catch (ChannelException e) {
String message = "Error starting Tribes channel";
throw new ClusteringFault (message, e);
}
}
- private void registerTribesInfoService(ConfigurationContext configContext2) throws ClusteringFault {
- try {
- AxisService service = AxisService.createService(
- "org.apache.axis2.cluster.tribes.info.TribesInfoWebService", configContext
- .getAxisConfiguration(), RPCMessageReceiver.class);
-
- configContext.getAxisConfiguration().addService(service);
- } catch (AxisFault e) {
- String message = "Unable to create Tribes info web service";
- throw new ClusteringFault (message, e);
- }
- }
+// private void registerTribesInfoService(ConfigurationContext configContext2) throws ClusteringFault {
+// try {
+// AxisService service = AxisService.createService(
+// "org.apache.axis2.cluster.tribes.info.TribesInfoWebService", configContext
+// .getAxisConfiguration(), RPCMessageReceiver.class);
+//
+// configContext.getAxisConfiguration().addService(service);
+// } catch (AxisFault e) {
+// String message = "Unable to create Tribes info web service";
+// throw new ClusteringFault (message, e);
+// }
+// }
public void setConfigurationManager(ConfigurationManager configurationManager) {
this.configurationManager = (TribesConfigurationManager) configurationManager;
@@ -173,4 +162,15 @@
parameters.remove(param.getName());
}
+ public void shutdown() throws ClusteringFault {
+ if (channel!=null) {
+ try {
+ channel.stop(Channel.DEFAULT);
+ } catch (ChannelException e) {
+ throw new ClusteringFault (e);
+ }
+ }
+ }
+
+
}
Modified: webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java?view=diff&rev=521603&r1=521602&r2=521603
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/ClusterManagerTestCase.java Fri Mar 23 00:05:09 2007
@@ -54,6 +54,8 @@
protected void setUp() throws Exception {
+ Thread.sleep(3000);
+
clusterManager1 = getClusterManager();
clusterManager2 = getClusterManager();
@@ -68,8 +70,8 @@
contextManagerListener2 = new DefaultContextManagerListener ();
clusterManager2.getContextManager(). addContextManagerListener (contextManagerListener2);
- clusterManager1.getConfigurationManager().setConfigurationContext(configurationContext1.getAxisConfiguration());
- clusterManager2.getConfigurationManager().setConfigurationContext(configurationContext2.getAxisConfiguration());
+ clusterManager1.getConfigurationManager().setConfigurationContext (configurationContext1);
+ clusterManager2.getConfigurationManager().setConfigurationContext(configurationContext2);
configurationManagerListener1 = new TestConfigurationManagerListener ();
clusterManager1.getConfigurationManager().addConfigurationManagerListener(configurationManagerListener1);
@@ -93,8 +95,8 @@
//Initiating ClusterManagers
try {
- clusterManager1.init(configurationContext1);
- clusterManager2.init(configurationContext2);
+ clusterManager1.init();
+ clusterManager2.init();
} catch (ClusteringFault e) {
String message = "Could not initialize ClusterManagers. Please check the network connection";
if (log.isErrorEnabled())
@@ -106,6 +108,8 @@
protected void tearDown() throws Exception {
super.tearDown();
+ clusterManager1.shutdown();
+ clusterManager2.shutdown();
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusterManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusterManager.java?view=diff&rev=521603&r1=521602&r2=521603
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusterManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusterManager.java Fri Mar 23 00:05:09 2007
@@ -23,9 +23,11 @@
public interface ClusterManager extends ParameterInclude {
- public void init(ConfigurationContext configurationContext) throws ClusteringFault;
+ public void init() throws ClusteringFault;
public ContextManager getContextManager ();
public ConfigurationManager getConfigurationManager ();
public void setContextManager (ContextManager contextManager);
public void setConfigurationManager (ConfigurationManager configurationManager);
+ public void shutdown () throws ClusteringFault;
+
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=521603&r1=521602&r2=521603
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Fri Mar 23 00:05:09 2007
@@ -95,7 +95,7 @@
configManager.setConfigurationContext(this);
}
if (shouldClusterBeInitiated(clusterManager)) {
- clusterManager.init(this);
+ clusterManager.init();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org