You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ra...@apache.org on 2003/12/07 00:18:55 UTC
cvs commit: jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF portlet.xml web.xml
raphael 2003/12/06 15:18:55
Modified: applications/demo/src/webapp/WEB-INF Tag:
aggregation_1-branch portlet.xml web.xml
Removed: applications/demo/src/java/org/apache/jetspeed/portlet Tag:
aggregation_1-branch ServletPortlet.java
Log:
move ServletPortlet from applications to commons so that it can be used from any
deployed WAR (including Jetspeed)
Revision Changes Path
No revision
No revision
1.5.2.1 +40 -40 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.xml
Index: portlet.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- portlet.xml 17 Oct 2003 20:03:19 -0000 1.5
+++ portlet.xml 6 Dec 2003 23:18:55 -0000 1.5.2.1
@@ -2,10 +2,10 @@
<portlet-app id="HW_App" version="1.0">
<portlet id="HelloPortlet">
<init-param>
- <description>test init param</description>
- <name>hello</name>
- <value>Hello Portlet</value>
- </init-param>
+ <description>test init param</description>
+ <name>hello</name>
+ <value>Hello Portlet</value>
+ </init-param>
<portlet-name>HelloPortlet</portlet-name>
<display-name>HelloWorld Portlet Wrapper</display-name>
<description>This is the hello world of portlets, it doesn't do much</description>
@@ -23,9 +23,9 @@
<keywords>Test</keywords>
</portlet-info>
</portlet>
-
+
<portlet id="JMXPortlet">
-
+
<portlet-name>JMXPortlet</portlet-name>
<display-name>JMX Registry Access portlet</display-name>
<portlet-class>org.apache.jetspeed.demo.jmx.JMXPortlet</portlet-class>
@@ -40,8 +40,8 @@
<keywords>JMX</keywords>
</portlet-info>
</portlet>
-
- <portlet id="PreferencePortlet">
+
+ <portlet id="PreferencePortlet">
<portlet-name>PreferencePortlet</portlet-name>
<display-name>PreferencePortlet</display-name>
<portlet-class>org.apache.jetspeed.demo.preferences.PreferencePortlet</portlet-class>
@@ -56,23 +56,23 @@
<keywords>Preferences</keywords>
</portlet-info>
<portlet-preferences>
- <preference>
- <name>pref1</name>
- <value>Hello</value>
- <value>Hello2</value>
- </preference>
+ <preference>
+ <name>pref1</name>
+ <value>Hello</value>
+ <value>Hello2</value>
+ </preference>
</portlet-preferences>
</portlet>
-
+
<portlet id="DisplayRequestPortlet">
- <init-param>
- <name>HelpPage</name>
- <value>/WEB-INF/demo/simple/DisplayRequestHelp.jsp</value>
- </init-param>
- <init-param>
- <name>ViewPage</name>
- <value>/WEB-INF/demo/simple/DisplayRequest.jsp</value>
- </init-param>
+ <init-param>
+ <name>HelpPage</name>
+ <value>/WEB-INF/demo/simple/DisplayRequestHelp.jsp</value>
+ </init-param>
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/demo/simple/DisplayRequest.jsp</value>
+ </init-param>
<portlet-name>DisplayRequestPortlet</portlet-name>
<display-name>DisplayRequest Portlet Wrapper</display-name>
<portlet-class>org.apache.jetspeed.portlet.ServletPortlet</portlet-class>
@@ -87,7 +87,7 @@
<short-title>Portlet Request Information</short-title>
</portlet-info>
</portlet>
-
+
<portlet id="PickANumberPortlet">
<portlet-name>PickANumberPortlet</portlet-name>
<display-name>Pick a number game</display-name>
@@ -102,7 +102,7 @@
<title>Pick a Number</title>
</portlet-info>
</portlet>
-
+
<portlet id="AttributeScopePortlet">
<portlet-name>AttributeScopePortlet</portlet-name>
<display-name>Attribute Scope Demo</display-name>
@@ -119,10 +119,10 @@
</portlet>
<portlet id="CustomerList">
- <init-param>
- <name>ViewPage</name>
- <value>/WEB-INF/demo/customerInfo/Page1.jsp</value>
- </init-param>
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/demo/customerInfo/Page1.jsp</value>
+ </init-param>
<portlet-name>CustomerList</portlet-name>
<display-name>Customer List</display-name>
<portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
@@ -138,10 +138,10 @@
</portlet>
<portlet id="CustomerInfo">
- <init-param>
- <name>ViewPage</name>
- <value>/WEB-INF/demo/customerInfo/Page2.jsp</value>
- </init-param>
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/demo/customerInfo/Page2.jsp</value>
+ </init-param>
<portlet-name>CustomerInfo</portlet-name>
<display-name>Customer Information</display-name>
<portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
@@ -157,10 +157,10 @@
</portlet>
<portlet id="CustomerDetail">
- <init-param>
- <name>ViewPage</name>
- <value>/WEB-INF/demo/customerInfo/Page3.jsp</value>
- </init-param>
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/demo/customerInfo/Page3.jsp</value>
+ </init-param>
<portlet-name>CustomerDetail</portlet-name>
<display-name>Customer Detail</display-name>
<portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
@@ -176,10 +176,10 @@
</portlet>
<portlet id="LoginPortlet">
- <init-param>
- <name>ViewPage</name>
- <value>/WEB-INF/demo/simple/Login.jsp</value>
- </init-param>
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/demo/simple/Login.jsp</value>
+ </init-param>
<portlet-name>LoginPortlet</portlet-name>
<display-name>LoginRequest Portlet Wrapper</display-name>
<portlet-class>org.apache.jetspeed.portlet.ServletPortlet</portlet-class>
1.1.1.1.2.1 +2 -2 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- web.xml 28 Jul 2003 23:46:34 -0000 1.1.1.1
+++ web.xml 6 Dec 2003 23:18:55 -0000 1.1.1.1.2.1
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+ "http://java.sun.com/dtd/web-app_2_2.dtd">
<web-app>
<display-name>HelloWorld-DN</display-name>
<description>Hello World Description</description>
@@ -19,6 +19,6 @@
<url-pattern>
/container/*
</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org