Author: azeez
Date: Mon Apr 16 05:27:44 2007
New Revision: 529221
URL: http://svn.apache.org/viewvc?view=rev&rev=529221
Log:
Changing the method signature of ConfigurationManager#applyPolicy to take a
serialized policy string instead of a Policy object
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelListener.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/ConfigurationCommand.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/TribesConfigurationManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationManager.java
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelListener.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelListener.java?view=diff&rev=529221&r1=529220&r2=529221
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelListener.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/ChannelListener.java
Mon Apr 16 05:27:44 2007
@@ -176,7 +176,7 @@
break;
case CommandType.APPLY_POLICY:
event.setServiceGroupName(command.getServiceGroupName());
- event.setPolicyId(command.getPolicyId());
+ event.setPolicyId(command.getPolicy());
configurationManager.notifyListeners(commandType, event);
break;
case CommandType.PREPARE:
Modified:
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/clustering/src/org/apache/axis2/cluster/tribes/configuration/ConfigurationCommand.java?view=diff&rev=529221&r1=529220&r2=529221
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/ConfigurationCommand.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/ConfigurationCommand.java
Mon Apr 16 05:27:44 2007
@@ -20,7 +20,7 @@
public class ConfigurationCommand extends CommandMessage {
- private String policyId;
+ private String policy;
private String serviceGroupName;
private String[] serviceGroupNames;
@@ -28,12 +28,12 @@
super (commandType);
}
- public String getPolicyId() {
- return policyId;
+ public String getPolicy() {
+ return policy;
}
- public void setPolicyId(String policyId) {
- this.policyId = policyId;
+ public void setPolicy(String policy) {
+ this.policy = policy;
}
public String[] getServiceGroupNames() {
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/TribesConfigurationManager.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/TribesConfigurationManager.java?view=diff&rev=529221&r1=529220&r2=529221
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/TribesConfigurationManager.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/cluster/tribes/configuration/TribesConfigurationManager.java
Mon Apr 16 05:27:44 2007
@@ -28,7 +28,6 @@
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.Member;
-import org.apache.neethi.Policy;
import org.apache.axiom.om.OMElement;
import java.util.*;
@@ -52,10 +51,10 @@
listeners.add(listener);
}
- public void applyPolicy(String serviceGroupName, Policy policy) throws
ClusteringFault {
+ public void applyPolicy(String serviceGroupName, String policy) throws
ClusteringFault {
ConfigurationCommand command = new
ConfigurationCommand(CommandType.APPLY_POLICY);
command.setServiceGroupName(serviceGroupName);
- command.setPolicyId(policy.getId());
+ command.setPolicy(policy);
send(command);
}
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=529221&r1=529220&r2=529221
==============================================================================
---
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 Apr 16 05:27:44 2007
@@ -19,31 +19,68 @@
import org.apache.axis2.cluster.ClusteringFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.ParameterInclude;
-import org.apache.neethi.Policy;
public interface ConfigurationManager extends ParameterInclude {
- /*
- * Configuration management methods
- */
-
+ // ###################### Configuration management methods
##########################
+ /**
+ * Load a set of service groups
+ *
+ * @param serviceGroupNames The set of service groups to be loaded
+ * @throws ClusteringFault
+ */
void loadServiceGroups(String[] serviceGroupNames) throws ClusteringFault;
+ /**
+ * Unload a set of service groups
+ *
+ * @param serviceGroupNames The set of service groups to be unloaded
+ * @throws ClusteringFault
+ */
void unloadServiceGroups(String[] serviceGroupNames) throws
ClusteringFault;
- void applyPolicy(String serviceGroupName, Policy policy) throws
ClusteringFault;
+ /**
+ * Apply a policy to a service
+ *
+ * @param serviceName The name of the service to which this policy needs
to be applied
+ * @param policy The serialized policy to be applied to the service
+ * @throws ClusteringFault
+ */
+ void applyPolicy(String serviceName, String policy) throws ClusteringFault;
+ /**
+ * Reload the entire configuration of an Axis2 Node
+ *
+ * @throws ClusteringFault
+ */
void reloadConfiguration() throws ClusteringFault;
- /*
- * Transaction management methods
- */
+ // ###################### Transaction management methods
##########################
+
+ /**
+ * First phase of the 2-phase commit protocol.
+ * Notifies a node that it needs to prepare to switch to a new
configuration.
+ *
+ * @throws ClusteringFault
+ */
void prepare() throws ClusteringFault;
+ /**
+ * Rollback whatever was done
+ *
+ * @throws ClusteringFault
+ */
void rollback() throws ClusteringFault;
+ /**
+ * Second phase of the 2-phase commit protocol.
+ * Notifies a node that it needs to switch to a new configuration.
+ *
+ * @throws ClusteringFault
+ */
void commit() throws ClusteringFault;
+ // ######################## General management methods
############################
/**
* To notify other nodes that an Exception occurred, during the processing
* of a [EMAIL PROTECTED] ConfigurationEvent}
@@ -57,5 +94,10 @@
*/
void addConfigurationManagerListener(ConfigurationManagerListener
listener);
+ /**
+ * Set the configuration context
+ *
+ * @param configurationContext
+ */
void setConfigurationContext(ConfigurationContext configurationContext);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
