tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r669097 - in /tuscany/sandbox/thilina/geronimo_ACE/src/main: java/org/apache/tuscany/geronimoace/GeronimoACE.java webapp/WEB-INF/geronimo-web.xml webapp/WEB-INF/portlet.xml webapp/WEB-INF/web.xml
Date Wed, 18 Jun 2008 06:55:35 GMT
Author: antelder
Date: Tue Jun 17 23:55:34 2008
New Revision: 669097

URL: http://svn.apache.org/viewvc?rev=669097&view=rev
Log:
TUSCANY-2391: Apply patch from Thilina Buddhika adding some license headers

Modified:
    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/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=669097&r1=669096&r2=669097&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
Tue Jun 17 23:55:34 2008
@@ -1,21 +1,40 @@
-package org.apache.tuscany.geronimoace;
-
-import javax.portlet.*;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-public class GeronimoACE extends GenericPortlet {
-	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();
-    }
-
-}
+/*
+ * 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;
+import java.io.PrintWriter;
+
+public class GeronimoACE extends GenericPortlet {
+	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();
+    }
+
+}

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=669097&r1=669096&r2=669097&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 Tue Jun
17 23:55:34 2008
@@ -1,30 +1,50 @@
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
-    <environment>
-        <moduleId>
-            <groupId>org.apache.tuscany.geronimoace</groupId>
-            <artifactId>geronimo-ace</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <type>war</type>
-        </moduleId>
-
-        <dependencies>
-            <dependency> <!-- Put a dependancy on the hosting portal (pluto) -->
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>pluto-support</artifactId>
-            </dependency>
-        </dependencies>
-    </environment>
-
-    <!-- This is where the files are accessed from. (aka - portletContext) -->
-    <context-root>/GeronimoACE</context-root>
-
-    <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
-  <gbean name="PlutoTest" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">Tuscany ACE</attribute>
-        <attribute name="portletContext">/GeronimoACE</attribute>
-        <attribute name="portletList">[GeronimoACE]</attribute>
-        <reference name="PortalContainerServices">
-        <name>PlutoPortalServices</name>
-        </reference>
-        </gbean>
-</web-app>
+<!--
+  ~ 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>
+            <groupId>org.apache.tuscany.geronimoace</groupId>
+            <artifactId>geronimo-ace</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <type>war</type>
+        </moduleId>
+
+        <dependencies>
+            <dependency> <!-- Put a dependancy on the hosting portal (pluto) -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto-support</artifactId>
+            </dependency>
+        </dependencies>
+    </environment>
+
+    <!-- This is where the files are accessed from. (aka - portletContext) -->
+    <context-root>/GeronimoACE</context-root>
+
+    <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
+  <gbean name="PlutoTest" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Tuscany ACE</attribute>
+        <attribute name="portletContext">/GeronimoACE</attribute>
+        <attribute name="portletList">[GeronimoACE]</attribute>
+        <reference name="PortalContainerServices">
+        <name>PlutoPortalServices</name>
+        </reference>
+        </gbean>
+</web-app>

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=669097&r1=669096&r2=669097&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 Tue Jun 17 23:55:34
2008
@@ -1,23 +1,43 @@
-<?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"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-  <portlet>
-    <description lang="EN">GeronimoACE</description>
-    <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>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>view</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <portlet-info>
-      <title>Tuscany Admin Console EXtension</title>
-      <short-title>Tuscany ACE</short-title>
-    </portlet-info>
-    </portlet>
-</portlet-app>
-
-
+<!--
+  ~ 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"
+xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+  <portlet>
+    <description lang="EN">GeronimoACE</description>
+    <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>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>view</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <portlet-info>
+      <title>Tuscany Admin Console EXtension</title>
+      <short-title>Tuscany ACE</short-title>
+    </portlet-info>
+    </portlet>
+</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=669097&r1=669096&r2=669097&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 Tue Jun 17 23:55:34
2008
@@ -1,22 +1,41 @@
-<?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">
-<web-app>
-
-    <!-- This is pretty standard servlet code -->
-
-    <servlet>
-        <servlet-name>GeronimoACE</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>GeronimoACE</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>GeronimoACE</servlet-name>
-        <url-pattern>/PlutoInvoker/GeronimoACE</url-pattern>
-    </servlet-mapping>
-
-</web-app>
+<!--
+  ~ 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">
+<web-app>
+
+    <!-- This is pretty standard servlet code -->
+
+    <servlet>
+        <servlet-name>GeronimoACE</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>GeronimoACE</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>GeronimoACE</servlet-name>
+        <url-pattern>/PlutoInvoker/GeronimoACE</url-pattern>
+    </servlet-mapping>
+
+</web-app>



Mime
View raw message