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 ta...@apache.org on 2004/06/02 07:05:39 UTC

cvs commit: jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF portlet.xml hello.jsp

taylor      2004/06/01 22:05:39

  Modified:    applications/demo/src/java/org/apache/jetspeed/portlet/helloworld
                        HelloWorld.java
               applications/demo/src/webapp/WEB-INF portlet.xml hello.jsp
  Added:       applications/demo/src/webapp/WEB-INF/demo/customerInfo
                        Page3Edit.jsp Page2Edit.jsp Page1Edit.jsp
  Log:
  clean up of demo portlets (could use *a lot* more clean up)
  added edit mode to customer portlets
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.1                  jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page3Edit.jsp
  
  Index: Page3Edit.jsp
  ===================================================================
  <%--
  Copyright 2004 The Apache Software Foundation
  
  Licensed 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"
           session="false"
  %>
  <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
  
  <div>
  This will be Edit mode for the Customer Detail Portlet<br>
  </div>
  
  
  
  1.1                  jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page2Edit.jsp
  
  Index: Page2Edit.jsp
  ===================================================================
  <%--
  Copyright 2004 The Apache Software Foundation
  
  Licensed 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"
           session="false"
  %>
  <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
  
  <div>
  This will be Edit mode for the Customer Info Portlet<br>
  </div>
  
  
  
  1.1                  jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/demo/customerInfo/Page1Edit.jsp
  
  Index: Page1Edit.jsp
  ===================================================================
  <%--
  Copyright 2004 The Apache Software Foundation
  
  Licensed 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"
           session="false"
  %>
  <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
  <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
  
  <div>
  This will be Edit mode for the Customer List Portlet<br>
  </div>
  
  
  
  1.5       +1 -1      jakarta-jetspeed-2/applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/HelloWorld.java
  
  Index: HelloWorld.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/HelloWorld.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HelloWorld.java	8 Mar 2004 00:05:01 -0000	1.4
  +++ HelloWorld.java	2 Jun 2004 05:05:39 -0000	1.5
  @@ -92,7 +92,7 @@
           // url.addParameter("test", "value");
           
           response.getWriter().println("<br/><b>Init Param 'Hello' = " + this.getInitParameter("hello") +  "</b>");
  -        response.getWriter().println("<br/><b>Render URL = " + url +  "</b>");
  +        // response.getWriter().println("<br/><b>Render URL = " + url +  "</b>");
           
           PortletRequestDispatcher rd = context.getRequestDispatcher("/WEB-INF/hello.jsp");
           rd.include(request, response);        
  
  
  
  1.14      +17 -2     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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- portlet.xml	22 May 2004 21:27:31 -0000	1.13
  +++ portlet.xml	2 Jun 2004 05:05:39 -0000	1.14
  @@ -143,9 +143,13 @@
   
     <portlet id="CustomerList">
       <init-param>
  -    <name>ViewPage</name>
  +      <name>ViewPage</name>
         <value>/WEB-INF/demo/customerInfo/Page1.jsp</value>
       </init-param>
  +    <init-param>    
  +    <name>EditPage</name>
  +      <value>/WEB-INF/demo/customerInfo/Page1Edit.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>
  @@ -153,6 +157,7 @@
       <supports>
         <mime-type>text/html</mime-type>
         <portlet-mode>VIEW</portlet-mode>
  +      <portlet-mode>EDIT</portlet-mode>      
       </supports>
       <portlet-info>
         <title>Customer List</title>
  @@ -165,6 +170,10 @@
       <name>ViewPage</name>
         <value>/WEB-INF/demo/customerInfo/Page2.jsp</value>
       </init-param>
  +    <init-param>        
  +      <name>EditPage</name>
  +      <value>/WEB-INF/demo/customerInfo/Page2Edit.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>
  @@ -172,6 +181,7 @@
       <supports>
         <mime-type>text/html</mime-type>
         <portlet-mode>VIEW</portlet-mode>
  +      <portlet-mode>EDIT</portlet-mode>            
       </supports>
       <portlet-info>
         <title>Customer Information</title>
  @@ -181,9 +191,13 @@
   
     <portlet id="CustomerDetail">
       <init-param>
  -    <name>ViewPage</name>
  +      <name>ViewPage</name>
         <value>/WEB-INF/demo/customerInfo/Page3.jsp</value>
       </init-param>
  +    <init-param>        
  +      <name>EditPage</name>
  +      <value>/WEB-INF/demo/customerInfo/Page3Edit.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>
  @@ -191,6 +205,7 @@
       <supports>
         <mime-type>text/html</mime-type>
         <portlet-mode>VIEW</portlet-mode>
  +      <portlet-mode>EDIT</portlet-mode>            
       </supports>
       <portlet-info>
         <title>Customer Detail</title>
  
  
  
  1.8       +2 -2      jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/hello.jsp
  
  Index: hello.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/hello.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- hello.jsp	27 May 2004 06:08:03 -0000	1.7
  +++ hello.jsp	2 Jun 2004 05:05:39 -0000	1.8
  @@ -26,6 +26,6 @@
   <a href="/jetspeed/portal/struts-demo">Struts Portlet Demo</a>
   </p>
   <p>
  -Portlet Mode is <%= renderRequest.getPortletMode().toString() %> <br/>
  -Window State is <%= renderRequest.getWindowState().toString() %> <br/>
  +Portlet Mode is <b><%= renderRequest.getPortletMode().toString() %></b> <br/>
  +Window State is <b><%= renderRequest.getWindowState().toString() %></b> <br/>
   </p>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org