craigmcc 2002/06/15 22:11:36
Modified: . build.xml
src/example/org/apache/struts/webapp/example
ApplicationResources.properties
src/share/org/apache/struts/config ActionConfig.java
Log:
Correct an off-by-one error when parsing comma-delimited role names.
Thanks for the fix!
PR: Bugzilla #9523
Submitted by: Chris Van Humbeeck <chris at vanhumbeeck.com>
Revision Changes Path
1.71 +2 -2 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- build.xml 16 Jun 2002 04:02:38 -0000 1.70
+++ build.xml 16 Jun 2002 05:11:35 -0000 1.71
@@ -87,8 +87,8 @@
-->
<!-- Load local and user build preferences -->
- <property file="build.properties"/>
<property file="${user.home}/build.properties"/>
+ <property file="build.properties"/>
<!-- Default values for unspecified properties -->
<property name="catalina.home" value="../jakarta-tomcat-4.0/build"/>
@@ -479,7 +479,7 @@
password="${catalina.password}"/>
</target>
- <target name="reload.catalina"
+ <target name="reload.catalina" depends="compile.webapps"
description="Dynamically reload struts-example on Catalina (Tomcat 4.1)">
<taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
<reload url="${catalina.url}" username="${catalina.username}"
1.6 +2 -2
jakarta-struts/src/example/org/apache/struts/webapp/example/ApplicationResources.properties
Index: ApplicationResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/ApplicationResources.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApplicationResources.properties 22 Mar 2002 21:57:02 -0000 1.5
+++ ApplicationResources.properties 16 Jun 2002 05:11:35 -0000 1.6
@@ -12,7 +12,7 @@
error.fullName.required=<li>Full Name is required</li>
error.host.required=<li>Mail Server is required</li>
error.noSubscription=<li>No Subscription bean in user session</li>
-error.password.expired=Your password has expired
+error.password.expired=Your password has expired for username {0}
error.password.required=<li>Password is required</li>
error.password2.required=<li>Confirmation password is required</li>
error.password.match=<li>Password and confirmation password must match</li>
@@ -26,7 +26,7 @@
errors.footer=</ul><hr>
errors.header=<h3><font color="red">Validation Error</font></h3>You must correct
the following error(s) before proceeding:<ul>
errors.ioException=I/O exception rendering error messages: {0}
-expired.password=User Password has expired
+expired.password=User Password has expired for {0}
heading.autoConnect=Auto
heading.subscriptions=Current Subscriptions
heading.host=Host Name
1.6 +5 -5
jakarta-struts/src/share/org/apache/struts/config/ActionConfig.java
Index: ActionConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ActionConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ActionConfig.java 23 Feb 2002 23:53:29 -0000 1.5
+++ ActionConfig.java 16 Jun 2002 05:11:36 -0000 1.6
@@ -325,7 +325,7 @@
int comma = roles.indexOf(',');
if (comma < 0)
break;
- list.add(roles.substring(1, comma).trim());
+ list.add(roles.substring(0, comma).trim());
roles = roles.substring(comma + 1);
}
roles = roles.trim();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
