diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-06 09:53:42 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-06 09:53:42 +0000 |
| commit | 074ca094dfe08c4d154f4ffdfd6575ac28d986c3 (patch) | |
| tree | b130ccda51fcd21c2e6284dd0d0508df7ba789ed | |
| parent | 8292c6b2b00e0f849dc8be2e1683858bd4c7b193 (diff) | |
TUSCANY-2391: Apply latest patch from Thilina Buddhika for the GSoC Tuscany SCA support in the Geronimo Admin Console project
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@674279 13f79535-47bb-0310-9956-ffa450edef68
9 files changed, 272 insertions, 86 deletions
diff --git a/sandbox/thilina/geronimo_ACE/README.txt b/sandbox/thilina/geronimo_ACE/README.txt index 38cdfe0a46..fd53333d2a 100644 --- a/sandbox/thilina/geronimo_ACE/README.txt +++ b/sandbox/thilina/geronimo_ACE/README.txt @@ -1,9 +1,10 @@ -How to build the Admin Console Extension -======================================== - -1.Extract the archive. -2.Go to the directory created after extracting the archive. -3.Type the following command "mvn install" -4.It will create a directory named "target" which contains the "org.apache.tuscany.geronimoace.geronimo-ace-1.0-SNAPSHOT.war". -5.Deploy this in geronimo. - +
+How to build the Admin Console Extension
+========================================
+
+1.Extract the archive.
+2.Go to the directory created after extracting the archive.
+3.Type the following command "mvn install"
+4.It will create a directory named "target" which contains the "org.apache.tuscany.geronimoace.geronimo-ace-1.0-SNAPSHOT.war".
+5.Deploy this in geronimo.
+
diff --git a/sandbox/thilina/geronimo_ACE/pom.xml b/sandbox/thilina/geronimo_ACE/pom.xml index 9bbeb2ed9d..4d6cd5764d 100644 --- a/sandbox/thilina/geronimo_ACE/pom.xml +++ b/sandbox/thilina/geronimo_ACE/pom.xml @@ -1,44 +1,50 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.geronimoace</groupId> - <artifactId>org.apache.tuscany.geronimoace.geronimo-ace</artifactId> - <packaging>war</packaging> - <version>1.0-SNAPSHOT</version> - <name>geronimo-ace</name> - <url>http://maven.apache.org</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>portlet-api</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - </dependency> - - </dependencies> - <build> - <defaultGoal>install</defaultGoal> - <directory>${basedir}/target</directory> - <finalName>${artifactId}-${version}</finalName> - <resources> - <resource> - <targetPath>WEB-INF</targetPath> - <filtering>false</filtering> - <directory>${basedir}/src/webapp/WEB-INF</directory> - <includes> - <include>web.xml</include> - </includes> - </resource> - </resources> - </build> -</project> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.geronimoace</groupId>
+ <artifactId>org.apache.tuscany.geronimoace.geronimo-ace</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>geronimo-ace</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version> <!-- to keep compatible with older servlet containers -->
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <directory>${basedir}/target</directory>
+ <finalName>${artifactId}-${version}</finalName>
+ <resources>
+ <resource>
+ <targetPath>WEB-INF</targetPath>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/webapp/WEB-INF</directory>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+</project>
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 eb52936bb6..a692e4eac7 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 @@ -17,6 +17,25 @@ * 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.*;
@@ -24,17 +43,26 @@ import java.io.IOException; import java.io.PrintWriter;
public class GeronimoACE extends GenericPortlet {
- public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException {
+ private String viewUrl;
+
+
+ public void init(PortletConfig config) throws PortletException {
+
+ super.init(config);
+ // viewUrl = config.getInitParameter("view_url");
+ }
+
+
+ public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException {
// Set the response to read HTML
- response.setContentType("text/html;charset=UTF-8");
-
- // Required call for use of getWriter() and getPortletOutputStream()
- PrintWriter out = response.getWriter();
- out.println("<html><body>");
- out.println("Hello World");
- out.println("</body></html>");
- out.flush();
- out.close();
+ response.setContentType("text/html;charset=UTF-8");
+
+
+ PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/pages/Home.jsp");
+ dispatcher.include(request,response);
+
+
}
+
}
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 7b0c484c49..dde24a2a71 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 @@ -18,6 +18,26 @@ -->
+<!--
+ ~ 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.
+ -->
+
+
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
<environment>
<moduleId>
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 f8f722e8cd..3f54ae7fef 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 @@ -18,7 +18,24 @@ -->
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+-->
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,7 +45,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http: <portlet-name>GeronimoACE</portlet-name>
<display-name lang="EN">Geronimo Admin Console for Tuscany</display-name>
<portlet-class>org.apache.tuscany.geronimoace.GeronimoACE</portlet-class>
- <supports>
+ <supports>
<mime-type>text/html</mime-type>
<portlet-mode>view</portlet-mode>
</supports>
@@ -38,6 +55,4 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http: <short-title>Tuscany ACE</short-title>
</portlet-info>
</portlet>
-</portlet-app>
-
-
+</portlet-app>
\ 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 c40f92057e..df6dd829ce 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,22 +1,21 @@ <!--
- ~ 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.
+-->
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp new file mode 100644 index 0000000000..d23cf9c7a0 --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp @@ -0,0 +1,71 @@ +<!--
+ ~ 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.
+-->
+
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>Simple jsp page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<style type="text/css">
+<!--
+.style1 {font-family: Verdana, Arial, Helvetica, sans-serif}
+.style2 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: large;
+ color: #0000FF;
+}
+-->
+</style>
+</head>
+<body>
+<table width="398" border="0" align="center">
+ <tr>
+ <td width="392" align="center" valign="top"><div align="justify" class="style2">Tuscany SCA Domain Manager </div></td>
+ </tr>
+</table>
+<p> </p>
+<table width="200" border="0" align="left">
+ <tr>
+ <td align="left"><ul>
+ <li><a href="ListDomains.jsp" class="style1">List Domains </a></li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td align="left"><ul>
+ <li><a href="ManageDomain.jsp" class="style1">Manage Domains </a></li>
+ </ul></td>
+ </tr>
+</table>
+<p> </p>
+<p> </p>
+<p> </p>
+<p> </p>
+<p> </p>
+<table width="287" border="0" align="center">
+ <tr>
+ <td width="129"><span class="style1">About</span></td>
+ <td width="130" class="style1"><a href="http://tuscany.apache.org/" target="_blank">Tuscany Home </a></td>
+ </tr>
+</table>
+<p> </p>
+</body>
+</html>
\ 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 new file mode 100644 index 0000000000..0e5257fb0d --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ListDomains.jsp @@ -0,0 +1,23 @@ +<!--
+ ~ 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.
+-->
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+ <head><title>Simple jsp page</title></head>
+ <body>Place your content here</body>
+</html>
\ 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 new file mode 100644 index 0000000000..0e5257fb0d --- /dev/null +++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ManageDomain.jsp @@ -0,0 +1,23 @@ +<!--
+ ~ 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.
+-->
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+ <head><title>Simple jsp page</title></head>
+ <body>Place your content here</body>
+</html>
\ No newline at end of file |