From 8cba37863047825ce071916a07b3599fb68b85dd Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 16 Jul 2008 13:01:57 +0000 Subject: TUSCANY-2391: commit latest patch from Thilina git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@677274 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/geronimoace/GeronimoACE.java | 157 ++++---- .../src/main/webapp/WEB-INF/geronimo-web.xml | 120 +++---- .../src/main/webapp/WEB-INF/portlet.xml | 78 ++-- .../geronimo_ACE/src/main/webapp/WEB-INF/web.xml | 63 ++-- .../geronimo_ACE/src/main/webapp/pages/Cloud.html | 400 +++++++++++++++++++++ .../src/main/webapp/pages/Composite.html | 286 +++++++++++++++ .../geronimo_ACE/src/main/webapp/pages/Files.html | 129 +++++++ .../geronimo_ACE/src/main/webapp/pages/Home.jsp | 188 +++++----- .../src/main/webapp/pages/ListDomains.jsp | 62 ---- .../src/main/webapp/pages/ManageDomain.jsp | 75 ---- .../src/main/webapp/pages/Workspace.html | 186 ++++++++++ .../geronimo_ACE/src/main/webapp/pages/header.jsp | 42 +-- .../geronimo_ACE/src/main/webapp/pages/manager.css | 158 ++++++++ .../org/apache/tuscany/geronimoace/AppTest.java | 20 +- 14 files changed, 1479 insertions(+), 485 deletions(-) create mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.html create mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html create mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Files.html delete mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ListDomains.jsp delete mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ManageDomain.jsp create mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Workspace.html create mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/manager.css (limited to 'sandbox/thilina/geronimo_ACE/src') 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 f55776fc0a..3eb5b82ed3 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 @@ -1,79 +1,78 @@ -/* - * 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. - */ - -/* - * 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 javax.portlet.*; -import java.io.IOException; - -public class GeronimoACE extends GenericPortlet { - private String viewUrl = "/pages/Home.jsp"; - - - public void init(PortletConfig config) throws PortletException { - super.init(config); - // viewUrl = config.getInitParameter("view_url"); - } - - public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException { - String task = request.getParameter("task"); - String domain = request.getParameter("domainName"); - if (task != null) { - if (task.equals("list")) { - viewUrl = "/pages/ListDomains.jsp"; - } - } - if (domain != null) { - request.setAttribute("domain", domain); - viewUrl = "/pages/ManageDomain.jsp"; - } - response.setPortletMode(PortletMode.VIEW); - } - - public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException { - // Set the response to read HTML - response.setContentType("text/html;charset=UTF-8"); - - PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(viewUrl); - dispatcher.include(request, response); - - - } - - -} +/* + * 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 javax.portlet.*; +import java.io.IOException; + +public class GeronimoACE extends GenericPortlet { + private String viewUrl = "/pages/Home.jsp"; // viewUrl is set to the home page by default + boolean isHome = true; // used for navigating back to the home page. + + + public void init(PortletConfig config) throws PortletException { + super.init(config); + } + + public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException { + isHome = true; + String task = request.getParameter("task"); // getting request parameters task and domain name + String domain = request.getParameter("domainName"); + if (task != null) { + if (task.equals("composites")) { // if the request is for Composites,forwarding to Composites.html + viewUrl = "/pages/Composite.html"; + } + if (task.equals("workspace")) { // if the request is for Contributions,forwarding to workspace.html + viewUrl = "/pages/Workspace.html"; + } + if (task.equals("cloud")) { // if the request is for Clouds,forwarding to Cloud.html + viewUrl = "/pages/Cloud.html"; + } + if (task.equals("files")) { // iif the request is for Files,forwarding to Files.html + viewUrl = "/pages/Files.html"; + } + } + + response.setPortletMode(PortletMode.VIEW); // by changing portlet mode, doview methos is called again. + + + } + + public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException { + // Set the response to read HTML + response.setContentType("text/html;charset=UTF-8"); + + if (isHome) { + // dispatching to the appropriate page + PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher(viewUrl); + dispatcher.include(request, response); + isHome = false; + } else { + // dispatching to the home page. + PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/pages/Home.jsp"); + dispatcher.include(request, response); + isHome = true; + } + } + +} + + + 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 cfd05c1866..376fe17d75 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,70 +1,50 @@ - - - - - - - - - - org.apache.tuscany.geronimoace - geronimo-ace - 1.0-SNAPSHOT - war - - - - - org.apache.geronimo.plugins - pluto-support - - - - - - /GeronimoACE - - - - Tuscany ACE - /GeronimoACE - [GeronimoACE] - - PlutoPortalServices - - - + + + + + + + org.apache.tuscany.geronimoace + geronimo-ace + 1.0-SNAPSHOT + war + + + + + org.apache.geronimo.plugins + pluto-support + + + + + + /GeronimoACE + + + + Tuscany ACE + /GeronimoACE + [GeronimoACE] + + PlutoPortalServices + + + diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml index 7989f30ed3..e0456f05fc 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml @@ -1,40 +1,40 @@ - - - - - GeronimoACE - GeronimoACE - Geronimo Admin Console for Tuscany - org.apache.tuscany.geronimoace.GeronimoACE - - text/html - view - edit - help - - en - - Tuscany Admin Console EXtension - Tuscany ACE - - + + + + + GeronimoACE + GeronimoACE + Geronimo Admin Console for Tuscany + org.apache.tuscany.geronimoace.GeronimoACE + + text/html + view + edit + help + + en + + Tuscany Admin Console EXtension + Tuscany ACE + + \ No newline at end of file diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml index fea2878551..b5c0e3667b 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml @@ -1,41 +1,22 @@ - - - - - - - - - - GeronimoACE - org.apache.pluto.core.PortletServlet - - portlet-name - GeronimoACE - - 1 - - - GeronimoACE - /PlutoInvoker/GeronimoACE - - - + + + + + + + + GeronimoACE + org.apache.pluto.core.PortletServlet + + portlet-name + GeronimoACE + + 1 + + + GeronimoACE + /PlutoInvoker/GeronimoACE + + + diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.html b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.html new file mode 100644 index 0000000000..ffd0ec61e1 --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Cloud.html @@ -0,0 +1,400 @@ + + + +SCA Domain - Cloud + + + + + + + + + + +
+ +
+
+ + SCA Domain

+ Cloud  + +

+ Here is the list of SCA nodes configured in your SCA domain cloud. +

+ +
+
+ + + + + + + + + + +
NodeStatusCompositeContributionNode Config
+
+
+ + + +
+ +

+ +
+ + + + + + + +
Add a Node
Add a node to the cloud. The node will run the SCA components declared in the specified composite. +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Node name:e.g. YourNode
Node URI:e.g. http://yourhost:8080
Composite namespace:e.g. http://your/namespace
Composite name:e.g. yourcomposite
Contribution URI:e.g. yourcontrib, http://yourcontrib
+ +
+ +
+ + + diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html new file mode 100644 index 0000000000..f616f61bd6 --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Composite.html @@ -0,0 +1,286 @@ + + + +SCA Domain - Domain Composite + + + + + + + + + + +
+ +
+
+ + SCA Domain

+ Domain Composite  + +

+ Here is the list of SCA composites currently included as top-level composites in your SCA domain. + +

+ + +
+ +
+ + + + + + + + +
CompositeContributionComponents
+
+
+ +
+ +

+ +
+ + + + + + + +
Add Composite
Add an SCA composite describing your SCA service components.
+
+ + + + + + + + + + + + + + + + +
Composite namespace:e.g. http://your/namespace
Composite name:e.g. yourcomposite
Contribution URI:e.g. yourcontrib, http://yourcontrib
+ +
+ +
+ + diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Files.html b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Files.html new file mode 100644 index 0000000000..5c69ba0ffc --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Files.html @@ -0,0 +1,129 @@ + + + + SCA Domain - Contribution File Server + + + + + + + + + + +
+ +
+
+ + SCA Domain

+ File Server  + +

+ This is a simple ATOM-based file server useful to share files if you don't have an FTP, SVN or Maven repository. +

+ +
+
+ + + + + + +
Files
+
+
+ +
+ +

+ +
+ + + + + + + +
Upload File
Upload a file to the server.
+
+ + + + + +
File:
+
+ +
+ +
+ + diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp index 27cb1665b6..52824e3cb9 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp @@ -1,87 +1,103 @@ - - -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1" %> -<%@ include file="header.jsp" %> - - - - Simple jsp page - - - - - - - - -
-
Tuscany SCA Domain Manager
-
-

 

- -
- - - - - - - - -
List Domains
-
- -
-
-
- -

 

- -

 

- -

 

- -

 

- -

 

- - - - - -
AboutTuscany Home
-

 

- + + +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1" %> +<%@ include file="header.jsp" %> + + + + Simple jsp page + + + + + + + + + +
+
Tuscany SCA Domain Manager
+
+

 

+ +
+ + + + + + + + + + + +
Contributions + + + Composites + + + Cloud + + + Files + + +
+
+ +
+
+
+ +

 

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + + +
AboutTuscany Home
+

 

+ \ No newline at end of file diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ListDomains.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ListDomains.jsp deleted file mode 100644 index 980fc3d3ce..0000000000 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ListDomains.jsp +++ /dev/null @@ -1,62 +0,0 @@ - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="header.jsp" %> - - - Untitled Document - - -

List of Domains

- -
-

- - Test Domain1

- -

- - Test Domain2

- -

- - Test Domain3

- -

- -

-
-

 

- - \ No newline at end of file diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ManageDomain.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ManageDomain.jsp deleted file mode 100644 index 9fe6f72175..0000000000 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ManageDomain.jsp +++ /dev/null @@ -1,75 +0,0 @@ - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ include file="header.jsp" %> - - - - Untitled Document - - -

Managing the domain

- - - - - - - - - - - - - - - - - - - - - -
Contributionsstartstop
-
test contribution1
- 		-
start
- 		-
stop
-
-

 

- \ No newline at end of file diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Workspace.html b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Workspace.html new file mode 100644 index 0000000000..11e5c3cbb1 --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Workspace.html @@ -0,0 +1,186 @@ + + + +SCA Domain - Contributions + + + + + + + + + + +
+ +
+
+ + SCA Domain

+ Contributions +

+ Here is the list of SCA contributions currently available in your SCA domain. +

+ +
+
+ + + + + + + + +
ContributionDependenciesDeployable Composites
+
+
+ +
+ +

+ +
+ + + + + + + +
Add Contribution
Add an SCA contribution containing your application artifacts to the SCA domain.
+
+ + + + + + + + + + + + + +
Contribution URI:e.g. yourcontrib, http://yourcontrib
Location:e.g. http://host/yourjar.jar, file:/yourdir, file:/yourjar.jar
+ +
+ +
+ + 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 99687d12d2..b202ba1d57 100644 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/header.jsp +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/header.jsp @@ -1,21 +1,21 @@ - -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> - - + +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> + + diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/manager.css b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/manager.css new file mode 100644 index 0000000000..9049b727aa --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/manager.css @@ -0,0 +1,158 @@ +/* + * 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. + */ + +body { + white-space: nowrap +} + +table { + border: 1px; + border-collapse: separate +} + +th { + font-weight: bold; + white-space: nowrap; + background-color: #e5ecf9; + color: #598edd; + text-align: left; + padding-left: 2px; + padding-right: 20px; + padding-top: 2px; + padding-bottom: 2px; + vertical-align: text-top; + border-top: 1px; + border-bottom: 1px; + border-left: 0px; + border-right: 0px; + border-style: solid; + border-top-color: #a2bae7; + border-bottom-color: #d1d3d4 +} + +td { + padding-left: 2px; + padding-top: 2px; + padding-right: 20px; + white-space: nowrap; + vertical-align: text-top +} + +input { + vertical-align: middle +} + +a:link { + color: blue +} + +a:visited { + color: blue +} + +.tdw { + padding-left: 2px; + padding-top: 2px; + padding-right: 20px; + white-space: normal; + vertical-align: text-top +} + +.hd1 { + font-size: 150%; + font-weight: bold +} + +.tbar { + margin: 0px; + padding-top: 0px; + padding-left: 0px; + padding-right: 0px; + padding-bottom: 3px; + border-bottom: 1px solid #a2bae7 +} + +.ltbar { + padding-left: 0px; + padding-top: 0px; + padding-right: 20px; + white-space: nowrap; + vertical-align: top +} + +.rtbar { + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + white-space: nowrap; + vertical-align: top; + text-align: right +} + +.suggest { + background-color: #e5ecf9; + color: #598edd; + border-top: 1px; + border-bottom: 1px; + border-left: 1px; + border-right: 1px; + border-style: solid; + border-top-color: #a2bae7; + border-bottom-color: #d1d3d4; + border-left-color: #d1d3d4; + border-right-color: #d1d3d4; + position: absolute; + overflow: auto; + overflow-x: hidden; + cursor: default; + padding: 0px; + margin: 0px; +} + +suggestTable { + border: 0px; + border-collapse: separate; + padding-left: 5px; + padding-right: 5px; + padding-top: 2px; + padding-bottom: 2px; + margin: 0px; +} + +.suggestItem { + padding-left: 2px; + padding-top: 0px; + padding-bottom: 0px; + padding-right: 2px; + white-space: nowrap; + vertical-align: text-top; + background-color: #e5ecf9; + color: #598edd; +} + +.suggestHilighted { + padding-left: 2px; + padding-top: 0px; + padding-bottom: 0px; + padding-right: 2px; + white-space: nowrap; + vertical-align: text-top; + background-color: #598edd; + color: #e5ecf9; +} diff --git a/sandbox/thilina/geronimo_ACE/src/test/java/org/apache/tuscany/geronimoace/AppTest.java b/sandbox/thilina/geronimo_ACE/src/test/java/org/apache/tuscany/geronimoace/AppTest.java index fe66243097..d16f7ff55d 100644 --- a/sandbox/thilina/geronimo_ACE/src/test/java/org/apache/tuscany/geronimoace/AppTest.java +++ b/sandbox/thilina/geronimo_ACE/src/test/java/org/apache/tuscany/geronimoace/AppTest.java @@ -7,32 +7,28 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest - extends TestCase -{ +public class AppTest + extends TestCase { /** * Create the test case * * @param testName name of the test case */ - public AppTest( String testName ) - { - super( testName ); + public AppTest(String testName) { + super(testName); } /** * @return the suite of tests being tested */ - public static Test suite() - { - return new TestSuite( AppTest.class ); + public static Test suite() { + return new TestSuite(AppTest.class); } /** * Rigourous Test :-) */ - public void testApp() - { - assertTrue( true ); + public void testApp() { + assertTrue(true); } } -- cgit v1.2.3