tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r674420 - in /tuscany/sandbox/thilina/geronimo_ACE: ./ src/main/java/org/apache/tuscany/geronimoace/ src/main/webapp/WEB-INF/ src/main/webapp/pages/
Date Mon, 07 Jul 2008 08:58:19 GMT
Author: antelder
Date: Mon Jul  7 01:58:19 2008
New Revision: 674420

URL: http://svn.apache.org/viewvc?rev=674420&view=rev
Log:
TUSCANY-2391: revert previous patch as the latest patch is cummulative including the chgs
from 674279

Removed:
    tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/pages/
Modified:
    tuscany/sandbox/thilina/geronimo_ACE/README.txt
    tuscany/sandbox/thilina/geronimo_ACE/pom.xml
    tuscany/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java
    tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml
    tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml
    tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml

Modified: tuscany/sandbox/thilina/geronimo_ACE/README.txt
URL: http://svn.apache.org/viewvc/tuscany/sandbox/thilina/geronimo_ACE/README.txt?rev=674420&r1=674419&r2=674420&view=diff
==============================================================================
--- tuscany/sandbox/thilina/geronimo_ACE/README.txt (original)
+++ tuscany/sandbox/thilina/geronimo_ACE/README.txt Mon Jul  7 01:58:19 2008
@@ -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. 
+

Modified: tuscany/sandbox/thilina/geronimo_ACE/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/thilina/geronimo_ACE/pom.xml?rev=674420&r1=674419&r2=674420&view=diff
==============================================================================
--- tuscany/sandbox/thilina/geronimo_ACE/pom.xml (original)
+++ tuscany/sandbox/thilina/geronimo_ACE/pom.xml Mon Jul  7 01:58:19 2008
@@ -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>

Modified: tuscany/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java?rev=674420&r1=674419&r2=674420&view=diff
==============================================================================
--- tuscany/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java
(original)
+++ tuscany/sandbox/thilina/geronimo_ACE/src/main/java/org/apache/tuscany/geronimoace/GeronimoACE.java
Mon Jul  7 01:58:19 2008
@@ -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.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();
     }
 
-
 }

Modified: tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml?rev=674420&r1=674419&r2=674420&view=diff
==============================================================================
--- tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/geronimo-web.xml Mon Jul
 7 01:58:19 2008
@@ -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>

Modified: tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml?rev=674420&r1=674419&r2=674420&view=diff
==============================================================================
--- tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml (original)
+++ tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml Mon Jul  7 01:58:19
2008
@@ -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 @@
     <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 @@
       <short-title>Tuscany ACE</short-title>
     </portlet-info>
     </portlet>
-</portlet-app>
\ No newline at end of file
+</portlet-app>
+
+

Modified: tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml?rev=674420&r1=674419&r2=674420&view=diff
==============================================================================
--- tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml (original)
+++ tuscany/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/web.xml Mon Jul  7 01:58:19
2008
@@ -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">



Mime
View raw message