From cdf90a5f77e7c0f7bb1457f618fc598675351522 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
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

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 @@
-<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>
+<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>
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("<html><body>");
+        out.println("Hello World");
+        out.println("</body></html>");
+        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 @@
   -->
 
 
-<!--
-  ~ 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 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 @@
   -->
 
 
-<!--
- ~ 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"?>
 
 <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"
@@ -45,7 +28,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>
@@ -55,4 +38,6 @@ 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>
\ No newline at end of file
+</portlet-app>
+
+
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.    
--->
+  ~ 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
deleted file mode 100644
index d23cf9c7a0..0000000000
--- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/Home.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
- ~ 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>&nbsp;</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>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</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>&nbsp;</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
deleted file mode 100644
index 0e5257fb0d..0000000000
--- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ListDomains.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- ~ 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
deleted file mode 100644
index 0e5257fb0d..0000000000
--- a/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/ManageDomain.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- ~ 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
-- 
cgit v1.2.3