geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r884990 - in /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src: main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
Date Fri, 27 Nov 2009 20:30:07 GMT
Author: djencks
Date: Fri Nov 27 20:30:06 2009
New Revision: 884990

URL: http://svn.apache.org/viewvc?rev=884990&view=rev
Log:
GERONIMO-4892 patch from Ashish Jain to try to make gbean names (?) more unique.  I think
this is not an ideal solution but better than nothing

Modified:
    geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java
    geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java

Modified: geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java?rev=884990&r1=884989&r2=884990&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java
(original)
+++ geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/MasterConfigurationStore.java
Fri Nov 27 20:30:06 2009
@@ -26,8 +26,10 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Hashtable;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.geronimo.farm.config.ClusterInfo;
@@ -281,7 +283,11 @@
 
     protected AbstractName buildControllerName(Artifact configId,
             NodeInfo nodeInfo) {
-        return new AbstractName(configId, Collections.singletonMap("nodeName", nodeInfo.getName()));
+    	Map nameMap= new Hashtable();
+    	nameMap.put("nodeName", nodeInfo.getName());
+    	nameMap.put("appName", configId.getArtifactId());
+    	return new AbstractName(configId, nameMap);
+       // return new AbstractName(configId, Collections.singletonMap("nodeName", nodeInfo.getName()));
     }
 
     public static final String GBEAN_J2EE_TYPE = "ConfigurationStore";

Modified: geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java?rev=884990&r1=884989&r2=884990&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
(original)
+++ geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/MasterConfigurationStoreTest.java
Fri Nov 27 20:30:06 2009
@@ -25,8 +25,10 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Hashtable;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 
 import junit.framework.AssertionFailedError;
 
@@ -73,7 +75,11 @@
         storeClient = (ClusterConfigurationStoreClient) mock(ClusterConfigurationStoreClient.class);
         kernel.getAbstractNameFor(clusterInfo);
         configId = new Artifact("groupId", "artifactId", "2.0", "car");
-        clusterInfoName = new AbstractName(configId, Collections.singletonMap("name", "ClusterInfo"));
+        Map nameMap= new Hashtable();
+    	nameMap.put("name", "ClusterInfo");
+    	nameMap.put("appName", configId.getArtifactId());
+        clusterInfoName= new AbstractName(configId,nameMap);
+       // clusterInfoName = new AbstractName(configId, Collections.singletonMap("name", "ClusterInfo"));
         modify().returnValue(clusterInfoName);
         
         delegate = (ConfigurationStore) mock(ConfigurationStore.class);



Mime
View raw message