Modified: webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ConfigurationManagerTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ConfigurationManagerTest.java?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ConfigurationManagerTest.java (original) +++ webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ConfigurationManagerTest.java Mon May 21 04:54:18 2007 @@ -20,10 +20,10 @@ import org.apache.axis2.cluster.tribes.TribesClusterManager; public class ConfigurationManagerTest extends - org.apache.axis2.clustering.configuration.ConfigurationManagerTestCase { + org.apache.axis2.clustering.configuration.ConfigurationManagerTestCase { - protected ClusterManager getClusterManager() { - return new TribesClusterManager (); - } + protected ClusterManager getClusterManager() { + return new TribesClusterManager(); + } }
Modified: webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ManageContextTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ManageContextTest.java?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ManageContextTest.java (original) +++ webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/ManageContextTest.java Mon May 21 04:54:18 2007 @@ -22,8 +22,8 @@ public class ManageContextTest extends ManageContextTestCase { - protected ClusterManager getClusterManager() { - return new TribesClusterManager(); - } + protected ClusterManager getClusterManager() { + return new TribesClusterManager(); + } } Modified: webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/UpdateStateTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/UpdateStateTest.java?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/UpdateStateTest.java (original) +++ webservices/axis2/trunk/java/modules/clustering/test/org/apache/axis2/clustering/tribes/UpdateStateTest.java Mon May 21 04:54:18 2007 @@ -22,8 +22,8 @@ public class UpdateStateTest extends UpdateStateTestCase { - protected ClusterManager getClusterManager() { - return new TribesClusterManager(); - } + protected ClusterManager getClusterManager() { + return new TribesClusterManager(); + } } Modified: webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original) +++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Mon May 21 04:54:18 2007 @@ -254,11 +254,11 @@ <!-- <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager"> <parameter name="param1">value1</parameter> - <configurationManager class="org.apache.axis2.cluster.tribes.configuration.TribesConfigurationManager"> + <configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager"> <listeners> </listeners> </configurationManager> - <contextManager class="org.apache.axis2.cluster.tribes.context.TribesContextManager"> + <contextManager class="org.apache.axis2.cluster.context.TribesContextManager"> <listeners> </listeners> </contextManager> Copied: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusteringCommand.java (from r539747, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/CommandMessage.java) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusteringCommand.java?view=diff&rev=540126&p1=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/CommandMessage.java&r1=539747&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusteringCommand.java&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/CommandMessage.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/ClusteringCommand.java Mon May 21 04:54:18 2007 @@ -18,22 +18,7 @@ import java.io.Serializable; -public abstract class CommandMessage implements Serializable { +public abstract class ClusteringCommand implements Serializable { - protected int commandType; - - public int getCommandType() { - return commandType; - } - - public void setCommandType(int commandType) { - this.commandType = commandType; - } - - protected CommandMessage() { - } - - public CommandMessage (int commandType) { - this.commandType = commandType; - } + public abstract int getCommandType(); } Added: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/MessageSender.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/MessageSender.java?view=auto&rev=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/MessageSender.java (added) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/MessageSender.java Mon May 21 04:54:18 2007 @@ -0,0 +1,28 @@ +/* + * Copyright 2004,2005 The Apache Software Foundation. + * + * Licensed 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.cluster; + +/** + * + */ +public interface MessageSender { + + public void sendToGroup(ClusteringCommand msg) throws ClusteringFault; + + public void sendToSelf(ClusteringCommand msg) throws ClusteringFault; + + public void sendToGroup(Throwable throwable) throws ClusteringFault; +} Copied: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationClusteringCommand.java (from r539747, webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/ConfigurationCommand.java) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationClusteringCommand.java?view=diff&rev=540126&p1=webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/ConfigurationCommand.java&r1=539747&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationClusteringCommand.java&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/ConfigurationCommand.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationClusteringCommand.java Mon May 21 04:54:18 2007 @@ -14,41 +14,57 @@ * limitations under the License. */ -package org.apache.axis2.cluster.tribes.configuration; +package org.apache.axis2.cluster.configuration; -import org.apache.axis2.cluster.CommandMessage; +import org.apache.axis2.cluster.ClusteringCommand; +import org.apache.axis2.context.ConfigurationContext; -public class ConfigurationCommand extends CommandMessage { - - private String policy; - private String serviceName; - private String[] serviceGroupNames; - - public ConfigurationCommand (int commandType) { - super (commandType); - } - - public String getPolicy() { - return policy; - } - - public void setPolicy(String policy) { - this.policy = policy; - } - - public String[] getServiceGroupNames() { - return serviceGroupNames; - } - - public void setServiceGroupNames(String[] serviceGroupNames) { - this.serviceGroupNames = serviceGroupNames; - } - - public String getServiceName() { - return serviceName; - } - - public void setServiceName(String serviceName) { - this.serviceName = serviceName; - } +/** + * This class represents the 2-phase commit protocol, where an event is processed, + * the system is prepared to switch to a new configuration based on the processed event, + * and finally commits the new configuration (i.e. the system switches to the new configuration). + * As can be seen, this is a 3-step process. + */ +public abstract class ConfigurationClusteringCommand extends ClusteringCommand { + + public static final int RELOAD_CONFIGURATION = 0; + public static final int LOAD_SERVICE_GROUPS = 1; + public static final int UNLOAD_SERVICE_GROUPS = 2; + public static final int APPLY_SERVICE_POLICY = 3; + public static final int PREPARE = 4; + public static final int COMMIT = 5; + public static final int EXCEPTION = 6; + public static final int ROLLBACK = 7; + + /** + * Process the <code>event</event>. The implementer of this interface will + * need to cache the outcome of this processing. + * + * @param configContext + * @throws Exception + */ + public abstract void process(ConfigurationContext configContext) throws Exception; + + /** + * Prepare to switch to the new configuration + * + * @param configContext + */ + public abstract void prepare(ConfigurationContext configContext); + + /** + * Commit the new configuration. i.e. switch the system to the new configuration + * + * @param configContext + * @throws Exception + */ + public abstract void commit(ConfigurationContext configContext) throws Exception; + + /** + * Rollback any changes carried out + * + * @param configContext + * @throws Exception + */ + public abstract void rollback(ConfigurationContext configContext) throws Exception; } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManager.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManager.java?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManager.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManager.java Mon May 21 04:54:18 2007 @@ -83,7 +83,7 @@ // ######################## General management methods ############################ /** * To notify other nodes that an Exception occurred, during the processing - * of a [EMAIL PROTECTED] ConfigurationEvent} + * of a [EMAIL PROTECTED] ConfigurationClusteringCommand} * * @param throwable The throwable which has to be propogated to other nodes */ Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManagerListener.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManagerListener.java?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManagerListener.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManagerListener.java Mon May 21 04:54:18 2007 @@ -20,19 +20,19 @@ public interface ConfigurationManagerListener { - void serviceGroupsLoaded(ConfigurationEvent event); + void serviceGroupsLoaded(ConfigurationClusteringCommand command); - void serviceGroupsUnloaded(ConfigurationEvent event); + void serviceGroupsUnloaded(ConfigurationClusteringCommand command); - void policyApplied(ConfigurationEvent event); + void policyApplied(ConfigurationClusteringCommand command); - void configurationReloaded(ConfigurationEvent event); + void configurationReloaded(ConfigurationClusteringCommand command); - void prepareCalled(ConfigurationEvent event); + void prepareCalled(); - void rollbackCalled(ConfigurationEvent event); + void rollbackCalled(); - void commitCalled(ConfigurationEvent event); + void commitCalled(); void handleException(Throwable throwable); Copied: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextClusteringCommand.java (from r539747, webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextCommandMessage.java) URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextClusteringCommand.java?view=diff&rev=540126&p1=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextCommandMessage.java&r1=539747&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextClusteringCommand.java&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextCommandMessage.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextClusteringCommand.java Mon May 21 04:54:18 2007 @@ -16,25 +16,21 @@ package org.apache.axis2.cluster.context; +import org.apache.axis2.cluster.ClusteringCommand; import org.apache.axis2.cluster.ClusteringFault; -import org.apache.axis2.cluster.CommandMessage; import org.apache.axis2.context.ConfigurationContext; -public abstract class ContextCommandMessage extends CommandMessage { +public abstract class ContextClusteringCommand extends ClusteringCommand { - public static final int CREATE_SERVICE_GROUP_CONTEXT_MSG = 0; - public static final int CREATE_SERVICE_CONTEXT_MSG = 1; - public static final int CREATE_SESSION_CONTEXT_MSG = 2; - public static final int UPDATE_SERVICE_GROUP_CONTEXT_MSG = 3; - public static final int UPDATE_SERVICE_CONTEXT_MSG = 4; - public static final int UPDATE_CONFIGURATION_CONTEXT_MSG = 5; - public static final int DELETE_SERVICE_GROUP_CONTEXT_MSG = 6; - public static final int DELETE_SERVICE_CONTEXT_MSG = 7; - - protected ContextCommandMessage() { - } + public static final int CREATE_SERVICE_GROUP_CONTEXT = 0; + public static final int CREATE_SERVICE_CONTEXT = 1; + public static final int CREATE_SESSION_CONTEXT = 2; + public static final int UPDATE_SERVICE_GROUP_CONTEXT = 3; + public static final int UPDATE_SERVICE_CONTEXT = 4; + public static final int UPDATE_CONFIGURATION_CONTEXT = 5; + public static final int DELETE_SERVICE_GROUP_CONTEXT = 6; + public static final int DELETE_SERVICE_CONTEXT = 7; public abstract void execute(ConfigurationContext configContext) throws ClusteringFault; - public abstract int getMessageType(); } Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextManagerListener.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextManagerListener.java?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextManagerListener.java (original) +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/context/ContextManagerListener.java Mon May 21 04:54:18 2007 @@ -21,11 +21,11 @@ public interface ContextManagerListener { - public void contextAdded(ContextCommandMessage message) throws ClusteringFault; + public void contextAdded(ContextClusteringCommand message) throws ClusteringFault; - public void contextRemoved(ContextCommandMessage message) throws ClusteringFault; + public void contextRemoved(ContextClusteringCommand message) throws ClusteringFault; - public void contextUpdated(ContextCommandMessage message) throws ClusteringFault; + public void contextUpdated(ContextClusteringCommand message) throws ClusteringFault; public void setConfigurationContext(ConfigurationContext configurationContext); } Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml (original) +++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml Mon May 21 04:54:18 2007 @@ -210,11 +210,11 @@ <!-- <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager"> <parameter name="param1">value1</parameter> - <configurationManager class="org.apache.axis2.cluster.tribes.configuration.TribesConfigurationManager"> + <configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager"> <listeners> </listeners> </configurationManager> - <contextManager class="org.apache.axis2.cluster.tribes.context.TribesContextManager"> + <contextManager class="org.apache.axis2.cluster.context.TribesContextManager"> <listeners> </listeners> </contextManager> Modified: webservices/axis2/trunk/java/modules/samples/jms/client_repository/conf/axis2.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jms/client_repository/conf/axis2.xml?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/samples/jms/client_repository/conf/axis2.xml (original) +++ webservices/axis2/trunk/java/modules/samples/jms/client_repository/conf/axis2.xml Mon May 21 04:54:18 2007 @@ -268,11 +268,11 @@ <!-- <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager"> <parameter name="param1" locked="false">value1</parameter> - <configurationManager class="org.apache.axis2.cluster.tribes.configuration.TribesConfigurationManager"> + <configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager"> <listeners> </listeners> </configurationManager> - <contextManager class="org.apache.axis2.cluster.tribes.context.TribesContextManager"> + <contextManager class="org.apache.axis2.cluster.context.TribesContextManager"> <listeners> </listeners> </contextManager> Modified: webservices/axis2/trunk/java/modules/samples/jms/server_repository/conf/axis2.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jms/server_repository/conf/axis2.xml?view=diff&rev=540126&r1=540125&r2=540126 ============================================================================== --- webservices/axis2/trunk/java/modules/samples/jms/server_repository/conf/axis2.xml (original) +++ webservices/axis2/trunk/java/modules/samples/jms/server_repository/conf/axis2.xml Mon May 21 04:54:18 2007 @@ -268,11 +268,11 @@ <!-- <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager"> <parameter name="param1" locked="false">value1</parameter> - <configurationManager class="org.apache.axis2.cluster.tribes.configuration.TribesConfigurationManager"> + <configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager"> <listeners> </listeners> </configurationManager> - <contextManager class="org.apache.axis2.cluster.tribes.context.TribesContextManager"> + <contextManager class="org.apache.axis2.cluster.context.TribesContextManager"> <listeners> </listeners> </contextManager> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
