portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/struts-portlet/demo/src/webapp staticJavascript.jsp
Date Sat, 24 Jul 2004 22:05:05 GMT
ate         2004/07/24 15:05:05

  Modified:    struts-portlet/demo/src/webapp/WEB-INF/view mainMenu.jsp
                        logon.jsp footer.jsp subscription.jsp
                        changePassword.jsp Error.jsp tour.html
                        Registration.jsp welcome.jsp
               struts-portlet/demo/src/webapp/WEB-INF validation.xml
                        web.xml
               struts-portlet/demo/src/java/org/apache/struts/webapp/example
                        ApplicationResources.properties
               struts-portlet/demo project.xml
               struts-portlet/demo/src/webapp staticJavascript.jsp
  Removed:     struts-portlet/demo/src/webapp/WEB-INF struts-logic.tld
                        tiles-defs.xml portlet.tld struts-bean.tld
                        struts-tiles.tld struts-nested.tld struts-html.tld
                        struts-portlet.tld
  Log:
  Struts-portlet framework demo updated for struts-1.2.1
  Struts-portlet.tld is now included in the struts-portlet.jar: cleaned up (removed) local
struts and struts-portlet tlds
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/mainMenu.jsp
  
  Index: mainMenu.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/mainMenu.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mainMenu.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ mainMenu.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,7 +1,7 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app" prefix="app" %>
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-portlet" prefix="sp" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-portlet" prefix="sp" %>
   <h2><bean:message key="mainMenu.title"/></h2>
   <hr/>
   <h3><bean:message key="mainMenu.heading"/> <bean:write name="user" property="fullName"
/></h3>
  
  
  
  1.2       +3 -3      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/logon.jsp
  
  Index: logon.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/logon.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logon.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ logon.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,8 +1,8 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app"         prefix="app" %>
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-html" prefix="html" %>
  -<%@ taglib uri="/tags/struts-portlet" prefix="sp" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
  +<%@ taglib uri="http://struts.apache.org/tags-portlet" prefix="sp" %>
   <!--
   <title><bean:message key="logon.title"/></title>
   -->
  
  
  
  1.2       +2 -2      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/footer.jsp
  
  Index: footer.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/footer.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- footer.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ footer.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,4 +1,4 @@
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-portlet" prefix="sp" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-portlet" prefix="sp" %>
   <hr />
   <p><sp:link action="/Welcome"><bean:message key="index.title"/></sp:link></p>
  
  
  
  1.2       +4 -4      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/subscription.jsp
  
  Index: subscription.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/subscription.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- subscription.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ subscription.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,9 +1,9 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app"    prefix="app" %>
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-html" prefix="html" %>
  -<%@ taglib uri="/tags/struts-logic" prefix="logic" %>
  -<%@ taglib uri="/tags/struts-portlet" prefix="sp" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
  +<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
  +<%@ taglib uri="http://struts.apache.org/tags-portlet" prefix="sp" %>
   <h2>
   <logic:equal name="SubscriptionForm" property="action"
               scope="request" value="Create">
  
  
  
  1.2       +2 -2      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/changePassword.jsp
  
  Index: changePassword.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/changePassword.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- changePassword.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ changePassword.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,6 +1,6 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-portlet" prefix="sp" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-portlet" prefix="sp" %>
   <h2><bean:message key="change.title"/></h2>
   <hr/>
   <bean:message key="change.message"/>
  
  
  
  1.2       +3 -7      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/Error.jsp
  
  Index: Error.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/Error.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Error.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ Error.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,10 +1,6 @@
   <%-- Errors.jsp - Display unexpected errors, such as a JSP exception
        or missing resources --%>
   <%--
  - $Header$
  - $Revision$
  - $Date$
  -
    Copyright 2000-2004 Apache Software Foundation
   
    Licensed under the Apache License, Version 2.0 (the "License");
  @@ -22,9 +18,9 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ page import="org.apache.struts.Globals" %>
   <%@ page import="org.apache.struts.webapp.example.Constants" %>
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-html" prefix="html" %>
  -<%@ taglib uri="/tags/struts-logic" prefix="logic" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
  +<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
   <h2>Unexpected Error</h2>
   <hr/>
   <h3>An unexpected error has occured</h3>
  
  
  
  1.2       +1 -1      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/tour.html
  
  Index: tour.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/tour.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tour.html	20 Apr 2004 02:06:03 -0000	1.1
  +++ tour.html	24 Jul 2004 22:05:04 -0000	1.2
  @@ -3,7 +3,7 @@
   
       <p><i>This article is meant to introduce a new user to Struts by "walking
through" an application. See the <a href="http://jakarta.apache.org/struts/">Struts
Users Guide and Strut's API</a> for more documentation.</i></p>
   
  -    <p><i>The MailReader application is based on the 1.2.0 build of Struts.
To follow along, you should install the MailReader application on your own development workstation
(e.g. localhost).</i></p>
  +    <p><i>The MailReader application is based on the 1.2.1 build of Struts.
To follow along, you should install the MailReader application on your own development workstation
(e.g. localhost).</i></p>
   
       <p><i>The article assumes the reader has a basic understanding of the Java
language, JavaBeans, web applications, and JavaServer Pages. For background on these technologies,
see the <a href="http://jakarta.apache.org/struts/userGuide/preface.html">Preface to
the Struts User Guide</a>.</i></p>
       <hr />
  
  
  
  1.2       +4 -4      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/Registration.jsp
  
  Index: Registration.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/Registration.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Registration.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ Registration.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,9 +1,9 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app"    prefix="app" %>
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-html" prefix="html" %>
  -<%@ taglib uri="/tags/struts-logic" prefix="logic" %>
  -<%@ taglib uri="/tags/struts-portlet" prefix="sp" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
  +<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
  +<%@ taglib uri="http://struts.apache.org/tags-portlet" prefix="sp" %>
   <h2>
   <logic:equal name="RegistrationForm" property="action"
               scope="request" value="Create">
  
  
  
  1.2       +3 -3      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/welcome.jsp
  
  Index: welcome.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/view/welcome.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- welcome.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ welcome.jsp	24 Jul 2004 22:05:04 -0000	1.2
  @@ -1,7 +1,7 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
  -<%@ taglib uri="/tags/struts-bean" prefix="bean" %>
  -<%@ taglib uri="/tags/struts-html" prefix="html" %>
  -<%@ taglib uri="/tags/struts-portlet" prefix="sp" %>
  +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
  +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
  +<%@ taglib uri="http://struts.apache.org/tags-portlet" prefix="sp" %>
   <h2><bean:message key="index.title"/></h2>
   <hr/>
   <h3><bean:message key="index.heading"/></h3>
  
  
  
  1.2       +8 -8      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/validation.xml
  
  Index: validation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/validation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- validation.xml	20 Apr 2004 02:06:02 -0000	1.1
  +++ validation.xml	24 Jul 2004 22:05:05 -0000	1.2
  @@ -25,10 +25,10 @@
   
               <field property="password"
                       depends="required, minlength,maxlength">
  -                <arg0   key="prompt.password"/>
  -                <arg1   key="${var:minlength}" name="minlength"
  +                <arg   key="prompt.password"/>
  +                <arg   key="${var:minlength}" name="minlength"
                      resource="false"/>
  -                <arg2   key="${var:maxlength}" name="maxlength"
  +                <arg   key="${var:maxlength}" name="maxlength"
                      resource="false"/>
                   <var>
                       <var-name>maxlength</var-name>
  @@ -47,22 +47,22 @@
   
               <field property="fromAddress"
                       depends="required,email">
  -                <arg0   key="prompt.fromAddress"/>
  +                <arg   key="prompt.fromAddress"/>
               </field>
   
               <field property="fullName"
                       depends="required">
  -              <arg0     key="prompt.fullName"/>
  +              <arg     key="prompt.fullName"/>
               </field>
   
               <field property="replyToAddress"
                       depends="email">
  -                <arg0   key="prompt.replyToAddress"/>
  +                <arg   key="prompt.replyToAddress"/>
               </field>
   
               <field property="username"
                       depends="required">
  -              <arg0     key="prompt.username"/>
  +              <arg     key="prompt.username"/>
               </field>
   
           </form>
  
  
  
  1.3       +0 -28     jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/WEB-INF/web.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- web.xml	10 Jun 2004 20:26:59 -0000	1.2
  +++ web.xml	24 Jul 2004 22:05:05 -0000	1.3
  @@ -46,32 +46,4 @@
       <taglib-location>/WEB-INF/app.tld</taglib-location>
     </taglib>
   
  -  <!-- Struts Tag Library Descriptors -->
  -  <taglib>
  -    <taglib-uri>/tags/struts-bean</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
  -  </taglib>
  -  <taglib>
  -    <taglib-uri>/tags/struts-html</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
  -  </taglib>
  -  <taglib>
  -    <taglib-uri>/tags/struts-logic</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
  -  </taglib>
  -  <taglib>
  -    <taglib-uri>/tags/struts-nested</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-nested.tld</taglib-location>
  -  </taglib>
  -  <taglib>
  -    <taglib-uri>/tags/tiles</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location>
  -  </taglib>
  -
  -  <!-- Struts Portlet Tag Library Descriptors -->
  -  <taglib>
  -    <taglib-uri>/tags/struts-portlet</taglib-uri>
  -    <taglib-location>/WEB-INF/struts-portlet.tld</taglib-location>
  -  </taglib>
  -
   </web-app>
  
  
  
  1.2       +2 -2      jakarta-jetspeed-2/struts-portlet/demo/src/java/org/apache/struts/webapp/example/ApplicationResources.properties
  
  Index: ApplicationResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/java/org/apache/struts/webapp/example/ApplicationResources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationResources.properties	20 Apr 2004 02:06:01 -0000	1.1
  +++ ApplicationResources.properties	24 Jul 2004 22:05:05 -0000	1.2
  @@ -52,7 +52,7 @@
   index.heading=MailReader Demonstration Application Options
   index.logon=Log on to the MailReader Demonstration Application
   index.registration=Register with the MailReader Demonstration Application
  -index.title=MailReader Demonstration Application (Struts 1.2.1-dev)
  +index.title=MailReader Demonstration Application (Struts 1.2.1)
   index.tour=A Walking Tour of the MailReader Demonstration Application
   linkSubscription.io=I/O Error: {0}
   linkSubscription.noSubscription=No subscription under attribute {0}
  
  
  
  1.5       +3 -3      jakarta-jetspeed-2/struts-portlet/demo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	11 Jul 2004 03:31:08 -0000	1.4
  +++ project.xml	24 Jul 2004 22:05:05 -0000	1.5
  @@ -117,7 +117,7 @@
       <dependency>
         <groupId>commons-validator</groupId>
         <artifactId>commons-validator</artifactId>
  -      <version>1.1.2</version>
  +      <version>1.1.3</version>
         <url>http://jakarta.apache.org/commons/validator/</url>
         <properties>
           <war.bundle>true</war.bundle>
  @@ -135,14 +135,14 @@
       <dependency>
         <groupId>struts</groupId>
         <artifactId>struts</artifactId>
  -      <version>1.2.1-dev-20040407</version>
  +      <version>1.2.1</version>
         <url>http://jakarta.apache.org/struts/</url>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
       </dependency>
       <dependency>
  -      <groupId>struts-portlet</groupId>
  +      <groupId>jetspeed2</groupId>
         <artifactId>struts-portlet</artifactId>
         <version>0.1</version>
         <properties>
  
  
  
  1.2       +1 -1      jakarta-jetspeed-2/struts-portlet/demo/src/webapp/staticJavascript.jsp
  
  Index: staticJavascript.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/src/webapp/staticJavascript.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- staticJavascript.jsp	20 Apr 2004 02:06:03 -0000	1.1
  +++ staticJavascript.jsp	24 Jul 2004 22:05:05 -0000	1.2
  @@ -2,6 +2,6 @@
   <%-- set document type to Javascript (addresses a bug in Netscape according to a web
resource --%>
   <%@ page contentType="application/x-javascript" %>
   
  -<%@ taglib uri="/tags/struts-html" prefix="html" %>
  +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
   
   <html:javascript dynamicJavascript="false" staticJavascript="true" cdata="false"/>
  
  
  

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


Mime
View raw message