Author: julien(a)jboss.com
Date: 2007-02-14 09:59:51 -0500 (Wed, 14 Feb 2007)
New Revision: 6273
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:
better impl of NodeManager / Node wiring
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-14
14:40:50 UTC (rev 6272)
+++
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/Node.java 2007-02-14
14:59:51 UTC (rev 6273)
@@ -31,20 +31,16 @@
public class Node
{
+ /** . */
private final NodeId id;
- private MBeanServer server;
+ /** . */
+ private final MBeanServer server;
- private NodeManager nodeManager;
-
- public Node(String id, MBeanServer server, NodeManager nodeManager)
+ public Node(String id, MBeanServer server)
{
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-14
14:40:50 UTC (rev 6272)
+++
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeId.java 2007-02-14
14:59:51 UTC (rev 6273)
@@ -40,6 +40,7 @@
/** . */
public static final NodeId PORTS_02 = new NodeId("ports-02");
+ /** . */
private final String value;
public NodeId(String value)
@@ -62,19 +63,12 @@
{
return true;
}
- if (o == null || getClass() != o.getClass())
+ if (o instanceof NodeId)
{
- return false;
+ NodeId that = (NodeId)o;
+ return value.equals(that.value);
}
-
- final NodeId nodeId = (NodeId)o;
-
- if (!value.equals(nodeId.value))
- {
- return false;
- }
-
- return true;
+ return false;
}
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-14
14:40:50 UTC (rev 6272)
+++
branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java 2007-02-14
14:59:51 UTC (rev 6273)
@@ -33,16 +33,17 @@
public class NodeManager
{
- Map nodeMap;
+ /** The nodes. */
+ private final Map nodeMap;
- public NodeManager()
+ public NodeManager(Node[] nodes)
{
- nodeMap = new HashMap();
-// for (Iterator i = nodes.iterator(); i.hasNext();)
-// {
-// Node node = (Node)i.next();
-// nodeMap.put(node.getId(), node);
-// }
+ this.nodeMap = new HashMap();
+ for (int i = 0;i < nodes.length;i++)
+ {
+ Node node = nodes[i];
+ 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-14
14:40:50 UTC (rev 6272)
+++
branches/JBoss_Portal_Branch_2_4/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml 2007-02-14
14:59:51 UTC (rev 6273)
@@ -88,7 +88,6 @@
<constructor>
<parameter><value>default</value></parameter>
<parameter><inject bean="MBeanServerFactory0"
property="server"/></parameter>
- <parameter><inject bean="NodeManager"/></parameter>
</constructor>
</bean>
@@ -96,7 +95,6 @@
<constructor>
<parameter><value>ports-01</value></parameter>
<parameter><inject bean="MBeanServerFactory1"
property="server"/></parameter>
- <parameter><inject bean="NodeManager"/></parameter>
</constructor>
</bean>
@@ -104,11 +102,19 @@
<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">
Show replies by date