cvs commit: jakarta-struts/conf/test/tomcat33 server.xml
martinc 2004/03/22 20:28:27 Modified:conf/test/tomcat33 server.xml Log: Change the port number for the AJP-12 connector so that it doesn't conflict with the default one in the container. (This probably isn't needed at all, but I'll leave that for someone more familiar with Tomcat to decide.) Revision ChangesPath 1.4 +1 -1 jakarta-struts/conf/test/tomcat33/server.xml Index: server.xml === RCS file: /home/cvs/jakarta-struts/conf/test/tomcat33/server.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- server.xml1 Aug 2003 04:58:08 - 1.3 +++ server.xml23 Mar 2004 04:28:27 - 1.4 @@ -150,7 +150,7 @@ tomcatAuthentication=false -- -Ajp12Connector port=8007 / +Ajp12Connector port=8008 / !-- Context definitions can be placed here ( not recommended ) or - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/config ActionConfigMatcher.java
martinc 2004/03/22 22:27:06
Modified:src/share/org/apache/struts/config ActionConfigMatcher.java
Log:
Make ActionConfigMatcher$Mapping serializable.
PR: 27376
Submitted by: Fabio Grassi
Revision ChangesPath
1.10 +4 -4
jakarta-struts/src/share/org/apache/struts/config/ActionConfigMatcher.java
Index: ActionConfigMatcher.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ActionConfigMatcher.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ActionConfigMatcher.java 14 Mar 2004 06:23:47 - 1.9
+++ ActionConfigMatcher.java 23 Mar 2004 06:27:06 - 1.10
@@ -211,7 +211,7 @@
/**
* Stores a compiled wildcard pattern and the ActionConfig it came from.
*/
-private class Mapping {
+private class Mapping implements Serializable {
/** The compiled pattern. */
private int[] pattern;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFrameTag1.jsp TestFrameTag3.jsp
martinc 2004/03/21 16:45:28 Modified:web/test/test/org/apache/struts/taglib/html TestFrameTag1.jsp TestFrameTag3.jsp Log: Fix some tests that were broken when module support was added to TagUtils.computeURL(). Revision ChangesPath 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp Index: TestFrameTag1.jsp === RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag1.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestFrameTag1.jsp 26 Dec 2003 22:08:01 - 1.3 +++ TestFrameTag1.jsp 22 Mar 2004 00:45:28 - 1.4 @@ -87,7 +87,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -98,7 +98,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -108,7 +108,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -118,7 +118,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -128,7 +128,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -138,7 +138,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -148,7 +148,7 @@ /bean:define bean:define id=thisMap name=paramMap type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false)% /bean:define /logic:equal @@ -158,7 +158,7 @@ /bean:define bean:define id=thisMap name=paramPropertyMap property=map type=java.util.Map/ bean:define id=EXPECTED_RESULTS toScope=page - frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, thisMap, null, false)% + frame src=%=org.apache.struts.taglib.TagUtils.getInstance().computeURL(pageContext, simpleForward, null, null, null, null, thisMap, null, false
cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestFrameTag3.jsp TestFrameTag5.jsp TestFrameTag7.jsp TestImgTag1a.jsp TestImgTag3a.jsp TestImgTag5a.jsp TestImgTag7a.jsp TestLinkTag1.jsp TestLinkTag3.jsp TestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp
martinc 2004/03/21 22:06:58 Modified:web/test/test/org/apache/struts/taglib/html TestFrameTag3.jsp TestFrameTag5.jsp TestFrameTag7.jsp TestImgTag1a.jsp TestImgTag3a.jsp TestImgTag5a.jsp TestImgTag7a.jsp TestLinkTag1.jsp TestLinkTag3.jsp TestLinkTag4.jsp TestLinkTag5.jsp TestLinkTag6.jsp TestLinkTag7.jsp TestLinkTag8.jsp Log: Fix remaining tests that were broken when module support was added to TagUtils.computeURL(). (Man, I wish Java had named parameters!) Revision ChangesPath 1.5 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag3.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag3.jsp.diff?r1=1.4r2=1.5 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag5.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag5.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag7.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag7.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag1a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag1a.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag3a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag3a.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag5a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag5a.jsp.diff?r1=1.3r2=1.4 1.4 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag7a.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestImgTag7a.jsp.diff?r1=1.3r2=1.4 1.5 +8 -8 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag1.jsp.diff?r1=1.4r2=1.5 1.5 +10 -10 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag3.jsp.diff?r1=1.4r2=1.5 1.5 +28 -28 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag4.jsp.diff?r1=1.4r2=1.5 1.5 +27 -27 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag5.jsp.diff?r1=1.4r2=1.5 1.5 +28 -28 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag6.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag6.jsp.diff?r1=1.4r2=1.5 1.5 +27 -27 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag7.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag7.jsp.diff?r1=1.4r2=1.5 1.5 +28 -28 jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag8.jsp http://cvs.apache.org/viewcvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag8.jsp.diff?r1=1.4r2=1.5 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/conf/test/tomcat50 - New directory
martinc 2004/03/21 23:06:12 jakarta-struts/conf/test/tomcat50 - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/conf/test/tomcat50 server.xml
martinc 2004/03/21 23:16:37
Modified:.build-tests.xml build.xml
Added: conf/test/tomcat50 server.xml
Log:
Add initial support for Cactus tests running against Tomcat 5.0. The tests
themselves run just fine, but for some reason Tomcat doesn't stop once the
tests have completed. (I have not added the 5.0 targets to the test suite
because of this.)
Revision ChangesPath
1.25 +83 -0 jakarta-struts/build-tests.xml
Index: build-tests.xml
===
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build-tests.xml 10 Oct 2003 22:09:26 - 1.24
+++ build-tests.xml 22 Mar 2004 07:16:37 - 1.25
@@ -631,6 +631,89 @@
/target
+!--
+Prepare test directory structure for Tomcat 5.0 servlet engine
+--
+target name=prepare.test.tomcat.50 depends=prepare.test.war
if=tomcat.home.50
+
+property name=out.tomcat.50.dir
value=${out.test.dir}/servers/tomcat50/
+filter token=out.tomcat.50.full.dir value=${out.tomcat.50.dir}/
+filter token=tomcat.connector.port value=${cactus.contextPort}/
+
+mkdir dir=${out.tomcat.50.dir}/webapps/
+mkdir dir=${out.tomcat.50.dir}/conf/
+
+ !-- Delete old directory so new war is unzipped --
+delete dir=${out.tomcat.50.dir}/webapps/test/
+
+!-- Copy war file --
+copy file=${out.test.dir}/test.war todir=${out.tomcat.50.dir}/webapps/
+
+!-- Copy configuration files --
+copy file=${conf.test.dir}/tomcat50/server.xml
+todir=${out.tomcat.50.dir}/conf filtering=on/
+
+/target
+
+!--
+Run unit tests on Tomcat 5.0 servlet engine
+--
+target name=test.tomcat.50 depends=prepare.test.tomcat.50
+
+!-- Start the servlet engine, wait for it to be started, run the
+ unit tests, stop the servlet engine, wait for it to be stopped.
+ The servlet engine is automatically stopped if the tests fail for
+ any reason.--
+
+runservertests testURL=${cactus.contextURL}
+startTarget=start.tomcat.50
+stopTarget=stop.tomcat.50
+testTarget=run.test/
+
+/target
+
+!--
+Start Tomcat 5.0 servlet engine
+--
+target name=start.tomcat.50
+
+java classname=org.apache.catalina.startup.Bootstrap fork=yes
+jvmarg value=-Dcatalina.home=${tomcat.home.50}/
+jvmarg value=-Dcatalina.base=${tomcat.home.50}/
+arg value=-config/
+arg value=${out.tomcat.50.dir}/conf/server.xml/
+arg value=start/
+classpath
+ pathelement location=${java.home}/../lib/tools.jar/
+ fileset dir=${tomcat.home.50}
+ include name=bin/bootstrap.jar/
+!-- include name=server/catalina.jar/ --
+ /fileset
+/classpath
+/java
+
+/target
+
+!--
+Stop Tomcat 5.0 servlet engine
+--
+target name=stop.tomcat.50
+
+java classname=org.apache.catalina.startup.Bootstrap fork=yes
+jvmarg value=-Dcatalina.home=${tomcat.home.50}/
+jvmarg value=-Dcatalina.base=${tomcat.home.50}/
+arg value=-config/
+arg value=${out.tomcat.50.dir}/conf/server.xml/
+arg value=stop/
+classpath
+ fileset dir=${tomcat.home.50}
+ include name=bin/bootstrap.jar/
+!-- include name=server/catalina.jar/ --
+ /fileset
+/classpath
+/java
+
+/target
!-- Non-Cactus JUnit Based Tests --
1.131 +16 -0 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- build.xml 29 Feb 2004 22:55:45 - 1.130
+++ build.xml 22 Mar 2004 07:16:37 - 1.131
@@ -868,6 +868,22 @@
/target
+target name=skip.tomcat.50 unless=tomcat.home.50
+echo message=*/
+echo message=WARNING : Property 'tomcat.home.50' has not been set./
+echo message= No test will be run on that servlet engine./
+echo message=*/
+echo message=/
+/target
+
+target name=test.tomcat.50 if=tomcat.home.50
+ depends=skip.tomcat.50,compile.library
+ description=Run unit tests on Tomcat 5.0
+echo message
cvs commit: jakarta-struts STATUS.txt
martinc 2004/03/16 09:53:02 Modified:.STATUS.txt Log: Correct the Servlet version for Struts 2.0. Revision ChangesPath 1.4 +2 -2 jakarta-struts/STATUS.txt Index: STATUS.txt === RCS file: /home/cvs/jakarta-struts/STATUS.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- STATUS.txt16 Mar 2004 15:53:27 - 1.3 +++ STATUS.txt16 Mar 2004 17:53:02 - 1.4 @@ -47,7 +47,7 @@ * Struts 1.x will remain based on Servlet 1.2/JSP 1.1 (evolution). -* Struts 2.x will be based on Servlet / JSP 2.0 (revolution). +* Struts 2.x will be based on Servlet 2.4/JSP 2.0 (revolution). * For more see http://jakarta.apache.org/struts/status.html. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/faqs helping.xml kickstart.xml
martinc 2004/02/29 14:55:46
Modified:.build.xml project.xml
conf/share MANIFEST.MF
contrib project.xml
contrib/artimus/WEB-INF build.xml
contrib/scaffold/conf/framework manifest
contrib/scaffold/conf/sample manifest
contrib/struts-chain/src/conf MANIFEST.MF
contrib/struts-el build.xml
contrib/struts-el/doc/stylesheets proposals.xsl struts.xsl
userGuide.xsl
contrib/struts-faces build.xml
contrib/struts-faces/src/conf MANIFEST.MF struts-doc.xsl
contrib/struts-faces/src/example2/org/apache/struts/webapp/example2
ApplicationResources.properties
doc index.xml
doc/faqs helping.xml kickstart.xml
doc/stylesheets struts.xsl
web/tiles-documentation/common footer.jsp
web/tiles-documentation/examples/tiles footer.jsp
xdocsfaq.fml
xdocs/faqs helping.xml kickstart.xml
Log:
Correct the ASF name, per Greg Stein's note.
Revision ChangesPath
1.130 +1 -1 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- build.xml 27 Feb 2004 06:26:42 - 1.129
+++ build.xml 29 Feb 2004 22:55:45 - 1.130
@@ -353,7 +353,7 @@
version=true
windowtitle=Apache Struts API Documentation
doctitle=lt;h1gt;Apache Struts Framework (Version
${project.version})lt;/h1gt;
-bottom=Copyright #169; 2000-${year} - Apache Software Foundation
+bottom=Copyright #169; 2000-${year} - The Apache Software Foundation
classpath refid=compile.classpath/
/javadoc
/target
1.25 +1 -1 jakarta-struts/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-struts/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 27 Feb 2004 14:27:04 - 1.24
+++ project.xml 29 Feb 2004 22:55:45 - 1.25
@@ -5,7 +5,7 @@
idstruts/id
currentVersion1.2.1-dev/currentVersion
organization
-nameApache Software Foundation/name
+nameThe Apache Software Foundation/name
urlhttp://jakarta.apache.org//url
logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo
/organization
1.10 +2 -2 jakarta-struts/conf/share/MANIFEST.MF
Index: MANIFEST.MF
===
RCS file: /home/cvs/jakarta-struts/conf/share/MANIFEST.MF,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MANIFEST.MF 29 Jan 2004 19:06:16 - 1.9
+++ MANIFEST.MF 29 Feb 2004 22:55:45 - 1.10
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Extension-Name: Struts Framework
Specification-Title: Struts Framework
-Specification-Vendor: Apache Software Foundation
+Specification-Vendor: The Apache Software Foundation
Specification-Version: 1.2.0
Implementation-Title: Struts Framework
-Implementation-Vendor: Apache Software Foundation
+Implementation-Vendor: The Apache Software Foundation
Implementation-Vendor-Id: org.apache
Implementation-Version: 1.2.0
Class-Path:
1.4 +1 -1 jakarta-struts/contrib/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 10 Jan 2004 23:43:51 - 1.3
+++ project.xml 29 Feb 2004 22:55:45 - 1.4
@@ -7,7 +7,7 @@
currentVersion1.0/currentVersion
organization
-nameApache Software Foundation/name
+nameThe Apache Software Foundation/name
urlhttp://www.apache.org/url
inceptionYear2000/inceptionYear
logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo
1.4 +2 -2 jakarta-struts/contrib/artimus/WEB-INF/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/artimus/WEB-INF/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 18 Jan 2004 13:43:07 - 1.3
+++ build.xml 29 Feb 2004 22:55:45 - 1.4
@@ -67,7 +67,7 @@
version=true
windowtitle=Artimus API Documentation
doctitle=lt;h1gt;${project.title} Documentation (Version
cvs commit: jakarta-struts build.xml
martinc 2004/02/26 22:26:42 Modified:.build.xml Log: Update build version to 1.2.1-dev. Revision ChangesPath 1.129 +1 -1 jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- build.xml 22 Feb 2004 10:03:51 - 1.128 +++ build.xml 27 Feb 2004 06:26:42 - 1.129 @@ -148,7 +148,7 @@ property name=project.name value=jakarta-struts/ !-- Version of the project -- -property name=project.version value=1.2.0/ +property name=project.version value=1.2.1-dev/ !-- == Derived Properties -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib/struts-el build.xml
martinc 2004/02/26 22:32:22 Modified:contrib/struts-el build.xml Log: Document the jstl.tld.dir property, required to build Struts-EL. Revision ChangesPath 1.21 +3 -0 jakarta-struts/contrib/struts-el/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- build.xml 10 Feb 2004 16:35:10 - 1.20 +++ build.xml 27 Feb 2004 06:32:22 - 1.21 @@ -38,6 +38,9 @@ jstl-standard.jar The path to the JSTL 1.0 standard jar file. +jstl.tld.dir The path to the directory containing the + TLD files for JSTL 1.0. + commons-beanutils.jar The path to the JAR file of the Jakarta Commons BeanUtils package (version 1.0 or later). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build.xml
martinc 2004/02/22 02:03:51 Modified:.build.xml Log: Update build version for 1.2.0 build. Revision ChangesPath 1.128 +1 -1 jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- build.xml 19 Feb 2004 00:05:21 - 1.127 +++ build.xml 22 Feb 2004 10:03:51 - 1.128 @@ -148,7 +148,7 @@ property name=project.name value=jakarta-struts/ !-- Version of the project -- -property name=project.version value=1.2-dev/ +property name=project.version value=1.2.0/ !-- == Derived Properties -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/stylesheets struts.xsl
martinc 2004/02/22 12:06:01
Modified:doc/stylesheets struts.xsl
Log:
Update copyright year in page footers.
Revision ChangesPath
1.19 +2 -2 jakarta-struts/doc/stylesheets/struts.xsl
Index: struts.xsl
===
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/struts.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- struts.xsl27 Nov 2003 04:06:52 - 1.18
+++ struts.xsl22 Feb 2004 20:06:01 - 1.19
@@ -138,7 +138,7 @@
xsl:value-of select=$relative-path/xsl:value-of
select=$powered-logo/
/xsl:variable
img src={$src} alt=Powered by Struts id=powered-logo/
-Copyright (c) 2000-2003, Apache Software Foundation span class=noprint-
+Copyright (c) 2000-2004, Apache Software Foundation span class=noprint-
a
href=http://nagoya.apache.org/wiki/apachewiki.cgi?StrutsDocComments;Comments?/a/span
/div
xsl:commentend footer/xsl:comment
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/config/impl ModuleConfigImpl.java
martinc 2004/02/16 21:51:48
Modified:conf/share struts-config_1_1.dtd
src/share/org/apache/struts/config ConfigRuleSet.java
ModuleConfig.java
src/share/org/apache/struts/config/impl
ModuleConfigImpl.java
Log:
Restore the functionality for the 'type' attribute on form-beans and
global-forwards elements in the config file. This allows the class name
to be specified for all sub-elements, rather than having to specify it
explicitly for each one.
PR: 26942
Submitted by: Charlie Jones
Revision ChangesPath
1.42 +1 -3 jakarta-struts/conf/share/struts-config_1_1.dtd
Index: struts-config_1_1.dtd
===
RCS file: /home/cvs/jakarta-struts/conf/share/struts-config_1_1.dtd,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- struts-config_1_1.dtd 1 Feb 2004 16:14:07 - 1.41
+++ struts-config_1_1.dtd 17 Feb 2004 05:51:47 - 1.42
@@ -135,7 +135,6 @@
typeFully qualified Java class to use when instantiating
ActionFormBean objects. If specified, the object must be a
subclass of the default class type.
- DEPRECATED.
WARNING: For Struts 1.0, this value is ignored. You
can set the default implementation class name with the
@@ -282,7 +281,6 @@
typeFully qualified Java class to use when instantiating
ActionForward objects. If specified, the object must be a
subclass of the default class type.
- DEPRECATED.
WARNING: For Struts 1.0, this value is ignored. You
can set the default implementation class name with the
1.17 +128 -12
jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java
Index: ConfigRuleSet.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ConfigRuleSet.java10 Jan 2004 21:03:34 - 1.16
+++ ConfigRuleSet.java17 Feb 2004 05:51:47 - 1.17
@@ -177,11 +177,13 @@
(struts-config/controller/set-property,
property, value);
-digester.addObjectCreate
+digester.addRule
+(struts-config/form-beans,
+ new SetActionFormBeanClassRule());
+
+digester.addFactoryCreate
(struts-config/form-beans/form-bean,
- // org.apache.struts.config.FormBeanConfig,
- org.apache.struts.action.ActionFormBean,
- className);
+ new ActionFormBeanFactory());
digester.addSetProperties
(struts-config/form-beans/form-bean);
digester.addSetNext
@@ -223,11 +225,13 @@
(struts-config/global-exceptions/exception/set-property,
property, value);
-digester.addObjectCreate
+digester.addRule
+(struts-config/global-forwards,
+ new SetGlobalForwardClassRule());
+
+digester.addFactoryCreate
(struts-config/global-forwards/forward,
- // org.apache.struts.config.ForwardConfig,
- org.apache.struts.action.ActionForward,
- className);
+ new GlobalForwardFactory());
digester.addSetProperties
(struts-config/global-forwards/forward);
digester.addSetNext
@@ -315,6 +319,62 @@
/**
+ * Class that sets the name of the class to use when creating action form bean
+ * instances. The value is set on the object on the top of the stack, which
+ * must be a codeorg.apache.struts.config.ModuleConfig/code.
+ */
+final class SetActionFormBeanClassRule extends Rule {
+
+public SetActionFormBeanClassRule() {
+super();
+}
+
+public void begin(String namespace, String name, Attributes attributes) throws
Exception {
+String className = attributes.getValue(type);
+if (className != null) {
+ModuleConfig mc = (ModuleConfig) digester.peek();
+mc.setActionFormBeanClass(className);
+}
+}
+
+}
+
+
+/**
+ * An object creation factory which creates action form bean instances, taking
+ * into account the default class name, which may have been specified on the
+ * parent element and which is made available through the object on the top
+ * of the stack, which must be a
+ * codeorg.apache.struts.config.ModuleConfig/code.
+ */
+final class
cvs commit: jakarta-struts/contrib/struts-faces build.xml
martinc 2004/01/24 23:57:36
Modified:contrib/struts-faces build.xml
Log:
Correct the default location for Commons Logging.
Revision ChangesPath
1.9 +1 -1 jakarta-struts/contrib/struts-faces/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 31 Dec 2003 07:17:48 - 1.8
+++ build.xml 25 Jan 2004 07:57:36 - 1.9
@@ -30,7 +30,7 @@
property name=commons-lang.jar
value=${struts.home}/lib/commons-lang.jar/
property name=commons-logging.jar
-value=${jwsdp.home}/lib/commons-logging.jar/
+value=${struts.home}/lib/commons-logging.jar/
property name=commons-validator.jar
value=${struts.home}/lib/commons-validator.jar/
property name=jsf-api.jar value=${jsf.home}/lib/jsf-api.jar/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/upload CommonsMultipartRequestHandler.java
martinc 2004/01/24 15:39:18 Modified:src/share/org/apache/struts/upload CommonsMultipartRequestHandler.java Log: Don't cast max size to an int, since the method wants a long anyway. PR: 26305 Submitted by: Charles Chen Revision ChangesPath 1.14 +5 -5 jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java Index: CommonsMultipartRequestHandler.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- CommonsMultipartRequestHandler.java 21 Jan 2004 03:53:49 - 1.13 +++ CommonsMultipartRequestHandler.java 24 Jan 2004 23:39:18 - 1.14 @@ -218,7 +218,7 @@ // see http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23255 upload.setHeaderEncoding(request.getCharacterEncoding()); // Set the maximum size before a FileUploadException will be thrown. -upload.setSizeMax((int) getSizeMax(ac)); +upload.setSizeMax(getSizeMax(ac)); // Set the maximum size that will be stored in memory. upload.setSizeThreshold((int) getSizeThreshold(ac)); // Set the the location for saving data on disk. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib/struts-jericho README.txt
martinc 2003/12/18 10:14:36 Modified:contrib/struts-jericho README.txt Log: Add Cornerstone (from Jetspeed 2) to the list of frameworks to consider. Revision ChangesPath 1.7 +1 -1 jakarta-struts/contrib/struts-jericho/README.txt Index: README.txt === RCS file: /home/cvs/jakarta-struts/contrib/struts-jericho/README.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README.txt18 Dec 2003 17:26:33 - 1.6 +++ README.txt18 Dec 2003 18:14:36 - 1.7 @@ -42,7 +42,7 @@ -Also under consideration- -* Services framework. Utilize Spring IoC, HiveMind, Avalon, orPico, et cetera, to configure services. +* Services framework. Utilize Spring IoC, HiveMind, Avalon, Pico, Cornerstone, et cetera, to configure services. * Configuration testing. Integrate utility of Struts TestCase, ideally configured from an XML configuration (a la Canoo Webtest). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/proposals release-plan_1_2_0.xml
martinc 2003/12/16 09:13:57 Modified:doc/proposals release-plan_1_2_0.xml Log: I can help. Revision ChangesPath 1.7 +2 -2 jakarta-struts/doc/proposals/release-plan_1_2_0.xml Index: release-plan_1_2_0.xml === RCS file: /home/cvs/jakarta-struts/doc/proposals/release-plan_1_2_0.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- release-plan_1_2_0.xml16 Dec 2003 17:07:56 - 1.6 +++ release-plan_1_2_0.xml16 Dec 2003 17:13:57 - 1.7 @@ -40,7 +40,7 @@ emTag Date/em - Saturday, December 20, 2003, 23:59:59 /li li - emRelease Manager(s)/em - Ted Husted, ? + emRelease Manager(s)/em - Ted Husted, Martin Cooper /li li emAlpha Release Announcement/em - To the following mailing list: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html SelectTag.java
martinc 2003/11/27 23:25:55
Modified:src/share/org/apache/struts/taglib/html SelectTag.java
Log:
Clear out the saved body content after use, so that it's not used again
inadvertently when the tag handler instance is reused.
PR: 24573
Submitted by: hurle at gmx.de
Revision ChangesPath
1.19 +5 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java
Index: SelectTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SelectTag.java31 Jul 2003 00:19:04 - 1.18
+++ SelectTag.java28 Nov 2003 07:25:55 - 1.19
@@ -367,6 +367,7 @@
StringBuffer results = new StringBuffer();
if (saveBody != null) {
results.append(saveBody);
+saveBody = null;
}
results.append(/select);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util MessageResources.java
martinc 2003/11/27 14:14:51
Modified:src/share/org/apache/struts/util MessageResources.java
Log:
Make sure getMessage(String) goes through the local implementation, rather
than bypassing it and therefore skipping the default locale handling.
PR: 22252
Submitted by: msc at ivu.de
Revision ChangesPath
1.20 +5 -5
jakarta-struts/src/share/org/apache/struts/util/MessageResources.java
Index: MessageResources.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/MessageResources.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MessageResources.java 9 Sep 2003 04:33:12 - 1.19
+++ MessageResources.java 27 Nov 2003 22:14:51 - 1.20
@@ -204,7 +204,7 @@
*/
public String getMessage(String key) {
-return this.getMessage((Locale) null, key);
+return this.getMessage((Locale) null, key, null);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide release-notes.xml
martinc 2003/11/27 15:01:22 Modified:.README build-all-clean.bat.sample contrib/struts-chain README.txt contrib/struts-faces README.txt doc/userGuide release-notes.xml Log: Document that Ant 1.5.2 or above is required to build Struts now (because we use the 'reloadstylesheet' attribute on the style task, which was only introduced in that version). Revision ChangesPath 1.17 +2 -2 jakarta-struts/README Index: README === RCS file: /home/cvs/jakarta-struts/README,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- README21 Mar 2002 02:57:24 - 1.16 +++ README27 Nov 2003 23:01:22 - 1.17 @@ -169,7 +169,7 @@ download and install a source distribution of Struts from http://jakarta.apache.org/builds/jakarta-struts/nightly/src. You will also need a recent nightly build of the Ant project development tool (you *must* -use version 1.3 or later of Ant). +use version 1.5.2 or later of Ant). Before committing any changes to the Struts CVS repository, you must do a build clean followed by a build dist, to ensure that everything compiles 1.11 +2 -2 jakarta-struts/build-all-clean.bat.sample Index: build-all-clean.bat.sample === RCS file: /home/cvs/jakarta-struts/build-all-clean.bat.sample,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- build-all-clean.bat.sample12 Aug 2003 04:37:57 - 1.10 +++ build-all-clean.bat.sample27 Nov 2003 23:01:22 - 1.11 @@ -16,7 +16,7 @@ rem are checked out of CVS in the same directory. rem Also assumes uses of rem maven beta 10 or above, -rem ant 1.5.1 +rem ant 1.5.2 rem cactus v 1.4.1 v1.2 rem v 1.2 Because the commons (resources) use an old version remof cactus for units test, that maven doesn't precompile 1.2 +2 -2 jakarta-struts/contrib/struts-chain/README.txt Index: README.txt === RCS file: /home/cvs/jakarta-struts/contrib/struts-chain/README.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README.txt11 Aug 2003 04:55:34 - 1.1 +++ README.txt27 Nov 2003 23:01:22 - 1.2 @@ -139,7 +139,7 @@ Install An Ant Distribution: --- -The provided build.xml script requires Ant, version 1.5.1 or later. You can +The provided build.xml script requires Ant, version 1.5.2 or later. You can get it from: http://ant.apache.org/ 1.3 +2 -2 jakarta-struts/contrib/struts-faces/README.txt Index: README.txt === RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/README.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README.txt4 Jun 2003 17:38:12 - 1.2 +++ README.txt27 Nov 2003 23:01:22 - 1.3 @@ -294,7 +294,7 @@ --- If you have downloaded the JWSDP 1.2ea release described above, Ant is already -included. Otherwise, download Apache Ant, version 1.5.1 or later, from: +included. Otherwise, download Apache Ant, version 1.5.2 or later, from: http://jakarta.apache.org/site/binindex.cgi 1.34 +1 -1 jakarta-struts/doc/userGuide/release-notes.xml Index: release-notes.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/release-notes.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- release-notes.xml 29 Sep 2003 02:49:18 - 1.33 +++ release-notes.xml 27 Nov 2003 23:01:22 - 1.34 @@ -162,7 +162,7 @@ reference implementation, and Xerces 1.3.1./p pstrongSOURCE DEVELOPERS NOTE! Ant Prerequisite Updated/strong/p -pTo build Struts from source Ant 1.4 or later is now required. This +pTo build Struts from source Ant 1.5.2 or later is now required. This does not affect developers that use Struts from the binary distribution./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build-webapps.xml
martinc 2003/11/27 17:29:50
Modified:.build-webapps.xml
Log:
Remove style tasks for news and resources, since those no longer exist
here. (This was causing the build to break when directories were pruned.)
Revision ChangesPath
1.24 +0 -18 jakarta-struts/build-webapps.xml
Index: build-webapps.xml
===
RCS file: /home/cvs/jakarta-struts/build-webapps.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build-webapps.xml 11 Sep 2003 01:21:59 - 1.23
+++ build-webapps.xml 28 Nov 2003 01:29:50 - 1.24
@@ -232,15 +232,6 @@
reloadstylesheet=true
param name=project-path expression=../faqs/project.xml/
/style
-!-- Create the news --
-style basedir=${doc.dir}/news
- destdir=${build.home}/documentation/news
- extension=.html style=${doc.dir}/stylesheets/struts.xsl
-includes=*.xml
-excludes=project.xml
-reloadstylesheet=true
- param name=project-path expression=../news/project.xml/
-/style
!-- Create the proposals --
style basedir=${doc.dir}/proposals
destdir=${build.home}/documentation/proposals
@@ -249,15 +240,6 @@
excludes=project.xml
reloadstylesheet=true
param name=project-path expression=../proposals/project.xml/
-/style
-!-- Create the resources --
-style basedir=${doc.dir}/resources
- destdir=${build.home}/documentation/resources
- extension=.html style=${doc.dir}/stylesheets/struts.xsl
-includes=*.xml
-excludes=project.xml
-reloadstylesheet=true
- param name=project-path expression=../resources/project.xml/
/style
!-- Create the user guide --
style basedir=${doc.dir}/userGuide
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic MessagesPresentTag.java
martinc 2003/11/27 17:55:40
Modified:src/share/org/apache/struts/taglib/logic
MessagesPresentTag.java
Log:
Use a local variable for the messages key name, instead of stomping on the
tag attribute value, so that the tag is happy in a reuse scenario.
PR: 23523
Submitted by: Klaus Bucka-Lassen Jan Sorensen
Revision ChangesPath
1.11 +4 -3
jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java
Index: MessagesPresentTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MessagesPresentTag.java 23 Aug 2003 00:22:12 - 1.10
+++ MessagesPresentTag.java 28 Nov 2003 01:55:40 - 1.11
@@ -122,12 +122,13 @@
protected boolean condition(boolean desired) throws JspException {
ActionMessages am = null;
+String key = name;
if (message != null true.equalsIgnoreCase(message)){
- name = Globals.MESSAGE_KEY;
+ key = Globals.MESSAGE_KEY;
}
try {
-am = TagUtils.getInstance().getActionMessages(pageContext, name);
+am = TagUtils.getInstance().getActionMessages(pageContext, key);
} catch (JspException e) {
TagUtils.getInstance().saveException(pageContext, e);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/upload BufferedMultipartInputStream.java ContentLengthExceededException.java DiskFile.java DiskMultipartRequestHandler.java MaxLengthExceededException.java MultipartBoundaryInputStream.java MultipartElement.java MultipartIterator.java MultipartValueStream.java
martinc 2003/11/25 21:57:06
Modified:src/share/org/apache/struts/upload
BufferedMultipartInputStream.java
ContentLengthExceededException.java DiskFile.java
DiskMultipartRequestHandler.java
MaxLengthExceededException.java
MultipartBoundaryInputStream.java
MultipartElement.java MultipartIterator.java
MultipartValueStream.java
Log:
Deprecate DiskMultipartRequestHandler and friends, which is the buggy
old upload implementation, no longer used as the default as of Struts
1.1. This will be removed after 1.2 (meaning as of 1.3/2.0).
Revision ChangesPath
1.9 +6 -3
jakarta-struts/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java
Index: BufferedMultipartInputStream.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BufferedMultipartInputStream.java 7 Nov 2002 05:58:03 - 1.8
+++ BufferedMultipartInputStream.java 26 Nov 2003 05:57:06 - 1.9
@@ -69,6 +69,9 @@
* This class implements buffering for an InputStream as well as a
* readLine method. The purpose of this is to provide a reliable
* readLine() method.
+ *
+ * @deprecated Use the Commons FileUpload based multipart handler instead. This
+ * class will be removed after Struts 1.2.
*/
public class BufferedMultipartInputStream extends InputStream {
1.3 +6 -3
jakarta-struts/src/share/org/apache/struts/upload/ContentLengthExceededException.java
Index: ContentLengthExceededException.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/ContentLengthExceededException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentLengthExceededException.java 6 Jul 2002 04:44:07 - 1.2
+++ ContentLengthExceededException.java 26 Nov 2003 05:57:06 - 1.3
@@ -66,6 +66,9 @@
/**
* This exception is thrown when multipart post data exceeds the value
* given by the Content-Length header
+ *
+ * @deprecated Use the Commons FileUpload based multipart handler instead. This
+ * class will be removed after Struts 1.2.
*/
public class ContentLengthExceededException extends IOException {
1.5 +7 -3 jakarta-struts/src/share/org/apache/struts/upload/DiskFile.java
Index: DiskFile.java
===
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskFile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DiskFile.java 8 Dec 2002 07:12:16 - 1.4
+++ DiskFile.java 26 Nov 2003 05:57:06 - 1.5
@@ -68,6 +68,10 @@
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
+/**
+ * @deprecated Use the Commons FileUpload based multipart handler instead. This
+ * class will be removed after Struts 1.2.
+ */
public class DiskFile implements FormFile {
/**
1.25 +6 -3
jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java
Index: DiskMultipartRequestHandler.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/DiskMultipartRequestHandler.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DiskMultipartRequestHandler.java 2 Aug 2003 22:22:13 - 1.24
+++ DiskMultipartRequestHandler.java 26 Nov 2003 05:57:06 - 1.25
@@ -82,6 +82,9 @@
* to temporary files on disk.
*
* @author Mike Schachter
+ *
+ * @deprecated Use the Commons FileUpload based multipart handler instead. This
+ * class will be removed after Struts 1.2.
*/
public class DiskMultipartRequestHandler implements MultipartRequestHandler {
1.3 +6 -3
jakarta-struts/src/share/org/apache/struts/upload/MaxLengthExceededException.java
Index: MaxLengthExceededException.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MaxLengthExceededException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MaxLengthExceededException.java 6 Jul 2002 04:44:07 - 1.2
+++ MaxLengthExceededException.java 26 Nov 2003 05:57:06 - 1.3
@@ -66,6 +66,9 @@
/**
* This exception
cvs commit: jakarta-struts/doc volunteers.xml
martinc 2003/10/14 22:15:11 Modified:doc volunteers.xml Log: Update my bio to reflect change of employer, amongst other things. Revision ChangesPath 1.38 +50 -10jakarta-struts/doc/volunteers.xml Index: volunteers.xml === RCS file: /home/cvs/jakarta-struts/doc/volunteers.xml,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- volunteers.xml29 Sep 2003 01:35:16 - 1.37 +++ volunteers.xml15 Oct 2003 05:15:11 - 1.38 @@ -294,16 +294,56 @@ pFrom a professional point of view, I have a Ph.D. in computer science. I have worked for 3 years in the Ramp;D department of a worldwide company developing Internet banking solutions. I am now a researcher at a university, and work European research projects. My main research interest is WWW, Distributed Systems and Object Oriented Design. When developing code, I always try to first propose reusable pieces of code./p h4 id=martincMartin Cooper -- Committer/h4 - -pCurrently, I'm a Principal Software Engineer at Tumbleweed Communications, working the Messaging Management System. Early last year (2000), I was working the architecture for a new web- based administration system for the product, and headed in the direction of servlets and JSP. I joined the JSP-INTEREST and SERVLET-INTEREST mailing lists to see what was going in those respective areas./p - -pBefore too long, some interesting discussions started up around the topic of Model 2 architectures. Model 2 sounded like the right way to go about things, and I followed those discussions closely. I was, however, still looking for a leg up - something to give me that core which to build./p - -pThen, in May, I saw a post to JSP-INTEREST from Craig McClanahan entitled something like New Jakarta-Struts Subproject, and describing Struts, and his vision for it. I hopped right over to the Jakarta web site and signed up for the mailing list. Before long, I realized this was exactly what I had been looking for./p - -pNow, a year or so later, we have a team of people, which I am the technical lead, just finishing up our web-based administration system as Struts reaches its 1.0 release. And I am still firmly convinced that I made the right decision in going with Struts in the first place./p - -pLike anyone else, my first postings to the struts-user list were questions to help me understand how to do things, and why Struts is the way it is. Over time, reading the lists and also the source code, and working my own fairly large web application, I came to the point where I could answer questions too. Now, I'm glad to able to give something back to the Struts community by helping others understand, and also by contributing ideas and code to help make Struts even better than it already is./p +p + Early in the year 2000, I was asked, by my employer at that time, + to investigate the best way to develop a new web-based application + for the administration and management of an existing product. + After exploring a number of technologies, I settled on Java, along + with servlets and JSP, as the way to go. Then I started looking + for methodologies and best practices, since others must surely + have been down that path before me. +/p +p + In addition to rummaging around on the web, I subscribed to the + SERVLET-INTEREST and JSP-INTEREST mailing lists, along with + several others, and monitored the discussions for a while. It was + clear that others were seeking the same answers as I was, and it + was also clear that many people were building their applications + in truly horrible ways. +/p +p + At some point -- I don't recall when, exactly -- the concept of + Model 1 versus Model 2 applications came up, and there was a + great deal of discussion around that. Model 2 seemed very much + like A Good Thing to me, and I paid it close attention. +/p +p + Then, in May of 2000, I saw a message from Craig McClanahan + about a new framework called Struts that was designed to ease + the process of building Model 2 applications, and provide + solutions for some of the important issues at the same time. I + hopped on over to the web site and took a look around. This was + exactly what I had been looking for. +/p +p + My first postings to the Struts mailing list were
cvs commit: jakarta-struts/doc/proposals todo-1.1.xml
martinc 2003/10/14 22:25:40 Modified:doc/proposals todo-1.1.xml Log: Remove myself as interested in ActionForm generation, since there are better solutions to that now. Revision ChangesPath 1.7 +0 -1 jakarta-struts/doc/proposals/todo-1.1.xml Index: todo-1.1.xml === RCS file: /home/cvs/jakarta-struts/doc/proposals/todo-1.1.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- todo-1.1.xml 9 Sep 2003 17:49:21 - 1.6 +++ todo-1.1.xml 15 Oct 2003 05:25:40 - 1.7 @@ -444,7 +444,6 @@ /p /info assigned -a href=mailto:[EMAIL PROTECTED]Martin Cooper/a a href=[EMAIL PROTECTED]Ravindran Ramaiah/a /assigned /task - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util RequestUtils.java
martinc 2003/07/15 21:57:44
Modified:src/share/org/apache/struts/util Tag: STRUTS_1_1_BRANCH
RequestUtils.java
Log:
Detab file.
Revision ChangesPath
No revision
No revision
1.105.2.1 +55 -55
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.105
retrieving revision 1.105.2.1
diff -u -r1.105 -r1.105.2.1
--- RequestUtils.java 28 Jun 2003 00:20:07 - 1.105
+++ RequestUtils.java 16 Jul 2003 04:57:44 - 1.105.2.1
@@ -393,8 +393,8 @@
boolean redirect)
throws MalformedURLException {
- return computeURL(pageContext, forward, href, page, null, params,
- anchor, redirect);
+return computeURL(pageContext, forward, href, page, null, params,
+ anchor, redirect);
}
/**
@@ -534,7 +534,7 @@
} else if (href != null) {
url.append(href);
} else if (action != null) {
- url.append(getActionMappingURL(action, pageContext));
+url.append(getActionMappingURL(action, pageContext));
} else /* if (page != null) */ {
url.append(request.getContextPath());
@@ -871,15 +871,15 @@
throws JspException {
if (scopeName == null) {
- return pageContext.findAttribute(name);
+return pageContext.findAttribute(name);
}
try {
- return pageContext.getAttribute(name, getScope(scopeName));
+return pageContext.getAttribute(name, getScope(scopeName));
} catch (JspException e) {
- saveException(pageContext, e);
- throw e;
+saveException(pageContext, e);
+throw e;
}
}
@@ -893,13 +893,13 @@
* @since Struts 1.1
*/
public static int getScope(String scopeName) throws JspException {
- Integer scope = (Integer) scopes.get(scopeName.toLowerCase());
+Integer scope = (Integer) scopes.get(scopeName.toLowerCase());
- if (scope == null) {
- throw new JspException(messages.getMessage(lookup.scope,
scope));
- }
+if (scope == null) {
+throw new JspException(messages.getMessage(lookup.scope, scope));
+}
- return scope.intValue();
+return scope.intValue();
}
/**
@@ -1040,8 +1040,8 @@
Object args[])
throws JspException {
- MessageResources resources =
- retrieveMessageResources(pageContext, bundle, false);
+MessageResources resources =
+retrieveMessageResources(pageContext, bundle, false);
Locale userLocale = retrieveUserLocale(pageContext, locale);
@@ -1072,11 +1072,11 @@
boolean checkPageScope)
throws JspException {
- MessageResources resources = null;
+MessageResources resources = null;
- if (bundle == null) {
- bundle = Globals.MESSAGES_KEY;
- }
+if (bundle == null) {
+bundle = Globals.MESSAGES_KEY;
+}
if (checkPageScope) {
resources =
@@ -1085,29 +1085,29 @@
PageContext.PAGE_SCOPE);
}
- if (resources == null) {
- resources =
- (MessageResources) pageContext.getAttribute(
- bundle,
- PageContext.REQUEST_SCOPE);
- }
-
- if (resources == null) {
- resources =
- (MessageResources) pageContext.getAttribute(
- bundle,
- PageContext.APPLICATION_SCOPE);
- }
-
- if (resources == null) {
- JspException e =
- new JspException(messages.getMessage(message.bundle,
bundle));
- saveException(pageContext, e);
- throw e;
- }
+if (resources == null) {
+resources =
+(MessageResources) pageContext.getAttribute(
+bundle,
+PageContext.REQUEST_SCOPE);
+}
+
+if (resources == null) {
+resources =
+(MessageResources
cvs commit: jakarta-struts/src/share/org/apache/struts/util RequestUtils.java
martinc 2003/07/15 22:10:38
Modified:src/share/org/apache/struts/util RequestUtils.java
Log:
Make retrieveMessageResources() module-aware by adding the module prefix
to the bundle name when retrieving from application context.
PR: 11932
Submitted by: Alex Kwan
Revision ChangesPath
1.110 +7 -8
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- RequestUtils.java 14 Jul 2003 04:21:05 - 1.109
+++ RequestUtils.java 16 Jul 2003 05:10:37 - 1.110
@@ -1057,9 +1057,6 @@
* default bundle name is used.
* @return MessageResources The bundle's resources stored in some scope.
* @throws JspException if the MessageResources object could not be found.
- *
- * @FIXME The bundle name needs the module prefix appended to it before
searching
- * to fix PR# 11932.
*/
private static MessageResources retrieveMessageResources(
PageContext pageContext,
@@ -1088,9 +1085,11 @@
}
if (resources == null) {
+ModuleConfig config = (ModuleConfig) pageContext.getAttribute(
+Globals.MODULE_KEY, PageContext.REQUEST_SCOPE);
resources =
(MessageResources) pageContext.getAttribute(
-bundle,
+bundle + config.getPrefix(),
PageContext.APPLICATION_SCOPE);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util RequestUtils.java
martinc 2003/07/15 22:11:11
Modified:src/share/org/apache/struts/util Tag: STRUTS_1_1_BRANCH
RequestUtils.java
Log:
Make retrieveMessageResources() module-aware by adding the module prefix
to the bundle name when retrieving from application context.
PR: 11932
Submitted by: Alex Kwan
Revision ChangesPath
No revision
No revision
1.105.2.2 +7 -8
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.105.2.1
retrieving revision 1.105.2.2
diff -u -r1.105.2.1 -r1.105.2.2
--- RequestUtils.java 16 Jul 2003 04:57:44 - 1.105.2.1
+++ RequestUtils.java 16 Jul 2003 05:11:10 - 1.105.2.2
@@ -1062,9 +1062,6 @@
* default bundle name is used.
* @return MessageResources The bundle's resources stored in some scope.
* @throws JspException if the MessageResources object could not be found.
- *
- * @FIXME The bundle name needs the module prefix appended to it before
searching
- * to fix PR# 11932.
*/
private static MessageResources retrieveMessageResources(
PageContext pageContext,
@@ -1093,9 +1090,11 @@
}
if (resources == null) {
+ModuleConfig config = (ModuleConfig) pageContext.getAttribute(
+Globals.MODULE_KEY, PageContext.REQUEST_SCOPE);
resources =
(MessageResources) pageContext.getAttribute(
-bundle,
+bundle + config.getPrefix(),
PageContext.APPLICATION_SCOPE);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util RequestUtils.java
martinc 2003/07/13 21:21:06
Modified:src/share/org/apache/struts/util RequestUtils.java
Log:
Detab file.
Revision ChangesPath
1.109 +55 -55
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- RequestUtils.java 4 Jul 2003 20:53:42 - 1.108
+++ RequestUtils.java 14 Jul 2003 04:21:05 - 1.109
@@ -388,8 +388,8 @@
boolean redirect)
throws MalformedURLException {
- return computeURL(pageContext, forward, href, page, null, params,
- anchor, redirect);
+return computeURL(pageContext, forward, href, page, null, params,
+ anchor, redirect);
}
/**
@@ -529,7 +529,7 @@
} else if (href != null) {
url.append(href);
} else if (action != null) {
- url.append(getActionMappingURL(action, pageContext));
+url.append(getActionMappingURL(action, pageContext));
} else /* if (page != null) */ {
url.append(request.getContextPath());
@@ -866,15 +866,15 @@
throws JspException {
if (scopeName == null) {
- return pageContext.findAttribute(name);
+return pageContext.findAttribute(name);
}
try {
- return pageContext.getAttribute(name, getScope(scopeName));
+return pageContext.getAttribute(name, getScope(scopeName));
} catch (JspException e) {
- saveException(pageContext, e);
- throw e;
+saveException(pageContext, e);
+throw e;
}
}
@@ -888,13 +888,13 @@
* @since Struts 1.1
*/
public static int getScope(String scopeName) throws JspException {
- Integer scope = (Integer) scopes.get(scopeName.toLowerCase());
+Integer scope = (Integer) scopes.get(scopeName.toLowerCase());
- if (scope == null) {
- throw new JspException(messages.getMessage(lookup.scope,
scope));
- }
+if (scope == null) {
+throw new JspException(messages.getMessage(lookup.scope, scope));
+}
- return scope.intValue();
+return scope.intValue();
}
/**
@@ -1035,8 +1035,8 @@
Object args[])
throws JspException {
- MessageResources resources =
- retrieveMessageResources(pageContext, bundle, false);
+MessageResources resources =
+retrieveMessageResources(pageContext, bundle, false);
Locale userLocale = retrieveUserLocale(pageContext, locale);
@@ -1067,11 +1067,11 @@
boolean checkPageScope)
throws JspException {
- MessageResources resources = null;
+MessageResources resources = null;
- if (bundle == null) {
- bundle = Globals.MESSAGES_KEY;
- }
+if (bundle == null) {
+bundle = Globals.MESSAGES_KEY;
+}
if (checkPageScope) {
resources =
@@ -1080,29 +1080,29 @@
PageContext.PAGE_SCOPE);
}
- if (resources == null) {
- resources =
- (MessageResources) pageContext.getAttribute(
- bundle,
- PageContext.REQUEST_SCOPE);
- }
-
- if (resources == null) {
- resources =
- (MessageResources) pageContext.getAttribute(
- bundle,
- PageContext.APPLICATION_SCOPE);
- }
-
- if (resources == null) {
- JspException e =
- new JspException(messages.getMessage(message.bundle,
bundle));
- saveException(pageContext, e);
- throw e;
- }
+if (resources == null) {
+resources =
+(MessageResources) pageContext.getAttribute(
+bundle,
+PageContext.REQUEST_SCOPE);
+}
+
+if (resources == null) {
+resources =
+(MessageResources) pageContext.getAttribute(
+bundle,
+PageContext.APPLICATION_SCOPE
cvs commit: jakarta-struts build.xml
martinc 2003/07/09 21:25:05 Modified:.build.xml Log: Update current build version to 1.2-dev. Reorganise the prerequisite properties documentation into required and optional sections, and alphabetised; this was getting too big to grok. Revision ChangesPath 1.114 +94 -83jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- build.xml 8 Jul 2003 00:30:33 - 1.113 +++ build.xml 10 Jul 2003 04:25:05 - 1.114 @@ -15,90 +15,101 @@ !-- == Prerequisite Properties === -- !-- -These properties MUST be set on the ant command line, a -build.properties file in the base directory, or a -build.properties file in your user home directory. - -catalina.home (optional). The path to the Tomcat 4.0 - installation. This is required only when - executing the deploy.catalina target. - -catalina.url (optional) URL of the Tomcat 4.1.x - manager app for dynamic installation - -catalina.username (optional) Username for the Tomcat 4.1.x - manager app for dynamic installation - -catalina.password (optional) Password for the Tomcat 4.1.x - manager app for dynamic installation - -commons-beanutils.jar (required). The path to the JAR file - of the Jakarta Commons Beanutils - package (version 1.0 or later). - -commons-collections.jar (required). The path to the JAR file - of the Jakarta Commons Collections - package (version 1.0 or later). - -struts-legacy.jar (required). The path to the JAR file - of the Jakarta Struts Legacy - package (version 1.0 or later). - -commons-digester.jar (required). The path to the JAR file - of the Jakarta Commons Digester - package (version 1.0 or later). - -commons-fileupload.jar(required). The path to the JAR file - of the Jakarta Commons FileUpload - package (version 1.0 or later) - -commons-lang.jar (required). The path to the JAR file - of the Jakarta Commons Lang - package (version 1.0 or later). - -commons-logging.jar (required). The path to the JAR file - of the Jakarta Commons Logging - package (version 1.0 or later). - -commons-validator.jar (required). The path to the JAR file - of the Jakarta Commons VALIDATOR - package (version 1.0 or later). - -jakarta-oro.jar (required). The path to the JAR file - of the Jakarta ORO - package (version 2.06 or later). - -jdbc20ext.jar (required). The path to the JAR file - for the JDBC 2.0 Optional Package APIs. - -jsp.jar (optional). the path to the JSP API - classes to compile against, if you are - using JSP 2.0 where these classes have - been separated from servlet.jar. If you - are using JSP 1.1 or 1.2, leave this - property unset. - -servlet.jar (required). The path to the Servlet API - classes to compile against (currently, - either version 2.2 or 2.3 supported). - -antlr.jar (required) The path to the ANTLR classes - to copy. Required for the validwhen - validator rule to parser it's args. - -tomcat.home (optional). The path to the Tomcat 3.x
cvs commit: jakarta-struts/doc/userGuide release-notes-1.1.xml
martinc 2003/06/28 23:46:07 Added: doc/userGuide release-notes-1.1.xml Log: Release notes for the 1.1 release. Revision ChangesPath 1.1 jakarta-struts/doc/userGuide/release-notes-1.1.xml Index: release-notes-1.1.xml === ?xml version=1.0? document url=release-notes-1.1.html properties authorCraig R. McClanahan/author authorRobert Leland/author authorTed Husted/author authorMartin Cooper/author titleStruts Release Notes (Version 1.1)/title /properties body chapter name=6.1 Release Notes href=release_notes section name=Release Notes href=beta pThis section contains the release notes for the strongVersion 1.1/strong build of the Struts Framework, for changes that have taken place since a href=release-notes-1.1-rc2.htmlVersion 1.1 Release Candidate 2/a was issued. For a complete list of changes since the last production release, see the a href=#IntroductionIntroduction/a /p /section section name=Release Candidate/Beta Fixes href=beta.Changes p In RC2, the bCommons-DBCP and Commons-Pool dependencies have been removed/b. These are replaced with a dependency on the Struts-Legacy package, containing the GenericDataSource and GenericConnection classes from Struts 1.0.2. These are distributed for J2SE 1.3 but may be recompiled for J2SE 1.4. Other DataSource implementations may be plugged in (recommended). /p p Other changes since RC1 have been routine fixes and refactorings. /p p bOTHER CHANGES:/b /p p bAction package:/b Deprecated processActionForward() because ActionForward is a subclass of ForwardConfig so there's no reason we can't use processForwardConfig() instead. Updated to use processForwardConfig instead of deprecated processActionForward. Deprecated the rest of the Action constants in favor of Globals. Refactored some of initModuleConfig into a separate method and cleaned up. Improved exception handling in ActionServlet and RequestProcessor; generally, we limited the scope of try/catch blocks and caught specific exceptions rather than Throwable. /p p bDocumentation:/b Document the lt;html:htmlgt; tag's locale attribute behaviour of creating a session if needed. Added note to validator section regarding the converNull servlet parameter and required validations of java.lang.Integer fields. Moved sites and consultants page to Struts Wiki. Other minor tweaks. /p p bEL package:/b Fixed mapping of onkeypress attribute. Separated expr attribute into expr and exprValue, being the original attribute value and the evaluated value. Fixed probably long-standing bug in notMatch tag that made it behave identically to the match tag (instead of the reverse). /p p bExample applicattions:/b Added Multi-config files for the example app. /p p bLegacy package:/b Added package under contrib to host old GenericDataSource and GenericConnection classes. /p p bTaglibs packages:/b Fixed several import statements. Refactored converting a scope name into its integer constant into a new method RequestUtils.getScope(String), and changed the DefineTag, EmptyTag, and TagUtils classes to use the new method. /p p ifaces taglib./i Added early release to contrib area. /p p ihtml taglib./i Reset the 'processed' flag at the beginning of each usage of the tag. Use a local copy of the 'name' attribute to avoid modifying the attribute value itself. Fixed references to static members. For FrameTag and HiddenTag, conform TLD with implementations. In ErrorsTag, render a platform-independent line ending instead of hard coded \r\n. In JavaScriptValidatorTag, make the line-end generation platform independent so that Cactus tests work properly. In FormTag, refactored code into smaller reusable methods. In RewriteTag, encode the ampersand character in XHTML mode only, otherwise write the ampersand as is so the URL will work in JavaScript scripts. Refactored form bean initialization out of doStartTag() into its own method. Refactored doStartTag() 'if' statement to avoid having long nested 'if' logic. In ErrorTag, fixed formatting and deprecated unused defaultLocale variable. Refactored doStartTag() and doEndTag() into smaller methods. Moved xhtml check to RequestUtils instead of duplicating the logic in many different classes
cvs commit: jakarta-struts/doc/userGuide release-notes-1.1.xml
martinc 2003/06/29 21:29:24 Modified:doc/userGuide release-notes-1.1.xml Log: Last minute changes to 1.1 release notes. Revision ChangesPath 1.2 +3 -3 jakarta-struts/doc/userGuide/release-notes-1.1.xml Index: release-notes-1.1.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/release-notes-1.1.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- release-notes-1.1.xml 29 Jun 2003 06:46:07 - 1.1 +++ release-notes-1.1.xml 30 Jun 2003 04:29:23 - 1.2 @@ -293,13 +293,13 @@ Fixed #20750 - RequestUtils.retrieveMessageResources (really an RC2 bug) /li li -Fixed #20835 - html:rewrite tag using page attribute bug +Fixed #20835 - lt;html:rewritegt; tag using page attribute bug /li li Fixed #20877 - MessagesTag has incorrect assignment in release() /li li -Fixed #20949 - Tag html:select doesn't work well on RC2 +Fixed #20949 - Tag lt;html:selectgt; doesn't work well on RC2 /li li Fixed #21051 - javascript required validator accepts fields containing only whitespace @@ -390,7 +390,7 @@ liCommons BeanUtils 1.6.1/li liCommons Collections 2.1/li liCommons Digester 1.5/li -liCommons FileUpload 1.0 RC1/li +liCommons FileUpload 1.0/li liCommons Lang 1.0.1/li liCommons Logging 1.0.3/li liCommons Validator 1.0.2/li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build.xml
martinc 2003/06/28 22:25:32 Modified:.build.xml Log: Update build version for 1.1 Final release. Revision ChangesPath 1.111 +1 -1 jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- build.xml 25 Jun 2003 12:52:55 - 1.110 +++ build.xml 29 Jun 2003 05:25:32 - 1.111 @@ -137,7 +137,7 @@ property name=project.name value=jakarta-struts/ !-- Version of the project -- -property name=project.version value=1.1-dev/ +property name=project.version value=1.1/ !-- == Derived Properties -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build.properties.sample
martinc 2003/06/28 22:27:58
Modified:.build.properties.sample
Log:
Update version numbers for 1.1 Final release. Although the latest versions
of all of our dependencies may not strictly be needed to actually build
Struts, it seems like asking for trouble to list older versions here.
Revision ChangesPath
1.42 +8 -8 jakarta-struts/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.properties.sample 19 Jun 2003 11:16:41 - 1.41
+++ build.properties.sample 29 Jun 2003 05:27:58 - 1.42
@@ -32,7 +32,7 @@
# if you are going to execute the deploy.catalina target.
catalina.home=${apache.home}/jakarta-tomcat-4.0.6
-# The JAR file containing the Beanutils package (Version 1.5 or later)
+# The JAR file containing the Beanutils package (Version 1.6.1 or later)
# from the Jakarta Commons project.
commons-beanutils.jar=${commons-lib.home}/beanutils/dist/commons-beanutils.jar
@@ -40,27 +40,27 @@
# from the Jakarta Commons project.
commons-collections.jar=${commons-lib.home}/collections/dist/commons-collections.jar
-# The JAR file containing the Digester package (Version 1.3 or later)
+# The JAR file containing the Digester package (Version 1.5 or later)
# from the Jakarta Commons project.
commons-digester.jar=${commons-lib.home}/digester/dist/commons-digester.jar
-# The JAR file containing the FileUpload package (Version 1.0 RC1 or later)
+# The JAR file containing the FileUpload package (Version 1.0 or later)
# from the Jakarta Commons project.
-commons-fileupload.jar=${commons-lib.home}/fileupload/dist/commons-fileupload.jar
+commons-fileupload.jar=${commons-lib.home}/fileupload/dist/commons-fileupload-1.0.jar
# The JAR file containing the Lang package (Version 1.0.1 or later)
# from the Jakarta Commons project.
-commons-lang.jar=${commons-lib.home}/lang/dist/commons-lang.jar
+commons-lang.jar=${commons-lib.home}/lang/dist/commons-lang-1.0.1.jar
# The JAR file containing the Logging package (Version 1.0.3 or later)
# from the Jakarta Commons project.
commons-logging.jar=${commons-lib.home}/logging/dist/commons-logging.jar
-# The JAR file containing the Validator package (Version 1.0.1 or later)
+# The JAR file containing the Validator package (Version 1.0.2 or later)
# from the Jakarta Commons project.
commons-validator.jar=${commons-lib.home}/validator/dist/commons-validator.jar
-# The JAR file containing the Jakarta ORO project version 2.06 (or later)
+# The JAR file containing the Jakarta ORO package (Version 2.0.6 or later)
jakarta-oro.jar=${apache.home}/jakarta-oro-2.0.6/jakarta-oro-2.0.6.jar
# The JAR file containing the JDBC 2.0 Optional Package extensions API
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc project.xml
martinc 2003/06/28 22:32:20 Modified:doc project.xml Log: Label 1.1 as the Stable Release, and 1.0.2 as the Previous Release. Update links for 1.1 release plan and release notes. Revision ChangesPath 1.37 +4 -4 jakarta-struts/doc/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/doc/project.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- project.xml 7 Jun 2003 22:31:13 - 1.36 +++ project.xml 29 Jun 2003 05:32:19 - 1.37 @@ -85,18 +85,18 @@ / /menu -menu name=Release Candidate (1.1-rc2) +menu name=Stable Release (1.1) item name=Release Notes -href=userGuide/release-notes-1.1-rc2.html +href=userGuide/release-notes-1.1.html / item name=Release Plan -href=proposals/release-plan-1.1rc2.html +href=proposals/release-plan-1.1.html / /menu -menu name=Stable Release (1.0.2) +menu name=Previous Release (1.0.2) item name=Welcome page href=http://jakarta.apache.org/struts/doc-1.0.2/index.html; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide installation.xml
martinc 2003/06/28 22:36:42 Modified:doc/userGuide installation.xml Log: Update dependency versions and correct a typo. Revision ChangesPath 1.29 +7 -7 jakarta-struts/doc/userGuide/installation.xml Index: installation.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- installation.xml 7 Jun 2003 21:52:33 - 1.28 +++ installation.xml 29 Jun 2003 05:36:42 - 1.29 @@ -86,17 +86,17 @@ strongJakarta Commons Packages/strong - Struts utilizes several packages from the a href=http://jakarta.apache.org/commons/;Jakarta Commons Project/a. - These are the packages which must be available if you you wish to + These are the packages which must be available if you wish to build Struts from source: ul - liemBeanutils/em (Version 1.5 or later)/li + liemBeanutils/em (Version 1.6.1 or later)/li liemCollections/em (Version 2.1 or later)/li - liemDigester/em (Version 1.3 or later)/li - liemFileUpload/em (1.0 RC1 or later)/li - liemLang/em (Version 1.1 or later)/li + liemDigester/em (Version 1.5 or later)/li + liemFileUpload/em (Version 1.0 or later)/li + liemLang/em (Version 1.0.1 or later)/li liemLogging/em (Version 1.0.3 or later when it is available)/li liemStruts-Legacy/em (Version 1.0 or later)/li - liemValidator/em (Version 1.0.1 or later) /li + liemValidator/em (Version 1.0.2 or later) /li /ul For your convenience, the requisite JARs are provided as a single download under the codelib/code sub-directory with each release @@ -108,7 +108,7 @@ listrongJakarta ORO/strong - a href=http://jakarta.apache.org/oro/index.html;Apache Jakarta ORO/a - version 2.06 (or later) is required to build Struts from source./li + version 2.0.6 (or later) is required to build Struts from source./li listrongXalan XSLT Processor/strong - If you are building Struts from the source distribution, you will need a version of Xalan to perform - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide index.xml
martinc 2003/06/28 22:58:56 Modified:doc/userGuide index.xml Log: Add a link for the 1.1 release notes (and one for the 1.1-rc2 release notes, for completeness). Revision ChangesPath 1.34 +2 -0 jakarta-struts/doc/userGuide/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/index.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- index.xml 20 Feb 2003 06:30:44 - 1.33 +++ index.xml 29 Jun 2003 05:58:56 - 1.34 @@ -159,6 +159,8 @@ ul lia href=release-notes.html6.1 Release Notes/a/li ul +lia href=release-notes-1.1.htmlRelease Notes 1.1/a/li +lia href=release-notes-1.1-rc2.htmlRelease Notes 1.1-rc2/a/li lia href=release-notes-1.1-rc1.htmlRelease Notes 1.1-rc1/a/li lia href=release-notes-1.1-b3.htmlRelease Notes 1.1-b3/a/li lia href=release-notes-1.1-b2.htmlRelease Notes 1.1-b2/a/li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition XmlParser.java
martinc 2003/06/17 20:58:03
Modified:src/share/org/apache/struts/tiles/xmlDefinition
XmlParser.java
Log:
Only register each public ID once, and register it with the correct entity
URL. Reported by Craig McClanahan.
Revision ChangesPath
1.11 +4 -8
jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java
Index: XmlParser.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XmlParser.java27 Feb 2003 19:19:42 - 1.10
+++ XmlParser.java18 Jun 2003 03:58:03 - 1.11
@@ -92,14 +92,10 @@
protected String registrations[] = {
// pre 1.1
-//Apache Software Foundation//DTD Tiles Configuration//EN,
-/org/apache/struts/tiles/resources/tiles-config_1_1.dtd,
--//Apache Software Foundation//DTD Tiles Configuration//EN,
/org/apache/struts/resources/tiles-config_1_1.dtd,
-//Apache Software Foundation//DTD Components Configuration//EN,
-/org/apache/struts/tiles/resources/tiles-config.dtd,
+/org/apache/struts/resources/tiles-config.dtd,
// version 1.1
--//Apache Software Foundation//DTD Tiles Configuration 1.1//EN,
-/org/apache/struts/tiles/resources/tiles-config_1_1.dtd,
-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN,
/org/apache/struts/resources/tiles-config_1_1.dtd,
};
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/exercise-taglib bean-cookie.jsp
martinc 2003/06/08 18:50:15 Modified:web/exercise-taglib bean-cookie.jsp Log: Remove the row corresponding to the name of the cookie. It causes problems on Tomcat 3.3.1 because of some kind of reflection issue, and isn't really necessary to prove that the bean:cookie tag works, anyway. Revision ChangesPath 1.2 +0 -5 jakarta-struts/web/exercise-taglib/bean-cookie.jsp Index: bean-cookie.jsp === RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/bean-cookie.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bean-cookie.jsp 7 Mar 2001 04:50:54 - 1.1 +++ bean-cookie.jsp 9 Jun 2003 01:50:15 - 1.2 @@ -37,11 +37,6 @@ tdbean:write name=sess property=maxAge//td /tr tr -tdname/td -tdjsp:getProperty name=sess property=name//td -tdbean:write name=sess property=name//td - /tr - tr tdpath/td tdjsp:getProperty name=sess property=path//td tdbean:write name=sess property=path//td - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/exercise-taglib logic-compare-numeric.jsp index.jsp logic-compare.jsp
martinc 2003/06/08 18:51:48 Modified:web/exercise-taglib index.jsp logic-compare.jsp Added: web/exercise-taglib logic-compare-numeric.jsp Log: Split the logic comparison tests into two pages, since the one gigantic page causes problems with Tomcat 3.3.1. The boolean and string tests are on one page, and the numeric tests are on a separate page now. Revision ChangesPath 1.5 +1 -0 jakarta-struts/web/exercise-taglib/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/index.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index.jsp 16 Jul 2002 04:56:42 - 1.4 +++ index.jsp 9 Jun 2003 01:51:48 - 1.5 @@ -32,6 +32,7 @@ h3LOGIC Tags/h3 ul lia href=logic-compare.jspComparison Tags/a/li +lia href=logic-compare-numeric.jspComparison Tags (Numeric)/a/li lia href=logic-iterate.jspIterate Tag/a/li lia href=logic-match.jsp?param1=value1Match Tags/a/li lia href=logic-present.jsp?param1=value1Presence Tags/a/li 1.6 +0 -489jakarta-struts/web/exercise-taglib/logic-compare.jsp Index: logic-compare.jsp === RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/logic-compare.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- logic-compare.jsp 16 Mar 2002 03:00:44 - 1.5 +++ logic-compare.jsp 9 Jun 2003 01:51:48 - 1.6 @@ -15,15 +15,6 @@ % String bool1 = true; String bool2 = false; - String doub1 = 321.0; - String doub2 = 111.0; - String doub3 = 333.0; - String long1 = 321; - String long2 = 111; - String long3 = 333; - String short1 = 987; - String short2 = 654; - String short3 = 999; String str1 = This is a string; String str2 = Less than; String str3 = XYZ greater than; @@ -97,486 +88,6 @@ /logic:equal logic:notEqual name=bean property=falseProperty value=%= bool1 % -notEqual - /logic:notEqual -/td - /tr - tr -tddouble / EQ/td -tdbean:write name=bean property=doubleProperty//td -td%= doub1 %/td -tdequal greaterEqual lessEqual/td -td - logic:equal name=bean property=doubleProperty - value=%= doub1 % -equal - /logic:equal - logic:greaterEqual name=bean property=doubleProperty - value=%= doub1 % -greaterEqual - /logic:greaterEqual - logic:greaterThan name=bean property=doubleProperty - value=%= doub1 % -greaterThan - /logic:greaterThan - logic:lessEqual name=bean property=doubleProperty - value=%= doub1 % -lessEqual - /logic:lessEqual - logic:lessThan name=bean property=doubleProperty - value=%= doub1 % -lessThan - /logic:lessThan - logic:notEqual name=bean property=doubleProperty - value=%= doub1 % -notEqual - /logic:notEqual -/td - /tr - tr -tddouble / GT/td -tdbean:write name=bean property=doubleProperty//td -td%= doub2 %/td -tdgreaterEqual greaterThan notEqual/td -td - logic:equal name=bean property=doubleProperty - value=%= doub2 % -equal - /logic:equal - logic:greaterEqual name=bean property=doubleProperty - value=%= doub2 % -greaterEqual - /logic:greaterEqual - logic:greaterThan name=bean property=doubleProperty - value=%= doub2 % -greaterThan - /logic:greaterThan - logic:lessEqual name=bean property=doubleProperty - value=%= doub2 % -lessEqual - /logic:lessEqual - logic:lessThan name=bean property=doubleProperty - value=%= doub2 % -lessThan - /logic:lessThan - logic:notEqual name=bean property=doubleProperty - value=%= doub2 % -notEqual - /logic:notEqual -/td - /tr - tr -tddouble / LT/td -tdbean:write name=bean property=doubleProperty//td -td%= doub3 %/td -tdlessEqual lessThan notEqual/td -td - logic:equal name=bean property=doubleProperty - value=%= doub3 % -equal - /logic:equal - logic:greaterEqual name=bean property=doubleProperty - value=%= doub3 % -greaterEqual - /logic:greaterEqual - logic:greaterThan name=bean property=doubleProperty - value=%= doub3 % -greaterThan - /logic:greaterThan - logic:lessEqual name=bean property=doubleProperty - value=%= doub3 % -lessEqual - /logic:lessEqual
cvs commit: jakarta-struts/web/tiles-documentation/tutorial/common/menu menuSrc.jsp
martinc 2003/06/08 18:54:46 Modified:web/tiles-documentation/tutorial/common/menu menuSrc.jsp Log: Fix the path for the menuViewSrc.jsp page. This fixes a servlet exception thrown when attempting to render extendedDefinitionTag.jsp. Revision ChangesPath 1.2 +1 -1 jakarta-struts/web/tiles-documentation/tutorial/common/menu/menuSrc.jsp Index: menuSrc.jsp === RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/tutorial/common/menu/menuSrc.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- menuSrc.jsp 6 Jul 2002 01:13:53 - 1.1 +++ menuSrc.jsp 9 Jun 2003 01:54:46 - 1.2 @@ -1,6 +1,6 @@ %@ taglib uri=/WEB-INF/struts-tiles.tld prefix=tiles % -tiles:insert page=/common/menuViewSrc.jsp flush=true +tiles:insert page=/tutorial/common/menuViewSrc.jsp flush=true tiles:putList name=list tiles:add value=/tutorial/basicPage.jsp / tiles:add value=/tutorial/portalPage.jsp / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic TestIterateTag.java
martinc 2003/03/06 08:07:13
Modified:src/share/org/apache/struts/taglib/nested
NestedPropertyTag.java NestedRootTag.java
src/test/org/apache/struts/taglib/logic TestIterateTag.java
Log:
Replace EVAL_BODY_AGAIN with EVAL_BODY_TAG so that the code compiles
against the JSP 1.1 API.
Revision ChangesPath
1.8 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java
Index: NestedPropertyTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedPropertyTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NestedPropertyTag.java28 Feb 2003 05:14:01 - 1.7
+++ NestedPropertyTag.java6 Mar 2003 16:07:13 - 1.8
@@ -118,7 +118,7 @@
NestedPropertyHelper.setName(request, originalName);
// run the body part
-return (EVAL_BODY_AGAIN);
+return (EVAL_BODY_TAG);
}
1.8 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedRootTag.java
Index: NestedRootTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedRootTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NestedRootTag.java28 Feb 2003 05:14:01 - 1.7
+++ NestedRootTag.java6 Mar 2003 16:07:13 - 1.8
@@ -132,7 +132,7 @@
}
// do the JSP thing
-return (EVAL_BODY_AGAIN);
+return (EVAL_BODY_TAG);
}
/**
1.3 +24 -24
jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java
Index: TestIterateTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestIterateTag.java 28 Feb 2003 02:42:11 - 1.2
+++ TestIterateTag.java 6 Mar 2003 16:07:13 - 1.3
@@ -146,7 +146,7 @@
out.print((String)pageContext.getAttribute(theId));
iteration++;
- } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN);
+ } while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
tag.doEndTag();
assertEquals(iterations, iteration);
}
@@ -193,7 +193,7 @@
out.print((String)pageContext.getAttribute(theId));
iteration++;
- } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN);
+ } while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
tag.doEndTag();
assertEquals(iterations, iteration);
}
@@ -240,7 +240,7 @@
out.print((String)pageContext.getAttribute(theId));
iteration++;
- } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN);
+ } while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
tag.doEndTag();
assertEquals(iterations, iteration);
}
@@ -308,7 +308,7 @@
out.print((String)pageContext.getAttribute(theId));
iteration++;
- } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN);
+ } while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
tag.doEndTag();
assertEquals(iterations, iteration);
}
@@ -366,7 +366,7 @@
out.print((String)pageContext.getAttribute(theId));
iteration++;
- } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN);
+ } while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
tag.doEndTag();
assertEquals(iterations, iteration);
}
@@ -424,7 +424,7 @@
out.print((String)pageContext.getAttribute(theId));
iteration++;
- } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN);
+ } while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
tag.doEndTag();
assertEquals(iterations, iteration);
}
@@ -478,7 +478,7 @@
{
out.print((String)pageContext.getAttribute(theId));
- } while (tag.doAfterBody() == tag.EVAL_BODY_AGAIN);
+ } while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
tag.doEndTag();
}
@@ -522,7 +522,7 @@
{
out.print((String)pageContext.getAttribute(theId
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html MessagesTag.java
martinc 2003/03/03 20:43:44
Modified:src/share/org/apache/struts/taglib/html MessagesTag.java
Log:
Reset the 'processed' flag at the beginning of each usage of the tag. Use
a local copy of the 'name' attribute to avoid modifying the attribute value
itself.
PR: 17613
Submitted by: Larry Zappaterrini
Revision ChangesPath
1.13 +22 -16
jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java
Index: MessagesTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MessagesTag.java 28 Feb 2003 02:37:30 - 1.12
+++ MessagesTag.java 4 Mar 2003 04:43:44 - 1.13
@@ -228,9 +228,15 @@
* @exception JspException if a JSP exception has occurred
*/
public int doStartTag() throws JspException {
+// Initialize for a new request.
+processed = false;
+
// Were any messages specified?
ActionMessages messages = null;
+// Make a local copy of the name attribute that we can modify.
+String name = this.name;
+
if (message != null true.equalsIgnoreCase(message)) {
name = Globals.MESSAGE_KEY;
}
@@ -305,18 +311,18 @@
}
// Decide whether to iterate or quit
-if (iterator.hasNext()) {
- ActionMessage report = (ActionMessage)iterator.next();
- String msg = RequestUtils.message(pageContext, bundle,
- locale, report.getKey(),
- report.getValues());
-
- pageContext.setAttribute(id, msg);
-
- return (EVAL_BODY_TAG);
-} else {
- return (SKIP_BODY);
-}
+if (iterator.hasNext()) {
+ ActionMessage report = (ActionMessage)iterator.next();
+ String msg = RequestUtils.message(pageContext, bundle,
+ locale, report.getKey(),
+ report.getValues());
+
+ pageContext.setAttribute(id, msg);
+
+ return (EVAL_BODY_TAG);
+} else {
+ return (SKIP_BODY);
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic IterateTag.java
martinc 2003/03/03 20:46:03 Modified:src/share/org/apache/struts/taglib/logic IterateTag.java Log: Set 'iterator' to null in doEndTag() so that we release the iterator reference as early as possible. We cannot do the same for 'collection' since it is a tag attribute, and needs to remain unchanged to comply with the JSP spec. Revision ChangesPath 1.21 +5 -4 jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java Index: IterateTag.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/IterateTag.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- IterateTag.java 1 Feb 2003 05:30:28 - 1.20 +++ IterateTag.java 4 Mar 2003 04:46:03 - 1.21 @@ -424,6 +424,7 @@ // Clean up our started state started = false; +iterator = null; // Continue processing this page return (EVAL_PAGE); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/faqs apps.xml
martinc 2003/03/03 21:36:42 Modified:doc/faqs apps.xml Log: Fix links to sections of the user guide. PR: 17573 Submitted by: Dan Walker Revision ChangesPath 1.2 +7 -7 jakarta-struts/doc/faqs/apps.xml Index: apps.xml === RCS file: /home/cvs/jakarta-struts/doc/faqs/apps.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apps.xml 29 Dec 2002 11:44:48 - 1.1 +++ apps.xml 4 Mar 2003 05:36:41 - 1.2 @@ -53,12 +53,12 @@ liImplement data entry forms as JSP files./li ol liUse elements from the codehtml/code taglib to define the form -elements. a href=struts-html.html(more...)/a/li +elements. a href=../userGuide/struts-html.html(more...)/a/li liUse codemessage/code and other elements from the codebean/code taglib to define the labels and other static text -of the form. a href=struts-bean.html(more...)/a/li ol +of the form. a href=../userGuide/struts-bean.html(more...)/a/li ol liCreate and maintain a properties file of the text elements to be -displayed. a href=preface.html#resources(more...) /a/li +displayed. a href=../userGuide/preface.html#resources(more...) /a/li /ol liUse codeproperty/code attributes to link form fields to codeActionForm/code instance variables./li @@ -95,15 +95,15 @@ actions. The file minimally needs:/li ol licodelt;form-beansgt;/code section to relate form-beans with ActionForms -a href=building_controller.html#config(more...)/a/li +a href=../userGuide/building_controller.html#config(more...)/a/li licodelt;action-mappingsgt;/code section to relate codelt;html:formgt; -/code actions with Action classes a href=building_controller.html#action_classes(more...)/a /li +/code actions with Action classes a href=../userGuide/building_controller.html#action_classes(more...)/a /li licodelt;message-resourcesgt;/code to make your ApplicationResources available to the rest of the app/li -licodelt;plug-ingt;/code section to link in the Struts validator and other extensionsa href=building_controller.html#plugin_classes +licodelt;plug-ingt;/code section to link in the Struts validator and other extensionsa href=../userGuide/building_controller.html#plugin_classes (more...)/a /li /ol liCreate or update codeweb.xml/code to reference - codeActionServlet/code, taglibs used by Struts. a href=building_controller.html#dd_config + codeActionServlet/code, taglibs used by Struts. a href=../userGuide/building_controller.html#dd_config (more...)/a/li liParallel Tasks/li ol - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide installation.xml
martinc 2003/02/27 22:42:21
Modified:.build-all-clean.bat.sample build-tests.xml
build-webapp.xml build.properties.sample build.xml
contrib/struts-el build-webapp.xml build.xml
doc/userGuide installation.xml
Log:
Remove dependency on Commons Resources for Struts 1.1 release.
Revision ChangesPath
1.7 +1 -6 jakarta-struts/build-all-clean.bat.sample
Index: build-all-clean.bat.sample
===
RCS file: /home/cvs/jakarta-struts/build-all-clean.bat.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-all-clean.bat.sample8 Feb 2003 19:31:52 - 1.6
+++ build-all-clean.bat.sample28 Feb 2003 06:42:20 - 1.7
@@ -72,11 +72,6 @@
cd ..\fileupload
call maven
-cd ..\..\jakarta-commons-sandbox
-
-cd resources
-call maven
-
cd ..\..\jakarta-struts-current
call ant %CLEAN% dist
1.18 +0 -1 jakarta-struts/build-tests.xml
Index: build-tests.xml
===
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build-tests.xml 27 Feb 2003 00:03:21 - 1.17
+++ build-tests.xml 28 Feb 2003 06:42:20 - 1.18
@@ -96,7 +96,6 @@
pathelement location=${commons-httpclient.jar}/
pathelement location=${commons-logging.jar}/
pathelement location=${commons-pool.jar}/
- pathelement location=${commons-resources.jar}/
pathelement location=${commons-validator.jar}/
pathelement location=${httpunit.jar}/
pathelement location=${aspectjrt.jar}/
1.13 +0 -5 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build-webapp.xml 22 Dec 2002 01:25:32 - 1.12
+++ build-webapp.xml 28 Feb 2003 06:42:20 - 1.13
@@ -77,10 +77,6 @@
of the Jakarta Commons POOL
package (version 1.0 or later).
-commons-resources.jar (required). The path to the JAR file
- of the Jakarta Commons Resources
- package (version 1.0 or later).
-
commons-validator.jar (required). The path to the JAR file
of the Jakarta Commons VALIDATOR
package (version 1.0 or later).
@@ -187,7 +183,6 @@
pathelement location=${commons-lang.jar}/
pathelement location=${commons-logging.jar}/
pathelement location=${commons-pool.jar}/
- pathelement location=${commons-resources.jar}/
pathelement location=${commons-validator.jar}/
pathelement location=${jdbc20ext.jar}/
pathelement location=${servlet.jar}/
1.31 +1 -5 jakarta-struts/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.properties.sample 27 Feb 2003 19:21:56 - 1.30
+++ build.properties.sample 28 Feb 2003 06:42:20 - 1.31
@@ -63,10 +63,6 @@
# from the Jakarta Commons project.
commons-pool.jar=${commons-lib.home}/pool/dist/commons-pool.jar
-# The JAR file containing the Resources package (recent Nightly Build)
-# from the Jakarta Commons project.
-commons-resources.jar=${commons-sandbox-lib.home}/resources/target/commons-resources.jar
-
# The JAR file containing the Validator package (Version 1.0.1 or later)
# from the Jakarta Commons project.
commons-validator.jar=${commons-lib.home}/validator/dist/commons-validator.jar
1.101 +0 -7 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- build.xml 27 Feb 2003 00:26:42 - 1.100
+++ build.xml 28 Feb 2003 06:42:20 - 1.101
@@ -64,10 +64,6 @@
of the Jakarta Commons POOL
package (version 1.0 or later).
-commons-resources.jar (required). The path to the JAR file
- of the Jakarta Commons Resources
cvs commit: jakarta-struts/doc/news index.xml
martinc 2003/02/23 01:08:42 Modified:doc/news index.xml Log: Adjust the release date to be in line with reality. Revision ChangesPath 1.20 +1 -1 jakarta-struts/doc/news/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-struts/doc/news/index.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- index.xml 20 Feb 2003 06:30:44 - 1.19 +++ index.xml 23 Feb 2003 09:08:42 - 1.20 -112,7 +112,7 hr size=1 noshade=/ -- -h3a name=20030220/a20 Feb 2003 - Struts 1.1 Release Candidate 1 Released/h3 +h3a name=20030223/a23 Feb 2003 - Struts 1.1 Release Candidate 1 Released/h3 p The Struts team is proud to announce the release of Struts 1.1 Release Candidate 1. This release includes some new functionality, as well as - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/conf/test struts-config.xml
martinc 2003/02/22 07:19:53 Modified:conf/test struts-config.xml Log: This is a fix for the tests in Struts 1.1 RC1. Version 1.2 of this file was originally tagged for RC1, and a problem was found in testing. In the interim, many changes were checked in as version 1.3, while the fix for the RC1 problem was checked in as version 1.4. This checkin applies the diff between 1.3 and 1.4 to version 1.2, thus providing a version of the file including only the change required for RC1. This version will be re-tagged for RC1, and then the change reverted for HEAD. Revision ChangesPath 1.5 +54 -24jakarta-struts/conf/test/struts-config.xml Index: struts-config.xml === RCS file: /home/cvs/jakarta-struts/conf/test/struts-config.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- struts-config.xml 22 Feb 2003 07:39:23 - 1.4 +++ struts-config.xml 22 Feb 2003 15:19:53 - 1.5 -11,19 +11,30 struts-config - !-- == Form Bean Definitions === -- - form-beans -form-bean name=testDynaFormBean - type=org.apache.struts.validator.DynaValidatorForm - form-property name=field1 type=java.lang.String/ - form-property name=field2 type=java.lang.String/ -/form-bean + !-- == Data Source Configuration === -- +!-- + data-sources +data-source + autoCommit=false + description=Example Data Source Configuration + driverClass=org.postgresql.Driver + maxCount=4 + minCount=2 + password=mypassword + url=jdbc:postgresql://localhost/mydatabase + user=myusername +/ + /data-sources +-- -!-- Registration form bean -- -form-bean name=testFormBean -type=org.apache.struts.taglib.SimpleFormBeanForTesting/ + !-- == Form Bean Definitions === -- + form-beans +!-- Example logon form bean +form-bean name=logonForm +type=org.apache.struts.webapp.example.LogonForm/ + -- /form-beans -34,30 +45,49 !-- Example logon forward forward name=logonpath=/logon.jsp/ -- - forward name=testIncludeTagForward - path=/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp/ -/global-forwards + + /global-forwards !-- == Action Mapping Definitions == -- action-mappings -!-- Process a user logoff -- -actionpath=/testIncludeTagTransaction - type=org.apache.struts.taglib.bean.resources.IncludeTagTransactionTestAction - forward name=success - path=/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp/ +!-- Example logon action +actionpath=/logon + type=org.apache.struts.webapp.example.LogonAction + name=logonForm + scope=request + input=/logon.jsp /action +-- - /action-mappings +!-- Example logoff action +actionpath=/logoff + type=org.apache.struts.webapp.example.LogoffAction + forward name=success path=/index.jsp/ +/action +-- - message-resources -parameter=org.apache.struts.taglib.bean.resources.ApplicationResources/ +!-- The standard administrative actions available with Struts -- +!-- These would be either omitted or protected by security -- +!-- in a real application deployment -- +actionpath=/admin/addFormBean + type=org.apache.struts.actions.AddFormBeanAction/ +actionpath=/admin/addForward + type=org.apache.struts.actions.AddForwardAction/ +actionpath=/admin/addMapping + type=org.apache.struts.actions.AddMappingAction/ +actionpath=/admin/reload + type=org.apache.struts.actions.ReloadAction/ +actionpath=/admin/removeFormBean + type=org.apache.struts.actions.RemoveFormBeanAction/ +actionpath=/admin/removeForward + type=org.apache.struts.actions.RemoveForwardAction/ +actionpath=/admin/removeMapping + type=org.apache.struts.actions.RemoveMappingAction/ - message-resources - parameter=org.apache.struts.taglib.bean.resources.AlternateApplicationResources -key=alternate/ + /action-mappings /struts-config - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail
cvs commit: jakarta-struts/conf/test struts-config.xml
martinc 2003/02/22 07:27:29 Modified:conf/test struts-config.xml Log: This checkin results in exactly the same content as version 1.4 of this file. It's just reverting the temporary change needed to get the fix for the tests into the 1.1 RC1 release. Revision ChangesPath 1.6 +24 -54jakarta-struts/conf/test/struts-config.xml Index: struts-config.xml === RCS file: /home/cvs/jakarta-struts/conf/test/struts-config.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- struts-config.xml 22 Feb 2003 15:19:53 - 1.5 +++ struts-config.xml 22 Feb 2003 15:27:29 - 1.6 -11,30 +11,19 struts-config - - !-- == Data Source Configuration === -- -!-- - data-sources -data-source - autoCommit=false - description=Example Data Source Configuration - driverClass=org.postgresql.Driver - maxCount=4 - minCount=2 - password=mypassword - url=jdbc:postgresql://localhost/mydatabase - user=myusername -/ - /data-sources --- - !-- == Form Bean Definitions === -- form-beans +form-bean name=testDynaFormBean + type=org.apache.struts.validator.DynaValidatorForm + form-property name=field1 type=java.lang.String/ + form-property name=field2 type=java.lang.String/ +/form-bean + + +!-- Registration form bean -- +form-bean name=testFormBean +type=org.apache.struts.taglib.SimpleFormBeanForTesting/ -!-- Example logon form bean -form-bean name=logonForm -type=org.apache.struts.webapp.example.LogonForm/ - -- /form-beans -45,49 +34,30 !-- Example logon forward forward name=logonpath=/logon.jsp/ -- - - /global-forwards + forward name=testIncludeTagForward + path=/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp/ +/global-forwards !-- == Action Mapping Definitions == -- action-mappings -!-- Example logon action -actionpath=/logon - type=org.apache.struts.webapp.example.LogonAction - name=logonForm - scope=request - input=/logon.jsp +!-- Process a user logoff -- +actionpath=/testIncludeTagTransaction + type=org.apache.struts.taglib.bean.resources.IncludeTagTransactionTestAction + forward name=success + path=/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp/ /action --- -!-- Example logoff action -actionpath=/logoff - type=org.apache.struts.webapp.example.LogoffAction - forward name=success path=/index.jsp/ -/action --- + /action-mappings -!-- The standard administrative actions available with Struts -- -!-- These would be either omitted or protected by security -- -!-- in a real application deployment -- -actionpath=/admin/addFormBean - type=org.apache.struts.actions.AddFormBeanAction/ -actionpath=/admin/addForward - type=org.apache.struts.actions.AddForwardAction/ -actionpath=/admin/addMapping - type=org.apache.struts.actions.AddMappingAction/ -actionpath=/admin/reload - type=org.apache.struts.actions.ReloadAction/ -actionpath=/admin/removeFormBean - type=org.apache.struts.actions.RemoveFormBeanAction/ -actionpath=/admin/removeForward - type=org.apache.struts.actions.RemoveForwardAction/ -actionpath=/admin/removeMapping - type=org.apache.struts.actions.RemoveMappingAction/ + message-resources +parameter=org.apache.struts.taglib.bean.resources.ApplicationResources/ + message-resources + parameter=org.apache.struts.taglib.bean.resources.AlternateApplicationResources +key=alternate/ - /action-mappings /struts-config - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide index.xml
martinc 2003/02/19 22:30:44 Modified:doc status.xml doc/news index.xml status.xml doc/userGuide index.xml Log: Updates to announce Struts 1.1 Release Candidate 1. IMPORTANT: Please do not update the web site with this or later content until you see the official announcement message for the Struts 1.1 RC1 release. I'm updating these pages now so that they are included in the RC1 struts-documentation.war web app, but I have not finished testing the release itself. Revision ChangesPath 1.28 +4 -4 jakarta-struts/doc/status.xml Index: status.xml === RCS file: /home/cvs/jakarta-struts/doc/status.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- status.xml15 Feb 2003 13:53:53 - 1.27 +++ status.xml20 Feb 2003 06:30:43 - 1.28 @@ -68,8 +68,8 @@ /p p -a href=proposals/release-plan-1.1b3.htmlStruts 1.1 beta 3/a is in circulation -and we are working toward a release candidate. +a href=proposals/release-plan-1.1rc1.htmlStruts 1.1 Release Candidate 1/a +is in circulation and we are working toward a final release. /p /section @@ -234,7 +234,7 @@ ul li -a href=proposals/release-plan-1.1b3.htmlRelease Plan 1.1-b3/a +a href=proposals/release-plan-1.1rc1.htmlRelease Plan 1.1-rc1/a /li li 1.19 +41 -1 jakarta-struts/doc/news/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-struts/doc/news/index.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- index.xml 19 Feb 2003 00:26:49 - 1.18 +++ index.xml 20 Feb 2003 06:30:44 - 1.19 @@ -14,7 +14,7 @@ /p p -a href=http://www.apache.org/dist/jakarta/struts/;Struts 1.1/a is in its third bbeta release/b (30 December 2002). +a href=http://www.apache.org/dist/jakarta/struts/;Struts 1.1/a is in its first brelease candidate/b build (20 February 2003). /p hr size=1 noshade=/ @@ -111,6 +111,46 @@ /p hr size=1 noshade=/ -- + +h3a name=20030220/a20 Feb 2003 - Struts 1.1 Release Candidate 1 Released/h3 +p +The Struts team is proud to announce the release of Struts 1.1 Release +Candidate 1. This release includes some new functionality, as well as +fixes for a number of bugs which were reported against earlier versions. +The Struts Team believes that this release is ready for prime time, hence +its designation as a release candidate. +/p +p +The binary distribution is available at: +/p +p +a href=http://www.apache.org/dist/jakarta/struts/binaries/; +http://www.apache.org/dist/jakarta/struts/binaries//a +/p +p +and the source distribution is available at: +/p +p +a href=http://www.apache.org/dist/jakarta/struts/source/; +http://www.apache.org/dist/jakarta/struts/source//a +/p +p +In addition, the library distribution, which contains updated binaries +without the sample applications, is available at: +/p +p +a href=http://www.apache.org/dist/jakarta/struts/library/; +http://www.apache.org/dist/jakarta/struts/library//a +/p +p +Details of the changes in this release are available in the Release +Notes, which can be found here: +/p +p +a href=http://jakarta.apache.org/struts/userGuide/release-notes-1.1-rc1.html; +http://jakarta.apache.org/struts/userGuide/release-notes-1.1-rc1.html/a +/p +hr size=1 noshade=/ h3a name=20030217/a17 Feb 2003 - Struts talk .. amp; labs live online w/ 4 Authors/h3 p 1.3 +1 -1 jakarta-struts/doc/news/status.xml Index: status.xml === RCS file: /home/cvs/jakarta-struts/doc/news/status.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- status.xml31 Dec 2002 03:12:11 - 1.2 +++ status.xml20 Feb 2003 06:30:44 - 1.3 @@ -15,7 +15,7 @@ /p p -a href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b3/;Struts 1.1b/a is in its third bbeta release/b (30 December 2002). +a href=http://www.apache.org/dist/jakarta/struts/;Struts 1.1/a is in its first brelease candidate/b build (20 February 2003). /p hr size=1 noshade=/ 1.33 +1 -0 jakarta-struts/doc/userGuide/index.xml Index: index.xml === RCS file
cvs commit: jakarta-struts build.xml
martinc 2003/02/18 22:01:45 Modified:.build.xml Log: Update for Struts 1.1 Release Candidate 1 build. Revision ChangesPath 1.99 +1 -1 jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- build.xml 11 Feb 2003 05:54:51 - 1.98 +++ build.xml 19 Feb 2003 06:01:45 - 1.99 @@ -132,7 +132,7 @@ property name=project.name value=jakarta-struts/ !-- Version of the project -- -property name=project.version value=1.1-b4-dev/ +property name=project.version value=1.1-rc1/ !-- == Derived Properties -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html MessagesTag.java
martinc 2003/02/15 21:29:46
Modified:src/share/org/apache/struts/taglib/html MessagesTag.java
Log:
If RequestUtils.message() returns null, don't call pageContext.setAttribute
(since that is illegal), but call pageContext.removeAttribute instead.
PR: 17016
Submitted by: Nick Afshartous
Revision ChangesPath
1.11 +13 -9
jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java
Index: MessagesTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MessagesTag.java 15 Feb 2003 03:22:59 - 1.10
+++ MessagesTag.java 16 Feb 2003 05:29:46 - 1.11
@@ -261,12 +261,16 @@
report.getKey(),
report.getValues());
-// log missing key to ease debugging
-if (msg == null log.isDebugEnabled()) {
-log.debug(messageResources.getMessage(messageTag.resources,
report.getKey()));
-}
+if (msg != null) {
+pageContext.setAttribute(id, msg);
+} else {
+pageContext.removeAttribute(id);
-pageContext.setAttribute(id, msg);
+// log missing key to ease debugging
+if (log.isDebugEnabled()) {
+log.debug(messageResources.getMessage(messageTag.resources,
report.getKey()));
+}
+}
if (header != null header.length() 0) {
String headerMessage = RequestUtils.message(pageContext, bundle,
locale, header);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/proposals release-plan-1.1rc1.xml
martinc 2003/02/15 21:35:54 Added: doc/proposals release-plan-1.1rc1.xml Log: Release plan for Struts 1.1 Release Candidate 1. Revision ChangesPath 1.1 jakarta-struts/doc/proposals/release-plan-1.1rc1.xml Index: release-plan-1.1rc1.xml === ?xml version=1.0? document url=./release-plan-1.1rc1.xml properties authorMartin F N Cooper/author titleStruts Release Plan (Version 1.1-rc1)/title /properties body section name=Objective href=Objective pfont size=-2$Id: release-plan-1.1rc1.xml,v 1.1 2003/02/16 05:35:54 martinc Exp $/font/p pThe objective of the strongStruts 1.1 Release Candidate 1/strong release is to create a milestone release in preparation for an imminent strongStruts 1.1 Final/strong release. As a release candidate, this milestone release currently contains no known showstoppers./p /section section name=The Plan href=Plan pA number of bugs have been fixed since the third Beta release of Struts 1.1, and all remaining bugs have been categorized either as enhancements, or as problems which can be fixed in a release subsequent to Struts 1.1 Final. Therefore it is time to make the latest code base available as a first Release Candidate. The goal is to move towards a final strongStruts 1.1/strong release as soon as is practicable./p pTherefore, the following release plan is proposed for Struts 1.1 Release Candidate 1: /p ul liemCode Freeze / Tag Date/em - Tuesday, February 18, 2003, 23:59:59/li liemRelease Manager/em - Martin Cooper/li liemRelease Announcement/em - To the following mailing lists: ul li[EMAIL PROTECTED]/li li[EMAIL PROTECTED]/li li[EMAIL PROTECTED]/li /ul/li /ul /section section name=Release Criteria href=Criteria pPrior to the release of Struts 1.1 Release Candidate 1, the following action items must be completed:/p ul liThe Struts 1.1 Release Notes document shall be updated to describe substantial changes and improvements since the Struts 1.0.2 release, along with associated updates to the main Struts Documentation Application pages describing the new release./li liAll of the Struts example applications that are included with the release shall operate successfully in the following servlet containers: ul lia href=http://jakarta.apache.org/tomcat;Tomcat 3.3.1/a/li lia href=http://jakarta.apache.org/tomcat;Tomcat 4.0.6/a/li lia href=http://jakarta.apache.org/tomcat;Tomcat 4.1.18/a/li /ul/li liA release vote shall take place on the STRUTS-DEV mailing list to approve this plan. The release vote MUST pass by Majority Approval of Struts committers./li /ul pPrior to the release of a subsequent Struts 1.1 Final release, the following action items must be completed:/p ul liAll a href=http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMEDamp;bug_status=NEWamp;bug_status=ASSIGNEDamp;bug_status=REOPENEDamp;bug_status=VERIFIEDamp;email1=amp;emailtype1=substringamp;emailassigned_to1=1amp;email2=amp;emailtype2=substringamp;emailreporter2=1amp;bugidtype=includeamp;bug_id=amp;changedin=amp;votes=amp;chfieldfrom=amp;chfieldto=Nowamp;chfieldvalue=amp;product=Strutsamp;version=Nightly+Buildamp;short_desc=amp;short_desc_type=allwordssubstramp;long_desc=amp;long_desc_type=allwordssubstramp;bug_file_loc=amp;bug_file_loc_type=allwordssubstramp;keywords=amp;keywords_type=anywordsamp;field0-0-0=noopamp;type0-0-0=noopamp;value0-0-0=amp;cmdtype=doitamp;newqueryname=amp;order=Bug+Number;Bugzilla bug reports/a against Struts 1.1 nightly builds MUST be marked as Resolved, with any of the legal Bugzilla resolutions (FIXED, INVALID, WONTFIX, LATER, REMIND, WORKSFORME)./li liBug reports that are resolved as LATER or REMIND will include comments as to whether those specific issues will be dealt with in a subsequent beta, release candidate, or final release, or whether they will be scheduled for consideration in a subsequent release time frame./li /ul /section /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build.xml
martinc 2003/02/10 21:54:51
Modified:.build.xml
Log:
Update for PMD 1.02. Also allow rule sets and report file to be specified
using custom build properties.
Revision ChangesPath
1.98 +4 -2 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- build.xml 11 Feb 2003 05:37:59 - 1.97
+++ build.xml 11 Feb 2003 05:54:51 - 1.98
@@ -99,6 +99,8 @@
!-- Default values for unspecified properties --
property name=catalina.home value=../jakarta-tomcat-4.0/build/
+property name=pmd.rulesets
value=rulesets/imports.xml,rulesets/unusedcode.xml/
+property name=pmd.report value=pmdreport.html/
!-- == Initialization Properties = --
@@ -738,8 +740,8 @@
classname=net.sourceforge.pmd.ant.PMDTask
classpath location=${pmd.jar}/
/taskdef
-pmd reportFile=pmdreport.html format=html
- rulesetfiles=rulesets/unusedcode.xml,rulesets/imports.xml
+pmd printToConsole=true rulesetfiles=${pmd.rulesets}
+ formatter type=html toFile=${pmd.report}/
fileset dir=${src.share.dir} includes=**/*.java/
/pmd
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util RequestUtils.java
martinc 2003/02/06 21:25:24
Modified:src/share/org/apache/struts/util RequestUtils.java
Log:
Do not remove the action mapping from the request for multipart requests.
This means that the action mapping will always be available under the
Globals.MAPPING_KEY request attribute, regardless of the type of request
being processed.
Revision ChangesPath
1.82 +4 -5
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- RequestUtils.java 6 Feb 2003 03:01:58 - 1.81
+++ RequestUtils.java 7 Feb 2003 05:25:23 - 1.82
@@ -1065,7 +1065,6 @@
request, multipartHandler);
names = Collections.enumeration(multipartParameters.keySet());
}
-request.removeAttribute(Globals.MAPPING_KEY);
}
if (!isMultipart) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java
martinc 2003/02/06 21:42:46
Modified:src/share/org/apache/struts/action ActionServlet.java
Log:
Add BigDecimal and BigInteger to the set of types for which default
converters are registered on startup.
PR: 16829
Submitted by: Brian Alexander Lee
Revision ChangesPath
1.143 +12 -4
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ActionServlet.java28 Jan 2003 19:30:23 - 1.142
+++ ActionServlet.java7 Feb 2003 05:42:45 - 1.143
@@ -65,6 +65,8 @@
import java.io.IOException;
import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
import java.net.URL;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -82,6 +84,8 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.converters.BigDecimalConverter;
+import org.apache.commons.beanutils.converters.BigIntegerConverter;
import org.apache.commons.beanutils.converters.BooleanConverter;
import org.apache.commons.beanutils.converters.ByteConverter;
import org.apache.commons.beanutils.converters.CharacterConverter;
@@ -1315,6 +1319,10 @@
}
if (convertNull) {
ConvertUtils.deregister();
+ConvertUtils.register(new BigDecimalConverter(null),
+ BigDecimal.class);
+ConvertUtils.register(new BigIntegerConverter(null),
+ BigInteger.class);
ConvertUtils.register(new BooleanConverter(null), Boolean.class);
ConvertUtils.register(new ByteConverter(null), Byte.class);
ConvertUtils.register(new CharacterConverter(null),
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/upload CommonsMultipartRequestHandler.java
martinc 2003/02/06 23:00:49
Modified:conf/share struts-config_1_1.dtd
src/share/org/apache/struts/config ControllerConfig.java
src/share/org/apache/struts/upload
CommonsMultipartRequestHandler.java
Log:
Allow configuration of the size threshold below which uploads will be saved
in memory, and above which they will be saved to some alternate storage
medium, typically disk.
Revision ChangesPath
1.36 +10 -1 jakarta-struts/conf/share/struts-config_1_1.dtd
Index: struts-config_1_1.dtd
===
RCS file: /home/cvs/jakarta-struts/conf/share/struts-config_1_1.dtd,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- struts-config_1_1.dtd 28 Jan 2003 19:30:23 - 1.35
+++ struts-config_1_1.dtd 7 Feb 2003 07:00:49 - 1.36
@@ -515,6 +515,14 @@
megabytes, or gigabytes, respectively.
[250M]
+ memFileSize The maximum size (in bytes) of a file whose contents will
+ be retained in memory after uploading. Files larger than
+ this threshold will be written to some alternative storage
+ medium, typically a hard disk. Can be expressed as a number
+ followed by a K, M, or G, which are interpreted to
+ mean kilobytes, megabytes, or gigabytes, respectively.
+ [256K]
+
multipartClass The fully qualified Java class name of the multipart
request handler class to be used with this module.
[org.apache.struts.upload.CommonsMultipartRequestHandler]
@@ -555,6 +563,7 @@
!ATTLIST controller inputForward %Boolean; #IMPLIED
!ATTLIST controller locale %Boolean; #IMPLIED
!ATTLIST controller maxFileSizeCDATA #IMPLIED
+!ATTLIST controller memFileSizeCDATA #IMPLIED
!ATTLIST controller multipartClass %ClassName; #IMPLIED
!ATTLIST controller nocache%Boolean; #IMPLIED
!ATTLIST controller pagePatternCDATA #IMPLIED
1.13 +26 -5
jakarta-struts/src/share/org/apache/struts/config/ControllerConfig.java
Index: ControllerConfig.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ControllerConfig.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ControllerConfig.java 28 Jan 2003 19:30:24 - 1.12
+++ ControllerConfig.java 7 Feb 2003 07:00:49 - 1.13
@@ -231,6 +231,23 @@
/**
+ * The maximum file size to retain in memory.
+ */
+protected String memFileSize = 256K;
+
+public String getMemFileSize() {
+return (this.memFileSize);
+}
+
+public void setMemFileSize(String memFileSize) {
+if (configured) {
+throw new IllegalStateException(Configuration is frozen);
+}
+this.memFileSize = memFileSize;
+}
+
+
+/**
* The fully qualified Java class name of the MultipartRequestHandler
* class to be used.
*/
@@ -369,8 +386,12 @@
sb.append(,locale=);
sb.append(this.locale);
if (this.maxFileSize != null) {
-sb.append(,maxFileSzie=);
+sb.append(,maxFileSize=);
sb.append(this.maxFileSize);
+}
+if (this.memFileSize != null) {
+sb.append(,memFileSize=);
+sb.append(this.memFileSize);
}
sb.append(,multipartClass=);
sb.append(this.multipartClass);
1.7 +42 -23
jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java
Index: CommonsMultipartRequestHandler.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/CommonsMultipartRequestHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommonsMultipartRequestHandler.java 9 Nov 2002 04:04:11 - 1.6
+++ CommonsMultipartRequestHandler.java 7 Feb 2003 07:00:49 - 1.7
@@ -218,7 +218,7 @@
// Set the maximum size before a FileUploadException will be thrown.
upload.setSizeMax((int) getSizeMax(ac));
// Set the maximum size that will be stored in memory.
-upload.setSizeThreshold(getSizeThreshold(ac));
+upload.setSizeThreshold((int) getSizeThreshold(ac));
// Set the the location for saving data on disk.
upload.setRepositoryPath(getRepositoryPath(ac));
@@ -324,8
cvs commit: jakarta-struts/src/share/org/apache/struts/util StrutsValidatorUtil.java
martinc 2003/01/24 21:52:36
Modified:src/share/org/apache/struts/tiles ComponentDefinition.java
TilesServlet.java
src/share/org/apache/struts/tiles/xmlDefinition
XmlParser.java
src/share/org/apache/struts/util StrutsValidatorUtil.java
Log:
More unused imports/methods/variables cleanup, thanks to PMD.
Revision ChangesPath
1.6 +3 -14
jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinition.java
Index: ComponentDefinition.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinition.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentDefinition.java 17 Dec 2002 00:57:36 - 1.5
+++ ComponentDefinition.java 25 Jan 2003 05:52:35 - 1.6
@@ -115,17 +115,6 @@
private Controller controllerInstance;
/**
- * Sets the value of the attributes property.
- *
- * @param aAttributes the new value of the attributes property
- * @deprecated No replacement
- */
- private void setAttributes(Map aAttributes)
-{
-attributes = aAttributes;
-}
-
- /**
* Constructor.
*/
public ComponentDefinition()
1.4 +3 -5
jakarta-struts/src/share/org/apache/struts/tiles/TilesServlet.java
Index: TilesServlet.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TilesServlet.java 10 Oct 2002 16:32:27 - 1.3
+++ TilesServlet.java 25 Jan 2003 05:52:35 - 1.4
@@ -62,8 +62,6 @@
package org.apache.struts.tiles;
-import org.apache.struts.tiles.DefinitionsUtil;
-import org.apache.struts.tiles.DefinitionsFactoryException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.7 +4 -4
jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java
Index: XmlParser.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XmlParser.java11 Dec 2002 06:30:21 - 1.6
+++ XmlParser.java25 Jan 2003 05:52:35 - 1.7
@@ -371,7 +371,7 @@
System.out.println( Read file ' + filename +' );
InputStream input = null;
- InputStream input2 = null;
+ // InputStream input2 = null;
// Open file
try
{
1.9 +4 -5
jakarta-struts/src/share/org/apache/struts/util/StrutsValidatorUtil.java
Index: StrutsValidatorUtil.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/StrutsValidatorUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StrutsValidatorUtil.java 22 Nov 2002 05:15:39 - 1.8
+++ StrutsValidatorUtil.java 25 Jan 2003 05:52:35 - 1.9
@@ -66,7 +66,6 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.util.MessageResources;
import org.apache.commons.validator.Field;
import org.apache.commons.validator.Validator;
import org.apache.commons.validator.ValidatorAction;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/conf/share validator-rules.xml
martinc 2003/01/19 21:12:32
Modified:conf/share validator-rules.xml
Log:
Allow '8' as a valid decimal and hexadecimal digit... ;-)
Add support for integer input in octal format.
Revision ChangesPath
1.22 +5 -2 jakarta-struts/conf/share/validator-rules.xml
Index: validator-rules.xml
===
RCS file: /home/cvs/jakarta-struts/conf/share/validator-rules.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- validator-rules.xml 20 Jan 2003 04:32:24 - 1.21
+++ validator-rules.xml 20 Jan 2003 05:12:32 - 1.22
@@ -428,11 +428,14 @@
function isAllDigits(argvalue) {
argvalue = argvalue.toString();
-var validchars = 012345679;
+var validchars = 0123456789;
var startFrom = 0;
if (argvalue.substring(0, 2) == 0x) {
- validchars = 012345679abcdefABCDEF;
+ validchars = 0123456789abcdefABCDEF;
startFrom = 2;
+} else if (argvalue.charAt(0) == 0) {
+ validchars = 01234567;
+ startFrom = 1;
}
for (var n = 0; n argvalue.length; n++) {
if (validChars.indexOf(argvalue.substring(n, n+1)) == -1)
return false;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/web/blank/WEB-INF/src build.xml
martinc 2003/01/14 21:07:56 Modified:web/blank/WEB-INF/src build.xml Log: Fix default values for servlet and JDBC properties. PR: 16072 Submitted by: Nayan Hajratwala Revision ChangesPath 1.2 +2 -2 jakarta-struts/web/blank/WEB-INF/src/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/web/blank/WEB-INF/src/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- build.xml 10 Jul 2002 20:23:29 - 1.1 +++ build.xml 15 Jan 2003 05:07:56 - 1.2 @@ -2,8 +2,8 @@ !-- Local system paths -- -property name=servlet.jar value=/javasoft/lib/jdbc2_0-stdext.jar/ -property name=jdbc20ext.jar value=/javasoft/lib/servlet.jar/ +property name=servlet.jar value=/javasoft/lib/servlet.jar/ +property name=jdbc20ext.jar value=/javasoft/lib/jdbc2_0-stdext.jar/ !-- NOTE: If dist target is used, a local projects/lib directory will be utilized or created -- property name=distpath.project value=/projects/lib/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib/struts-el build.xml
martinc 2003/01/06 21:42:56
Modified:.build.xml
contrib/scaffold build.xml
contrib/struts-el build.xml
Log:
Dynamically specify the end year for JavaDoc copyright notices, so that we
don't have to update the build script each year.
Many thanks to Stefan Bodewig for the tip!
Revision ChangesPath
1.93 +5 -1 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- build.xml 6 Jan 2003 16:21:35 - 1.92
+++ build.xml 7 Jan 2003 05:42:55 - 1.93
@@ -255,6 +255,10 @@
echo message=java.home = ${java.home}/
echo message=user.home = ${user.home}/
+tstamp
+format property=year pattern=/
+/tstamp
+
/target
!--
@@ -361,7 +365,7 @@
version=true
windowtitle=Apache Struts API Documentation
doctitle=lt;h1gt;Apache Struts Framework (Version
${project.version})lt;/h1gt;
-bottom=Copyright #169; 2000-2002 - Apache Software Foundation
+bottom=Copyright #169; 2000-${year} - Apache Software Foundation
classpath refid=compile.classpath/
/javadoc
/target
1.8 +5 -3 jakarta-struts/contrib/scaffold/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/scaffold/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 12 Sep 2002 12:40:27 - 1.7
+++ build.xml 7 Jan 2003 05:42:55 - 1.8
@@ -50,7 +50,9 @@
!-- Check timestamp on files --
target name=prepare
-tstamp/
+tstamp
+format property=year pattern=/
+/tstamp
/target
!-- Copy any resource or configuration files --
@@ -99,7 +101,7 @@
version=true
windowtitle=${project.title} API Documentation
doctitle=lt;h1gt;${project.title} API Documentation (Version
${project.version})lt;/h1gt;
-bottom=Copyright #169; 2001-2002 - Apache Software Foundation
+bottom=Copyright #169; 2001-${year} - Apache Software Foundation
classpath refid=${compile.classpath}/
/javadoc
/target
1.8 +5 -1 jakarta-struts/contrib/struts-el/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 6 Jan 2003 21:30:12 - 1.7
+++ build.xml 7 Jan 2003 05:42:56 - 1.8
@@ -176,6 +176,10 @@
echo message=user.home = ${user.home}/
echo message=struts.jar = ${struts.jar}/
echo message=struts-el.jar = ${struts-el.jar}/
+
+ tstamp
+ format property=year pattern=/
+ /tstamp
/target
!--
@@ -263,7 +267,7 @@
version=true
windowtitle=Apache Struts-EL API Documentation
doctitle=lt;h1gt;Apache Struts-EL Framework (Version
${project.version})lt;/h1gt;
- bottom=Copyright #169; 2000-2002 - Apache Software Foundation
+ bottom=Copyright #169; 2000-${year} - Apache Software Foundation
classpath refid=compile.classpath/
/javadoc
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib/struts-el/doc/stylesheets proposals.xsl struts.xsl
martinc 2003/01/06 21:50:12
Modified:contrib/struts-el/doc/stylesheets proposals.xsl struts.xsl
Log:
Fix line ends.
Revision ChangesPath
1.2 +318 -318 jakarta-struts/contrib/struts-el/doc/stylesheets/proposals.xsl
Index: proposals.xsl
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/doc/stylesheets/proposals.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proposals.xsl 26 Sep 2002 04:54:38 - 1.1
+++ proposals.xsl 7 Jan 2003 05:50:11 - 1.2
@@ -1,318 +1,318 @@
-?xml version=1.0 encoding=ISO-8859-1?
-!-- Content Stylesheet for Struts User's Guide --
-!-- $Id$ --
-
-xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
- version=1.0
-
-
- !-- Output method --
- xsl:output method=html indent=no/
-
-
- !-- Defined variables --
- xsl:variable name=body-bg select='#ff'/
- xsl:variable name=body-fg select='#00'/
- xsl:variable name=body-link select='#023264'/
- xsl:variable name=banner-bg select='#023264'/
- xsl:variable name=banner-fg select='#ff'/
-
-
- !-- Process an entire document into an HTML page --
- xsl:template match=document
-xsl:variable name=project
-select=document('../proposals/project.xml')/project/
-html
-head
-meta name=author content={properties/author/.}/
-!-- link rel=stylesheet type=text/css href=default.css/ --
-xsl:choose
- xsl:when test=properties/title
-titlexsl:value-of select=properties/title//title
- /xsl:when
- xsl:when test=body/title
-titlexsl:value-of select=body/title//title
- /xsl:when
- xsl:otherwise
-titlexsl:value-of select=$project/title//title
- /xsl:otherwise
-/xsl:choose
-/head
-
-body bgcolor={$body-bg} text={$body-fg} link={$body-link}
- alink={$body-link} vlink={$body-link}
-
-table border=0 width=100% cellspacing=5
-
- trtd colspan=2
-a href=http://jakarta.apache.org;
-img src=../images/jakarta-logo.gif align=left border=0/
-/a
-img src=../images/struts.gif align=right border=0/
- /td/tr
-
- trtd colspan=2
-hr/
- /td/tr
-
- tr
-td width=120 valign=top
- xsl:apply-templates select=$project/
-/td
-
-td valign=top
- xsl:apply-templates select=body/
-/td
- /tr
-
- trtd colspan=2
-hr/
- /td/tr
-
- trtd colspan=2
-div align=centerfont color={$body-link} size=-1Struts Nightly
Buildbr/
-em
-Copyright (c) 2000-2002, Apache Software Foundation
-/em/font/div
-img src=../images/struts-power.gif align=right border=0/
- /td/tr
-
-/table
-/body
-/html
-
- /xsl:template
-
-
- !-- Process the project element for the navigation bar --
- xsl:template match=project
-xsl:apply-templates/
- /xsl:template
-
-
- !-- Process an entire chapter (assumes one chapter per page) --
- xsl:template match=chapter
-xsl:element name=a
- xsl:attribute name=name
-xsl:value-of select=@href /
- /xsl:attribute
-/xsl:element
-table border=0 cellspacing=5 cellpadding=5 width=100%
- trtd bgcolor={$banner-bg}
-font color={$banner-fg} face=arial,helvetica,sanserif size=+1
- strongxsl:value-of select=@name//strong
-/font
- /td/tr
-/table
-xsl:apply-templates select=section /
- /xsl:template
-
-
- !-- Process a menu for the navigation bar --
- xsl:template match=menu
-table border=0 cellspacing=5
- tr
-th colspan=2 align=left
- font color={$body-link}strong
-xsl:value-of select=@name/
- /strong/font
-/th
- /tr
- xsl:apply-templates/
-/table
- /xsl:template
-
-
- !-- Process a menu item for the navigation bar --
- xsl:template match=item
-tr
- td align=center width=15/td
- td
-font size=-1
-xsl:variable name=href
- xsl:value-of select=@href/
-/xsl:variable
-a href={$href}xsl:value-of select=@name//a
-/font
- /td
-/tr
- /xsl:template
-
-
- !-- Process a documentation section --
- xsl:template match=section
-xsl:choose
- xsl:when test=@href
-xsl:variable name=href
- xsl:value-of select=@href/
-/xsl:variable
-a name={$href}/a
- /xsl:when
-/xsl:choose
-table
cvs commit: jakarta-struts/doc/stylesheets faqs.xsl news.xsl proposals.xsl resources.xsl struts.xsl userGuide.xsl
martinc 2003/01/06 21:57:37
Modified:contrib/struts-el/doc/stylesheets proposals.xsl struts.xsl
userGuide.xsl
doc/stylesheets faqs.xsl news.xsl proposals.xsl
resources.xsl struts.xsl userGuide.xsl
Log:
Update end year for documentation copyright notices. If someone knows how
to do this dynamically in XSLT, a la Stefan's JavaDoc trick, please let me
know.
Revision ChangesPath
1.3 +2 -2 jakarta-struts/contrib/struts-el/doc/stylesheets/proposals.xsl
Index: proposals.xsl
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/doc/stylesheets/proposals.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proposals.xsl 7 Jan 2003 05:50:11 - 1.2
+++ proposals.xsl 7 Jan 2003 05:57:36 - 1.3
@@ -72,7 +72,7 @@
trtd colspan=2
div align=centerfont color={$body-link} size=-1Struts Nightly
Buildbr/
em
-Copyright (c) 2000-2002, Apache Software Foundation
+Copyright (c) 2000-2003, Apache Software Foundation
/em/font/div
img src=../images/struts-power.gif align=right border=0/
/td/tr
1.3 +2 -2 jakarta-struts/contrib/struts-el/doc/stylesheets/struts.xsl
Index: struts.xsl
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/doc/stylesheets/struts.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts.xsl7 Jan 2003 05:50:11 - 1.2
+++ struts.xsl7 Jan 2003 05:57:36 - 1.3
@@ -69,7 +69,7 @@
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright (c) 2000-2002, Apache Software Foundation
+Copyright (c) 2000-2003, Apache Software Foundation
/em/font/div
img src=images/struts-power.gif align=right border=0/
/td/tr
1.2 +2 -2 jakarta-struts/contrib/struts-el/doc/stylesheets/userGuide.xsl
Index: userGuide.xsl
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/doc/stylesheets/userGuide.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userGuide.xsl 26 Sep 2002 04:54:38 - 1.1
+++ userGuide.xsl 7 Jan 2003 05:57:36 - 1.2
@@ -71,7 +71,7 @@
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright (c) 2000-2002, Apache Software Foundation
+Copyright (c) 2000-2003, Apache Software Foundation
/em/font/div
img src=../images/struts-power.gif align=right border=0/
/td/tr
1.3 +2 -2 jakarta-struts/doc/stylesheets/faqs.xsl
Index: faqs.xsl
===
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/faqs.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- faqs.xsl 11 Nov 2002 22:00:03 - 1.2
+++ faqs.xsl 7 Jan 2003 05:57:36 - 1.3
@@ -80,7 +80,7 @@
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright (c) 2000-2002, Apache Software Foundation
+Copyright (c) 2000-2003, Apache Software Foundation
/em/font/div
img src=../images/struts-power.gif align=right border=0/
/td/tr
1.3 +2 -2 jakarta-struts/doc/stylesheets/news.xsl
Index: news.xsl
===
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/news.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- news.xsl 11 Nov 2002 22:00:03 - 1.2
+++ news.xsl 7 Jan 2003 05:57:36 - 1.3
@@ -80,7 +80,7 @@
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright (c) 2000-2002, Apache Software Foundation
+Copyright (c) 2000-2003, Apache Software Foundation
/em/font/div
img src=../images/struts-power.gif align=right border=0/
/td/tr
1.3 +2 -2 jakarta-struts/doc/stylesheets/proposals.xsl
Index: proposals.xsl
===
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/proposals.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proposals.xsl 11 Nov 2002 22:00:03 - 1.2
+++ proposals.xsl 7 Jan 2003 05:57:36 - 1.3
@@ -74,7 +74,7 @@
trtd colspan=2
div align=centerfont color={$body-link} size=-1Struts Nightly
Buildbr/
em
cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionErrors.java ActionFormBeans.java ActionForwards.java ActionMappings.java ActionMessages.java ExceptionHandler.java ForwardingActionForward.java RedirectingActionForward.java RequestActionMapping.java SessionActionMapping.java
martinc 2003/01/06 22:32:26
Modified:src/share/org/apache/struts/action ActionErrors.java
ActionFormBeans.java ActionForwards.java
ActionMappings.java ActionMessages.java
ExceptionHandler.java ForwardingActionForward.java
RedirectingActionForward.java
RequestActionMapping.java SessionActionMapping.java
Log:
Detab sources.
Revision ChangesPath
1.10 +40 -40
jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java
Index: ActionErrors.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ActionErrors.java 20 Oct 2002 19:10:45 - 1.9
+++ ActionErrors.java 7 Jan 2003 06:32:25 - 1.10
@@ -88,44 +88,44 @@
public class ActionErrors extends ActionMessages implements Serializable {
- // - Manifest Constants
+// - Manifest Constants
- /**
- * The property name marker to use for global errors, as opposed to
- * those related to a specific property.
- */
- public static final String GLOBAL_ERROR =
org.apache.struts.action.GLOBAL_ERROR;
-
- // - Public Methods
-
- /**
- * Create an empty codeActionErrors/code object.
- */
- public ActionErrors() {
- super();
- }
-
- /**
- * Create an codeActionErrors/code object initialized with the given
- * messages.
- *
- * @param messages The messages to be initially added to this object.
- * @since Struts 1.1
- */
- public ActionErrors(ActionErrors messages) {
- super(messages);
- }
-
- /**
- * Add an error message to the set of errors for the specified property.
- *
- * @param property Property name (or ActionErrors.GLOBAL_ERROR)
- * @param error The error message to be added
- */
- public void add(String property, ActionError error) {
+/**
+ * The property name marker to use for global errors, as opposed to
+ * those related to a specific property.
+ */
+public static final String GLOBAL_ERROR =
org.apache.struts.action.GLOBAL_ERROR;
+
+// - Public Methods
+
+/**
+ * Create an empty codeActionErrors/code object.
+ */
+public ActionErrors() {
+super();
+}
+
+/**
+ * Create an codeActionErrors/code object initialized with the given
+ * messages.
+ *
+ * @param messages The messages to be initially added to this object.
+ * @since Struts 1.1
+ */
+public ActionErrors(ActionErrors messages) {
+super(messages);
+}
+
+/**
+ * Add an error message to the set of errors for the specified property.
+ *
+ * @param property Property name (or ActionErrors.GLOBAL_ERROR)
+ * @param error The error message to be added
+ */
+public void add(String property, ActionError error) {
- super.add(property, error);
+super.add(property, error);
- }
+}
}
1.7 +7 -7
jakarta-struts/src/share/org/apache/struts/action/ActionFormBeans.java
Index: ActionFormBeans.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionFormBeans.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ActionFormBeans.java 28 Nov 2002 07:12:42 - 1.6
+++ ActionFormBeans.java 7 Jan 2003 06:32:25 - 1.7
@@ -125,7 +125,7 @@
*/
public void addFormBean(ActionFormBean formBean) {
- formBeans.put(formBean.getName(), formBean);
+formBeans.put(formBean.getName(), formBean);
}
@@ -138,7 +138,7 @@
*/
public ActionFormBean findFormBean(String name) {
- return ((ActionFormBean) formBeans.get(name));
+return ((ActionFormBean) formBeans.get(name));
}
@@ -162,7 +162,7 @@
*/
public void removeFormBean(ActionFormBean formBean) {
- formBeans.remove(formBean.getName());
+formBeans.remove(formBean.getName());
}
1.8 +7 -7
jakarta-struts/src/share/org/apache/struts/action/ActionForwards.java
Index: ActionForwards.java
===
RCS file:
/home/cvs/jakarta-struts/src
cvs commit: jakarta-struts/doc/resources powered.xml
martinc 2003/01/04 14:15:10
Modified:.build.xml
doc/resources powered.xml
Log:
Add Benefit Systems to the Powered By page.
PR: 15753
Submitted by: James Turner
Revision ChangesPath
1.89 +25 -0 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- build.xml 30 Dec 2002 08:52:50 - 1.88
+++ build.xml 4 Jan 2003 22:15:10 - 1.89
@@ -832,6 +832,31 @@
/target
+
+
+
+
+target name=checkSource
+description=Checks source code against coding guidelines
+depends=init
+taskdef name=checkstyle
+ classname=com.puppycrawl.tools.checkstyle.CheckStyleTask
+ classpath=${checkstyle.classpath} /
+checkstyle properties=${shared.java.dir}/Config/checkstyle.properties
+headerFile=${shared.java.dir}/Config/checkstyle.header
+formatter type=plain/
+fileset dir=${basedir} includes=**/*.java/
+/checkstyle
+/target
+
+
+
+
+
+
+
+
+
!--
Run tests on all servers not commented out in the build.properties file.
--
1.11 +1 -0 jakarta-struts/doc/resources/powered.xml
Index: powered.xml
===
RCS file: /home/cvs/jakarta-struts/doc/resources/powered.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- powered.xml 25 Dec 2002 06:25:04 - 1.10
+++ powered.xml 4 Jan 2003 22:15:10 - 1.11
@@ -17,6 +17,7 @@
!-- MISSING CREDIT 6/25/02 --pa
href=http://www.application-servers.com/;bApplication-Servers.com/b/a - French
site./p
pa href=http://amalregistry.webhop.org/;bAlaskan Malamute
Registry/b/a/p
pa href=http://www.basebeans.com/;bbaseBeans Engineering/b/a/p
+pa href=https://secure.benefit-systems.com/benefit/bsi/;bBenefit Systems,
Inc./b/a/p
pa href=http://www.bug-track.com/;bBug-Track.com/b/a/p
!-- HTTP [500] 6/25/02 --pa
href=http://www.clickstarttutoring.com/index.jsp;bClickstart Tutoring/b/a -
One on one in home tutoring./p
!-- MISSING CREDIT 6/25/02 --pa href=http://dbforms.org/;bdbForms/b/a
- RAD framework for database applications./p
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic MessagesPresentTag.java
martinc 2003/01/04 16:40:04 Modified:src/share/org/apache/struts/config ConfigHelperInterface.java src/share/org/apache/struts/taglib/bean MessageTag.java src/share/org/apache/struts/taglib/html FormTag.java src/share/org/apache/struts/taglib/logic MessagesPresentTag.java Log: Fix duplicate imports and unused imports. Revision ChangesPath 1.5 +4 -7 jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java Index: ConfigHelperInterface.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ConfigHelperInterface.java12 Nov 2002 03:56:09 - 1.4 +++ ConfigHelperInterface.java5 Jan 2003 00:40:04 - 1.5 @@ -80,9 +80,6 @@ import org.apache.struts.upload.MultipartRequestWrapper; import org.apache.struts.util.MessageResources; -// since 1.1 -import org.apache.struts.action.ActionMessages; - /** * NOTE: THIS CLASS IS UNDER ACTIVE DEVELOPMENT. 1.9 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java Index: MessageTag.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- MessageTag.java 12 Nov 2002 03:56:08 - 1.8 +++ MessageTag.java 5 Jan 2003 00:40:04 - 1.9 @@ -69,7 +69,6 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.Globals; -import org.apache.struts.action.Action; import org.apache.struts.util.MessageResources; import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; 1.42 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java Index: FormTag.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- FormTag.java 29 Dec 2002 17:00:15 - 1.41 +++ FormTag.java 5 Jan 2003 00:40:04 - 1.42 @@ -62,7 +62,6 @@ package org.apache.struts.taglib.html; import java.io.IOException; -import java.util.StringTokenizer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; 1.6 +1 -2 jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java Index: MessagesPresentTag.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MessagesPresentTag.java 12 Nov 2002 03:56:10 - 1.5 +++ MessagesPresentTag.java 5 Jan 2003 00:40:04 - 1.6 @@ -61,7 +61,6 @@ import javax.servlet.jsp.JspException; import org.apache.struts.Globals; -import org.apache.struts.action.Action; import org.apache.struts.action.ActionMessages; import org.apache.struts.util.RequestUtils; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/tiles/actions NoOpAction.java ReloadDefinitionsAction.java ViewDefinitionsAction.java
martinc 2003/01/04 17:24:48 Modified:src/share/org/apache/struts/tiles ActionComponentServlet.java ActionController.java ComponentDefinitionsFactory.java DefinitionAttribute.java DefinitionNameAttribute.java DefinitionsUtil.java DirectStringAttribute.java PathAttribute.java TilesPlugin.java TilesUtilStrutsImpl.java TilesUtilStrutsModulesImpl.java src/share/org/apache/struts/tiles/actions NoOpAction.java ReloadDefinitionsAction.java ViewDefinitionsAction.java Log: Fix remaining unused imports. I think I've nailed them all now. Revision ChangesPath 1.7 +3 -4 jakarta-struts/src/share/org/apache/struts/tiles/ActionComponentServlet.java Index: ActionComponentServlet.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ActionComponentServlet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ActionComponentServlet.java 17 Dec 2002 00:57:36 - 1.6 +++ ActionComponentServlet.java 5 Jan 2003 01:24:48 - 1.7 @@ -76,7 +76,6 @@ import org.apache.struts.action.ActionServlet; import org.apache.struts.taglib.html.Constants; import org.apache.struts.upload.MultipartRequestWrapper; -import org.apache.struts.util.RequestUtils; /** * Action Servlet to be used with Tiles and Struts 1.0.x. 1.2 +3 -4 jakarta-struts/src/share/org/apache/struts/tiles/ActionController.java Index: ActionController.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ActionController.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ActionController.java 25 Jun 2002 03:14:49 - 1.1 +++ ActionController.java 5 Jan 2003 01:24:48 - 1.2 @@ -63,7 +63,6 @@ package org.apache.struts.tiles; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionServlet; import java.io.IOException; import javax.servlet.http.HttpServletRequest; 1.3 +3 -4 jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinitionsFactory.java Index: ComponentDefinitionsFactory.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinitionsFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ComponentDefinitionsFactory.java 15 Jul 2002 12:51:52 - 1.2 +++ ComponentDefinitionsFactory.java 5 Jan 2003 01:24:48 - 1.3 @@ -64,7 +64,6 @@ import java.util.Map; import java.io.Serializable; -import javax.servlet.jsp.PageContext; import javax.servlet.ServletRequest; import javax.servlet.ServletContext; 1.2 +3 -8 jakarta-struts/src/share/org/apache/struts/tiles/DefinitionAttribute.java Index: DefinitionAttribute.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionAttribute.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefinitionAttribute.java 25 Jun 2002 03:14:49 - 1.1 +++ DefinitionAttribute.java 5 Jan 2003 01:24:48 - 1.2 @@ -62,11 +62,6 @@ package org.apache.struts.tiles; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.JspException; -import javax.servlet.ServletException; -import java.io.IOException; - /** * Attribute representing a Component Definition. * This attribute definition contains a Component definition. 1.2 +3 -8 jakarta-struts/src/share/org/apache/struts/tiles/DefinitionNameAttribute.java Index: DefinitionNameAttribute.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionNameAttribute.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefinitionNameAttribute.java 25 Jun 2002 03:14:49 - 1.1 +++ DefinitionNameAttribute.java 5 Jan 2003 01:24:48 - 1.2 @@ -62,11 +62,6 @@ package org.apache.struts.tiles; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.JspException; -import javax.servlet.ServletException; -import java.io.IOException; - /** * Component attribute. * Such attribute value represent an instance name. 1.10 +3 -4 jakarta-struts/src/share/org/apache/struts
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseHandlerTag.java
martinc 2003/01/04 17:40:44 Modified:src/share/org/apache/struts/taglib/html BaseHandlerTag.java Log: Ack! Fix one more (newly added!) unused import. Revision ChangesPath 1.22 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java Index: BaseHandlerTag.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- BaseHandlerTag.java 5 Jan 2003 00:50:08 - 1.21 +++ BaseHandlerTag.java 5 Jan 2003 01:40:44 - 1.22 @@ -65,7 +65,6 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.Tag; import org.apache.struts.Globals; import org.apache.struts.taglib.logic.IterateTag; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts build.properties.sample build.xml
martinc 2003/01/04 18:48:22
Modified:.build.properties.sample build.xml
Log:
Add new tasks for running Checkstyle and PMD, if available. If the tools
are not available, the tasks do nothing.
Revision ChangesPath
1.24 +12 -1 jakarta-struts/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.properties.sample 29 Dec 2002 20:54:15 - 1.23
+++ build.properties.sample 5 Jan 2003 02:48:21 - 1.24
@@ -95,6 +95,17 @@
# going to execute the deploy.catalina target.
xerces.jar=${apache.home}/xerces-1_4_4/xerces.jar
+# Properties related to optional tasks
+#
+
+# The JAR file containing the Checkstyle package version 2.4, if available. If
+# you do not have Checkstyle installed, do not set this property.
+checkstyle.jar = /Java/checkstyle-2.4/checkstyle-all-2.4.jar
+
+# The JAR file containing the PMD package version 1.01, if available. If
+# you do not have PMD installed, do not set this property.
+pmd.jar = /Java/pmd/lib/pmd-1.01.jar
+
# Properties related to Struts Contrib
# -
1.91 +30 -0 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- build.xml 4 Jan 2003 22:22:24 - 1.90
+++ build.xml 5 Jan 2003 02:48:21 - 1.91
@@ -745,6 +745,36 @@
!--
+Source code analysis targets
+--
+target name=checkstyle if=checkstyle.jar
+description=Checks source code against Sun coding guidelines
+depends=init
+taskdef name=checkstyle
+ classname=com.puppycrawl.tools.checkstyle.CheckStyleTask
+classpath location=${checkstyle.jar}/
+/taskdef
+checkstyle
+formatter type=plain/
+fileset dir=${src.share.dir} includes=**/*.java/
+/checkstyle
+/target
+
+target name=pmd if=pmd.jar
+description=Locates unused imports, unused variables, etc.
+depends=init
+taskdef name=pmd
+ classname=net.sourceforge.pmd.ant.PMDTask
+classpath location=${pmd.jar}/
+/taskdef
+pmd reportFile=pmdreport.html format=html
+ rulesetfiles=rulesets/unusedcode.xml,rulesets/imports.xml
+fileset dir=${src.share.dir} includes=**/*.java/
+/pmd
+/target
+
+
+!--
Compile Website documenation
--
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts build.xml
martinc 2002/12/30 00:48:13 Modified:.build.xml Log: Update version for 1.1-b3 release. Revision ChangesPath 1.87 +1 -1 jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- build.xml 22 Dec 2002 01:25:32 - 1.86 +++ build.xml 30 Dec 2002 08:48:13 - 1.87 @@ -166,7 +166,7 @@ property name=project.name value=jakarta-struts/ !-- Version of the project -- -property name=project.version value=1.1-b3-dev/ +property name=project.version value=1.1-b3/ !-- == Derived Properties -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts build.xml
martinc 2002/12/30 00:52:50 Modified:.build.xml Log: Reset version for ongoing development. Revision ChangesPath 1.88 +1 -1 jakarta-struts/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-struts/build.xml,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- build.xml 30 Dec 2002 08:48:13 - 1.87 +++ build.xml 30 Dec 2002 08:52:50 - 1.88 @@ -166,7 +166,7 @@ property name=project.name value=jakarta-struts/ !-- Version of the project -- -property name=project.version value=1.1-b3/ +property name=project.version value=1.1-b4-dev/ !-- == Derived Properties -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide release-notes-1.1-b3.xml index.xml
martinc 2002/12/30 19:12:11 Modified:doc acquiring.xml project.xml status.xml doc/news index.xml status.xml doc/userGuide index.xml Added: doc/userGuide release-notes-1.1-b3.xml Log: Last minute doc updates for 1.1-b3 release. Revision ChangesPath 1.8 +7 -7 jakarta-struts/doc/acquiring.xml Index: acquiring.xml === RCS file: /home/cvs/jakarta-struts/doc/acquiring.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- acquiring.xml 29 Dec 2002 21:07:03 - 1.7 +++ acquiring.xml 31 Dec 2002 03:12:11 - 1.8 @@ -75,17 +75,17 @@ /p ul -lia href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b2; -bStruts 1.1 Beta 2 Binary Distribution/b/a/li -lia href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b2/lib; -bStruts 1.1 Beta 2 Library Distribution/b/a/li -lia href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b2/src; -bStruts 1.1 Beta 2 Source Code Distribution/b/a/li +lia href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b3; +bStruts 1.1 Beta 3 Binary Distribution/b/a/li +lia href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b3/lib; +bStruts 1.1 Beta 3 Library Distribution/b/a/li +lia href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b3/src; +bStruts 1.1 Beta 3 Source Code Distribution/b/a/li /ul p Check the -a href=http://jakarta.apache.org/struts/userGuide/release-notes-1.1-b2.html; +a href=http://jakarta.apache.org/struts/userGuide/release-notes-1.1-b3.html; Release Notes/a for a summary of the changes since the Struts 1.0.2 release. /p 1.32 +3 -3 jakarta-struts/doc/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/doc/project.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- project.xml 29 Nov 2002 19:01:31 - 1.31 +++ project.xml 31 Dec 2002 03:12:11 - 1.32 @@ -85,14 +85,14 @@ / /menu -menu name=Beta Release (1.1-b2) +menu name=Beta Release (1.1-b3) item name=Release Notes -href=userGuide/release-notes-1.1-b2.html +href=userGuide/release-notes-1.1-b3.html / item name=Release Plan -href=proposals/release-plan-1.1b2.html +href=proposals/release-plan-1.1b3.html / /menu 1.23 +1 -5 jakarta-struts/doc/status.xml Index: status.xml === RCS file: /home/cvs/jakarta-struts/doc/status.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- status.xml29 Dec 2002 18:07:26 - 1.22 +++ status.xml31 Dec 2002 03:12:11 - 1.23 @@ -211,10 +211,6 @@ /li li -a href=proposals/release-plan-1.1b2.htmlRelease Plan 1.1-b2/a -/li - -li a href=proposals/workflow.htmlWorkflow Proposal/a /li 1.14 +36 -1 jakarta-struts/doc/news/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-struts/doc/news/index.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- index.xml 24 Dec 2002 01:05:54 - 1.13 +++ index.xml 31 Dec 2002 03:12:11 - 1.14 @@ -14,7 +14,7 @@ /p p -a href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b2/;Struts 1.1b/a is in its second bbeta release/b (12 August 2002). +a href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b3/;Struts 1.1b/a is in its third bbeta release/b (30 December 2002). /p hr size=1 noshade=/ @@ -111,6 +111,41 @@ /p hr size=1 noshade=/ -- + +h3a name=20021230/a30 Dec 2002 - Struts 1.1 Beta 3 Released/h3 +pThe Struts team is proud to announce the release of Struts 1.1 Beta 3. This +release includes significant new functionality, while retaining full +backwards compatibility with earlier versions of Struts. It also +incorporates fixes for a number of bugs which were reported against earlier +versions. +/p +p +The binary distribution is available at: +/p +p +a href=http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b3/;http://jakarta.apache.org/builds/jakarta-struts/release/v1.1-b3//a +/p +p +and the source distribution is available at: +/p +p +a href=http://jakarta.apache.org/builds
cvs commit: jakarta-struts KEYS
martinc 2002/12/30 19:44:34 Added: .KEYS Log: File containing PGP keys for signing the release. Revision ChangesPath 1.1 jakarta-struts/KEYS Index: KEYS === This file contains the PGP keys of various Apache developers. Please don't use them for email unless you have to. Their main purpose is code signing. Apache users: pgp KEYS Apache developers: (pgpk -ll your name pgpk -xa your name) this file. or (gpg --fingerprint --list-sigs your name gpg --armor --export your name) this file. Apache developers: please ensure that your key is also available via the PGP keyservers (such as pgpkeys.mit.edu). Type bits keyID Date User ID DSS 2048/1024 0x357AE38C 2002/12/30 *** DEFAULT SIGNING KEY *** Martin F. N. Cooper [EMAIL PROTECTED] -BEGIN PGP PUBLIC KEY BLOCK- Version: PGP 6.5.8 mQGiBD4QG2ARBADidho8fyIoGRxNu1rXBtVov8IpHcHCOzqY6C1Phgj+sCkeoLvX 7fBPwLhk+YhrkbhX2Fy0Hg8RzOy7J6XM1GYclPpYc+F7gW7tYqzGoiEeVAx3tIYa X83Z3d4f3pcwz3MePsFFIMkJzm766DbxEJwUlrNziD7KHOMkSPtt9E1O2QCg/21P 4LIkL6MAiqSoHPi7iXSCcv8D/1Vj4Nw7VpTFYupzDotjTf43G9WpbRjYPwPIpBbK G72JC8a3BQZmKUXEVHTHfOe4vWFrkrs1WTsBT8q5qo3d+wSxrUVj1wlNqQolQ8RP 7j+dx5zRYDKYD+DGdkF2Qokd3qx2uxcJnRNBeUsAB3aPj9IEqMMMGjEqybCbzTjv EfiuA/4x7hqPNGirRiNLkGFn9GJg+z/yYkiC2eaQC6VMU+S8JccHE2l4DgUSfKnc vm+QJGjDbylpZ1P4shtCkkHnoC21oeJrcKYB8jn/TAEGPv955xZDLj5fvvYQreg7 iaQ6Hx5TAnu+7tnET9UmoZe/fMN1jpwT4G3lXsl4AsizTXXZDbQoTWFydGluIEYu IE4uIENvb3BlciA8bWFydGluY0BhcGFjaGUub3JnPokATgQQEQIADgUCPhAbYAQL AwIBAhkBAAoJEJhjoec1euOM5g4An1/g/v4GZcqxsMWRpGsZRGJYASDSAKCKAIlZ RMiKyomfYl43R8HtgNNp0rkCDQQ+EBtgEAgA9kJXtwh/CBdyorrWqULzBej5UxE5 T7bxbrlLOCDaAadWoxTpj0BV89AHxstDqZSt90xkhkn4DIO9ZekX1KHTUPj1WV/c dlJPPT2N286Z4VeSWc39uK50T8X8dryDxUcwYc58yWb/Ffm7/ZFexwGq01uejaCl cjrUGvC/RgBYK+X0iP1YTknbzSC0neSRBzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD 8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGzeMyEstSr/POGxKUAYEY18hKcKctaGxAMZ yAcpesqVDNmWn6vQClCbAkbTCD1mpF1Bn5x8vYlLIhkmuquiXsNV6TILOwACAgf8 D0YiROjHXpHdBHkBaSoL9DmHT+JoUA5XLaLekQ2j4aNpGVHrPpRIEUUVLZFlfiTm IYVt4sMhh8prmqo7Yr4o1vG4cKJbqkiD+wCMntc4WTAifR9Py2I2G8D8aBQt2oRY fJdjEM41NX6B6k5swiCYjqEIHR1fh10cc/jeCwjcb2S65JK+UlTPBjjUNbbwVgmo VB2VOfjpas8yXTPZB0MOaxQqLP6+LPwUBLeNPvl+19Pfnaf6vSoObz4/OlO4FXET Q3wj/kipicoWaUj4Wq0bNETIeaKOnNkKn0Vvk8/yTn1RSzYb2xLFSm2wJBJAazfD g6pbPTWu532wXg1ErKCgm4kARgQYEQIABgUCPhAbYAAKCRCYY6HnNXrjjOvSAKC5 2FwUjvHy9zKbEV458B6p/BxtXwCg1xYG1Ad4mNDb5udKpQtMMzM28Ik= =noY8 -END PGP PUBLIC KEY BLOCK- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts build-webapps.xml
martinc 2002/12/30 23:29:16
Modified:.build-webapps.xml
Log:
Since we have links to the news and FAQs in the documentation app, and on
the web site, it would be a really good idea to actually build these and
include them in the documentation app, and thus have them appear on the
web site.
Now please excuse me while I go rebuild the 1.1-b3 release to include all
the relevant content...
Revision ChangesPath
1.18 +10 -0 jakarta-struts/build-webapps.xml
Index: build-webapps.xml
===
RCS file: /home/cvs/jakarta-struts/build-webapps.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build-webapps.xml 18 Aug 2002 02:08:42 - 1.17
+++ build-webapps.xml 31 Dec 2002 07:29:16 - 1.18
@@ -185,6 +185,16 @@
style basedir=${doc.dir} destdir=${build.home}/documentation
extension=.html style=${doc.dir}/stylesheets/struts.xsl
includes=*.xml/
+!-- Create the FAQs --
+style basedir=${doc.dir}/faqs
+ destdir=${build.home}/documentation/faqs
+ extension=.html style=${doc.dir}/stylesheets/faqs.xsl
+includes=*.xml/
+!-- Create the news --
+style basedir=${doc.dir}/news
+ destdir=${build.home}/documentation/news
+ extension=.html style=${doc.dir}/stylesheets/news.xsl
+includes=*.xml/
!-- Create the proposals --
style basedir=${doc.dir}/proposals
destdir=${build.home}/documentation/proposals
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/proposals release-plan-1.1b3.xml
martinc 2002/12/23 14:26:34 Modified:doc/proposals release-plan-1.1b3.xml Log: Update proposed freeze / tag date and open bug list. Revision ChangesPath 1.3 +11 -24jakarta-struts/doc/proposals/release-plan-1.1b3.xml Index: release-plan-1.1b3.xml === RCS file: /home/cvs/jakarta-struts/doc/proposals/release-plan-1.1b3.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- release-plan-1.1b3.xml17 Dec 2002 05:46:14 - 1.2 +++ release-plan-1.1b3.xml23 Dec 2002 22:26:34 - 1.3 @@ -33,7 +33,7 @@ pTherefore, the following release plan is proposed for Struts 1.1 Beta 3: /p ul - liemCode Freeze / Tag Date/em - Saturday, December 21, 2002/li + liemCode Freeze / Tag Date/em - Sunday, December 29, 2002/li liemRelease Manager/em - Martin Cooper/li liemRelease Announcement/em - To the following mailing lists: ul @@ -60,7 +60,7 @@ ul lia href=http://jakarta.apache.org/tomcat;Tomcat 3.3.1/a/li lia href=http://jakarta.apache.org/tomcat;Tomcat 4.0.6/a/li - lia href=http://jakarta.apache.org/tomcat;Tomcat 4.1.12/a/li + lia href=http://jakarta.apache.org/tomcat;Tomcat 4.1.18/a/li /ul/li liA release vote shall take place on the STRUTS-DEV mailing list to approve this plan. The release vote MUST pass by Majority Approval @@ -102,10 +102,6 @@ tdSporadic error in html:form action attribute/td /tr tr - td width=7512470/td - tdWeb Site Cancel does not work correctly when using dynamic validation/td -/tr -tr td width=7515044/td tdTaglib - Index Attribute in html:Checkbox doesn't set correctly/td /tr @@ -113,6 +109,14 @@ td width=7515196/td tdBug on the RequestUtils.computeParameters using a DynaValidatorForm as map of the parameter/td /tr +tr + td width=7515451/td + tdMultiple mapped properties not possible / Direct maps and indexes not possible/td +/tr +tr + td width=7515601/td + tdtile examples to move to standard webapp location/td +/tr !-- Controller -- tr @@ -127,10 +131,6 @@ tdRename Application components to Module/td /tr tr - td width=7514669/td - tdreset() in DynaActionForm act the same as ActionForm/td -/tr -tr td width=7514749/td tdAction input not starting with '/' and not a valid forward will cause an internal server error/td /tr @@ -148,15 +148,6 @@ tdUpdated Action documentation/td /tr -!-- File Upload -- -tr - td colspan=2strongFile Upload/strong/td -/tr -tr - td width=752017/td - tdText entered in forms using multi-part/formdata cannot be utf8/td -/tr - !-- Utilities -- tr td colspan=2strongUtilities/strong/td @@ -164,10 +155,6 @@ tr td width=7511932/td td(Message Resource is not multi-app aware) Multi-Resource not work in Multi-Appliction config environment/td -/tr -tr - td width=7514800/td - tdFix initialization bug and add size parameter to form-property/td /tr !-- Unknown -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide installation.xml release-notes.xml
martinc 2002/12/21 17:25:33
Modified:.build-tests.xml build-webapp.xml build.xml
contrib/struts-el build-tests.xml build-webapp.xml
doc/userGuide installation.xml release-notes.xml
Log:
Remove dependence on Commons Services from the build process, and remove
references to it as a requirement from the documentation.
Revision ChangesPath
1.11 +0 -3 jakarta-struts/build-tests.xml
Index: build-tests.xml
===
RCS file: /home/cvs/jakarta-struts/build-tests.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-tests.xml 7 Nov 2002 07:04:00 - 1.10
+++ build-tests.xml 22 Dec 2002 01:25:32 - 1.11
@@ -94,7 +94,6 @@
pathelement location=${commons-logging.jar}/
pathelement location=${commons-pool.jar}/
pathelement location=${commons-resources.jar}/
- pathelement location=${commons-services.jar}/
pathelement location=${commons-validator.jar}/
pathelement location=${aspectjrt.jar}/
pathelement location=${cactus.jar}/
@@ -184,8 +183,6 @@
copy file=${commons-logging.jar}
todir=${out.test.dir}/lib/
copy file=${commons-pool.jar}
- todir=${out.test.dir}/lib/
-copy file=${commons-services.jar}
todir=${out.test.dir}/lib/
copy file=${commons-validator.jar}
todir=${out.test.dir}/lib/
1.12 +0 -5 jakarta-struts/build-webapp.xml
Index: build-webapp.xml
===
RCS file: /home/cvs/jakarta-struts/build-webapp.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build-webapp.xml 8 Aug 2002 05:01:22 - 1.11
+++ build-webapp.xml 22 Dec 2002 01:25:32 - 1.12
@@ -81,10 +81,6 @@
of the Jakarta Commons Resources
package (version 1.0 or later).
-commons-services.jar (required). The path to the JAR file
- of the Jakarta Commons SERVICES
- package (version 1.0 or later).
-
commons-validator.jar (required). The path to the JAR file
of the Jakarta Commons VALIDATOR
package (version 1.0 or later).
@@ -192,7 +188,6 @@
pathelement location=${commons-logging.jar}/
pathelement location=${commons-pool.jar}/
pathelement location=${commons-resources.jar}/
- pathelement location=${commons-services.jar}/
pathelement location=${commons-validator.jar}/
pathelement location=${jdbc20ext.jar}/
pathelement location=${servlet.jar}/
1.86 +0 -7 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- build.xml 7 Nov 2002 07:02:51 - 1.85
+++ build.xml 22 Dec 2002 01:25:32 - 1.86
@@ -104,10 +104,6 @@
of the Jakarta Commons Resources
package (version 1.0 or later).
-commons-services.jar (required). The path to the JAR file
- of the Jakarta Commons SERVICES
- package (version 1.0 or later).
-
commons-validator.jar (required). The path to the JAR file
of the Jakarta Commons VALIDATOR
package (version 1.0 or later).
@@ -234,7 +230,6 @@
pathelement location=${commons-logging.jar}/
pathelement location=${commons-pool.jar}/
pathelement location=${commons-resources.jar}/
- pathelement location=${commons-services.jar}/
pathelement location=${commons-validator.jar}/
pathelement location=${jakarta-oro.jar}/
pathelement location=${jdbc20ext.jar}/
@@ -292,8 +287,6 @@
tofile=${build.home}/library/commons-pool.jar/
copy file=${commons-resources.jar}
tofile=${build.home}/library/commons-resources.jar/
-copy file=${commons-services.jar}
-tofile=${build.home}/library/commons-services.jar/
copy file=${commons-validator.jar}
tofile=${build.home}/library/commons-validator.jar/
copy file=${jakarta-oro.jar}
1.2 +0 -3 jakarta-struts/contrib/struts
cvs commit: jakarta-struts/contrib/struts-el build.properties.sample
martinc 2002/12/21 22:13:08
Modified:.build.properties.sample
conf/share MANIFEST.MF
contrib/struts-el build.properties.sample
Log:
Missed some references to commons-services in previous commit to remove it
as a dependency.
Revision ChangesPath
1.20 +1 -5 jakarta-struts/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.properties.sample 22 Dec 2002 04:42:24 - 1.19
+++ build.properties.sample 22 Dec 2002 06:13:07 - 1.20
@@ -63,10 +63,6 @@
# from the Jakarta Commons project.
commons-resources.jar=${commons-sandbox-lib.home}/resources/target/commons-resources-1.0-dev.jar
-# The JAR file containing a recent version of the SERVICES package
-# from the Jakarta Commons project.
-commons-services.jar=${commons-sandbox-lib.home}/services/dist/commons-services.jar
-
# The JAR file containing a recent version of the VALIDATOR package
# from the Jakarta Commons project.
commons-validator.jar=${commons-lib.home}/validator/dist/commons-validator.jar
1.4 +0 -1 jakarta-struts/conf/share/MANIFEST.MF
Index: MANIFEST.MF
===
RCS file: /home/cvs/jakarta-struts/conf/share/MANIFEST.MF,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MANIFEST.MF 29 Aug 2002 02:02:42 - 1.3
+++ MANIFEST.MF 22 Dec 2002 06:13:08 - 1.4
@@ -13,6 +13,5 @@
Class-Path: commons-digester.jar
Class-Path: commons-logging.jar
Class-Path: commons-pool.jar
-Class-Path: commons-services.jar
Class-Path: commons-validator.jar
Class-Path: jakarta-oro.jar
1.2 +1 -5 jakarta-struts/contrib/struts-el/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 26 Sep 2002 04:54:37 - 1.1
+++ build.properties.sample 22 Dec 2002 06:13:08 - 1.2
@@ -44,10 +44,6 @@
# from the Jakarta Commons project.
commons-pool.jar = path to commons-pool.jar
-# The JAR file containing a recent version of the SERVICES package
-# from the Jakarta Commons project.
-commons-services.jar = path to commons-services.jar
-
# The JAR file containing a recent version of the VALIDATOR package
# from the Jakarta Commons project.
commons-validator.jar= path to commons-validator.jar
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/config ConfigRuleSet.java
martinc 2002/12/20 20:42:20
Modified:src/share/org/apache/struts/config ConfigRuleSet.java
Log:
Update to avoid the use of deprecated Digester methods. Some deprecated
methods are still used, but their replacements are not yet available in
a released version of Digester. We don't want to depend on a new Digester
release just for this, so leave them for now.
Revision ChangesPath
1.14 +15 -14
jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java
Index: ConfigRuleSet.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConfigRuleSet.java7 Nov 2002 05:18:26 - 1.13
+++ ConfigRuleSet.java21 Dec 2002 04:42:20 - 1.14
@@ -112,11 +112,11 @@
digester.addRule
(struts-config/data-sources/data-source/set-property,
- new AddDataSourcePropertyRule(digester));
+ new AddDataSourcePropertyRule());
digester.addRule
(struts-config/action-mappings,
- new SetActionMappingClassRule(digester));
+ new SetActionMappingClassRule());
digester.addFactoryCreate
(struts-config/action-mappings/action,
@@ -267,7 +267,7 @@
digester.addRule
(struts-config/plug-in/set-property,
- new PlugInSetPropertyRule(digester));
+ new PlugInSetPropertyRule());
}
@@ -282,8 +282,8 @@
final class AddDataSourcePropertyRule extends Rule {
-public AddDataSourcePropertyRule(Digester digester) {
-super(digester);
+public AddDataSourcePropertyRule() {
+super();
}
public void begin(Attributes attributes) throws Exception {
@@ -302,8 +302,8 @@
final class PlugInSetPropertyRule extends Rule {
-public PlugInSetPropertyRule(Digester digester) {
-super(digester);
+public PlugInSetPropertyRule() {
+super();
}
public void begin(Attributes attributes) throws Exception {
@@ -322,8 +322,8 @@
*/
final class SetActionMappingClassRule extends Rule {
-public SetActionMappingClassRule(Digester digester) {
-super(digester);
+public SetActionMappingClassRule() {
+super();
}
public void begin(Attributes attributes) throws Exception {
@@ -361,7 +361,8 @@
actionMapping =
RequestUtils.applicationInstance(className);
} catch (Exception e) {
-digester.log(ActionMappingFactory.createObject: , e);
+digester.getLogger().error(
+ActionMappingFactory.createObject: , e);
}
return actionMapping;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide installation.xml
martinc 2002/12/17 18:35:03 Modified:doc/userGuide installation.xml Log: A couple of corrections: - Commons Services isn't yet released. - Commons Validator release is 1.0.1. Revision ChangesPath 1.18 +4 -2 jakarta-struts/doc/userGuide/installation.xml Index: installation.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- installation.xml 17 Dec 2002 17:24:37 - 1.17 +++ installation.xml 18 Dec 2002 02:35:03 - 1.18 @@ -97,8 +97,10 @@ liemLang/em (Version 1.1 or later)/li liemLogging/em (Version 1.02 or later)/li liemPool/em (Version 1.01 or later)/li - liemServices/em (Version 1.0 or later)/li - liemValidator/em (Version 1.01 or later) /li + liemServices/em (No official release, obtain current +a href=http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-services;Nightly Build/a +)/li + liemValidator/em (Version 1.0.1 or later) /li /ul /li -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide installation.xml
martinc 2002/12/17 18:41:48 Modified:doc/userGuide installation.xml Log: Whoops! A couple more: - Commons Logging release is 1.0.2. - Commons Pool release is 1.0.1. Revision ChangesPath 1.19 +2 -2 jakarta-struts/doc/userGuide/installation.xml Index: installation.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- installation.xml 18 Dec 2002 02:35:03 - 1.18 +++ installation.xml 18 Dec 2002 02:41:48 - 1.19 @@ -95,8 +95,8 @@ a href=http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-fileupload;Nightly Build/a )/li liemLang/em (Version 1.1 or later)/li - liemLogging/em (Version 1.02 or later)/li - liemPool/em (Version 1.01 or later)/li + liemLogging/em (Version 1.0.2 or later)/li + liemPool/em (Version 1.0.1 or later)/li liemServices/em (No official release, obtain current a href=http://jakarta.apache.org/builds/jakarta-commons/nightly/commons-services;Nightly Build/a )/li -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/proposals release-plan-1.1b3.xml
martinc 2002/12/16 21:46:14 Modified:doc/proposals release-plan-1.1b3.xml Log: Update proposed freeze / tag date and open bug list. Revision ChangesPath 1.2 +6 -6 jakarta-struts/doc/proposals/release-plan-1.1b3.xml Index: release-plan-1.1b3.xml === RCS file: /home/cvs/jakarta-struts/doc/proposals/release-plan-1.1b3.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- release-plan-1.1b3.xml12 Dec 2002 06:02:25 - 1.1 +++ release-plan-1.1b3.xml17 Dec 2002 05:46:14 - 1.2 @@ -33,7 +33,7 @@ pTherefore, the following release plan is proposed for Struts 1.1 Beta 3: /p ul - liemCode Freeze / Tag Date/em - Saturday, December 14, 2002/li + liemCode Freeze / Tag Date/em - Saturday, December 21, 2002/li liemRelease Manager/em - Martin Cooper/li liemRelease Announcement/em - To the following mailing lists: ul @@ -113,10 +113,6 @@ td width=7515196/td tdBug on the RequestUtils.computeParameters using a DynaValidatorForm as map of the parameter/td /tr -tr - td width=7515298/td - tdhtml:form and context-root of '/' causes page action to have // prepended to action/td -/tr !-- Controller -- tr @@ -146,6 +142,10 @@ tr td width=7510537/td td[:TODO:] sections/td +/tr +tr + td width=7515167/td + tdUpdated Action documentation/td /tr !-- File Upload -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition XmlParser.java
martinc 2002/12/10 22:30:22
Modified:src/share/org/apache/struts/tiles/xmlDefinition
XmlParser.java
Log:
Allow the Digester to use the context class loader when parsing Tiles
definitions.
PR: 15035
Submitted by: Everett Toews (Thanks for the comprehensive explanation!)
Revision ChangesPath
1.6 +4 -4
jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java
Index: XmlParser.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XmlParser.java16 Nov 2002 04:24:36 - 1.5
+++ XmlParser.java11 Dec 2002 06:30:21 - 1.6
@@ -119,7 +119,7 @@
digester.setDebug(digesterDebugLevel);
digester.setValidating(validating);
digester.setNamespaceAware(true);
- //digester.setUseContextClassLoader(true);
+ digester.setUseContextClassLoader(true);
// Register our local copy of the DTDs that we can find
for (int i = 0; i registrations.length; i += 2) {
URL url = this.getClass().getResource(registrations[i+1]);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/web/upload display.jsp upload.jsp
martinc 2002/12/09 22:03:21
Modified:src/share/org/apache/struts/util RequestUtils.java
src/upload/org/apache/struts/webapp/upload UploadAction.java
UploadForm.java
web/upload display.jsp upload.jsp
Log:
Pick up query string parameters when processing multipart/file-data (i.e.
file upload) requests. Enhance the struts-upload application to include
this scenario and indicate successful parameter handling.
PR: 12884
Submitted by: Serge Huber, Christopher Murray
Revision ChangesPath
1.74 +79 -38
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- RequestUtils.java 24 Nov 2002 21:59:43 - 1.73
+++ RequestUtils.java 10 Dec 2002 06:03:21 - 1.74
@@ -67,6 +67,7 @@
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
@@ -104,6 +105,7 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.upload.MultipartRequestHandler;
+import org.apache.struts.upload.MultipartRequestWrapper;
/**
* General purpose utility methods related to processing a servlet request
@@ -121,7 +123,7 @@
/**
* Commons Logging instance.
*/
-protected static Log LOG = LogFactory.getLog(RequestUtils.class);
+protected static Log log = LogFactory.getLog(RequestUtils.class);
/**
* The default Locale for our server.
@@ -538,8 +540,8 @@
}
// Look up any existing form bean instance
-if (LOG.isDebugEnabled()) {
-LOG.debug(
+if (log.isDebugEnabled()) {
+log.debug(
Looking for ActionForm bean instance in scope '
+ mapping.getScope()
+ ' under attribute key '
@@ -560,13 +562,13 @@
if (config.getDynamic()) {
String className = ((DynaBean) instance).getDynaClass().getName();
if (className.equals(config.getName())) {
-if (LOG.isDebugEnabled()) {
-LOG.debug(
+if (log.isDebugEnabled()) {
+log.debug(
Recycling existing DynaActionForm instance
+ of type '
+ className
+ ');
-LOG.trace( -- + instance);
+log.trace( -- + instance);
}
return (instance);
}
@@ -574,19 +576,19 @@
try {
Class configClass = applicationClass(config.getType());
if (configClass.isAssignableFrom(instance.getClass())) {
-if (LOG.isDebugEnabled()) {
-LOG.debug(
+if (log.isDebugEnabled()) {
+log.debug(
Recycling existing ActionForm instance
+ of class '
+ instance.getClass().getName()
+ ');
-LOG.trace( -- + instance);
+log.trace( -- + instance);
}
return (instance);
}
return (instance);
} catch (Throwable t) {
-LOG.error(servlet.getInternal().getMessage(formBean,
config.getType()), t);
+log.error(servlet.getInternal().getMessage(formBean,
config.getType()), t);
return (null);
}
}
@@ -598,31 +600,31 @@
DynaActionFormClass dynaClass =
DynaActionFormClass.createDynaActionFormClass(config);
instance = (ActionForm) dynaClass.newInstance();
-if (LOG.isDebugEnabled()) {
-LOG.debug(
+if (log.isDebugEnabled()) {
+log.debug(
Creating new DynaActionForm instance
+ of type '
+ config.getType()
+ ');
-LOG.trace( -- + instance);
+log.trace( -- + instance
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles UseAttributeTag.java
martinc 2002/12/05 23:58:40
Modified:src/share/org/apache/struts/taglib/tiles
UseAttributeTag.java
Log:
Fix a problem with tag handler instance reuse - do not modify attribute
values from within the tag handler.
PR: 14366
Submitted by: Anand
Revision ChangesPath
1.6 +8 -8
jakarta-struts/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java
Index: UseAttributeTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/UseAttributeTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UseAttributeTag.java 16 Nov 2002 04:46:05 - 1.5
+++ UseAttributeTag.java 6 Dec 2002 07:58:39 - 1.6
@@ -211,9 +211,9 @@
public int doStartTag() throws JspException
{
// Do a local copy of id
-String id=this.id;
-if( id==null )
- id=attributeName;
+String localId=this.id;
+if( localId==null )
+ localId=attributeName;
ComponentContext compContext = (ComponentContext)pageContext.getAttribute(
ComponentConstants.COMPONENT_CONTEXT, pageContext.REQUEST_SCOPE);
if( compContext == null )
@@ -231,10 +231,10 @@
{
scope = TagUtils.getScope( scopeName, PageContext.PAGE_SCOPE );
if(scope!=ComponentConstants.COMPONENT_SCOPE)
-pageContext.setAttribute(id, value, scope);
+pageContext.setAttribute(localId, value, scope);
}
else
- pageContext.setAttribute(id, value);
+ pageContext.setAttribute(localId, value);
// Continue processing this page
return SKIP_BODY;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/tiles/definition ComponentDefinitionsFactoryWrapper.java ReloadableDefinitionsFactory.java
martinc 2002/11/20 19:42:21
Modified:src/share/org/apache/struts/taglib/template PutTag.java
src/share/org/apache/struts/tiles
ActionComponentServlet.java
ComponentDefinition.java DefaultTilesUtilImpl.java
DefinitionsUtil.java TilesPlugin.java
src/share/org/apache/struts/tiles/definition
ComponentDefinitionsFactoryWrapper.java
ReloadableDefinitionsFactory.java
Log:
Replace calls to Class.forName() with RequestUtils.applicationClass().
Add a missing license header to one file.
Revision ChangesPath
1.12 +6 -5
jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java
Index: PutTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/PutTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PutTag.java 12 Nov 2002 03:56:09 - 1.11
+++ PutTag.java 21 Nov 2002 03:42:21 - 1.12
@@ -68,6 +68,7 @@
import org.apache.struts.Globals;
import org.apache.struts.taglib.template.util.Content;
+import org.apache.struts.util.RequestUtils;
/**
* Tag handler for lt;template:putgt;, which puts content into request scope.
@@ -279,7 +280,7 @@
Class klass = null; // cant name variable class
try {
- klass = Class.forName(className);
+ klass = RequestUtils.applicationClass(className);
}
catch(ClassNotFoundException ex) {
pageContext.setAttribute(Globals.EXCEPTION_KEY, ex,
1.5 +6 -4
jakarta-struts/src/share/org/apache/struts/tiles/ActionComponentServlet.java
Index: ActionComponentServlet.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ActionComponentServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ActionComponentServlet.java 12 Nov 2002 03:56:08 - 1.4
+++ ActionComponentServlet.java 21 Nov 2002 03:42:21 - 1.5
@@ -76,6 +76,7 @@
import org.apache.struts.action.ActionServlet;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.upload.MultipartRequestWrapper;
+import org.apache.struts.util.RequestUtils;
/**
* Action Servlet to be used with Tiles and Struts 1.0.x.
@@ -111,7 +112,8 @@
{
// Check struts version by checkin PlugIn classes existance.
try {
-Class plugInClass = Class.forName(org.apache.struts.action.PlugIn);
+Class plugInClass = RequestUtils.applicationClass(
+org.apache.struts.action.PlugIn);
// Class exist == struts 1.1 or greater
log(
Warning - ActionComponentServlet class: This class is to be used
with Struts1.0.x only.
1.4 +5 -4
jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinition.java
Index: ComponentDefinition.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/ComponentDefinition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ComponentDefinition.java 16 Nov 2002 04:07:54 - 1.3
+++ ComponentDefinition.java 21 Nov 2002 03:42:21 - 1.4
@@ -67,6 +67,7 @@
import java.util.HashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts.util.RequestUtils;
/**
* Definition of a template / component attributes.
@@ -571,7 +572,7 @@
{
try
{
- Class requestedClass = Class.forName(classname);
+ Class requestedClass = RequestUtils.applicationClass(classname);
Object instance = requestedClass.newInstance();
/*
if( instance instanceof org.apache.struts.action.Action )
1.3 +5 -4
jakarta-struts/src/share/org/apache/struts/tiles/DefaultTilesUtilImpl.java
Index: DefaultTilesUtilImpl.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefaultTilesUtilImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultTilesUtilImpl.java 16 Nov 2002 06:04:28 - 1.2
+++ DefaultTilesUtilImpl.java 21 Nov 2002 03:42:21 - 1.3
@@ -72,6 +72,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.tiles.definition.ComponentDefinitionsFactoryWrapper;
+import org.apache.struts.util.RequestUtils;
/**
* Default
cvs commit: jakarta-struts/src/share/org/apache/struts/util AppException.java
martinc 2002/11/08 11:38:12
Modified:src/share/org/apache/struts/util AppException.java
Log:
Fix line ends. (They were Mac style.)
Revision ChangesPath
1.5 +160 -1
jakarta-struts/src/share/org/apache/struts/util/AppException.java
Index: AppException.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/AppException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AppException.java 22 Oct 2002 23:54:43 - 1.4
+++ AppException.java 8 Nov 2002 19:38:12 - 1.5
@@ -1 +1,160 @@
-/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 The
Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in
source and binary forms, with or without
* modification, are permitted provided that
the following conditions
* are met:
*
* 1. Redistributions of source code must
retain the above copyright
*notice, this list of conditions and the following
disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the
documentation and/or other materials provided with the
*distribution.
*
* 3.
The end-user documentation included with the redistribution, if
*any, must
include the following acknowlegement:
* This product includes software
developed by the
*Apache Software Foundation (http://www.apache.org/).
*
Alternately, this acknowlegement may appear in the software itself,
*if and
wherever such third-party acknowlegements normally appear.
*
* 4. The names The
Jakarta Project, Struts, and Apache Software
*Foundation must not be used to
endorse or promote products derived
*from this software without prior written
permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5.
Products derived from this software may not be called Apache
*nor may Apache
appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE
SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
*
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This
software consists of voluntary contributions made by many
* individuals on behalf of
the Apache Software Foundation. For more
* information on the Apache Software
Foundation, please see
* http://www.apache.org/.
*
*/
package
org.apache.struts.util;
import org.apache.struts.action.ActionError;
public class
AppException extends Exception {
protected String property = null;
protected
ActionError error = null;
//
--- Constructors
/**
* Construct an application module exception with no replacement values.
*
* @param key Message key for this error message
*/
public
AppException(String key) {
super(key);
error = new
ActionError(key);
}
/**
* Construct an application module exception with
the specified replacement values.
*
* @param key Message key for this error
message
* @param value First replacement value
*/
public
AppException(String key, Object value) {
super(key);
error
= new ActionError(key, value);
}
/**
* Construct an application module
exception with the specified replacement values.
*
* @param key Message key
for this error message
* @param value0 First replacement value
*
@param value1 Second replacement value
*/
public AppException(String key,
Object value0, Object value1) {
super(key);
error = new
ActionError(key, value0, value1);
}
/**
* Construct an application module
exception with the specified replacement values.
*
* @param key Message key
for this error message
* @param value0 First replacement value
*
@param value1 Second replacement value
* @param value2 Third replacement value
*/
public AppException(String key, Object value0, Object
cvs commit: jakarta-struts/src/share/org/apache/struts/validator DynaValidatorForm.java ValidatorForm.java
martinc 2002/11/08 11:46:35
Modified:src/share/org/apache/struts/validator DynaValidatorForm.java
ValidatorForm.java
Log:
Fix line ends. (They were Mac style.)
Revision ChangesPath
1.7 +227 -1
jakarta-struts/src/share/org/apache/struts/validator/DynaValidatorForm.java
Index: DynaValidatorForm.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/DynaValidatorForm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DynaValidatorForm.java18 Oct 2002 01:35:02 - 1.6
+++ DynaValidatorForm.java8 Nov 2002 19:46:35 - 1.7
@@ -1 +1,227 @@
-/*
* $Header$
* $Revision$
* $Date$
*
*
*
* The Apache
Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation.
All rights
* reserved.
*
* Redistribution and use in source and binary forms, with
or without
* modification, are permitted provided that the following conditions
*
are met:
*
* 1. Redistributions of source code must retain the above copyright
*
notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions
in binary form must reproduce the above copyright
*notice, this list of
conditions and the following disclaimer in
*the documentation and/or other
materials provided with the
*distribution.
*
* 3. The end-user documentation
included with the redistribution, if
*any, must include the following
acknowlegement:
* This product includes software developed by the
*
Apache Software Foundation (http://www.apache.org/).
*Alternately, this
acknowlegement may appear in the software itself,
*if and wherever such
third-party acknowlegements normally appear.
*
* 4. The names The Jakarta Project,
Struts, and Apache Software
*Foundation must not be used to endorse or
promote products derived
*from this software without prior written permission.
For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products
derived from this software may not be called Apache
*nor may Apache appear in
their names without prior written
*permission of the Apache Group.
*
* THIS
SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE
FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
*
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR
BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
*
SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on
behalf of the Apache Software Foundation. For more
* information on the Apache
Software Foundation, please see
* http://www.apache.org/.
*/
package
org.apache.struts.validator;
import java.io.Serializable;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import
org.apache.commons.validator.Validator;
import
org.apache.commons.validator.ValidatorException;
import
org.apache.commons.validator.ValidatorResults;
import
org.apache.struts.action.ActionErrors;
import org.apache.struts.action.DynaActionForm;
import org.apache.struts.action.ActionMapping;
/**
* pThis class extends
strongDynaActionForm/strong and provides
* basic field validation based on an XML
file. The key passed into the
* validator is the action element's 'name' attribute
from the
* struts-config.xml which should match the form element's name attribute
*
in the validation.xml./p
*
* ulliSee codeValidatorPlugin/code definition
in struts-config.xml
* for validation rules./li/ul
*
* @author David
Winterfeldt
* @version $Revision$ $Date$
* @since Struts 1.1
* @see
org.apache.struts.action.ActionForm
*/
public class DynaValidatorForm extends
DynaActionForm implements DynaBean, Serializable {
/**
* Commons Logging
instance.
*/
private static Log log =
LogFactory.getLog(DynaValidatorForm.class);
/**
* The results returned from
the validation performed
* by the codeValidator/code.
*/
protected
ValidatorResults
cvs commit: jakarta-struts/doc/userGuide struts-html.xml
martinc 2002/10/27 11:19:59 Modified:doc/userGuide struts-html.xml Log: Remove accesskey attribute from select tag. PR: 13337 Submitted by: David M. Karr Revision ChangesPath 1.31 +0 -10 jakarta-struts/doc/userGuide/struts-html.xml Index: struts-html.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- struts-html.xml 26 Oct 2002 00:34:54 - 1.30 +++ struts-html.xml 27 Oct 2002 19:19:59 - 1.31 -5609,16 +5609,6 attribute -nameaccesskey/name -requiredfalse/required -rtexprvaluetrue/rtexprvalue -info -The keyboard character used to move focus immediately to this -element. -/info -/attribute - -attribute namealt/name requiredfalse/required rtexprvaluetrue/rtexprvalue -- To unsubscribe, e-mail: mailto:struts-dev-unsubscribe;jakarta.apache.org For additional commands, e-mail: mailto:struts-dev-help;jakarta.apache.org
cvs commit: jakarta-struts/doc/userGuide struts-logic.xml
martinc 2002/10/12 12:19:18
Modified:src/share/org/apache/struts/taglib/logic EmptyTag.java
doc/userGuide struts-logic.xml
Log:
Add support for Map to logic:empty and logic:notEmpty tags.
PR: 13569
Submitted by: Robert Rasmussen - thanks for the patch.
Revision ChangesPath
1.4 +8 -4
jakarta-struts/src/share/org/apache/struts/taglib/logic/EmptyTag.java
Index: EmptyTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/EmptyTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EmptyTag.java 25 Jun 2002 00:53:41 - 1.3
+++ EmptyTag.java 12 Oct 2002 19:19:18 - 1.4
@@ -63,6 +63,7 @@
package org.apache.struts.taglib.logic;
import java.util.Collection;
+import java.util.Map;
import javax.servlet.jsp.JspException;
import org.apache.struts.util.RequestUtils;
@@ -121,6 +122,9 @@
} else if (value instanceof Collection) {
Collection collValue = (Collection)value;
empty = collValue.isEmpty();
+} else if (value instanceof Map) {
+Map mapValue = (Map)value;
+empty = mapValue.isEmpty();
} else {
empty = false;
}
1.7 +3 -2 jakarta-struts/doc/userGuide/struts-logic.xml
Index: struts-logic.xml
===
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-logic.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- struts-logic.xml 3 Aug 2002 18:43:40 - 1.6
+++ struts-logic.xml 12 Oct 2002 19:19:18 - 1.7
@@ -80,8 +80,9 @@
info
pThis tag evaluates its nested body content only if the specified value
is either absent (i.e. codenull/code), an empty string (i.e. a
-codejava.lang.String/code with a length of zero) or an empty
java.util.Collection
-(tested by the .isEmpty() method on the java.util.Collection interface)./p
+codejava.lang.String/code with a length of zero), or an empty
+codejava.util.Collection/code or codejava.util.Map/code (tested by
+the .isEmpty() method on the respective interface)./p
/info
attribute
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/conf/share tiles-config_1_1.dtd validation_1_1.dtd validator-rules_1_1.dtd
martinc 2002/10/10 20:11:41 Modified:conf/share tiles-config_1_1.dtd validation_1_1.dtd validator-rules_1_1.dtd Log: Remove the XML prolog from Tiles and Validator DTDs. DTDs are not supposed to have this, and some XML processors will complain if it is present. Fix line ends in validation_1_1.dtd. Revision ChangesPath 1.2 +1 -2 jakarta-struts/conf/share/tiles-config_1_1.dtd Index: tiles-config_1_1.dtd === RCS file: /home/cvs/jakarta-struts/conf/share/tiles-config_1_1.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tiles-config_1_1.dtd 15 Aug 2002 09:31:05 - 1.1 +++ tiles-config_1_1.dtd 11 Oct 2002 03:11:41 - 1.2 @@ -1,4 +1,3 @@ -?xml version=1.0 encoding=ISO-8859-1? !-- DTD for the Tile Definition File, Version 1.1 1.3 +222 -224 jakarta-struts/conf/share/validation_1_1.dtd Index: validation_1_1.dtd === RCS file: /home/cvs/jakarta-struts/conf/share/validation_1_1.dtd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- validation_1_1.dtd11 Jul 2002 12:07:23 - 1.2 +++ validation_1_1.dtd11 Oct 2002 03:11:41 - 1.3 @@ -1,225 +1,223 @@ -?xml version=1.0 encoding=ISO-8859-1? - -!-- -DTD for the Validation Configuration File, Version 1.1 - -To allow Struts to validate your validator.xml configuration files, -include the following DOCTYPE element at the beginning (after the -xml declaration): - -!DOCTYPE form-validation PUBLIC - -//Apache Software Foundation//DTD Struts Validation Configuration 1.1//EN - http://jakarta.apache.org/struts/dtds/validation_1_1.dtd; - -$Id$ --- - - -!-- - The form-validation element is the root of the configuration file - hierarchy, and contains nested elements for all of the other - configuration settings. --- -!ELEMENT form-validation (global*, formset+) - - -!-- -Global constants may be defined for use of other elements. --- -!ELEMENT global (constant*) - - -!-- - The constant element defines a static value that can be used as - replacement parameters within field elements. The constant-name and - constant-value elements define the constant's reference id and - replacement value. --- -!ELEMENT constant (constant-name, constant-value) -!ELEMENT constant-name (#PCDATA) -!ELEMENT constant-value (#PCDATA) - - -!-- - The formset element defines a set of forms for a locale. Formsets for - specific locales can override only those fields that change. The - localization is properly scoped, so that a formset can override just the - language, or just the country, or both. --- -!ELEMENT formset (constant*, form+) -!ATTLIST formset language CDATA #IMPLIED - country CDATA #IMPLIED - - -!-- - The form element defines a set of fields to be validated. The name - corresponds to the identifer the application assigns to the form. In the - case of the Struts framework, this is the attribute property from - the ActionMapping. Struts also offers the alternative of using the - the path property as the Validator form name. --- -!ELEMENT form(field+ ) -!ATTLIST formname CDATA #REQUIRED - - -!-- - The field element defines the properties to be validated. In a - web application, a field would also correspond to a control on - a HTML form. To validate the properties, the validator works through - a JavaBean representation, like a Struts ActionForm. The field element - can accept up to 4 attributes: - - propertyThe property on the JavaBean corresponding to this - field element. - - depends The comma-delimited list of validators to apply against - this field. For the field to succeed, all the - validators must succeed. - - pageThe JavaBean corresponding to this form may include - a page property. Only fields with a page attribute - value that is equal to or less than the page property - on the form JavaBean are processed. This is useful when - using a wizard approach to completing a large form, - to ensure that a page is not skipped. - [0] - - indexedListProperty - The indexedListProperty is the method name that will - return an array or a Collection
cvs commit: jakarta-struts/web/exercise-taglib html-select.jsp
martinc 2002/10/08 22:09:36
Modified:src/exercise-taglib/org/apache/struts/webapp/exercise
ApplicationResources.properties TestBean.java
src/share/org/apache/struts/taglib/html OptionTag.java
web/exercise-taglib html-select.jsp
Log:
Check for null bodyContent before attempting to process it. Add a test case
to catch this.
PR: 13064
Submitted by: Juozas Baliuka
Revision ChangesPath
1.3 +8 -0
jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/ApplicationResources.properties
Index: ApplicationResources.properties
===
RCS file:
/home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/ApplicationResources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationResources.properties 16 Jul 2002 04:56:42 - 1.2
+++ ApplicationResources.properties 9 Oct 2002 05:09:35 - 1.3
@@ -29,3 +29,11 @@
property3message1=Property 3, Message 1
property3message2=Property 3, Message 2
globalMessage=Global Message
+
+#
+# Resources for testing html:option.
+#
+
+resources0=Resources 0
+resources1=Resources 1
+resources2=Resources 2
1.7 +18 -4
jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java
Index: TestBean.java
===
RCS file:
/home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestBean.java 12 Mar 2002 06:30:56 - 1.6
+++ TestBean.java 9 Oct 2002 05:09:35 - 1.7
@@ -398,6 +398,20 @@
/**
+ * A single-String value for a SELECT element based on resource strings.
+ */
+private String resourcesSelect = Resources 2;
+
+public String getResourcesSelect() {
+return (this.resourcesSelect);
+}
+
+public void setResourcesSelect(String resourcesSelect) {
+this.resourcesSelect = resourcesSelect;
+}
+
+
+/**
* A property that allows a null value but is still used in a SELECT.
*/
private String withNulls = null;
1.12 +11 -9
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java
Index: OptionTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- OptionTag.java4 Oct 2002 05:34:19 - 1.11
+++ OptionTag.java9 Oct 2002 05:09:35 - 1.12
@@ -262,11 +262,13 @@
*/
public int doAfterBody() throws JspException {
-String text = bodyContent.getString();
-if (text != null) {
-text = text.trim();
-if (text.length() 0)
-this.text = text;
+if (bodyContent != null) {
+String text = bodyContent.getString();
+if (text != null) {
+text = text.trim();
+if (text.length() 0)
+this.text = text;
+}
}
return (SKIP_BODY);
1.8 +11 -0 jakarta-struts/web/exercise-taglib/html-select.jsp
Index: html-select.jsp
===
RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/html-select.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- html-select.jsp 12 Mar 2002 06:30:56 - 1.7
+++ html-select.jsp 9 Oct 2002 05:09:35 - 1.8
@@ -102,6 +102,17 @@
/tr
tr
+th align=rightSelect With Labels From Resources:/th
+td align=left
+ html:select property=resourcesSelect size=3
+html:option value=Resources 0 key=resources0/
+html:option value=Resources 1 key=resources1/
+html:option value=Resources 2 key=resources2/
+ /html:select
+/td
+ /tr
+
+ tr
th align=right
Collection with null labels and values:
/th
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/resources books.xml guis.xml powered.xml
martinc 2002/10/08 23:25:29 Modified:doc/resources books.xml guis.xml powered.xml Log: Various updates to external resources. PR: 12323, 12729, 13086, 13268 Submitted by: Thierry Tremblay, Azrul Azwar, James Turner, Matt Raible Revision ChangesPath 1.7 +1 -0 jakarta-struts/doc/resources/books.xml Index: books.xml === RCS file: /home/cvs/jakarta-struts/doc/resources/books.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- books.xml 30 Aug 2002 22:50:00 - 1.6 +++ books.xml 9 Oct 2002 06:25:29 - 1.7 @@ -10,6 +10,7 @@ chapter name=Struts Resources href=http://husted.com/struts/resources; section name=Books +pa href=http://www.amazon.com/exec/obidos/ISBN=0672324725/hitchhikeguidetoA/;bStruts Kick Start/b/a by James Turner and Kevin Bedell - Not yet published./p pa href=http://www.amazon.com/exec/obidos/ISBN=1558608621/hitchhikeguidetoA/;bThe Struts Framework: Practical Guide for Programmers/b/a by Sue Spielman - Not yet published./p pa href=http://www.amazon.com/exec/obidos/ISBN=0596003285/hitchhikeguidetoA/;bProgramming Jakarta Struts/b/a by Chuck Cavaness - Not yet published. a href=http://www.theserverside.com/resources/strutsreview.jsp;Public review draft online/a./p pa href=http://www.amazon.com/exec/obidos/ISBN=1930110502/hitchhikeguidetoA/;bJava Web Development with Struts/b/a by Ted Husted, Cedric Dumoulin, George Franciscus, and David Winterfeldt; Foreword by Craig R. McClanahan - Not yet published./p 1.6 +7 -6 jakarta-struts/doc/resources/guis.xml Index: guis.xml === RCS file: /home/cvs/jakarta-struts/doc/resources/guis.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- guis.xml 29 Aug 2002 13:22:27 - 1.5 +++ guis.xml 9 Oct 2002 06:25:29 - 1.6 @@ -10,21 +10,22 @@ chapter name=Struts Resources href=http://husted.com/struts/resources; section name=Code Generators and GUIs -pa href=http://www.alien-factory.co.uk/struts/struts-index.html;bStruts GUI/b/a by Alien-Factory - Alien-Factory's Struts GUI for Microsoft Visio is essentially a Visio Stencil with Visual Basic Macros./p -pa href=http://rivernorth.sourceforge.net;bStruts Builder/b/a by RiverNorth - an Opensource tool (GPL license) originally developed for internal use to aid in development of Struts-based web applications (1.1 style)./p pa href=http://www.synthis.com/products/adalon/overview.jsp;bAdalon/b/a - Adalon is a next generation functional design tool that fills the gaps left by today's market leading software design products. /p pa href=http://easystruts.sourceforge.net/;bEasy Struts/b/a by Emmanuel Boudrant - The aim of this project is to provide a bunch of development tools, for Eclispe v2.0 and Borland JBuilder 5-7, in order to facilitate the development of a Struts application. A GUI editor for struts-config.xml files is available in Eclipse 2.0 plugin./p pa href=http://www.solanasoft.com;bJForms:/b/a a visual tool for Struts-based Web forms./p -pa href=http://husted.com/struts/resources/StrutsGen.htm;bStruts Gen/b/a by Cyberzombie - A rudimentary wrapper tool for value objects./p -pa href=http://xsltgenerator.sourceforge.net/;bStruts XSLT Code Generator/b/a by Shengmeng Liu - An XSLT based code generator for Struts, completely based on the XSLT transformation and a set of stylesheet files. Ideally, users can customize the stylesheet for each type of Struts files to have templates of their own without having to access the source code and recompile it./p +pa href=http://www.javanovic.com;bKarapan Sapi:/b/a open source generator software for the Struts framework./p pa href=http://www.objectventure.com/products/objectassembler.html;bObjectAssembler/b/a by ObjectVentur - supports the development of Struts applications, a popular open source web application framework that is part of Apache's Jakarta Project. The same visual development and code synchronization available with J2EE components are available for Struts components./p -pa href=http://www.objectwave.com/html/tools/tool1_3.htm;bX2J/b/a by Objectwave - A code generation tool for building Struts applications. It includes wizard for easily creating JSPs, and the required Action and ActionForm classes as well as graphical tools for updating the config file. /p -pa href=http://www.jamesholmes.com/struts/;bStruts Console/b/a by James Holmes. The Struts Console is a standalone Java Swing application for managing Struts-based applications, including plugin support for Sun Forte for Java, NetBeans, Borland JBuilder, and Oracle JDeveloper 9i. /p pa href=http://www.scioworks.com/scioworks_camino.html;bScioworks Camino/b/a by Scioworks Pte Ltd. - A visual tool
cvs commit: jakarta-struts/src/share/org/apache/struts/util RequestUtils.java
martinc 2002/10/07 23:16:42
Modified:src/share/org/apache/struts/util RequestUtils.java
Log:
Remove obsolete unused code.
PR: 13281
Submitted by: Nicola Guidotto
Revision ChangesPath
1.54 +4 -5
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- RequestUtils.java 23 Aug 2002 02:37:12 - 1.53
+++ RequestUtils.java 8 Oct 2002 06:16:41 - 1.54
@@ -953,7 +953,6 @@
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
String stripped = name;
-int subscript = stripped.lastIndexOf([);
if (prefix != null) {
if (!stripped.startsWith(prefix))
continue;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html FrameTag.java
martinc 2002/10/07 23:22:41
Modified:src/share/org/apache/struts/taglib/html FrameTag.java
Log:
Output the correct text for the 'longdesc' attribute.
PR: 12988
Submitted by: John Yu
Revision ChangesPath
1.4 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java
Index: FrameTag.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FrameTag.java 23 Sep 2002 05:13:43 - 1.3
+++ FrameTag.java 8 Oct 2002 06:22:41 - 1.4
@@ -239,7 +239,7 @@
}
if (longdesc != null) {
results.append( longdesc=\);
-results.append(frameborder);
+results.append(longdesc);
results.append(\);
}
results.append(prepareStyles());
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/action ExceptionHandler.java
martinc 2002/09/21 22:36:37
Modified:src/share/org/apache/struts/action ExceptionHandler.java
Log:
Fix line ends.
Revision ChangesPath
1.7 +162 -162
jakarta-struts/src/share/org/apache/struts/action/ExceptionHandler.java
Index: ExceptionHandler.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ExceptionHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExceptionHandler.java 8 Aug 2002 22:54:18 - 1.6
+++ ExceptionHandler.java 22 Sep 2002 05:36:37 - 1.7
@@ -1,162 +1,162 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in
- *the documentation and/or other materials provided with the
- *distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *any, must include the following acknowlegement:
- * This product includes software developed by the
- *Apache Software Foundation (http://www.apache.org/).
- *Alternately, this acknowlegement may appear in the software itself,
- *if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names The Jakarta Project, Struts, and Apache Software
- *Foundation must not be used to endorse or promote products derived
- *from this software without prior written permission. For written
- *permission, please contact [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called Apache
- *nor may Apache appear in their names without prior written
- *permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * http://www.apache.org/.
- *
- */
-package org.apache.struts.action;
-
-import java.util.Locale;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.config.ExceptionConfig;
-import org.apache.struts.util.AppException;
-
-
-public class ExceptionHandler {
-/**
- * Handle the exception.
- * Return the codeActionForward/code instance (if any) returned by
- * the called codeExceptionHandler/code.
- *
- * @param ex The exception to handle
- * @param ae The ExceptionConfig corresponding to the exception
- * @param mapping The ActionMapping we are processing
- * @param formInstance The ActionForm we are processing
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- *
- * @exception ServletException if a servlet exception occurs
- *
- * @since Struts 1.1
- */
-public ActionForward execute(Exception ex,
- ExceptionConfig ae
cvs commit: jakarta-struts/src/share/org/apache/struts/action Action.java ActionErrors.java ActionMappings.java ActionServlet.java ActionServletWrapper.java ExceptionHandler.java RequestProcessor.java
martinc 2002/09/21 22:46:52
Modified:src/share/org/apache/struts/action Action.java
ActionErrors.java ActionMappings.java
ActionServlet.java ActionServletWrapper.java
ExceptionHandler.java RequestProcessor.java
Log:
Cleanup identified by IDEA. I think I'm a convert...
Revision ChangesPath
1.47 +7 -9 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Action.java 28 Jul 2002 00:17:27 - 1.46
+++ Action.java 22 Sep 2002 05:46:51 - 1.47
@@ -67,7 +67,6 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Locale;
-import java.util.Hashtable;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -80,7 +79,6 @@
import org.apache.struts.config.ApplicationConfig;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.upload.MultipartRequestHandler;
/**
@@ -414,7 +412,7 @@
* this method.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request (if any)
+ * @param form The optional ActionForm bean for this request (if any)
* @param request The non-HTTP request we are processing
* @param response The non-HTTP response we are creating
*
@@ -448,7 +446,7 @@
* already been completed.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request (if any)
+ * @param form The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
*
@@ -691,7 +689,7 @@
session.removeAttribute(TRANSACTION_TOKEN_KEY);
// Retrieve the transaction token included in this request
-String token = (String) request.getParameter(Constants.TOKEN_KEY);
+String token = request.getParameter(Constants.TOKEN_KEY);
if (token == null)
return (false);
1.8 +4 -8
jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java
Index: ActionErrors.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ActionErrors.java 25 Jun 2002 01:30:40 - 1.7
+++ ActionErrors.java 22 Sep 2002 05:46:51 - 1.8
@@ -64,10 +64,6 @@
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.HashMap;
/**
1.9 +4 -6
jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java
Index: ActionMappings.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMappings.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ActionMappings.java 13 Jan 2002 00:25:35 - 1.8
+++ ActionMappings.java 22 Sep 2002 05:46:51 - 1.9
@@ -64,8 +64,6 @@
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections.FastHashMap;
1.120 +5 -5
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ActionServlet.java27 Jul 2002 21:53:13 - 1.119
+++ ActionServlet.java22 Sep 2002 05:46:51 - 1.120
@@ -789,7 +789,7 @@
* Look up and return the {@link RequestProcessor} responsible for the
* specified application module, creating a new one if necessary.
*
- * @param appConfig The application module configuration for which to
+ * @param config The application module configuration for which to
* acquire and return
cvs commit: jakarta-struts/src/share/org/apache/struts/actions DispatchAction.java ForwardAction.java IncludeAction.java LookupDispatchAction.java SwitchAction.java
martinc 2002/09/21 22:58:46 Modified:src/share/org/apache/struts/actions DispatchAction.java ForwardAction.java IncludeAction.java LookupDispatchAction.java SwitchAction.java Log: More cleanup identified by IDEA. Revision ChangesPath 1.11 +5 -7 jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java Index: DispatchAction.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/DispatchAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DispatchAction.java 4 Aug 2002 00:33:04 - 1.10 +++ DispatchAction.java 22 Sep 2002 05:58:46 - 1.11 @@ -63,13 +63,11 @@ package org.apache.struts.actions; -import java.io.PrintWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; @@ -187,7 +185,7 @@ * already been completed. * * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) + * @param form The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * 1.3 +5 -5 jakarta-struts/src/share/org/apache/struts/actions/ForwardAction.java Index: ForwardAction.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/ForwardAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ForwardAction.java23 Jun 2002 00:52:50 - 1.2 +++ ForwardAction.java22 Sep 2002 05:58:46 - 1.3 @@ -125,7 +125,7 @@ * already been completed. * * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) + * @param form The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * 1.4 +5 -5 jakarta-struts/src/share/org/apache/struts/actions/IncludeAction.java Index: IncludeAction.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/IncludeAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- IncludeAction.java9 Aug 2002 05:20:15 - 1.3 +++ IncludeAction.java22 Sep 2002 05:58:46 - 1.4 @@ -126,7 +126,7 @@ * already been completed. * * @param mapping The ActionMapping used to select this instance - * @param actionForm The optional ActionForm bean for this request (if any) + * @param form The optional ActionForm bean for this request (if any) * @param request The HTTP request we are processing * @param response The HTTP response we are creating * 1.7 +0 -2 jakarta-struts/src/share/org/apache/struts/actions/LookupDispatchAction.java Index: LookupDispatchAction.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/LookupDispatchAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- LookupDispatchAction.java 27 Jul 2002 23:49:58 - 1.6 +++ LookupDispatchAction.java 22 Sep 2002 05:58:46 - 1.7 @@ -56,8 +56,6 @@ */ package org.apache.struts.actions; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.Iterator; import java.util.Locale; 1.6 +4 -7 jakarta-struts/src/share/org/apache/struts/actions/SwitchAction.java Index: SwitchAction.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/SwitchAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SwitchAction.java 9 Jul 2002 23:57:16 - 1.5 +++ SwitchAction.java 22 Sep 2002 05:58:46 - 1.6 @@ -62,8 +62,6 @@ package org.apache.struts.actions; -import java.io.IOException; -import
cvs commit: jakarta-struts/src/share/org/apache/struts/config ActionConfig.java ApplicationConfig.java ConfigHelper.java ConfigHelperInterface.java
martinc 2002/09/21 23:13:57
Modified:src/share/org/apache/struts/config ActionConfig.java
ApplicationConfig.java ConfigHelper.java
ConfigHelperInterface.java
Log:
More cleanup identified by IDEA.
Revision ChangesPath
1.8 +4 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ActionConfig.java 9 Jul 2002 23:57:37 - 1.7
+++ ActionConfig.java 22 Sep 2002 06:13:56 - 1.8
@@ -66,7 +66,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
/**
1.17 +4 -6
jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java
Index: ApplicationConfig.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ApplicationConfig.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ApplicationConfig.java9 Jul 2002 23:57:37 - 1.16
+++ ApplicationConfig.java22 Sep 2002 06:13:56 - 1.17
@@ -66,8 +66,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
1.3 +7 -7
jakarta-struts/src/share/org/apache/struts/config/ConfigHelper.java
Index: ConfigHelper.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigHelper.java 25 Jun 2002 01:30:40 - 1.2
+++ ConfigHelper.java 22 Sep 2002 06:13:56 - 1.3
@@ -741,7 +741,7 @@
* Return the URL for the specified ActionMapping,
* otherwise return codenull/code.
*
- * @param name Name given to local or global forward.
+ * @param path Name given to local or global forward.
*/
public String getAction(String path) {
@@ -889,7 +889,7 @@
* Wrapper for getErrorMarkup(null)
*/
public String getErrorOutput() {
-return getErrorOutput((String) null);
+return getErrorOutput(null);
}
@@ -932,7 +932,7 @@
/**
* Wrapper for getAction(String)
*
- * @param name Name given to local or global forward.
+ * @param path Name given to local or global forward.
*/
public String action(String path) {
return getAction(path);
1.3 +5 -5
jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java
Index: ConfigHelperInterface.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigHelperInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigHelperInterface.java25 Jun 2002 01:30:40 - 1.2
+++ ConfigHelperInterface.java22 Sep 2002 06:13:56 - 1.3
@@ -345,7 +345,7 @@
* Return the URL for the specified ActionMapping,
* otherwise return codenull/code.
*
- * @param name Name given to local or global forward.
+ * @param path Name given to local or global forward.
*/
public String getAction(String path);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/tiles GetAttributeTag.java
martinc 2002/09/18 11:24:18 Modified:src/share/org/apache/struts/taglib/tiles GetAttributeTag.java Log: Don't call release() at the end of doEndTag(), so that attribute values are retained for tag handler reuse. This fixes a bug which caused a second identical invocation of the tag to fail when the container chose not to set the attribute the second time (which is valid). Revision ChangesPath 1.4 +3 -4 jakarta-struts/src/share/org/apache/struts/taglib/tiles/GetAttributeTag.java Index: GetAttributeTag.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/tiles/GetAttributeTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- GetAttributeTag.java 26 Jul 2002 16:18:28 - 1.3 +++ GetAttributeTag.java 18 Sep 2002 18:24:17 - 1.4 @@ -204,7 +204,6 @@ throw new JspException ( Error - tag.getProperty : IOException ); } -release(); return EVAL_PAGE; } } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide installation.xml
martinc 2002/09/10 12:06:28 Modified:doc/userGuide installation.xml Log: Update build requirements to specify Ant version 1.5, since we need that version to handle multiple Class-Path attributes in the manifest file. Revision ChangesPath 1.7 +1 -1 jakarta-struts/doc/userGuide/installation.xml Index: installation.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/installation.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- installation.xml 31 Aug 2002 13:15:02 - 1.6 +++ installation.xml 10 Sep 2002 19:06:28 - 1.7 @@ -55,7 +55,7 @@ Struts, below./li listrongAnt Build System/strong - If you are building Struts from the - source distribution, you must download and install version 1.4 (or later) + source distribution, you must download and install version 1.5 (or later) of the a href=http://jakarta.apache.org/ant;Ant/a build system. This package is also strongly recommended for use in developing your own web applications based on Struts. -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
