diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-18 12:01:31 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-18 12:01:31 +0000 |
| commit | ef7c2424929d86cd59c0197729901bee89d67221 (patch) | |
| tree | 86d8fcfb56db171d0c62d809079757b7e85d3ba6 /sandbox/thilina/geronimo_ACE/src/main/webapp/pages | |
| parent | 70aa266cc4504b9a813e74e7faa542ba0f40e692 (diff) | |
TUSCANY-2391: apply latest patch from Thilina for Tuscany SCA support in the Geronimo Admin Console
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@686733 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
4 files changed, 107 insertions, 36 deletions
diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.jsp index c264528092..92e347d013 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.jsp +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.jsp @@ -363,7 +363,7 @@ function init() { <tr>
<td>Composite namespace:</td>
<td><input type="text" name="compositeNamespace" size="50"/></td>
- <td>e.g. http://your/namespace</td>
+ <td>e.g. http://your/namespace</td>
</tr>
<tr>
<td>Composite name:</td>
diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html index 164ea2e6b4..512a952fd2 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html @@ -67,17 +67,18 @@ function getCompositesResponse(feed) { content = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
}
var components = '';
- var bs = content.indexOf('<span id="components">'); http://localhost:8080/console/portal//Tuscany ACE/__pm0x3GeronimoACE0x2GeronimoACE!353877598|0_view
- if (bs != -1) {
- var es = content.indexOf('</span>', bs);
- components = content.substring(bs, es + 7);
- } else {
- bs = content.indexOf('<span id="problem"');
- if (bs != -1) {
- var es = content.indexOf('</span>', bs);
- components = content.substring(bs, es + 7);
- }
- }
+ var bs = content.indexOf('<span id="components">');
+ http://localhost:8080/console/portal//Tuscany ACE/__pm0x3GeronimoACE0x2GeronimoACE!353877598|0_view
+ if (bs != -1) {
+ var es = content.indexOf('</span>', bs);
+ components = content.substring(bs, es + 7);
+ } else {
+ bs = content.indexOf('<span id="problem"');
+ if (bs != -1) {
+ var es = content.indexOf('</span>', bs);
+ components = content.substring(bs, es + 7);
+ }
+ }
composites += '<tr>'
composites += '<td><input name="composites" type="checkbox" value="' + id + '">';
@@ -104,7 +105,7 @@ function deleteComposite() { }
function deleteCompositeResponse() {
-
+
getComposites();
}
@@ -204,9 +205,9 @@ function suggestContributionURIs() { }
return array(uris);
}
- function echo(){
+function echo() {
- }
+}
function init() {
toolbar();
diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Standalone.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Standalone.jsp index 120d7583eb..feaf41d156 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Standalone.jsp +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Standalone.jsp @@ -1,25 +1,90 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="header.jsp" %>
<html>
- <head><title>Simple jsp page</title></head>
- <body>
- <form id="form1" name="form1" method="post" action="<portlet:actionURL/>">
- <table>
- <tr>
- <td>Contribution Location :</td>
- <td><input type="text" name="contributionLocation" size="100"/></td>
- </tr>
- <tr>
- <td>Name of the node :</td>
- <td><input type="text" name="nodeName" size="100"/></td>
- </tr>
- <tr>
- <td>Composite :</td>
- <td><input type="text" name="composite" size="100"/></td>
- </tr>
- </table>
- <input type="submit" name="addStandaloneNode" value="start"/>
- </form>
-
- </body>
+<head><title>Simple jsp page</title></head>
+<body>
+
+
+<form id="form1" name="form1" method="post" action="<portlet:actionURL/>">
+
+ <table>
+
+ <tr>
+ <td>Contribution Location :</td>
+ <td><input type="text" name="contributionLocation" size="100"/></td>
+ </tr>
+ <tr>
+ <td>Name of the node :</td>
+ <td><input type="text" name="nodeName" size="100"/></td>
+ </tr>
+ <tr>
+ <td>Composite :</td>
+ <td><input type="text" name="composite" size="100"/></td>
+ </tr>
+
+ <br><br>
+ </table>
+
+ <input type="submit" name="addStandaloneNode" value="start"/>
+
+</form>
+
+<form id="form2" name="form2" method="post" action="<portlet:actionURL/>">
+ <table width="100%">
+ <thead><b> Manage Nodes</b></thead>
+
+ <tbody>
+ <tr>
+ <th>Node</th>
+ <th>Contributions</th>
+ <th>Start Node</th>
+ <th>stop Node</th>
+ </tr>
+ <% ManageNodes mNodes = (ManageNodes) application.getAttribute("managenodes");
+ List<LocalNode> nodeSet = mNodes.getNodeSet();
+ Iterator<LocalNode> iterator = nodeSet.iterator();
+ if (iterator.hasNext() == false) { %>
+
+
+ <tr>
+ <td>
+
+ </td>
+ </tr>
+ <%
+ }
+ while (iterator.hasNext()) {
+ LocalNode temp = iterator.next();
+
+ %>
+ <tr>
+ <td>
+ <%=
+ temp.getName()
+ %>
+ </td>
+
+ <td>
+ <table>
+ <% Iterator<SCAContribution> contributionList = temp.getContributionList().iterator();
+ while (contributionList.hasNext()) { %>
+
+ <tr>
+ <%=contributionList.next().getLocation()%>
+ </tr>
+ <br>
+ <%
+ } %></table>
+ </td>
+ <td><input type="hidden" name="nodeName" value=<%=temp.getName()%>/></td>
+ <td><input type="submit" name="StartStandaloneNode" value="start"/></td>
+ <td><input type="submit" name="StopStandaloneNode" value="stop"/></td>
+ </tr>
+ <%
+ }
+ %>
+ </tbody>
+ </table>
+</form>
+</body>
</html>
\ No newline at end of file diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/header.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/header.jsp index b202ba1d57..b9fbcce8e9 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/header.jsp +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/header.jsp @@ -1,3 +1,8 @@ +<%@ page import="org.apache.tuscany.geronimoace.LocalNode" %> +<%@ page import="org.apache.tuscany.geronimoace.ManageNodes" %> +<%@ page import="org.apache.tuscany.sca.node.SCAContribution" %> +<%@ page import="java.util.Iterator" %> +<%@ page import="java.util.List" %> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file |