[jboss-cvs] JBossAS SVN: r76844 - in trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster: config and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2008-08-08 15:16:41 -0400 (Fri, 08 Aug 2008)
New Revision: 76844

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/MCMPHandlerConfiguration.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/ModClusterConfig.java
Log:
Renamed servicePerDomain to masterPerDomain.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java	2008-08-08 19:10:33 UTC (rev 76843)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/ModClusterService.java	2008-08-08 19:16:41 UTC (rev 76844)
@@ -103,7 +103,7 @@
    private final RpcHandler rpcHandler;
    private final JBossWebEventHandler eventHandlerDelegate;
    private final String domain;
-   private final boolean servicePerDomain;
+   private final boolean masterPerDomain;
    
    volatile int latestLoad;
    private volatile int statusCount = 0;
@@ -153,7 +153,7 @@
       this.loadManager = loadFactorProvider;
       this.eventHandlerDelegate = new DefaultJBossWebEventHandler(config, config, this.clusteredHandler, loadFactorProvider);
       this.domain = config.getDomain();
-      this.servicePerDomain = config.isServicePerDomain();
+      this.masterPerDomain = config.isMasterPerDomain();
       
       this.setElectionPolicy(electionPolicy);
       
@@ -204,7 +204,7 @@
       this.loadManager = loadManager;
       this.eventHandlerDelegate = new DefaultJBossWebEventHandler(nodeConfig, balancerConfig, clusteredHandler, loadManager);
       this.domain = nodeConfig.getDomain();
-      this.servicePerDomain = mcmpHandlerConfig.isServicePerDomain();
+      this.masterPerDomain = mcmpHandlerConfig.isMasterPerDomain();
       
       this.setElectionPolicy(electionPolicy);
       
@@ -416,7 +416,7 @@
    {
       String name = this.getServiceHAName();
       
-      return ((this.domain != null) && this.servicePerDomain) ? name + ":" + this.domain : name;
+      return ((this.domain != null) && this.masterPerDomain) ? name + ":" + this.domain : name;
    }
    
    /**

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/MCMPHandlerConfiguration.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/MCMPHandlerConfiguration.java	2008-08-08 19:10:33 UTC (rev 76843)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/MCMPHandlerConfiguration.java	2008-08-08 19:16:41 UTC (rev 76844)
@@ -46,5 +46,5 @@
    
    String getAdvertiseSecurityKey();   
    
-   boolean isServicePerDomain();
+   boolean isMasterPerDomain();
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/ModClusterConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/ModClusterConfig.java	2008-08-08 19:10:33 UTC (rev 76843)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/modcluster/config/ModClusterConfig.java	2008-08-08 19:16:41 UTC (rev 76844)
@@ -347,6 +347,6 @@
    public void setMaxAttempts(int maxAttempts) { this.maxAttempts = maxAttempts; }
 
    private boolean servicePerDomain = false;
-   public boolean isServicePerDomain() { return this.servicePerDomain; }
+   public boolean isMasterPerDomain() { return this.servicePerDomain; }
    public void setServicePerDomain(boolean servicePerDomain) { this.servicePerDomain = servicePerDomain; }
 }