1 files changed, 13 insertions, 10 deletions

diff --git a/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java b/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java
index 4808434c2d..f7cb2d72cc 100644
--- a/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java
+++ b/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java
@@ -19,11 +19,6 @@
 

 package org.apache.tuscany.geronimoace;

 

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.apache.tuscany.sca.node.SCAContribution;

-import org.apache.tuscany.sca.node.SCANode2;

-import org.apache.tuscany.sca.node.SCANode2Factory;

-

 import javax.portlet.*;

 import java.io.IOException;

 

@@ -34,15 +29,20 @@ public class GeronimoACE extends GenericPortlet {
 

     public void init(PortletConfig config) throws PortletException {

         super.init(config);

+        config.getPortletContext().setAttribute("managenodes", new ManageNodes());

+

     }

 

-    public void manageStandaloneNode(String loc, String nodeName, String composite){

+    public void manageStandaloneNode(String loc, String nodeName, String composite) {

 

-        SCANode2Factory factory = org.apache.tuscany.sca.node.SCANode2Factory.newInstance();

-        

+        /*SCANode2Factory factory = org.apache.tuscany.sca.node.SCANode2Factory.newInstance();

         SCAContribution contribution = new SCAContribution(nodeName, "file:"+loc);

         SCANode2 node = factory.createSCANode(composite, new SCAContribution[] {contribution});

-        node.start();

+                        

+        node.start(); */

+        ManageNodes manager = (ManageNodes) this.getPortletContext().getAttribute("managenodes");

+        manager.serviceRequest(loc, nodeName, composite);

+        this.getPortletContext().setAttribute("managenodes", manager);

 

     }

 

@@ -57,6 +57,7 @@ public class GeronimoACE extends GenericPortlet {
         if (task != null) {

             if (task.equals("composites")) {       // if the request is for Composites,forwarding to Composites.html

                 viewUrl = "/pages/Composite.jsp";

+                System.out.println("sys:" + this.getPortletContext().getAttribute("test"));

             }

             if (task.equals("StandaloneNode")) {       // if the request is for Composites,forwarding to Composites.html

                 viewUrl = "/pages/Standalone.jsp";

@@ -66,12 +67,14 @@ public class GeronimoACE extends GenericPortlet {
             }

             if (task.equals("cloud")) {       // if the request is for Clouds,forwarding to Cloud.html

                 viewUrl = "/pages/Cloud.jsp";

+                this.getPortletContext().setAttribute("test", "hello");

+

             }

             if (task.equals("files")) {       // iif the request is for Files,forwarding to Files.html

                 viewUrl = "/pages/Files.jsp";

             }

         }

-        if (location != null){

+        if (location != null) {

             manageStandaloneNode(location, nodeName, composite);

         }