From cdf90a5f77e7c0f7bb1457f618fc598675351522 Mon Sep 17 00:00:00 2001 From: antelder Date: Mon, 7 Jul 2008 08:58:19 +0000 Subject: TUSCANY-2391: revert previous patch as the latest patch is cummulative including the chgs from 674279 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@674420 13f79535-47bb-0310-9956-ffa450edef68 --- sandbox/thilina/geronimo_ACE/README.txt | 19 +++-- sandbox/thilina/geronimo_ACE/pom.xml | 94 ++++++++++------------ .../apache/tuscany/geronimoace/GeronimoACE.java | 48 +++-------- .../src/main/webapp/WEB-INF/geronimo-web.xml | 20 ----- .../src/main/webapp/WEB-INF/portlet.xml | 25 ++---- .../geronimo_ACE/src/main/webapp/WEB-INF/web.xml | 35 ++++---- .../geronimo_ACE/src/main/webapp/pages/Home.jsp | 71 ---------------- .../src/main/webapp/pages/ListDomains.jsp | 23 ------ .../src/main/webapp/pages/ManageDomain.jsp | 23 ------ 9 files changed, 86 insertions(+), 272 deletions(-) delete mode 100644 sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp 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 (limited to 'sandbox/thilina') diff --git a/sandbox/thilina/geronimo_ACE/README.txt b/sandbox/thilina/geronimo_ACE/README.txt index fd53333d2a..38cdfe0a46 100644 --- a/sandbox/thilina/geronimo_ACE/README.txt +++ b/sandbox/thilina/geronimo_ACE/README.txt @@ -1,10 +1,9 @@ - -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 4d6cd5764d..9bbeb2ed9d 100644 --- a/sandbox/thilina/geronimo_ACE/pom.xml +++ b/sandbox/thilina/geronimo_ACE/pom.xml @@ -1,50 +1,44 @@ - - 4.0.0 - org.apache.tuscany.geronimoace - org.apache.tuscany.geronimoace.geronimo-ace - war - 1.0-SNAPSHOT - geronimo-ace - http://maven.apache.org - - - junit - junit - 3.8.1 - test - - - portlet-api - portlet-api - 1.0 - - - javax.portlet - portlet-api - 1.0 - - - javax.servlet - servlet-api - 2.4 - provided - - - - - install - ${basedir}/target - ${artifactId}-${version} - - - WEB-INF - false - ${basedir}/src/webapp/WEB-INF - - web.xml - - - - - + + 4.0.0 + org.apache.tuscany.geronimoace + org.apache.tuscany.geronimoace.geronimo-ace + war + 1.0-SNAPSHOT + geronimo-ace + http://maven.apache.org + + + junit + junit + 3.8.1 + test + + + portlet-api + portlet-api + 1.0 + + + javax.portlet + portlet-api + 1.0 + + + + + install + ${basedir}/target + ${artifactId}-${version} + + + WEB-INF + false + ${basedir}/src/webapp/WEB-INF + + web.xml + + + + + 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 a692e4eac7..eb52936bb6 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,25 +17,6 @@ * 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.*; @@ -43,26 +24,17 @@ import java.io.IOException; import java.io.PrintWriter; public class GeronimoACE extends GenericPortlet { - 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 { + 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("/pages/Home.jsp"); - dispatcher.include(request,response); - - + response.setContentType("text/html;charset=UTF-8"); + + // Required call for use of getWriter() and getPortletOutputStream() + PrintWriter out = response.getWriter(); + out.println(""); + out.println("Hello World"); + out.println(""); + out.flush(); + out.close(); } - } 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 dde24a2a71..7b0c484c49 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,26 +18,6 @@ --> - - - 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 3f54ae7fef..f8f722e8cd 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,24 +18,7 @@ --> - + Geronimo Admin Console for Tuscany org.apache.tuscany.geronimoace.GeronimoACE - + text/html view @@ -55,4 +38,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http: 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 df6dd829ce..c40f92057e 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,21 +1,22 @@ + ~ 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. + --> + diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp b/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp deleted file mode 100644 index d23cf9c7a0..0000000000 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp +++ /dev/null @@ -1,71 +0,0 @@ - - -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - -Simple jsp page - - - - - - - - -
Tuscany SCA Domain Manager
-

 

- - - - - - - -
-

 

-

 

-

 

-

 

-

 

- - - - - -
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 0e5257fb0d..0000000000 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ListDomains.jsp +++ /dev/null @@ -1,23 +0,0 @@ - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - Simple jsp page - Place your content here - \ 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 0e5257fb0d..0000000000 --- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ManageDomain.jsp +++ /dev/null @@ -1,23 +0,0 @@ - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - Simple jsp page - Place your content here - \ No newline at end of file -- cgit v1.2.3