Index: ContainerChildFactory.java
===================================================================
RCS file: /cvs/serverplugins/sun/appsrvbridge/src/org/netbeans/modules/j2ee/sun/util/ContainerChildFactory.java,v
retrieving revision 1.4
diff -r1.4 ContainerChildFactory.java
20a21,22
> import java.util.ArrayList;
> import java.util.Arrays;
21a24
> import java.util.List;
158c161
<         Node ext = getExtensionNode();
---
>         List extNodes = getExtensionNodes();
160,161c163,164
<         if (ext==null)
<         return new Node[] { 
---
>         
>         Node[] nodes = new Node[] { 
166,169d168
<         else
<         return new Node[] { 
<             new AppserverMgmtContainerNode(controller, NodeTypes.APPLICATIONS),
<             resourceHolder,
171,173c170,176
<             new JVMNode(controller), ext
<            // new JBIAppserverMgmtContainerNode(controller, "JBI")
<         };
---
>         if (extNodes.size() == 0) {
>             return nodes;
>         } else {
>             List nodeList = new ArrayList(Arrays.asList(nodes));
>             nodeList.addAll(extNodes);
>             return (Node[]) nodeList.toArray(new Node[nodeList.size()]);
>         }
176c179
<    Node getExtensionNode() {
---
>    List getExtensionNodes() {
177a181,182
>        List nodes = new ArrayList();
> 
180,186c185,190
<            if (cc==null){
<                return null;
<            }
<            Node ce = cc.getAppserverExtensionNode(controller);
<            if (ce != null){
<                return ce;
<            }
---
>            if (cc!= null) {
>                 Node ce = cc.getAppserverExtensionNode(controller);
>                 if (ce != null){
>                     nodes.add(ce);
>                 }
>             }
188c192
<        return null;
---
>        return nodes;