[riftsaw-commits] riftsaw SVN: r949 - in trunk: runtime/clustering/src/main/resources/META-INF and 1 other directories.

[riftsaw-commits at lists.jboss.org]

Author: jeff.yuchang
Date: 2010-09-17 03:32:10 -0400 (Fri, 17 Sep 2010)
New Revision: 949

Modified:
   trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
   trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
   trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java
   trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java
Log:
* RIFTSAW-197, Set the Scheduler's node name from clustering node name.
  (using the HAPartition's node name property to inject it into the ServerConfig)


Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
===================================================================
--- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml	2010-09-15 05:27:10 UTC (rev 948)
+++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml	2010-09-17 07:32:10 UTC (rev 949)
@@ -37,8 +37,6 @@
         class="org.jboss.soa.bpel.runtime.integration.ServerConfigImpl">
     <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
     <property name="webServiceHost">${jboss.bind.address}</property>
-    <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
-    <property name="serverName">${jboss.server.name}</property>
   </bean>
 
 

Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml	2010-09-15 05:27:10 UTC (rev 948)
+++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml	2010-09-17 07:32:10 UTC (rev 949)
@@ -37,8 +37,7 @@
         class="org.jboss.soa.bpel.runtime.integration.ServerConfigImpl">
     <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
     <property name="webServiceHost">${jboss.bind.address}</property>
-    <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
-    <property name="serverName">${jboss.server.name}</property>
+    <property name="clusterNodeName"><inject bean="HAPartition" property="nodeName" /></property>
   </bean>
 
   

Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java	2010-09-15 05:27:10 UTC (rev 948)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfig.java	2010-09-17 07:32:10 UTC (rev 949)
@@ -48,10 +48,6 @@
 
   int getWebServiceSecurePort();
 
-  public String getPartitionName();
-
-  public String getServerName();
-
   public String getClusterNodeName();
   
 }
\ No newline at end of file

Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java	2010-09-15 05:27:10 UTC (rev 948)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/integration/ServerConfigImpl.java	2010-09-17 07:32:10 UTC (rev 949)
@@ -53,9 +53,9 @@
   // The webservice port that will be used when updating the wsdl
   private int webServiceSecurePort;
   
-  private String partitionName="DefaultPartition";
-  private String serverName=null;
   private static String nonClusteredServerName=new GUID().toString();
+  
+  private String clusterNodeName;
 
   public ServerConfigImpl()
   {
@@ -231,32 +231,15 @@
       return -1;
     }
   }
-
-  public String getPartitionName() {
-	  return(this.partitionName);
-  }
   
-  public void setPartitionName(String name) {
-	  this.partitionName = name;
+  public String getClusterNodeName() {
+	 if (this.clusterNodeName == null || "".equals(this.clusterNodeName.trim())) {
+		 return nonClusteredServerName;
+	 }
+	 return this.clusterNodeName;
   }
-
-  public String getServerName() {
-	  return(this.serverName);
-  }
   
-  public void setServerName(String name) {
-	  this.serverName = name;
+  public void setClusterNodeName(String clusterNodeName) {
+	  this.clusterNodeName = clusterNodeName;
   }
-  
-  public String getClusterNodeName() {
-	  String ret=this.serverName;
-	  
-	  // If server name not explicitly provided, then use a stable randomly generated name
-	  if (ret == null) {
-		  ret = ServerConfigImpl.nonClusteredServerName;
-	  }
-	  ret += ":"+this.partitionName;
-	  
-	  return(ret);
-  }
 }