TUSCANY-2391: Apply 'managing_nodes' patch from Thilina Buddhika for Tuscany SCA support in the Geronimo Admin Console

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@686458 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 142 insertions, 10 deletions

diff --git a/sandbox/thilina/geronimo_ACE/pom.xml b/sandbox/thilina/geronimo_ACE/pom.xml
index 2ee343dffd..51c99a93b0 100644
--- a/sandbox/thilina/geronimo_ACE/pom.xml
+++ b/sandbox/thilina/geronimo_ACE/pom.xml
@@ -102,6 +102,16 @@
     </dependencies>

     <build>

         <defaultGoal>install</defaultGoal>

+        <plugins>

+                    <plugin>

+                        <artifactId>maven-compiler-plugin</artifactId>

+                        <inherited>true</inherited>

+                        <configuration>

+                            <source>1.5</source>

+                            <target>1.5</target>

+                        </configuration>

+                    </plugin>

+        </plugins>

         <directory>${basedir}/target</directory>

         <finalName>${artifactId}-${version}</finalName>

         <resources>

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);

         }

 

diff --git a/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/LocalNode.java b/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/LocalNode.java
new file mode 100644
index 0000000000..85d54dd03e
--- /dev/null
+++ b/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/LocalNode.java
@@ -0,0 +1,49 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package org.apache.tuscany.geronimoace;

+

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

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

+

+import java.util.ArrayList;

+

+

+public class LocalNode {

+

+    private SCANode2 node;

+    private ArrayList<SCAContribution> contributionList = new ArrayList<SCAContribution>();

+

+    public LocalNode(SCANode2 node) {

+        this.node = node;

+    }

+

+    public void addContribution(SCAContribution contr) {

+        contributionList.add(contr);

+    }

+

+    public ArrayList<SCAContribution> getContributionList() {

+        return contributionList;

+    }

+

+

+    public SCANode2 getNode() {

+        return node;

+    }

+}

diff --git a/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/ManageNodes.java b/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/ManageNodes.java
new file mode 100644
index 0000000000..c6a726ddd2
--- /dev/null
+++ b/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/ManageNodes.java
@@ -0,0 +1,68 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+

+package org.apache.tuscany.geronimoace;

+

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

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

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

+

+import java.util.ArrayList;

+import java.util.Hashtable;

+import java.util.Map;

+

+

+public class ManageNodes {

+

+    Map<String, LocalNode> nodeList = new Hashtable<String, LocalNode>();

+

+    private SCANode2Factory factory;

+

+    public ManageNodes() {

+        factory = SCANode2Factory.newInstance();

+    }

+

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

+        if (nodeList.containsKey(nodeName)) {

+            LocalNode topNode = nodeList.get(nodeName);

+            SCANode2 tempNode = topNode.getNode();

+            tempNode.stop();

+

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

+            ArrayList<SCAContribution> contributionList = topNode.getContributionList();

+            contributionList.add(contribution);

+            SCAContribution[] tempArray = new SCAContribution[contributionList.size()];

+            for (int i = 0; i < contributionList.size(); i++) {

+                tempArray[i] = contributionList.get(i);

+            }

+            SCANode2 node = factory.createSCANode(composite, tempArray);

+            nodeList.remove(nodeName);

+            nodeList.put(nodeName, new LocalNode(node));

+            node.start();

+

+        } else {

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

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

+            nodeList.put(nodeName, new LocalNode(node));

+            node.start();

+        }

+    }

+

+

+}

diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml
index bfb6edd2c6..f8767a7327 100644
--- a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -1,3 +1,4 @@
+

 <!--

   ~ Licensed to the Apache Software Foundation (ASF) under one

   ~ or more contributor license agreements.  See the NOTICE file

@@ -49,3 +50,4 @@
         </reference>

     </gbean>

 </web-app>

+