You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by az...@apache.org on 2007/04/19 07:50:13 UTC
svn commit: r530280 - in /webservices/axis2/trunk/java/modules:
clustering/src/org/apache/axis2/cluster/tribes/
clustering/src/org/apache/axis2/cluster/tribes/configuration/
kernel/src/org/apache/axis2/cluster/configuration/
kernel/src/org/apache/axis2...
Author: azeez
Date: Wed Apr 18 22:50:12 2007
New Revision: 530280
URL: http://svn.apache.org/viewvc?view=rev&rev=530280
Log:
1. Null check for module in AxisConfiguration
2. s/serviceGroupName/serviceName in clusteing implementation
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/ConfigurationEvent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.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=530280&r1=530279&r2=530280
==============================================================================
--- 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 Wed Apr 18 22:50:12 2007
@@ -175,7 +175,7 @@
configurationManager.notifyListeners(commandType, event);
break;
case CommandType.APPLY_POLICY:
- event.setServiceGroupName(command.getServiceGroupName());
+ event.setServiceName(command.getServiceName());
event.setPolicy(command.getPolicy());
configurationManager.notifyListeners(commandType, event);
break;
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=530280&r1=530279&r2=530280
==============================================================================
--- 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 Wed Apr 18 22:50:12 2007
@@ -21,7 +21,7 @@
public class ConfigurationCommand extends CommandMessage {
private String policy;
- private String serviceGroupName;
+ private String serviceName;
private String[] serviceGroupNames;
public ConfigurationCommand (int commandType) {
@@ -44,11 +44,11 @@
this.serviceGroupNames = serviceGroupNames;
}
- public String getServiceGroupName() {
- return serviceGroupName;
+ public String getServiceName() {
+ return serviceName;
}
- public void setServiceGroupName(String serviceGroupName) {
- this.serviceGroupName = serviceGroupName;
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
}
}
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=530280&r1=530279&r2=530280
==============================================================================
--- 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 Wed Apr 18 22:50:12 2007
@@ -53,7 +53,7 @@
public void applyPolicy(String serviceGroupName, String policy) throws ClusteringFault {
ConfigurationCommand command = new ConfigurationCommand(CommandType.APPLY_POLICY);
- command.setServiceGroupName(serviceGroupName);
+ command.setServiceName(serviceGroupName);
command.setPolicy(policy);
send(command);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationEvent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationEvent.java?view=diff&rev=530280&r1=530279&r2=530280
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationEvent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/cluster/configuration/ConfigurationEvent.java Wed Apr 18 22:50:12 2007
@@ -19,8 +19,8 @@
public class ConfigurationEvent {
private String[] serviceGroupNames;
- private String serviceGroupName;
private int configurationType;
+ private String serviceName;
private String policy;
public String[] getServiceGroupNames() {
@@ -31,12 +31,12 @@
this.serviceGroupNames = serviceGroupNames;
}
- public String getServiceGroupName() {
- return serviceGroupName;
+ public String getServiceName() {
+ return serviceName;
}
- public void setServiceGroupName(String serviceGroupName) {
- this.serviceGroupName = serviceGroupName;
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
}
public int getConfigurationType() {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=530280&r1=530279&r2=530280
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Wed Apr 18 22:50:12 2007
@@ -773,8 +773,12 @@
}
public boolean isEngaged(String moduleName) {
- boolean b = engagedModules.contains(moduleName);
- return b ? b : engagedModules.contains(getDefaultModule(moduleName).getName());
+ boolean isEngaged = engagedModules.contains(moduleName);
+ AxisModule defaultModule = getDefaultModule(moduleName);
+ if (!isEngaged && defaultModule != null) {
+ isEngaged = engagedModules.contains(defaultModule.getName());
+ }
+ return isEngaged;
}
public void setGlobalOutPhase(ArrayList outPhases) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org