Author: azeez
Date: Wed May 23 01:30:21 2007
New Revision: 540882
URL: http://svn.apache.org/viewvc?view=rev&rev=540882
Log:
1. Set a custom domain for this node
2. Some output messages for debugging - will be removed shortly
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/PropertyUpdater.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateServiceContextCommand.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/PropertyUpdater.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/PropertyUpdater.java?view=diff&rev=540882&r1=540881&r2=540882
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/PropertyUpdater.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/PropertyUpdater.java
Wed May 23 01:30:21 2007
@@ -31,6 +31,7 @@
private Map properties;
public void updateProperties(AbstractContext abstractContext) {
+ System.err.println("----- updating props in " + abstractContext);
for (Iterator iter = properties.keySet().iterator(); iter.hasNext();) {
String key = (String) iter.next();
PropertyDifference propDiff =
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateServiceContextCommand.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateServiceContextCommand.java?view=diff&rev=540882&r1=540881&r2=540882
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateServiceContextCommand.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/CreateServiceContextCommand.java
Wed May 23 01:30:21 2007
@@ -59,6 +59,8 @@
configurationContext.
registerServiceGroupContextintoSoapSessionTable(sgCtx);
}
+ //TODO: Handle transport session properties
+// configurationContext.s
}
try {
sgCtx.getServiceContext(axisService, false);
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java?view=diff&rev=540882&r1=540881&r2=540882
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceContextCommand.java
Wed May 23 01:30:21 2007
@@ -19,6 +19,7 @@
import org.apache.axis2.clustering.context.PropertyUpdater;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.PropertyDifference;
+import org.apache.axis2.context.ServiceGroupContext;
import java.util.HashMap;
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java?view=diff&rev=540882&r1=540881&r2=540882
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/context/commands/UpdateServiceGroupContextCommand.java
Wed May 23 01:30:21 2007
@@ -34,6 +34,8 @@
public void execute(ConfigurationContext configurationContext) throws
ClusteringFault {
ServiceGroupContext sgCtx =
configurationContext.getServiceGroupContext(serviceGroupContextId);
+ System.err.println("%%%%% serviceGroupContextId=" +
serviceGroupContextId);
+ System.err.println("####### sgCtx=" + sgCtx);
propertyUpdater.updateProperties(sgCtx);
}
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java?view=diff&rev=540882&r1=540881&r2=540882
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
Wed May 23 01:30:21 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.clustering.ClusterManager;
import org.apache.axis2.clustering.ClusteringFault;
+import org.apache.axis2.clustering.ClusteringConstants;
import org.apache.axis2.clustering.configuration.ConfigurationManager;
import org.apache.axis2.clustering.configuration.DefaultConfigurationManager;
import org.apache.axis2.clustering.context.ContextManager;
@@ -32,6 +33,7 @@
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.group.interceptors.DomainFilterInterceptor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -78,6 +80,21 @@
try {
ManagedChannel channel = new GroupChannel();
+
+ // Set the domain for this Node
+ Parameter domainParam = getParameter(ClusteringConstants.DOMAIN);
+ byte[] domain;
+ if (domainParam != null) {
+ domain = ((String)domainParam.getValue()).getBytes();
+ channel.getMembershipService().setDomain(domain);
+ } else {
+ domain = "apache.axis2.domain".getBytes();
+ channel.getMembershipService().setDomain(domain);
+ }
+ DomainFilterInterceptor dfi = new DomainFilterInterceptor();
+ dfi.setDomain(domain);
+ channel.addInterceptor(dfi);
+
this.channel = channel;
channel.addChannelListener(listener);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
