Author: chris.laprun(a)jboss.com Date: 2007-02-21 15:03:17 -0500 (Wed, 21 Feb 2007) New Revision: 6367 Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml Log: Reverted http://fisheye.jboss.org/changelog/Portal/branches/JBoss_Portal_Branch_2_... Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java 2007-02-21 18:28:18 UTC (rev 6366) +++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java 2007-02-21 20:03:17 UTC (rev 6367) @@ -31,16 +31,20 @@ public class Node { - /** . */ private final NodeId id; - /** . */ - private final MBeanServer server; + private MBeanServer server; - public Node(String id, MBeanServer server) + private NodeManager nodeManager; + + public Node(String id, MBeanServer server, NodeManager nodeManager) { this.id = new NodeId(id); this.server = server; + this.nodeManager = nodeManager; + + // + nodeManager.nodeMap.put(this.id, this); } public NodeId getId() Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java 2007-02-21 18:28:18 UTC (rev 6366) +++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java 2007-02-21 20:03:17 UTC (rev 6367) @@ -40,7 +40,6 @@ /** . */ public static final NodeId PORTS_02 = new NodeId("ports-02"); - /** . */ private final String value; public NodeId(String value) @@ -63,12 +62,19 @@ { return true; } - if (o instanceof NodeId) + if (o == null || getClass() != o.getClass()) { - NodeId that = (NodeId)o; - return value.equals(that.value); + return false; } - return false; + + final NodeId nodeId = (NodeId)o; + + if (!value.equals(nodeId.value)) + { + return false; + } + + return true; } public int hashCode() Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java 2007-02-21 18:28:18 UTC (rev 6366) +++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java 2007-02-21 20:03:17 UTC (rev 6367) @@ -33,17 +33,16 @@ public class NodeManager { - /** The nodes. */ - private final Map nodeMap; + Map nodeMap; - public NodeManager(Node[] nodes) + public NodeManager() { - this.nodeMap = new HashMap(); - for (int i = 0;i < nodes.length;i++) - { - Node node = nodes[i]; - nodeMap.put(node.getId(), node); - } + nodeMap = new HashMap(); +// for (Iterator i = nodes.iterator(); i.hasNext();) +// { +// Node node = (Node)i.next(); +// nodeMap.put(node.getId(), node); +// } } public Collection getNodes() Modified: branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml 2007-02-21 18:28:18 UTC (rev 6366) +++ branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml 2007-02-21 20:03:17 UTC (rev 6367) @@ -88,6 +88,7 @@ <constructor> <parameter><value>default</value></parameter> <parameter><inject bean="MBeanServerFactory0" property="server"/></parameter> + <parameter><inject bean="NodeManager"/></parameter> </constructor> </bean> @@ -95,6 +96,7 @@ <constructor> <parameter><value>ports-01</value></parameter> <parameter><inject bean="MBeanServerFactory1" property="server"/></parameter> + <parameter><inject bean="NodeManager"/></parameter> </constructor> </bean> @@ -102,19 +104,11 @@ <constructor> <parameter><value>ports-02</value></parameter> <parameter><inject bean="MBeanServerFactory2" property="server"/></parameter> + <parameter><inject bean="NodeManager"/></parameter> </constructor> </bean> <bean name="NodeManager" class="org.jboss.portal.test.framework.server.NodeManager"> - <constructor> - <parameter> - <array class="[org.jboss.portal.test.framework.server.Node;"> - <inject bean="Node0"/> - <inject bean="Node1"/> - <inject bean="Node2"/> - </array> - </parameter> - </constructor> </bean> <bean name="Deployer" class="org.jboss.portal.test.framework.deployment.Deployer">