ate         2005/01/19 17:42:22

  Modified:    
applications/struts-demo/src/java/org/apache/struts/webapp/example
                        ApplicationResources_it.properties
                        ApplicationResources_fr.properties
                        ApplicationResources.properties
               applications/struts-demo/src/webapp/WEB-INF validation.xml
                        struts-config.xml struts-config-registration.xml
               applications/struts-demo/src/webapp/WEB-INF/view
                        changePassword.jsp Registration.jsp footer.jsp
                        mainMenu.jsp subscription.jsp tour.html logon.jsp
                        welcome.jsp
               applications/struts-demo project.xml
  Added:       applications/struts-demo/src/webapp/WEB-INF
                        struts-portlet-config.xml
  Log:
  Upgrade of the struts-demo to Struts-1.2.4 and the new Struts Bridge 0.2
  
  Revision  Changes    Path
  1.2       +2 -2      
jakarta-jetspeed-2/applications/struts-demo/src/java/org/apache/struts/webapp/example/ApplicationResources_it.properties
  
  Index: ApplicationResources_it.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-demo/src/java/org/apache/struts/webapp/example/ApplicationResources_it.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationResources_it.properties        10 Aug 2004 15:19:40 -0000      
1.1
  +++ ApplicationResources_it.properties        20 Jan 2005 01:42:21 -0000      
1.2
  @@ -58,7 +58,7 @@
   index.heading=Opzioni applicazione dimostrativa MailReader
   index.logon=Log on nella applicazione dimostrativa MailReader
   index.registration=Registra con applicazione dimostrativa MailReader
  -index.title=Applicazione dimostrativa MailReader (Struts 1.2.1)
  +index.title=Applicazione dimostrativa MailReader (Struts 1.2.4)
   index.tour=Un tour della applicazione dimostrativa MailReader
   linkSubscription.io=Errore I/O: {0}
   linkSubscription.noSubscription=Nessuna sottoscrizione sotto l' attributo {0}
  
  
  
  1.2       +5 -5      
jakarta-jetspeed-2/applications/struts-demo/src/java/org/apache/struts/webapp/example/ApplicationResources_fr.properties
  
  Index: ApplicationResources_fr.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-demo/src/java/org/apache/struts/webapp/example/ApplicationResources_fr.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationResources_fr.properties        16 Aug 2004 18:24:28 -0000      
1.1
  +++ ApplicationResources_fr.properties        20 Jan 2005 01:42:21 -0000      
1.2
  @@ -3,9 +3,9 @@
   # 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.
  @@ -52,14 +52,14 @@
   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)
  +index.title=MailReader Demonstration Application (Struts 1.2.4)
   index.tour=A Walking Tour of the MailReader Demonstration Application
   linkSubscription.io=I/O Error: {0}
   linkSubscription.noSubscription=No subscription under attribute {0}
   linkUser.io=I/O Error: {0}
   linkUser.noUser=No user under attribute {0}
   logon.title=MailReader Demonstration Application - Logon
  -mainMenu.heading=Main Menu Options for 
  +mainMenu.heading=Main Menu Options for
   mainMenu.logoff=Log off MailReader Demonstration Application
   mainMenu.registration=Edit your user registration profile
   mainMenu.title=MailReader Demonstration Application - Main Menu
  
  
  
  1.2       +5 -5      
jakarta-jetspeed-2/applications/struts-demo/src/java/org/apache/struts/webapp/example/ApplicationResources.properties
  
  Index: ApplicationResources.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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   29 Jul 2004 22:23:03 -0000      1.1
  +++ ApplicationResources.properties   20 Jan 2005 01:42:21 -0000      1.2
  @@ -3,9 +3,9 @@
   # 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.
  @@ -52,14 +52,14 @@
   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)
  +index.title=MailReader Demonstration Application (Struts 1.2.4)
   index.tour=A Walking Tour of the MailReader Demonstration Application
   linkSubscription.io=I/O Error: {0}
   linkSubscription.noSubscription=No subscription under attribute {0}
   linkUser.io=I/O Error: {0}
   linkUser.noUser=No user under attribute {0}
   logon.title=MailReader Demonstration Application - Logon
  -mainMenu.heading=Main Menu Options for 
  +mainMenu.heading=Main Menu Options for
   mainMenu.logoff=Log off MailReader Demonstration Application
   mainMenu.registration=Edit your user registration profile
   mainMenu.title=MailReader Demonstration Application - Main Menu
  
  
  
  1.2       +3 -3      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/validation.xml
  
  Index: validation.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/validation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- validation.xml    29 Jul 2004 22:23:04 -0000      1.1
  +++ validation.xml    20 Jan 2005 01:42:21 -0000      1.2
  @@ -1,8 +1,8 @@
   <?xml version="1.0" encoding="ISO-8859-1" ?>
   
   <!DOCTYPE form-validation PUBLIC
  -          "-//Apache Software Foundation//DTD Commons Validator Rules 
Configuration 1.1//EN"
  -          "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";>
  +          "-//Apache Software Foundation//DTD Commons Validator Rules 
Configuration 1.1.3//EN"
  +          "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd";>
   
   <!--
       Validation Rules for the Struts Example Web Application
  
  
  
  1.2       +1 -1      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/struts-config.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- struts-config.xml 29 Jul 2004 22:23:04 -0000      1.1
  +++ struts-config.xml 20 Jan 2005 01:42:21 -0000      1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="ISO-8859-1" ?>
   <!DOCTYPE struts-config PUBLIC
             "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
  -          "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
  +          "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
   <!--
   
    Copyright 2000-2004 Apache Software Foundation
  
  
  
  1.2       +3 -3      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/struts-config-registration.xml
  
  Index: struts-config-registration.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/struts-config-registration.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- struts-config-registration.xml    29 Jul 2004 22:23:04 -0000      1.1
  +++ struts-config-registration.xml    20 Jan 2005 01:42:21 -0000      1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="ISO-8859-1" ?>
   <!DOCTYPE struts-config PUBLIC
             "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
  -          "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
  +          "http://struts.apache.org/dtds/struts-config_1_2.dtd";>
   <!--
    $Header$
    $Revision$
  
  
  
  1.1                  
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/struts-portlet-config.xml
  
  Index: struts-portlet-config.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
  
   Copyright 2000-2004 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.
  
    $Id: struts-portlet-config.xml,v 1.1 2005/01/20 01:42:21 ate Exp $
  -->
  <config>
    <!-- backwards compatability setting with Struts Bridge 0.1
         which defaulted html:link and html:rewrite urls to be action type
         Could rewrite the struts-config definitions but don't feel like it.
         The JPetstore example provides a much better definition.
    -->
    <portlet-url-type default="action"/>
  </config>  
  
  
  1.2       +4 -4      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/changePassword.jsp
  
  Index: changePassword.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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        29 Jul 2004 22:23:03 -0000      1.1
  +++ changePassword.jsp        20 Jan 2005 01:42:21 -0000      1.2
  @@ -17,10 +17,10 @@
   --%>
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
  -<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet"; 
prefix="sp" %>
  +<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html"; 
prefix="html" %>
   <h2><bean:message key="change.title"/></h2>
   <hr/>
   <bean:message key="change.message"/>
  -<sp:link action="/Logon">
  +<html:link action="/Logon">
     <bean:message key="change.try"/>
  -</sp:link>
  +</html:link>
  
  
  
  1.2       +7 -8      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/Registration.jsp
  
  Index: Registration.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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  29 Jul 2004 22:23:03 -0000      1.1
  +++ Registration.jsp  20 Jan 2005 01:42:21 -0000      1.2
  @@ -18,9 +18,8 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app"    prefix="app" %>
   <%@ 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://portals.apache.org/bridges/struts/tags-portlet"; 
prefix="sp" %>
  +<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html"; 
prefix="html" %>
   <h2>
   <logic:equal name="RegistrationForm" property="action"
               scope="request" value="Create">
  @@ -34,7 +33,7 @@
   <hr/>
   <html:errors/>
   
  -<sp:form action="/SaveRegistration" focus="username"
  +<html:form action="/SaveRegistration" focus="username"
            onsubmit="return validateRegistrationForm(this);">
   <html:hidden property="action"/>
   <table border="0" width="100%">
  @@ -122,7 +121,7 @@
     </tr>
   
   </table>
  -</sp:form>
  +</html:form>
   
   <logic:equal name="RegistrationForm" property="action"
               scope="request" value="Edit">
  @@ -178,10 +177,10 @@
   
   </table>
   
  -<sp:link action="/EditSubscription?action=Create" paramId="username"
  +<html:link action="/EditSubscription?action=Create" paramId="username"
    paramName="RegistrationForm" paramProperty="username">
     <bean:message key="registration.addSubscription"/>
  -</sp:link>
  +</html:link>
   
   
   </logic:equal>
  @@ -190,6 +189,6 @@
           dynamicJavascript="true"
            staticJavascript="false" cdata="false"/>
   
  -<sp:script src="/staticJavascript.jsp"/>
  +<html:script src="/staticJavascript.jsp"/>
   
   <jsp:include page="footer.jsp" />
  
  
  
  1.2       +3 -3      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/footer.jsp
  
  Index: footer.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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        29 Jul 2004 22:23:03 -0000      1.1
  +++ footer.jsp        20 Jan 2005 01:42:21 -0000      1.2
  @@ -16,6 +16,6 @@
     $Id$
   --%>
   <%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
  -<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet"; 
prefix="sp" %>
  +<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html"; 
prefix="html" %>
   <hr />
  -<p><sp:link action="/Welcome"><bean:message key="index.title"/></sp:link></p>
  +<p><html:link action="/Welcome"><bean:message 
key="index.title"/></html:link></p>
  
  
  
  1.2       +4 -4      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/mainMenu.jsp
  
  Index: mainMenu.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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      29 Jul 2004 22:23:03 -0000      1.1
  +++ mainMenu.jsp      20 Jan 2005 01:42:21 -0000      1.2
  @@ -18,11 +18,11 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app" prefix="app" %>
   <%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
  -<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet"; 
prefix="sp" %>
  +<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html"; 
prefix="html" %>
   <h2><bean:message key="mainMenu.title"/></h2>
   <hr/>
   <h3><bean:message key="mainMenu.heading"/> <bean:write name="user" 
property="fullName" /></h3>
   <ul>
  -<li><sp:link action="/EditRegistration?action=Edit"><bean:message 
key="mainMenu.registration"/></sp:link></li>
  -<li><sp:link forward="logoff"><bean:message 
key="mainMenu.logoff"/></sp:link></li>
  +<li><html:link action="/EditRegistration?action=Edit"><bean:message 
key="mainMenu.registration"/></html:link></li>
  +<li><html:link forward="logoff"><bean:message 
key="mainMenu.logoff"/></html:link></li>
   </ul>
  
  
  
  1.2       +4 -5      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/subscription.jsp
  
  Index: subscription.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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  29 Jul 2004 22:23:03 -0000      1.1
  +++ subscription.jsp  20 Jan 2005 01:42:21 -0000      1.2
  @@ -18,9 +18,8 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app"    prefix="app" %>
   <%@ 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://portals.apache.org/bridges/struts/tags-portlet"; 
prefix="sp" %>
  +<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html"; 
prefix="html" %>
   <h2>
   <logic:equal name="SubscriptionForm" property="action"
               scope="request" value="Create">
  @@ -38,7 +37,7 @@
   <hr/>
   <html:errors/>
   
  -<sp:form action="/SaveSubscription" focus="host">
  +<html:form action="/SaveSubscription" focus="host">
   <html:hidden property="action"/>
   <table border="0" width="100%">
   
  @@ -143,6 +142,6 @@
   
   </table>
   
  -</sp:form>
  +</html:form>
   
   <jsp:include page="footer.jsp" />
  
  
  
  1.2       +2 -2      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/tour.html
  
  Index: tour.html
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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 29 Jul 2004 22:23:03 -0000      1.1
  +++ tour.html 20 Jan 2005 01:42:21 -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.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 MailReader application is based on the 1.2.4 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 />
  @@ -181,7 +181,7 @@
   <code>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.4)
   index.tour=A Walking Tour of the MailReader Demonstration Application</code>
   </pre>
       <hr />
  
  
  
  1.2       +5 -6      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/logon.jsp
  
  Index: logon.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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 29 Jul 2004 22:23:03 -0000      1.1
  +++ logon.jsp 20 Jan 2005 01:42:21 -0000      1.2
  @@ -18,15 +18,14 @@
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="/tags/app"         prefix="app" %>
   <%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
  -<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
  -<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet"; 
prefix="sp" %>
  +<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html"; 
prefix="html" %>
   <!--
   <title><bean:message key="logon.title"/></title>
   -->
   
   <html:errors/>
   
  -<sp:form action="/SubmitLogon" focus="username"
  +<html:form action="/SubmitLogon" focus="username"
            onsubmit="return validateLogonForm(this);">
   <table border="0" width="100%">
   
  @@ -60,11 +59,11 @@
   
   </table>
   
  -</sp:form>
  +</html:form>
   
   <html:javascript formName="LogonForm"
           dynamicJavascript="true"
            staticJavascript="false" cdata="false"/>
  -<sp:script src="/staticJavascript.jsp"/>
  +<html:script src="/staticJavascript.jsp"/>
   
   <jsp:include page="footer.jsp" />
  
  
  
  1.2       +8 -9      
jakarta-jetspeed-2/applications/struts-demo/src/webapp/WEB-INF/view/welcome.jsp
  
  Index: welcome.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/applications/struts-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       29 Jul 2004 22:23:03 -0000      1.1
  +++ welcome.jsp       20 Jan 2005 01:42:21 -0000      1.2
  @@ -17,26 +17,25 @@
   --%>
   <%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
  -<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
  -<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet"; 
prefix="sp" %>
  +<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet-html"; 
prefix="html" %>
   <h2><bean:message key="index.title"/></h2>
   <hr/>
   <h3><bean:message key="index.heading"/></h3>
   <ul>
  -<li><sp:link action="/EditRegistration?action=Create"><bean:message 
key="index.registration"/></sp:link></li>
  -<li><sp:link action="/Logon"><bean:message key="index.logon"/></sp:link></li>
  +<li><html:link action="/EditRegistration?action=Create"><bean:message 
key="index.registration"/></html:link></li>
  +<li><html:link action="/Logon"><bean:message 
key="index.logon"/></html:link></li>
   </ul>
   
   <h3>Language Options</h3>
   <ul>
  -<li><sp:link action="/Locale?language=en">English</sp:link></li>
  -<li><sp:link action="/Locale?language=ja" 
useLocalEncoding="true">Japanese</sp:link></li>
  -<li><sp:link action="/Locale?language=ru" 
useLocalEncoding="true">Russian</sp:link></li>
  +<li><html:link action="/Locale?language=en">English</html:link></li>
  +<li><html:link action="/Locale?language=ja" 
useLocalEncoding="true">Japanese</html:link></li>
  +<li><html:link action="/Locale?language=ru" 
useLocalEncoding="true">Russian</html:link></li>
   </ul>
   
   <hr />
   
   <p><html:img bundle="alternate" pageKey="struts.logo.path" 
altKey="struts.logo.alt"/></p>
   
  -<p><sp:link action="/Tour"><bean:message key="index.tour"/></sp:link></p>
  +<p><html:link action="/Tour"><bean:message key="index.tour"/></html:link></p>
   
  
  
  
  1.5       +3 -3      jakarta-jetspeed-2/applications/struts-demo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/struts-demo/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml       8 Dec 2004 20:35:02 -0000       1.4
  +++ project.xml       20 Jan 2005 01:42:21 -0000      1.5
  @@ -148,7 +148,7 @@
       <dependency>
         <groupId>struts</groupId>
         <artifactId>struts</artifactId>
  -      <version>1.2.1</version>
  +      <version>1.2.4</version>
         <url>http://jakarta.apache.org/struts/</url>
         <properties>
           <war.bundle>true</war.bundle>
  @@ -157,7 +157,7 @@
       <dependency>
         <groupId>portals-bridges</groupId>
         <artifactId>portals-bridges-struts</artifactId>
  -      <version>0.1</version>
  +      <version>0.2</version>
         <properties>
           <war.bundle>true</war.bundle>
         </properties>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to