cvs commit: jakarta-struts/contrib/artimus/WEB-INF/src/java/org/apache/artimus LICENSE
sraeburn2004/03/13 23:18:54 Added: contrib/artimus LICENSE.txt NOTICE.txt Removed: contrib/artimus/WEB-INF LICENSE.txt NOTICE.txt contrib/artimus LICENSE contrib/artimus/WEB-INF/src/java/org/apache/artimus LICENSE Log: Convert to Apache License 2.0 Revision ChangesPath 1.1 jakarta-struts/contrib/artimus/LICENSE.txt Index: LICENSE.txt === Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. License shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. Licensor shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. Legal Entity shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, control means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. You (or Your) shall mean an individual or Legal Entity exercising permissions granted by this License. Source form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. Object form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. Work shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). Derivative Works shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. Contribution shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, submitted means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as Not a Contribution. Contributor shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor
cvs commit: jakarta-struts/src/share/org/apache/struts/validator/validwhen ValidWhenParser.g
sraeburn2004/03/13 23:21:06 Modified:src/share/org/apache/struts/validator/validwhen ValidWhenParser.g Log: Convert to Apache License 2.0 Revision ChangesPath 1.5 +17 -58 jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParser.g Index: ValidWhenParser.g === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParser.g,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ValidWhenParser.g 29 Sep 2003 04:19:37 - 1.4 +++ ValidWhenParser.g 14 Mar 2004 07:21:06 - 1.5 @@ -4,60 +4,19 @@ * $Revision$ * $Date$ * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2003 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 acknowledgement: - * 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 name, without prior written - *permission of the Apache Software Foundation. - * - * 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/. - * + * Copyright 2003-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.struts.validator.validwhen; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib project.xml
sraeburn2004/01/10 15:43:51 Modified:contrib project.xml Log: Add missing closing tag for dependencies Revision ChangesPath 1.3 +1 -0 jakarta-struts/contrib/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/contrib/project.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.xml 6 Jan 2004 05:49:40 - 1.2 +++ project.xml 10 Jan 2004 23:43:51 - 1.3 @@ -173,6 +173,7 @@ version2.5.1/version urlhttp://xml.apache.org/xalan/url /dependency +/dependencies build nagEmailAddress[EMAIL PROTECTED]/nagEmailAddress - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts project.xml
sraeburn2003/12/30 12:46:38 Modified:.project.xml Log: Added user ids required for various Maven reports Revision ChangesPath 1.18 +15 -0 jakarta-struts/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/project.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- project.xml 26 Dec 2003 22:14:17 - 1.17 +++ project.xml 30 Dec 2003 20:46:38 - 1.18 @@ -102,90 +102,105 @@ developers developer +idcraigmcc/id nameCraig R. McClanahan/name emailcraigmcc at apache.org/email organization/organization /developer developer +idhusted/id nameTed Husted/name emailhusted at apache.org/email organization/organization /developer developer +idrleland/id nameRob Leland/name emailrleland at apache.org/email organization/organization /developer developer +idcedric/id nameCedric Dumoulin/name emailcedric.dumoulin at lifl.fr/email organization/organization /developer developer +idmartinc/id nameMartin Cooper/name emailmartinc at apache.org/email organization/organization /developer developer +idarron/id nameArron Bates/name emailarron at apache.org/email organization/organization /developer developer +idjholmes/id nameJames Holmes/name emailjholmes at apache.org/email organization/organization /developer developer +iddmkarr/id nameDavid M. Karr/name emaildmkarr at apache.org/email organization/organization /developer developer +idekbush/id nameEddie Bush/name emailekbush at apache.org/email organization/organization /developer developer +iddgraham/id nameDavid Graham/name emaildgraham at apache.org/email organization/organization /developer developer +idjmitchell/id nameJames Mitchell/name emailjmitchell at apache.org/email organization/organization /developer developer +idturner/id nameJames Turner/name emailturner at blackbear.com/email organization/organization /developer developer +idsraeburn/id nameSteve Raeburn/name emailsraeburn at apache.org/email organization/organization /developer developer +idmrdon/id nameDon Brown/name emailmrdon at apache.org/email organization/organization /developer developer +idgermuska/id nameJoe Germuska/name emailgermuska at apache.org/email organization/organization - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts struts.jsl
sraeburn2003/12/11 12:08:07 Modified:.struts.jsl Log: Fix additional whitespace problems occurring in pre sections Revision ChangesPath 1.2 +4 -9 jakarta-struts/struts.jsl Index: struts.jsl === RCS file: /home/cvs/jakarta-struts/struts.jsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- struts.jsl29 Nov 2003 07:27:33 - 1.1 +++ struts.jsl11 Dec 2003 20:08:07 - 1.2 @@ -495,18 +495,13 @@ /jsl:template !-- copy any other elements through -- - jsl:template match=* trim=false -jsl:copy trim=false - jsl:applyTemplates trim=false/ -/jsl:copy - /jsl:template + jsl:template match=* trim=falsejsl:copy trim=false + jsl:applyTemplates trim=false//jsl:copy/jsl:template !-- element values don't pass through as text -- jsl:template match=@*/ !-- CDATA and text nodes pass-thru -- - jsl:template match=text() - x:expr select=./ - /jsl:template + jsl:template match=text()x:expr select=.//jsl:template /jsl:stylesheet - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/stylesheets struts.css
sraeburn2003/12/11 12:18:59
Added: xdocs/stylesheets struts.css
Log:
Add missing css stylesheet
Revision ChangesPath
1.1 jakarta-struts/xdocs/stylesheets/struts.css
Index: struts.css
===
/* $Id: struts.css,v 1.1 2003/12/11 20:18:59 sraeburn Exp $ */
body {
background: #fff;
color: #000;
}
.app h3, .app h4, .tabs td, .tabs th, .functnbar {
background-image: url(../images/nw_maj.gif);
background-repeat: no-repeat;
}
.functnbar, .functnbar2 {
background-color: #aaa;
}
.functnbar2, .functnbar3 {
background-color: #aaa;
/*background-image: url(../images/sw_maj_rond.gif); */
background-repeat: no-repeat;
background-position: bottom left;
}
.functnbar3 {
background-color: #ddd;
/*background-image: url(../images/sw_med_rond.gif); */
}
.functnbar, .functnbar2, .functnbar3 {
color: #000;
}
.functnbar a, .functnbar2 a, .functnbar3 a {
color: #000;
text-decoration: underline;
}
#navcolumn .body div, body.docs #toc li li {
background-image: url(../images/strich.gif);
background-repeat: no-repeat;
background-position: .5em .5em;
}
#searchbox .body div, #navcolumn .body .heading {
background-image: none;
}
a:link, #navcolumn a:visited, .app a:visited, .tasknav a:visited {
color: blue;
}
a:link.selfref, a:visited.selfref {
color: #555 !important;
text-decoration: none;
}
a:active, a:hover, #leftcol a:active, #leftcol a:hover {
color: #f30 !important;
}
#leftcol a, #breadcrumbs a {
text-decoration: none;
}
.app h3, .app h4 {
color: #fff;
}
.app h3 {
background-color: #333;
}
.app h3 a:link, .app h3 a:visited, .app h4 a:link, .app h4 a:visited {
color: #fff !important;
text-decoration: underline;
}
.app h4 {
background-color: #888;
}
.a td {
background: #ddd;
}
.b td {
background: #efefef;
}
table, th, td {
border: none;
}
div.colbar {
background: #eee;
border-color: #999 #EEE #EEE #999;
border-width: 1px;
border-style: solid;
}
.toolgroup {
background: #efefef;
}
.toolgroup .label {
border-bottom: 1px solid #666;
border-right: 1px solid #666;
background: #ddd;
color: #555;
}
.toolgroup .body {
border-right: 1px solid #aaa;
border-bottom: 1px solid #aaa;
}
#breadcrumbs {
border-top: 1px solid #fff;
background-color: #ccc;
}
#main {
border-top: 1px solid #999;
}
#rightcol div.www, #rightcol div.help {
border: 1px solid #ddd;
}
body.docs div.docs {
background-color: #fff;
border-left: 1px solid #ddd;
border-top: 1px solid #ddd;
}
#helptext .label {
background-image: url(../images/icon_help_sml.gif);
background-repeat: no-repeat;
background-position: 97%;
}
body.docs {
background: #eee url(../images/help_logo.gif) top right no-repeat !important;
}
.docs h3, .docs h4 {
border-top: solid 1px #000;
}
#apphead h2 em {
color: #777;
}
.app th {
background-color: #bbb;
}
.tabs th {
border-right: 1px solid #333;
background-color: #ddd;
color: #fff;
border-left: 1px solid #fff;
}
.tabs td {
background-color: #999;
border-bottom: 1px solid #fff;
border-right: 1px solid #fff;
border-left: 1px solid #fff;
}
.tabs {
border-bottom: 6px #ddd solid;
}
.tabs th, .tabs th a:link, .tabs th a:visited {
color: #555;
}
.tabs td, .tabs td a:link, .tabs td a:visited {
color: #fff;
}
.tabs a {
text-decoration: none;
}
.axial th {
background-color: #ddd;
color: black;
}
.alert {
background-color: #ff9;
}
.expandedwaste {
background: url(../images/icon_arrowwaste2_sml.gif) no-repeat;
}
.collapsedwaste {
background: url(../images/icon_arrowwaste1_sml.gif) no-repeat;
}
.filebrowse .expanded, .filebrowse-alt .expanded {
background-image: url(../images/icon_arrowfolderopen2_sml.gif);
background-repeat: no-repeat;
}
.filebrowse .collapsed, .filebrowse-alt .collapsed {
background-image: url(../images/icon_arrowfolderclosed1_sml.gif);
background-repeat: no-repeat;
}
.filebrowse .leafnode, .filebrowse-alt .leafnode {
background-image: url(../images/icon_folder_sml.gif);
background-repeat: no-repeat;
}
.filebrowse .leaf, .filebrowse-alt .leaf {
background-image: url(../images/icon_doc_sml.gif
cvs commit: jakarta-struts project.properties maven.xml project.xml
sraeburn2003/12/02 18:05:09
Modified:.project.properties maven.xml project.xml
Log:
Maven build changes to create TLDs copy resources for struts.jar
PR: 25076 25147
Submitted by: Tim Chen Joe Germuska
Revision ChangesPath
1.4 +5 -1 jakarta-struts/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-struts/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties29 Nov 2003 07:27:33 - 1.3
+++ project.properties3 Dec 2003 02:05:09 - 1.4
@@ -21,6 +21,10 @@
#keep ant maven directories seperate.
maven.build.dir=m-target
+# doc.dir is a property used in the original Ant-oriented build.xml.
+# define it here to make it easier to port ant tasks to maven.xml
+doc.dir=doc
+
# display the date on the site
maven.xdoc.date = left
# Display the version the web site is documenting
1.4 +70 -5 jakarta-struts/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-struts/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 29 Nov 2003 07:27:33 - 1.3
+++ maven.xml 3 Dec 2003 02:05:09 - 1.4
@@ -1,15 +1,80 @@
-project default=jar:jar
+project default=jar:jar
+ xmlns:j=jelly:core
+ xmlns:ant=jelly:ant
preGoal name=xdoc:jelly-transform
attainGoal name=html2xdoc/
- /preGoal
- !--
+!--
Maven FAQ PlugIn 1.2 will allow multiple faqs
For now, we'll just generate them from xdocs
- preGoal name=xdoc:jelly-transform
attainGoal name=faq/
+--
/preGoal
- --
+
+ !-- Prepare additional Jar resources --
+ postGoal name=java:jar-resources
+
+!-- Generate TLDs --
+
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
+ ant:style basedir=doc/userGuide
+ destdir=${maven.build.dir}/classes/META-INF/tlds
+ extension=.tld
+ style=doc/stylesheets/tld.xsl
+ includes=struts-*.xml/
+
+ !-- Copy DTDs --
+ant:copy todir=${maven.build.dir}/classes/org/apache/struts/resources
+ ant:fileset dir=./conf/share
+ant:include name=*.dtd/
+ /ant:fileset
+/ant:copy
+ /postGoal
+
+ postGoal name=dist:prepare-bin-filesystem
+
+!-- Copy Instructions and Readmes --
+ant:copy todir=${maven.dist.bin.assembly.dir}
+ ant:fileset dir=.
+ant:include name=README*/
+ant:include name=LICENSE*/
+ant:include name=STATUS*/
+ant:include name=INSTALL*/
+ /ant:fileset
+/ant:copy
+
+!-- Copy configuration files --
+j:set var=docsDest value=${maven.docs.dest}/
+ant:copy todir=${maven.dist.bin.assembly.dir}/conf
+ ant:fileset dir=./conf/share
+ant:include name=*.xml/
+ant:include name=*.dtd/
+ /ant:fileset
+/ant:copy
+ /postGoal
+
+
+ postGoal name=dist:prepare-src-filesystem
+!-- Copy Instructions and Readmes --
+ant:copy todir=${maven.dist.src.assembly.dir}
+ ant:fileset dir=.
+ant:include name=README*/
+ant:include name=LICENSE*/
+ant:include name=STATUS*/
+ant:include name=INSTALL*/
+ /ant:fileset
+/ant:copy
+
+!-- Copy configuration files --
+j:set var=docsDest value=${maven.docs.dest}/
+ant:copy todir=${maven.dist.src.assembly.dir}/conf
+ ant:fileset dir=./conf/share
+ant:include name=*.xml/
+ant:include name=*.dtd/
+ /ant:fileset
+/ant:copy
+ /postGoal
+
+
/project
1.15 +9 -0 jakarta-struts/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-struts/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 29 Nov 2003 07:27:33 - 1.14
+++ project.xml 3 Dec 2003 02:05:09 - 1.15
@@ -285,6 +285,15 @@
version1.4.1/version
urlhttp://jakarta.apache.org/cactus/url
/dependency
+
+ !-- for tld generation --
+ dependency
+ groupIdxalan/groupId
+ artifactIdxalan/artifactId
+ version2.5.1/version
+ urlhttp://xml.apache.org/xalan/url
+ /dependency
+
/dependencies
build
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/faqs - New directory
sraeburn2003/11/28 23:27:01 jakarta-struts/xdocs/faqs - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/images/logos - New directory
sraeburn2003/11/28 23:27:02 jakarta-struts/xdocs/images/logos - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/stylesheets - New directory
sraeburn2003/11/28 23:27:02 jakarta-struts/xdocs/stylesheets - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/userGuide - New directory
sraeburn2003/11/28 23:27:02 jakarta-struts/xdocs/userGuide - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/proposals - New directory
sraeburn2003/11/28 23:27:02 jakarta-struts/xdocs/proposals - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/xdocs/tiles - New directory
sraeburn2003/11/28 23:27:02 jakarta-struts/xdocs/tiles - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts struts.jsl project.xml project.properties maven.xml
sraeburn2003/11/28 23:27:34 Modified:xdocsindex.xml faq.fml navigation.xml .project.xml project.properties maven.xml Added: xdocs/faqs database.xml indexedprops.xml works.xml apps.xml eclipse.xml actionForm.xml struts-el.xml ssl.xml project.xml kickstart.xml helping.xml index.xml netbeans.xml newbie.xml xdocs/userGuide installation-jetty.xml release-notes-1.0-b3.xml release-notes.xml installation-sas.xml installation-ipas.xml installation-1.0.xml installation-ubs72.xml struts-tiles.xml dev_bean.xml release-notes-1.0-b1.xml installation-was352-x.xml dev_logic.xml dev_validator.xml struts-logic.xml installation-tc.xml index.xml dev_html.xml release-notes-1.1-b1.xml building_controller.xml preface.xml building_view.xml release-notes-1.1-b3.xml dev_nested.xml project.xml struts-html.xml release-notes-1.1.xml installation.xml building_model.xml release-notes-1.0.2.xml release-notes-1.1-rc1.xml introduction.xml dev_tiles.xml installation-jr30.xml installation-oas.xml installation-was352.xml installation-wls5.xml release-notes-1.0.1.xml release-notes-1.1-rc2.xml struts-bean.xml configuration.xml release-notes-1.1-b2.xml struts-nested.xml dev_util.xml release-notes-1.0-b2.xml release-notes-1.0.xml installation-ip.xml installation-novell.xml xdocs/proposals release-plan-1.1b1.xml struts-faces.xml workflow.xml todo-1.0.xml release-plan-1.1rc2.xml project.xml release-plan_1_2_0.xml todo-1.1.xml release-plan-1.1b2.xml release-plan-1.1rc1.xml release-plan-1.0b1.xml release-plan-1.0.1.xml release-plan-1.1.xml release-plan-1.1b3.xml xdocsstatus.xml project.xml learning.xml releases.xml volunteers.xml example.xml acquiring.xml using.xml announce.xml xdocs/tiles installation.xml project.xml xdocs/images/logos struts-power.gif .struts.jsl Removed: xdocscommunity.xml tasks.xml .cvsignore resources.xml Log: Changes to configuration xdocs for Maven build Revision ChangesPath 1.1 jakarta-struts/xdocs/faqs/database.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/database.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/indexedprops.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/indexedprops.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/works.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/works.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/apps.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/apps.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/eclipse.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/eclipse.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/actionForm.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/actionForm.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/struts-el.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/struts-el.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/ssl.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/ssl.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/project.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/project.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/kickstart.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/kickstart.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/helping.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/helping.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/index.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/index.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/netbeans.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/netbeans.xml?rev=1.1 1.1 jakarta-struts/xdocs/faqs/newbie.xml http://cvs.apache.org/viewcvs/jakarta-struts/xdocs/faqs/newbie.xml?rev=1.1 1.1 jakarta-struts/xdocs/userGuide/installation-jetty.xml http
cvs commit: jakarta-struts/xdocs navigation.xml
sraeburn2003/11/29 00:05:30 Modified:xdocsnavigation.xml Log: Menu change for Mmaven Revision ChangesPath 1.5 +5 -5 jakarta-struts/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-struts/xdocs/navigation.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- navigation.xml29 Nov 2003 07:27:33 - 1.4 +++ navigation.xml29 Nov 2003 08:05:30 - 1.5 @@ -17,7 +17,7 @@ menu name=Documentation item name=User and Developer Guides href=userGuide/index.html/ - item name=Javadochref=api/index.html/ + item name=Javadochref=apidocs/index.html/ item name=FAQs and Howtoshref=faqs/index.html/ /menu @@ -56,11 +56,11 @@ /menu menu name=Development - item name=CVS Access href=reports/cvs-usage.html/ + item name=CVS Access href=cvs-usage.html/ item name=CVS Repository href=http://cvs.apache.org/viewcvs/jakarta-struts// - item name=CVS Changelog href=reports/changelog-report.html/ - item name=File Activity href=reports/file-activity-report.html/ - item name=Build Dependencies href=reports/dependencies.html/ + item name=CVS Changelog href=changelog-report.html/ + item name=File Activity href=file-activity-report.html/ + item name=Build Dependencies href=dependencies.html/ item name=Release Guidelines href=releases.html/ item name=Roadmaphref=status.html/ /menu - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts project.xml
sraeburn2003/11/28 01:07:13 Modified:.project.xml Log: Update Validator dependency to 1.1.1 Enable some JUnit tests Revision ChangesPath 1.12 +14 -6 jakarta-struts/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 27 Nov 2003 19:28:13 - 1.11 +++ project.xml 28 Nov 2003 09:07:13 - 1.12 @@ -222,11 +222,19 @@ urlhttp://jakarta.apache.org/commons/logging.html/url /dependency + !-- dependency idcommons-validator/id versionSNAPSHOT/version urlhttp://jakarta.apache.org/commons/validator.html/url /dependency +-- + +dependency + idcommons-validator/id + version1.1.1-dev/version + urlhttp://jakarta.apache.org/commons/validator.html/url +/dependency dependency idoro/id @@ -286,7 +294,7 @@ sourceDirectorysrc/share/sourceDirectory - !-- Unit test cases + !-- Unit test cases -- unitTestSourceDirectorysrc/test/unitTestSourceDirectory integrationUnitTestSourceDirectory/ @@ -294,13 +302,13 @@ unitTest includes -include**/*Test.java/include +includeorg/apache/struts/action/TestDynaActionForm.java/include +includeorg/apache/struts/action/TestDynaActionFormClass.java/include +includeorg/apache/struts/config/TestModuleConfig.java/include +includeorg/apache/struts/config/TestActionConfigMatcher.java/include +includeorg/apache/struts/util/Test*.java/include /includes - excludes -exclude**/RepositoryTest.java/exclude - /excludes /unitTest --- !-- J A R R E S O U R C E S -- !-- Resources that are packaged up inside the JAR file -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/blank/WEB-INF struts-config.xml
sraeburn2003/10/14 10:02:53 Modified:web/blank/WEB-INF struts-config.xml Log: Fixed missing end tag in form-bean example config PR# 23816 Also reformatted to remove unneccessary blank lines. Revision ChangesPath 1.10 +1 -142jakarta-struts/web/blank/WEB-INF/struts-config.xml Index: struts-config.xml === RCS file: /home/cvs/jakarta-struts/web/blank/WEB-INF/struts-config.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- struts-config.xml 29 Dec 2002 21:41:57 - 1.9 +++ struts-config.xml 14 Oct 2003 17:02:53 - 1.10 @@ -4,288 +4,147 @@ -//Apache Software Foundation//DTD Struts Configuration 1.1//EN http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd; - - !-- - This is a blank Struts configuration file with an example - welcome action/page and other commented sample elements. - - Tiles and the Struts Validator are configured using the factory defaults - and are ready-to-use. - - NOTE: If you have a generator tool to create the corresponding Java classes - for you, you could include the details in the form-bean declarations. - Otherwise, you would only define the form-bean element itself, with the - corresponding name and type attributes, as shown here. - -- - - - struts-config - - !-- Data Source Configuration -- - !-- - data-sources - data-source - set-property - property=autoCommit - value=false/ - set-property - property=description - value=Example Data Source Configuration/ - set-property - property=driverClass - value=org.postgresql.Driver/ - set-property - property=maxCount - value=4/ - set-property - property=minCount - value=2/ - set-property - property=password - value=mypassword/ - set-property - property=url - value=jdbc:postgresql://localhost/mydatabase/ - set-property - property=user - value=myusername/ - /data-source - /data-sources - -- - - !-- Form Bean Definitions -- - - form-beans - - !-- sample form bean descriptor for an ActionForm - form-bean - name=inputForm - type=app.InputForm/ - end sample -- - - !-- sample form bean descriptor for a DynaActionForm - form-bean - name=logonForm - type=org.apache.struts.action.DynaActionForm - form-property - name=username - type=java.lang.String/ - form-property - name=password - type=java.lang.String/ - + /form-bean end sample -- - /form-beans - - - !-- = Global Exception Definitions -- - - global-exceptions - !-- sample exception handler - exception - key=expired.password - type=app.ExpiredPasswordException - path=/changePassword.jsp/ - end sample -- - /global-exceptions - - - !-- === Global Forward Definitions -- - - global-forwards - !-- Default forward to Welcome action -- - !-- Demonstrates using index.jsp to forward -- - forward - name=welcome - path=/Welcome.do/ - /global-forwards - - - !-- === Action Mapping Definitions -- - - action-mappings - - !-- Default Welcome action -- - !-- Forwards to Welcome.jsp -- - action - path=/Welcome - type=org.apache.struts.actions.ForwardAction - parameter=/pages/Welcome.jsp/ - - !-- sample input and input submit actions - - action - path=/Input - type=org.apache.struts.actions.ForwardAction - parameter=/pages/Input.jsp/ - - action - path=/InputSubmit - type=app.InputAction - name=inputForm - scope=request - validate=true - input=/pages/Input.jsp/ - - end samples
cvs commit: jakarta-struts/doc/stylesheets struts.xsl
sraeburn2003/09/29 10:03:02
Modified:doc struts.css
doc/stylesheets struts.xsl
Log:
Added ApacheCon 2003 logo to web site.
Improved styling for taglib and task list tables.
Revision ChangesPath
1.7 +7 -0 jakarta-struts/doc/struts.css
Index: struts.css
===
RCS file: /home/cvs/jakarta-struts/doc/struts.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- struts.css17 Sep 2003 18:54:25 - 1.6
+++ struts.css29 Sep 2003 17:03:02 - 1.7
@@ -134,6 +134,13 @@
thead {
border: 2px solid #CC;
+ background: #DD;
+ color: #33;
+ font-family: Arial, Helvetica, sans-serif;
+}
+
+tr.evenRow {
+ background: #F6F6F6;
}
.center {
1.16 +27 -3 jakarta-struts/doc/stylesheets/struts.xsl
Index: struts.xsl
===
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/struts.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- struts.xsl17 Sep 2003 18:54:25 - 1.15
+++ struts.xsl29 Sep 2003 17:03:02 - 1.16
@@ -96,6 +96,12 @@
/div
div id=menu
+
+!-- to be removed after ApacheCon 2003 ends 20th of November 2003 --
+a href=http://apachecon.com/2003/US/index.html;
+img src=http://jakarta.apache.org/images/logos/ac2003-150.gif;
alt=ApacheCon 2003/
+/a
+
xsl:apply-templates select=$project/
!--
@@ -241,6 +247,15 @@
/thead
xsl:for-each select=tag
tr
+xsl:choose
+ xsl:when test=position() mod 2 = 1
+ xsl:attribute name=classevenRow/xsl:attribute
+ /xsl:when
+ xsl:otherwise
+xsl:attribute name=classoddRow/xsl:attribute
+ /xsl:otherwise
+/xsl:choose
+
td align=center
xsl:variable name=name
xsl:value-of select=name/
@@ -291,11 +306,20 @@
pa href=#topBack to top/a/p
/xsl:template
-
+
!-- Create the table of documentation for a tag --
- xsl:template match=attribute
+ xsl:template match=attribute
tr
+xsl:choose
+ xsl:when test=position() mod 2 = 1
+xsl:attribute name=classevenRow/xsl:attribute
+ /xsl:when
+ xsl:otherwise
+xsl:attribute name=classoddRow/xsl:attribute
+ /xsl:otherwise
+/xsl:choose
+
td align=center
xsl:value-of select=name/
/td
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/stylesheets struts.xsl
sraeburn2003/09/29 17:17:05
Modified:doc struts.css
doc/stylesheets struts.xsl
Log:
Update site layout to prevent problems with the menu being
overlapped/pushed down at smaller window sizes
Revision ChangesPath
1.8 +15 -8 jakarta-struts/doc/struts.css
Index: struts.css
===
RCS file: /home/cvs/jakarta-struts/doc/struts.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- struts.css29 Sep 2003 17:03:02 - 1.7
+++ struts.css30 Sep 2003 00:17:05 - 1.8
@@ -6,10 +6,11 @@
background: #FF;
color: #00;
margin: 0;
- padding: 21px 16px;
+ padding: 20px 15px;
}
div.authors{
+ width: 150px;
background: #FF;
border: 1px solid #FF;
color: #33;
@@ -31,7 +32,7 @@
}
div.indent {
- padding: 0 5%;
+ padding: 0 4%;
}
div.notice {
@@ -210,14 +211,12 @@
}
#main {
- float: right;
- margin-bottom: 1em;
- width: 85%;
+ margin-left: 22%;
}
#menu {
- margin: 1em 86% 1em 0;
- padding: 0.2em;
+ width: 21%;
+ float: left;
}
#menu li {
@@ -254,6 +253,14 @@
display: none;
}
#main {
- width: 100%;
+ margin-left: 0;
+}
+
+h1, h2, h3 {
+ background: #fff;
+ color: #000;
+ font-weight: bold;
}
+
+
}
1.17 +13 -8 jakarta-struts/doc/stylesheets/struts.xsl
Index: struts.xsl
===
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/struts.xsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- struts.xsl29 Sep 2003 17:03:02 - 1.16
+++ struts.xsl30 Sep 2003 00:17:05 - 1.17
@@ -22,7 +22,6 @@
indent=yes
media-type=text/html/
-
!-- Defined parameters (overrideable) --
xsl:paramname=home-logo select='/images/jakarta-logo.gif'/
xsl:paramname=powered-logo select='/images/struts-power.gif'/
@@ -88,17 +87,13 @@
img src={$src} alt=Struts Framework id=struts-logo/
/a
/div
+xsl:commentend heading/xsl:comment
div id=content
-
-div id=main
-xsl:apply-templates select=body/
-/div
-
div id=menu
!-- to be removed after ApacheCon 2003 ends 20th of November 2003 --
-a href=http://apachecon.com/2003/US/index.html;
+a href=http://apachecon.com/2003/US/index.html;
style=text-decoration: none
img src=http://jakarta.apache.org/images/logos/ac2003-150.gif;
alt=ApacheCon 2003/
/a
@@ -125,8 +120,17 @@
/xsl:if
/xsl:if
/div
+xsl:commentend menu/xsl:comment
+
+
+div id=main
+xsl:apply-templates select=body/
+/div
+xsl:commentend main/xsl:comment
+
/div
+xsl:commentend content/xsl:comment
div id=footer
xsl:variable name=src
@@ -136,6 +140,7 @@
Copyright (c) 2000-2003, 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
/body
/html
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/stylesheets struts.xsl
sraeburn2003/09/17 11:54:26 Modified:doc/userGuide struts-bean.xml struts-logic.xml struts-html.xml configuration.xml doc struts.css doc/stylesheets struts.xsl Log: Fix missing deprecation warnings on taglib docs. Revision ChangesPath 1.18 +8 -6 jakarta-struts/doc/userGuide/struts-bean.xml Index: struts-bean.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-bean.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- struts-bean.xml 11 Sep 2003 21:31:23 - 1.17 +++ struts-bean.xml 17 Sep 2003 18:54:25 - 1.18 @@ -440,9 +440,11 @@ info pApplication-relative name (starting with a '/') of the web application resource to be dispatched, and whose response data is to be made - available as a bean. strongDEPRECATED - Use the page attribute - instead/strong./p + available as a bean./p /info + deprecated + Use the page attribute instead. + /deprecated /attribute attribute @@ -551,7 +553,7 @@ codeMessageResources/code object containing our messages is stored./p /info - defaultAction.MESSAGES_KEY/default + defaultGlobals.MESSAGES_KEY/default /attribute attribute @@ -574,7 +576,7 @@ pThe name of the session scope bean under which our currently selected codeLocale/code object is stored./p /info - defaultAction.LOCALE_KEY/default + defaultGlobals.LOCALE_KEY/default /attribute attribute @@ -968,7 +970,7 @@ codeMessageResources/code object containing our messages is stored./p /info - defaultAction.MESSAGES_KEY/default + defaultGlobals.MESSAGES_KEY/default /attribute attribute @@ -1070,7 +1072,7 @@ pThe name of the session scope bean under which our currently selected codeLocale/code object is stored./p /info - defaultAction.LOCALE_KEY/default + defaultGlobals.LOCALE_KEY/default /attribute attribute 1.16 +4 -4 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- struts-logic.xml 11 Sep 2003 21:31:23 - 1.15 +++ struts-logic.xml 17 Sep 2003 18:54:25 - 1.16 @@ -950,9 +950,9 @@ rtexprvaluetrue/rtexprvalue info pBy default the tag will retrieve the request scope bean it will - iterate over from the codeAction.ERROR_KEY/code constant string, + iterate over from the codeGlobals.ERROR_KEY/code constant string, but if this attribute is set to 'true' the request scope bean - will be retrieved from the codeAction.MESSAGE_KEY/code + will be retrieved from the codeGlobals.MESSAGE_KEY/code constant string. Also if this is set to 'true', any value assigned to the name attribute will be ignored. /p @@ -1007,9 +1007,9 @@ rtexprvaluetrue/rtexprvalue info pBy default the tag will retrieve the request scope bean it will - iterate over from the codeAction.ERROR_KEY/code constant string, + iterate over from the codeGlobals.ERROR_KEY/code constant string, but if this attribute is set to 'true' the request scope bean - will be retrieved from the codeAction.MESSAGE_KEY/code + will be retrieved from the codeGlobals.MESSAGE_KEY/code constant string. Also if this is set to 'true', any value assigned to the name attribute will be ignored. /p 1.65 +15 -11jakarta-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.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- struts-html.xml 11 Sep 2003 21:31:23 - 1.64 +++ struts-html.xml 17 Sep 2003 18:54:25 - 1.65 @@ -992,7 +992,7 @@ info Name of the request scope bean under which our error messages have been stored. If not present, the name specified by the - codeAction.ERROR_KEY/code constant string will be used. + codeGlobals.ERROR_KEY/code constant string will be used. /info /attribute @@ -2228,7 +2228,7 @@ /info deprecated
cvs commit: jakarta-struts/doc/stylesheets struts.xsl
sraeburn2003/09/11 12:20:14 Modified:doc/stylesheets struts.xsl Log: Fix missing tag attribute descriptions Revision ChangesPath 1.13 +31 -11jakarta-struts/doc/stylesheets/struts.xsl Index: struts.xsl === RCS file: /home/cvs/jakarta-struts/doc/stylesheets/struts.xsl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- struts.xsl9 Sep 2003 21:29:10 - 1.12 +++ struts.xsl11 Sep 2003 19:20:14 - 1.13 @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=utf-8? +?xml version=1.0 encoding=utf-8? !-- Content Stylesheet for Struts User's Guide -- !-- $Id$ -- @@ -93,6 +93,26 @@ div id=main xsl:apply-templates select=body/ + +!-- TODO +hr/ +h3Contributors/h3 +pProject/@Authors: xsl:value-of select=boolean($project/@authors)//p +pDocument/@Authors: xsl:value-of select=boolean(/document/@authors)//p + +xsl:if test=/[EMAIL PROTECTED]'false'] and + ([EMAIL PROTECTED]'true'] or /[EMAIL PROTECTED]'true']) +div class=authors +pContributors/p +ul + xsl:for-each select=/document/properties/author + lixsl:value-of select=.//li + /xsl:for-each +/ul +/div +/xsl:if +-- + /div div id=menu @@ -246,9 +266,18 @@ xsl:apply-templates select=info/ + xsl:if test=not(@document-attributes) +xsl:call-template name=document-tag-attributes / + /xsl:if + xsl:if test=@document-attributes='true' +xsl:call-template name=document-tag-attributes / + /xsl:if + +!-- xsl:if test=child::task xsl:apply-templates select=attribute/ /xsl:if +-- /div pa href=#topBack to top/a/p @@ -337,15 +366,6 @@ /td tdxsl:value-of select=assigned//td /tr - /xsl:template - -!-- Contributors -- - xsl:template match=contributors -ul -xsl:for-each select=/document/properties/author -lixsl:value-of select=.//li -/xsl:for-each -/ul /xsl:template - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/stylesheets struts.xsl
sraeburn2003/09/11 14:31:24 Modified:doc/userGuide struts-html.xml struts-tiles.xml struts-nested.xml project.xml struts-logic.xml building_controller.xml struts-bean.xml doc project.xml struts.css doc/faqs project.xml index.xml doc/stylesheets struts.xsl Log: Added back generation of contributors list Revision ChangesPath 1.64 +1 -1 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.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- struts-html.xml 9 Sep 2003 23:50:34 - 1.63 +++ struts-html.xml 11 Sep 2003 21:31:23 - 1.64 @@ -1,5 +1,5 @@ ?xml version=1.0? -document url=struts-html.html +document url=struts-html.html authors=false properties authorCraig R. McClanahan/author 1.11 +1 -1 jakarta-struts/doc/userGuide/struts-tiles.xml Index: struts-tiles.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-tiles.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- struts-tiles.xml 9 Sep 2003 17:49:17 - 1.10 +++ struts-tiles.xml 11 Sep 2003 21:31:23 - 1.11 @@ -1,5 +1,5 @@ ?xml version=1.0? -document url=struts-tiles.html +document url=struts-tiles.html authors=false properties authorCedric Dumoulin/author 1.22 +1 -1 jakarta-struts/doc/userGuide/struts-nested.xml Index: struts-nested.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-nested.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- struts-nested.xml 9 Sep 2003 17:49:18 - 1.21 +++ struts-nested.xml 11 Sep 2003 21:31:23 - 1.22 @@ -1,5 +1,5 @@ ?xml version=1.0? -document url=struts-nested.html +document url=struts-nested.html authors=false properties authorArron Bates/author 1.22 +3 -2 jakarta-struts/doc/userGuide/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/project.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- project.xml 8 Jul 2003 00:30:33 - 1.21 +++ project.xml 11 Sep 2003 21:31:23 - 1.22 @@ -1,10 +1,11 @@ ?xml version=1.0 encoding=ISO-8859-1? project name=Struts User's Guide href=http://jakarta.apache.org/struts/userGuide; -image=../images/struts.gif +image=../images/struts.gif + authors=true titleGetting Started/title - + menu name=User Guide item name=Table of Contents 1.15 +1 -1 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.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- struts-logic.xml 10 May 2003 18:39:47 - 1.14 +++ struts-logic.xml 11 Sep 2003 21:31:23 - 1.15 @@ -1,5 +1,5 @@ ?xml version=1.0? -document url=struts-logic.html +document url=struts-logic.html authors=false properties authorCraig R. McClanahan/author 1.70 +0 -8 jakarta-struts/doc/userGuide/building_controller.xml Index: building_controller.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/building_controller.xml,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- building_controller.xml 9 Sep 2003 17:49:18 - 1.69 +++ building_controller.xml 11 Sep 2003 21:31:23 - 1.70 @@ -156,14 +156,6 @@ /p table - -tr -td -/td -td -/td -/tr - tr td codeprocessPath/code 1.17 +1 -1 jakarta-struts/doc/userGuide/struts-bean.xml Index: struts-bean.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-bean.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- struts-bean.xml 9 Sep 2003 17:49:17 - 1.16 +++ struts-bean.xml 11 Sep 2003 21:31:23 - 1.17 @@ -1,5 +1,5 @@ ?xml version=1.0? -document url=struts-bean.html +document url=struts-bean.html authors=false
cvs commit: jakarta-struts build-webapps.xml
sraeburn2003/09/10 18:21:59
Modified:.build-webapps.xml
Log:
Reload stylesheets for XSL tranformations to avoid NPE bug.
Revision ChangesPath
1.23 +12 -6 jakarta-struts/build-webapps.xml
Index: build-webapps.xml
===
RCS file: /home/cvs/jakarta-struts/build-webapps.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build-webapps.xml 9 Sep 2003 21:29:10 - 1.22
+++ build-webapps.xml 11 Sep 2003 01:21:59 - 1.23
@@ -219,7 +219,8 @@
style basedir=${doc.dir} destdir=${build.home}/documentation
extension=.html style=${doc.dir}/stylesheets/struts.xsl
includes=*.xml
-excludes=project.xml
+excludes=project.xml
+reloadstylesheet=true
param name=relative-path expression=./
/style
!-- Create the FAQs --
@@ -227,7 +228,8 @@
destdir=${build.home}/documentation/faqs
extension=.html style=${doc.dir}/stylesheets/struts.xsl
includes=*.xml
-excludes=project.xml
+excludes=project.xml
+reloadstylesheet=true
param name=project-path expression=../faqs/project.xml/
/style
!-- Create the news --
@@ -235,7 +237,8 @@
destdir=${build.home}/documentation/news
extension=.html style=${doc.dir}/stylesheets/struts.xsl
includes=*.xml
-excludes=project.xml
+excludes=project.xml
+reloadstylesheet=true
param name=project-path expression=../news/project.xml/
/style
!-- Create the proposals --
@@ -243,7 +246,8 @@
destdir=${build.home}/documentation/proposals
extension=.html style=${doc.dir}/stylesheets/struts.xsl
includes=*.xml
-excludes=project.xml
+excludes=project.xml
+reloadstylesheet=true
param name=project-path expression=../proposals/project.xml/
/style
!-- Create the resources --
@@ -251,7 +255,8 @@
destdir=${build.home}/documentation/resources
extension=.html style=${doc.dir}/stylesheets/struts.xsl
includes=*.xml
-excludes=project.xml
+excludes=project.xml
+reloadstylesheet=true
param name=project-path expression=../resources/project.xml/
/style
!-- Create the user guide --
@@ -259,7 +264,8 @@
destdir=${build.home}/documentation/userGuide
extension=.html style=${doc.dir}/stylesheets/struts.xsl
includes=*.xml
-excludes=project.xml
+excludes=project.xml
+reloadstylesheet=true
param name=project-path expression=../userGuide/project.xml/
/style
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc struts.css
sraeburn2003/09/09 10:39:05
Modified:doc struts.css
Log:
Website docs XHTML migration.
Added missing XML source doc for news/2003Q2.
Revision ChangesPath
1.3 +4 -2 jakarta-struts/doc/struts.css
Index: struts.css
===
RCS file: /home/cvs/jakarta-struts/doc/struts.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts.css8 Sep 2003 01:35:54 - 1.2
+++ struts.css9 Sep 2003 17:39:05 - 1.3
@@ -6,7 +6,9 @@
background: #FF;
color: #00;
}
-
+img {
+ border: none;
+}
q {
font-family: Arial, Helvetica, sans-serif;
}
@@ -81,7 +83,7 @@
background: #023264;
color: #FF;
font-family: Arial, Helvetica, sans-serif;
- font-size: 1.5em;
+ font-size: 1.1em;
}
.menu-title {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/uml Credits.html
sraeburn2003/09/09 10:49:23 Modified:doc/userGuide installation-jr30.xml struts-bean.xml release-notes-1.1-b1.xml building_model.xml building_view.xml release-notes-1.0-b3.xml installation-wls5.xml installation-oas.xml struts-tiles.xml installation-ip.xml dev_validator.xml dev_tiles.xml struts-html.xml introduction.xml installation-tc.xml installation-was352-x.xml installation-sas.xml installation-ipas.xml release-notes.xml release-notes-1.0.2.xml installation-ubs72.xml installation.xml release-notes-1.1-rc2.xml release-notes-1.1.xml installation-novell.xml preface.xml installation-jetty.xml release-notes-1.0.1.xml release-notes-1.1-b3.xml installation-was352.xml index.xml struts-nested.xml release-notes-1.1-rc1.xml release-notes-1.0.xml building_controller.xml release-notes-1.1-b2.xml installation-1.0.xml configuration.xml doc/resources utilities.xml articles.xml powered.xml views.xml examples.xml related_books.xml related.xml tutorials.xml sigs.xml hosts.xml resources.xml taglibs.xml models.xml enabling.xml tools.xml 1st.xml archives.xml seminars.xml consultants.xml index.xml extensions.xml books.xml doc/proposals release-plan-1.0.1.xml release-plan-1.1rc2.xml todo-1.1.xml release-plan-1.0b1.xml release-plan-1.1rc1.xml workflow.xml release-plan-1.1b3.xml release-plan-1.1.xml release-plan_1_2_0.xml release-plan-1.1b2.xml release-plan-1.1b1.xml doc acquiring.xml kickstart.xml index.xml press.xml resources.xml newbie.xml helping.xml releases.xml news.xml volunteers.xml learning.xml status.xml using.xml doc/faqs newbie.xml apps.xml works.xml helping.xml actionForm.xml struts-el.xml kickstart.xml database.xml indexedprops.xml doc/news project.xml news_2002_q4.xml news_2003_q1.xml status.xml news_2002_q3.xml news_2001.xml news_2002_q2.xml index.xml news_2002_q1.xml doc/tiles installation.xml doc/uml Credits.html Added: doc/news news_2003_q2.xml Log: Website docs XHTML migration. Added missing XML source doc for news/2003Q2. Revision ChangesPath 1.5 +9 -6 jakarta-struts/doc/userGuide/installation-jr30.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/installation-jr30.xml.diff?r1=1.4r2=1.5 1.16 +1 -1 jakarta-struts/doc/userGuide/struts-bean.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/struts-bean.xml.diff?r1=1.15r2=1.16 1.6 +0 -2 jakarta-struts/doc/userGuide/release-notes-1.1-b1.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/release-notes-1.1-b1.xml.diff?r1=1.5r2=1.6 1.20 +13 -13jakarta-struts/doc/userGuide/building_model.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/building_model.xml.diff?r1=1.19r2=1.20 1.35 +25 -25jakarta-struts/doc/userGuide/building_view.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/building_view.xml.diff?r1=1.34r2=1.35 1.4 +5 -16 jakarta-struts/doc/userGuide/release-notes-1.0-b3.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/release-notes-1.0-b3.xml.diff?r1=1.3r2=1.4 1.4 +1 -1 jakarta-struts/doc/userGuide/installation-wls5.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/installation-wls5.xml.diff?r1=1.3r2=1.4 1.4 +3 -2 jakarta-struts/doc/userGuide/installation-oas.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/installation-oas.xml.diff?r1=1.3r2=1.4 1.10 +2 -2 jakarta-struts/doc/userGuide/struts-tiles.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/struts-tiles.xml.diff?r1=1.9r2=1.10 1.4 +3 -3 jakarta-struts/doc/userGuide/installation-ip.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/installation-ip.xml.diff?r1=1.3r2=1.4 1.37 +4 -4 jakarta-struts/doc/userGuide/dev_validator.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/userGuide/dev_validator.xml.diff?r1=1.36r2=1.37 1.17 +7 -7 jakarta-struts/doc/userGuide
cvs commit: jakarta-struts/web/tiles-documentation/doc compatibilityChanges.html comps2Tiles.html
sraeburn2003/09/09 14:29:10 Modified:web/tiles-documentation/doc/portal revisionsCont.html .build-webapps.xml build.xml doc/tiles installation.xml doc/stylesheets struts.xsl doc struts.css web/tiles-documentation/doc compatibilityChanges.html comps2Tiles.html Added: doc/dtds xhtml1-transitional.dtd xhtml1-strict.dtd xhtml-lat1.ent README.txt xhtml-symbol.ent xhtml-special.ent Log: Documentation XHTML conversion - Site layout is now CSS based and tableless. Docs validation task added to build process. Revision ChangesPath 1.2 +298 -277 jakarta-struts/web/tiles-documentation/doc/portal/revisionsCont.html http://cvs.apache.org/viewcvs/jakarta-struts/web/tiles-documentation/doc/portal/revisionsCont.html.diff?r1=1.1r2=1.2 1.1 jakarta-struts/doc/dtds/xhtml1-transitional.dtd http://cvs.apache.org/viewcvs/jakarta-struts/doc/dtds/xhtml1-transitional.dtd?rev=1.1 1.1 jakarta-struts/doc/dtds/xhtml1-strict.dtd http://cvs.apache.org/viewcvs/jakarta-struts/doc/dtds/xhtml1-strict.dtd?rev=1.1 1.1 jakarta-struts/doc/dtds/xhtml-lat1.ent http://cvs.apache.org/viewcvs/jakarta-struts/doc/dtds/xhtml-lat1.ent?rev=1.1 1.1 jakarta-struts/doc/dtds/README.txt http://cvs.apache.org/viewcvs/jakarta-struts/doc/dtds/README.txt?rev=1.1 1.1 jakarta-struts/doc/dtds/xhtml-symbol.ent http://cvs.apache.org/viewcvs/jakarta-struts/doc/dtds/xhtml-symbol.ent?rev=1.1 1.1 jakarta-struts/doc/dtds/xhtml-special.ent http://cvs.apache.org/viewcvs/jakarta-struts/doc/dtds/xhtml-special.ent?rev=1.1 1.22 +37 -18jakarta-struts/build-webapps.xml http://cvs.apache.org/viewcvs/jakarta-struts/build-webapps.xml.diff?r1=1.21r2=1.22 1.122 +1 -0 jakarta-struts/build.xml http://cvs.apache.org/viewcvs/jakarta-struts/build.xml.diff?r1=1.121r2=1.122 1.4 +315 -307 jakarta-struts/doc/tiles/installation.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/tiles/installation.xml.diff?r1=1.3r2=1.4 1.12 +147 -190 jakarta-struts/doc/stylesheets/struts.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/struts.xsl.diff?r1=1.11r2=1.12 1.4 +133 -76 jakarta-struts/doc/struts.css http://cvs.apache.org/viewcvs/jakarta-struts/doc/struts.css.diff?r1=1.3r2=1.4 1.2 +82 -74 jakarta-struts/web/tiles-documentation/doc/compatibilityChanges.html http://cvs.apache.org/viewcvs/jakarta-struts/web/tiles-documentation/doc/compatibilityChanges.html.diff?r1=1.1r2=1.2 1.2 +108 -117 jakarta-struts/web/tiles-documentation/doc/comps2Tiles.html http://cvs.apache.org/viewcvs/jakarta-struts/web/tiles-documentation/doc/comps2Tiles.html.diff?r1=1.1r2=1.2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/dtds - New directory
sraeburn2003/09/09 14:29:04 jakarta-struts/doc/dtds - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc struts.css
sraeburn2003/09/07 18:35:54
Modified:doc/stylesheets struts.xsl
doc/tiles installation.xml
.build-webapps.xml build.xml
doc struts.css
Added: doc/tiles project.xml
Removed: doc/stylesheets news.xsl resources.xsl faqs.xsl
userGuide.xsl proposals.xsl tiles.xsl
Log:
Docs converted to use single XSL stylesheet.
Ant build files changed to avoid duplication of documentation build steps.
Revision ChangesPath
1.11 +74 -18jakarta-struts/doc/stylesheets/struts.xsl
Index: struts.xsl
===
RCS file: /home/cvs/jakarta-struts/doc/stylesheets/struts.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- struts.xsl5 Sep 2003 23:02:40 - 1.10
+++ struts.xsl8 Sep 2003 01:35:53 - 1.11
@@ -1,10 +1,11 @@
?xml version=1.0 encoding=ISO-8859-1?
-!-- Content Stylesheet for Struts Documentation --
+!-- 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=xml
version=1.0
@@ -15,11 +16,24 @@
indent=yes
media-type=text/html/
+
+ !-- Defined parameters (overrideable) --
+ xsl:paramname=home-logo select='/images/jakarta-logo.gif'/
+ xsl:paramname=powered-logo select='/images/struts-power.gif'/
+ xsl:paramname=project-logo select='/images/struts.gif'/
+ xsl:paramname=project-name select='Struts Framework'/
+ xsl:paramname=relative-path select='..'/
+ xsl:paramname=css-path select='/struts.css'/
+ xsl:paramname=project-path select='../project.xml'/
+
+
+ !-- Import project information document --
+ xsl:variable name=project
+select=document($project-path)/project/
+
+
!-- Process an entire document into an HTML page --
xsl:template match=document
-xsl:variable name=project
-select=document('../project.xml')/project/
-
html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en
head
xsl:choose
@@ -33,22 +47,44 @@
titlexsl:value-of select=$project/title//title
/xsl:otherwise
/xsl:choose
+
meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 /
-meta name=author content={properties/author/.}/
-link rel=stylesheet type=text/css href=struts.css/
+
+xsl:for-each select=properties/author
+xsl:variable name=author
+ xsl:value-of select=./
+/xsl:variable
+meta name=author content={$author}/
+/xsl:for-each
+
+xsl:variable name=css
+ xsl:value-of select=$relative-path//struts.css
+/xsl:variable
+link rel=stylesheet type=text/css href={$css}/
/head
body
-
+
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 alt=The Apache
Jakarta Project/
+
+xsl:commentJAKARTA LOGO/xsl:comment
+xsl:variable name=src
+ xsl:value-of select=$relative-path/xsl:value-of select=$home-logo/
+/xsl:variable
+a href=http://jakarta.apache.org/;
+img src={$src} align=left alt=The Jakarta Project border=0
id=jakarta-logo/
/a
-a href=http://jakarta.apache.org/struts;
-img src=images/struts.gif align=right border=0 alt=Struts/
+
+xsl:commentSTRUTS LOGO/xsl:comment
+xsl:variable name=src
+ xsl:value-of select=$relative-path/xsl:value-of
select=$project-logo/
+/xsl:variable
+a href=http://jakarta.apache.org/struts/;
+img src={$src} align=right alt=Struts Framework border=0/
/a
+
/td/tr
trtd colspan=2
@@ -56,9 +92,9 @@
/td/tr
tr
-td width=120 valign=top
- xsl:apply-templates select=$project/
-/td
+ td width=120 valign=top class=menu
+xsl:apply-templates select=$project/
+ /td
td valign=top
xsl:apply-templates select=body/
@@ -71,9 +107,13 @@
trtd colspan=2
div class=footer
-Copyright (c) 2000-2003, Apache Software Foundation - a
href=http://nagoya.apache.org/wiki/apachewiki.cgi?StrutsDocComments;Comments?/a
+Copyright (c) 2000-2003, Apache Software Foundation span class=noprint-
a
href=http://nagoya.apache.org/wiki/apachewiki.cgi?StrutsDocComments;Comments?/a/span
/div
-img src=images/struts-power.gif align=right border=0 alt=Powered by
Struts
cvs commit: jakarta-struts/doc/faqs netbeans.xml eclipse.xml actionForm.xml newbie.xml apps.xml
sraeburn2003/09/05 16:02:42 Modified:doc/stylesheets faqs.xsl resources.xsl userGuide.xsl proposals.xsl news.xsl tiles.xsl struts.xsl doc index.xml doc/resources powered.xml sigs.xml resources.xml consultants.xml tutorials.xml books.xml guis.xml utilities.xml articles.xml tools.xml views.xml hosts.xml enabling.xml seminars.xml 1st.xml related_books.xml extensions.xml related.xml archives.xml examples.xml taglibs.xml models.xml doc/userGuide configuration.xml building_view.xml release-notes.xml preface.xml dev_validator.xml index.xml doc/news news_2002_q3.xml news_2002_q2.xml news_2001.xml news_2002_q1.xml index.xml project.xml news_2003_q1.xml news_2002_q4.xml doc/faqs netbeans.xml eclipse.xml actionForm.xml newbie.xml apps.xml Added: doc struts.css Log: Converted web site docs to XHTML 1.0 Transitional Revision ChangesPath 1.5 +131 -101 jakarta-struts/doc/stylesheets/faqs.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/faqs.xsl.diff?r1=1.4r2=1.5 1.5 +128 -60 jakarta-struts/doc/stylesheets/resources.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/resources.xsl.diff?r1=1.4r2=1.5 1.15 +138 -94 jakarta-struts/doc/stylesheets/userGuide.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/userGuide.xsl.diff?r1=1.14r2=1.15 1.5 +121 -95 jakarta-struts/doc/stylesheets/proposals.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/proposals.xsl.diff?r1=1.4r2=1.5 1.5 +133 -100 jakarta-struts/doc/stylesheets/news.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/news.xsl.diff?r1=1.4r2=1.5 1.2 +165 -60 jakarta-struts/doc/stylesheets/tiles.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/tiles.xsl.diff?r1=1.1r2=1.2 1.10 +56 -47jakarta-struts/doc/stylesheets/struts.xsl http://cvs.apache.org/viewcvs/jakarta-struts/doc/stylesheets/struts.xsl.diff?r1=1.9r2=1.10 1.48 +14 -7 jakarta-struts/doc/index.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/index.xml.diff?r1=1.47r2=1.48 1.1 jakarta-struts/doc/struts.css http://cvs.apache.org/viewcvs/jakarta-struts/doc/struts.css?rev=1.1 1.14 +1 -1 jakarta-struts/doc/resources/powered.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/powered.xml.diff?r1=1.13r2=1.14 1.5 +1 -1 jakarta-struts/doc/resources/sigs.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/sigs.xml.diff?r1=1.4r2=1.5 1.3 +1 -1 jakarta-struts/doc/resources/resources.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/resources.xml.diff?r1=1.2r2=1.3 1.15 +1 -1 jakarta-struts/doc/resources/consultants.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/consultants.xml.diff?r1=1.14r2=1.15 1.16 +1 -1 jakarta-struts/doc/resources/tutorials.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/tutorials.xml.diff?r1=1.15r2=1.16 1.22 +9 -9 jakarta-struts/doc/resources/books.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/books.xml.diff?r1=1.21r2=1.22 1.11 +1 -1 jakarta-struts/doc/resources/guis.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/guis.xml.diff?r1=1.10r2=1.11 1.5 +1 -1 jakarta-struts/doc/resources/utilities.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/utilities.xml.diff?r1=1.4r2=1.5 1.15 +1 -1 jakarta-struts/doc/resources/articles.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/articles.xml.diff?r1=1.14r2=1.15 1.12 +1 -1 jakarta-struts/doc/resources/tools.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/tools.xml.diff?r1=1.11r2=1.12 1.8 +1 -1 jakarta-struts/doc/resources/views.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/views.xml.diff?r1=1.7r2=1.8 1.3 +1 -1 jakarta-struts/doc/resources/hosts.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/hosts.xml.diff?r1=1.2r2=1.3 1.2 +21 -21jakarta-struts/doc/resources/enabling.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/enabling.xml.diff?r1=1.1r2=1.2 1.2 +1 -1 jakarta-struts/doc/resources/seminars.xml http://cvs.apache.org/viewcvs/jakarta-struts/doc/resources/seminars.xml.diff?r1=1.1r2=1.2
cvs commit: jakarta-struts/doc/stylesheets userGuide.xsl
sraeburn2003/09/05 16:58:23 Modified:doc/userGuide struts-bean.xml struts-tiles.xml dev_tiles.xml struts-html.xml struts-nested.xml doc/stylesheets userGuide.xsl Log: Update taglib docs to XHTML 1.0 Transitional Revision ChangesPath 1.15 +1 -2 jakarta-struts/doc/userGuide/struts-bean.xml Index: struts-bean.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-bean.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- struts-bean.xml 30 Aug 2003 23:19:20 - 1.14 +++ struts-bean.xml 5 Sep 2003 23:58:23 - 1.15 @@ -941,7 +941,7 @@ bodycontentempty/bodycontent info pRetrieve the value of the specified bean property, and render it to the -current JspWriter as a String by the ways: +current JspWriter as a String by the ways:/p ul liIf codeformat/code attribute exists then value will be formatted on base of format string from codeformat/code attribute and default system locale./li @@ -954,7 +954,6 @@ codegetAsText()/code method will be called./li liOtherwise, the usual codetoString()/code conversions will be applied./li /ul - /p pIf a problem occurs while retrieving the specified bean property, a request time exception will be thrown./p 1.9 +50 -48jakarta-struts/doc/userGuide/struts-tiles.xml Index: struts-tiles.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-tiles.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- struts-tiles.xml 1 Apr 2003 02:08:16 - 1.8 +++ struts-tiles.xml 5 Sep 2003 23:58:23 - 1.9 @@ -19,14 +19,12 @@ display-nameTiles Tag Library/display-name urihttp://jakarta.apache.org/struts/tags-tiles/uri info -This tag library provides tiles tags. -br/br -br/br -Tiles were previously called Components. For historical reasons, names, pages, components and templates +pThis tag library provides tiles tags./p +pTiles were previously called Components. For historical reasons, names, pages, components and templates are used indifferently to design a tile. Also, a lot of tags and attribute names are -left for backward compatibility. -br/brTo know more about tags defined in this library, check the associated documentation: -tiles-doc. +left for backward compatibility./p +pTo know more about tags defined in this library, check the associated documentation: +tiles-doc./p /info !-- = Include Tags == -- @@ -37,32 +35,34 @@ Insert a tiles/component/template. /summary info -Insert a tiles/component/template with the possibility to pass parameters +pInsert a tiles/component/template with the possibility to pass parameters (called attribute). A tile can be seen as a procedure that can take parameters or attributes. codelt;template:insertgt;/code allows to define these attributes and pass them to the inserted jsp page, called template. Attributes are defined using nested tag codelt;template:putgt;/code or codelt;template:putListgt;/code. -br/br +/p +p You must specify one of this tag attribute : +/p ul licodetemplate/code, for inserting a tiles/component/template page,/li licodecomponent/code, for inserting a tiles/component/template page, (same as template)/li licodepage/code for inserting a JSP page, (same as template)/li licodedefinition/code, for inserting a definition from definitions factory/li licodeattribute/code, surrounding tiles's attribute name whose value is used. -brIf attribute is associated to 'direct' flag (see put), and flag is true, write +br/If attribute is associated to 'direct' flag (see put), and flag is true, write attribute value (no insertion). -/br/li + /li licodename/code, to let 'insert' determine the type of entities to insert. In this later case, search is done in this order : definitions, tiles/components/templates, pages. /li /ul - br/br + p In fact, Page, component and template, are equivalent as a tile, component or template are jsp page. - br/br - STRONGExample : /STRONG + /p + pstrongExample : /strong/p precode lt;template:insert page=/basic/myLayout.jsp flush=truegt; lt;template:put name=title value=My first page /gt; @@ -80,8 +80,8 @@ requiredfalse/required rtexprvaluetrue
cvs commit: jakarta-struts/doc/userGuide building_controller.xml
sraeburn2003/08/28 20:18:29 Modified:doc/userGuide building_controller.xml Log: Fixed documentation typo PR: 22784 Revision ChangesPath 1.66 +1 -1 jakarta-struts/doc/userGuide/building_controller.xml Index: building_controller.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/building_controller.xml,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- building_controller.xml 26 Jul 2003 04:30:41 - 1.65 +++ building_controller.xml 29 Aug 2003 03:18:29 - 1.66 @@ -954,7 +954,7 @@ exception key=some.key type=java.io.IOException - handler=com.yourcorp.ExceptionHandler + handler=com.yourcorp.ExceptionHandler/ /global-exceptions ]]/code/pre - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts project.xml
sraeburn2003/08/09 19:39:28 Modified:.project.xml Log: Added myself Revision ChangesPath 1.4 +5 -0 jakarta-struts/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 8 Aug 2003 06:16:21 - 1.3 +++ project.xml 10 Aug 2003 02:39:28 - 1.4 @@ -173,6 +173,11 @@ organization/organization /developer +developer +nameSteve Raeburn/name +emailsraeburn at apache.org/email + organization/organization +/developer /developers contributors - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide struts-html.xml struts-nested.xml
sraeburn2003/08/10 02:14:04
Modified:contrib/struts-el/src/share/org/apache/strutsel/taglib/html
ELFormTag.java
contrib/struts-el/doc/userGuide struts-html-el.xml
src/share/org/apache/struts/taglib/html FormTag.java
src/share/org/apache/struts/taglib/nested/html
NestedFormTag.java
doc/userGuide struts-html.xml struts-nested.xml
Log:
Removed deprecated FormTag attributes: name, scope, type
Also affects nested and el form tags.
I added a name property to NestedFormTag because it is used internally
for nesting. Someone familiar with nested tags may know a better way.
Revision ChangesPath
1.11 +5 -64
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java
Index: ELFormTag.java
===
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ELFormTag.java10 Aug 2003 00:48:28 - 1.10
+++ ELFormTag.java10 Aug 2003 09:14:04 - 1.11
@@ -6,7 +6,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -105,11 +105,6 @@
*/
private String methodExpr;
/**
- * Instance variable mapped to name tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-private String nameExpr;
-/**
* Instance variable mapped to onreset tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -120,11 +115,6 @@
*/
private String onsubmitExpr;
/**
- * Instance variable mapped to scope tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-private String scopeExpr;
-/**
* Instance variable mapped to scriptLanguage tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -149,11 +139,6 @@
* (Mapping set in associated BeanInfo class.)
*/
private String targetExpr;
-/**
- * Instance variable mapped to type tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-private String typeExpr;
/**
* Getter method for action tag attribute.
@@ -181,11 +166,6 @@
*/
public String getMethodExpr() { return (methodExpr); }
/**
- * Getter method for name tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-public String getNameExpr() { return (nameExpr); }
-/**
* Getter method for onreset tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -196,11 +176,6 @@
*/
public String getOnsubmitExpr() { return (onsubmitExpr); }
/**
- * Getter method for scope tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-public String getScopeExpr() { return (scopeExpr); }
-/**
* Getter method for scriptLanguage tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -225,11 +200,6 @@
* (Mapping set in associated BeanInfo class.)
*/
public String getTargetExpr() { return (targetExpr); }
-/**
- * Getter method for type tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-public String getTypeExpr() { return (typeExpr); }
/**
* Setter method for action tag attribute.
@@ -257,11 +227,6 @@
*/
public void setMethodExpr(String methodExpr) { this.methodExpr = methodExpr; }
/**
- * Setter method for name tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-public void setNameExpr(String nameExpr) { this.nameExpr = nameExpr; }
-/**
* Setter method for onreset tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -272,11 +237,6 @@
*/
public void setOnsubmitExpr(String onsubmitExpr) { this.onsubmitExpr =
onsubmitExpr; }
/**
- * Setter method for scope tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
-public void setScopeExpr(String scopeExpr) { this.scopeExpr = scopeExpr; }
-/**
* Setter method for scriptLanguage tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -301,11 +261,6 @@
* (Mapping set in associated BeanInfo class.)
*/
public void setTargetExpr(String targetExpr) { this.targetExpr
cvs commit: jakarta-struts/doc volunteers.xml
sraeburn2003/08/09 19:07:34 Modified:doc volunteers.xml Log: Added myself Revision ChangesPath 1.27 +10 -0 jakarta-struts/doc/volunteers.xml Index: volunteers.xml === RCS file: /home/cvs/jakarta-struts/doc/volunteers.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- volunteers.xml30 Jul 2003 03:43:38 - 1.26 +++ volunteers.xml10 Aug 2003 02:07:34 - 1.27 @@ -144,6 +144,9 @@ li Kurt Post /li +li +Steve Raeburn +/li /ul @@ -287,6 +290,9 @@ li Phil Steitz /li +li +Steve Raeburn +/li /ul /section @@ -341,6 +347,10 @@ li bJames Turner/b (turner at blackbear.com) +/li + +li +bSteve Raeburn/b (sraeburn at apache.org) /li /ul - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/plugins DigestingPlugIn.java
sraeburn2003/08/10 03:20:50
Modified:src/share/org/apache/struts/plugins DigestingPlugIn.java
Log:
Tidied up @see tags. Are they all neccessary?
Revision ChangesPath
1.4 +16 -16
jakarta-struts/src/share/org/apache/struts/plugins/DigestingPlugIn.java
Index: DigestingPlugIn.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/plugins/DigestingPlugIn.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DigestingPlugIn.java 7 Aug 2003 04:02:42 - 1.3
+++ DigestingPlugIn.java 10 Aug 2003 10:20:50 - 1.4
@@ -87,7 +87,7 @@
* @author Joe Germuska
* @author David Graham
* @version $Revision$
- * @see PlugIn
+ * @see org.apache.struts.PlugIn
* @since Struts 1.2
*/
public class DigestingPlugIn implements PlugIn {
@@ -231,7 +231,7 @@
* @return a configured Digester
* @throws FileNotFoundException
* @throws MalformedURLException
- * @see getConfigURL(String, String)
+ * @see #getConfigURL(String, String)
*/
protected Digester digesterFromXml(String path, String source)
throws IOException {
@@ -350,7 +350,7 @@
/**
* @param configPath the path to configuration information for this PlugIn.
- * @see configSource
+ * @see #configSource
*/
public void setConfigPath(String configPath) {
this.configPath = configPath;
@@ -358,7 +358,7 @@
/**
* @return the configPath property
- * @see configSource
+ * @see #configSource
*/
public String getConfigPath() {
return configPath;
@@ -381,7 +381,7 @@
* /li
* /ul
* @param configSource the source (lookup method) for the config file.
- * @see configPath
+ * @see #configPath
*/
public void setConfigSource(String configSource) {
this.configSource = configSource;
@@ -390,7 +390,7 @@
/**
* @return the string describing which access method should be used to
* resolve configPath.
- * @see configPath
+ * @see #configPath
*/
public String getConfigSource() {
return configSource;
@@ -440,8 +440,8 @@
/**
* pThe path to a Digester XML configuration file, relative to the
* codedigesterSource/code property. (Optional)/p
- * @see digesterSource
- * @see getConfigURL(String, String)
+ * @see #digesterSource
+ * @see #getConfigURL(String, String)
*/
public void setDigesterPath(String digesterPath) {
this.digesterPath = digesterPath;
@@ -449,8 +449,8 @@
/**
* @return the configured path to a Digester XML config file, or null.
- * @see digesterSource
- * @see getConfigURL(String, String)
+ * @see #digesterSource
+ * @see #getConfigURL(String, String)
*/
public String getDigesterPath() {
return digesterPath;
@@ -461,7 +461,7 @@
* (Optional)
* /p
* @param digesterSource
- * @see getConfigURL(String, String)
+ * @see #getConfigURL(String, String)
*/
public void setDigesterSource(String digesterSource) {
this.digesterSource = digesterSource;
@@ -470,7 +470,7 @@
/**
* @return the configured lookup mechanism for resolving
* codedigesterPath/code.
- * @see getConfigURL(String, String)
+ * @see #getConfigURL(String, String)
*/
public String getDigesterSource() {
return this.digesterSource;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/resources examples.xml
sraeburn2003/08/12 02:50:54 Modified:doc/resources examples.xml Log: Remove broken/obsolete links Revision ChangesPath 1.6 +1 -5 jakarta-struts/doc/resources/examples.xml Index: examples.xml === RCS file: /home/cvs/jakarta-struts/doc/resources/examples.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- examples.xml 10 Aug 2003 09:29:50 - 1.5 +++ examples.xml 12 Aug 2003 09:50:54 - 1.6 @@ -10,19 +10,15 @@ chapter name=Struts Resources href=http://husted.com/struts/resources; section name=Projects and Examples -pa href=http://http://www.reumann.net/do/struts/main;bStruttin' with Struts/b/a by Rick Reumann - Struts lessons and examples./p +pa href=http://www.reumann.net/do/struts/main;bStruttin' with Struts/b/a by Rick Reumann - Struts lessons and examples./p pa href=http://www.ajug.org/meetings/download/struts_demo.zip;bAJUG Presentation Demo Application/b/a by Chuck Cavaness - The demo application uses OJB and Hypersonic./p pa href=http://www.ehatchersolutions.com/JavaDevWithAnt/;bJavaDevWithAnt/b/a by Erik Hatchter - Demonstrates using Ant, XDoclet, Struts, JUnit, Cactus, and Lucene within the same application./p pa href=http://basicportal.sourceforge.net/;bbasicPortal/b/a by Vic Cekvenich - Sample Struts + JSTL Vertical apps/p -pa href=http://geocities.yahoo.com/dominique_plante/sdstuff/strutsGuessingGame1.0.zip;bStruts Guessing Game v1.0/b/a by Dominique Plante - A guessing game written with Struts like the one that comes with Tomcat's examples, includes sources, ANT build script and a Struts jar distribution/p pa href=http://chiki.emaho.org/;bChiki/b/a by GhootEmaho - A Wiki-like webapp built using Struts and J2EE, and runs on Tomcat./p pa href=http://sourceforge.net/project/showfiles.php?group_id=49385;bArtimus/b/a by Ted Husted - News poster application. Demonstrates using beans beans and a JDBC database with Struts, along with other niceties. WAR zipped for download. Uses Scaffold package. See WEB-INF/README.txt for setup./p pa href=http://sourceforge.net/project/showfiles.php?group_id=49385;bScaffold/b/a by Ted Husted - Utility package of classes that can be used with various Web applications./p pa href=http://sourceforge.net/project/showfiles.php?group_id=49385;bStruts Polls/b/a by Ted Husted - Simple poll application. Demonstrates using a database with Struts./p -pa href=http://www.raibledesigns.com/struts/;bStruts-example modified for iPlanet Application Server SP2/b/a by Matt Raible./p pa href=http://www.newparticles.com/struts/;bThe Struts Framework/b/a by Steve Wilkinson - Excerpt from latest Wrox Professional JSP book./p -pa href=http://mycart.cjb.net/;bmyCart/b/a - Example Shopping Cart application using Struts - joint project with several contributors./p -pa href=http://www.oakgrovesoftware.com/~rbackhouse;bSample hdml/wireless based struts application/b/a by Richard Backhouse./p pa href=http://sourceforge.net/project/showfiles.php?group_id=49385;bStruts Login/b/a (WAR file zipped for download) by Ted Husted - A minimalist Struts application demonstrating form validation and tracking users with a session attribute (WAR file)./p pa href=http://sourceforge.net/project/showfiles.php?group_id=49385;bStruts-Simple/b/a by Ted Husted - (WAR file zipped for download) A simple skeleton application outlining the files needs to input and re-display data. Now also demonstrates using quot;wizardsquot; and quot;nestedquot; beans./p pa href=http://gallery.bluestone.com/scripts/SaISAPI.dll/Gallery.class/demos/i18n/index.jsp;bSonic Struts Storefront/b/ab -/b The Sonic Struts Storefront sample application demonstrates how to assemblean internationalized e-business application using the Struts framework./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/actions MappingDispatchAction.java
sraeburn2003/08/11 20:52:15 Modified:src/share/org/apache/struts/actions MappingDispatchAction.java Log: *** keyword substitution change *** Revision ChangesPath 1.2 +259 -259 jakarta-struts/src/share/org/apache/struts/actions/MappingDispatchAction.java Index: MappingDispatchAction.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/MappingDispatchAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MappingDispatchAction.java12 Aug 2003 03:26:53 - 1.1 +++ MappingDispatchAction.java12 Aug 2003 03:52:15 - 1.2 @@ -1,260 +1,260 @@ -/* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999-2003 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.actions; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -/** - * pAn abstract strongAction/strong that dispatches to a public - * method that is named by the codeparameter/code attribute of - * the corresponding ActionMapping. This is useful for developers who prefer - * to combine many related actions into a single Action class./p - * - * pTo configure the use of this action in your - * codestruts-config.xml/code file, create an entry like this:/p - * - * precode - * lt;action path=/saveSubscription - * type=org.example.SubscriptionAction - * name=subscriptionForm - * scope=request - * input=/subscription.jsp - * parameter=method/gt; - * /code/pre - * - * pwhere 'method' is the name of a method in your subclass of - * MappingDispatchAction that has the same signature (other than method - * name) of the standard Action.execute method. For example, you might combine - * the methods
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html RewriteTag.java
sraeburn2003/08/10 03:05:51 Modified:doc/userGuide struts-html.xml src/share/org/apache/struts/taglib/html RewriteTag.java Log: Added action attribute to rewrite tag. PR: 22261 Revision ChangesPath 1.58 +17 -0 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.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- struts-html.xml 10 Aug 2003 09:14:04 - 1.57 +++ struts-html.xml 10 Aug 2003 10:05:51 - 1.58 @@ -5550,6 +5550,23 @@ a JavaScript procedure./p /info + attribute + nameaction/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue + info + pLogical name of a codeAction/code that + contains the actual content-relative URI of the destination + of this transfer. This hyperlink may be dynamically + modified by the inclusion of query parameters, as described + in the tag description. You strongmust/strong specify + exactly one of the codeaction/code attribute, the + codeforward/code attribute, the + codehref/code attribute, or the codepage/code + attribute./p + /info +/attribute + attribute nameanchor/name requiredfalse/required 1.15 +5 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java Index: RewriteTag.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- RewriteTag.java 31 Jul 2003 00:25:39 - 1.14 +++ RewriteTag.java 10 Aug 2003 10:05:51 - 1.15 @@ -102,7 +102,7 @@ forward, href, page, - null, + action, params, anchor, false, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/resources project.xml examples.xml projects.xml
sraeburn2003/08/10 02:29:50 Modified:doc/resources project.xml examples.xml projects.xml Log: We had two almsot identical examples pages. Merged into examples.xml Revision ChangesPath 1.9 +1 -1 jakarta-struts/doc/resources/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-struts/doc/resources/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- project.xml 29 Dec 2002 11:46:59 - 1.8 +++ project.xml 10 Aug 2003 09:29:50 - 1.9 @@ -11,7 +11,7 @@ item href=books.html name=Books/ item href=consultants.html name=Consultants/ item href=enabling.html name=Enabling Tech/ -item href=projects.html name=Examples/ +item href=examples.html name=Examples/ item href=extensions.html name=Extensions/ item href=sigs.html name=Interest Groups/ item href=hosts.html name=ISPs/ 1.5 +2 -0 jakarta-struts/doc/resources/examples.xml Index: examples.xml === RCS file: /home/cvs/jakarta-struts/doc/resources/examples.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- examples.xml 8 Jul 2003 01:38:13 - 1.4 +++ examples.xml 10 Aug 2003 09:29:50 - 1.5 @@ -10,6 +10,8 @@ chapter name=Struts Resources href=http://husted.com/struts/resources; section name=Projects and Examples +pa href=http://http://www.reumann.net/do/struts/main;bStruttin' with Struts/b/a by Rick Reumann - Struts lessons and examples./p +pa href=http://www.ajug.org/meetings/download/struts_demo.zip;bAJUG Presentation Demo Application/b/a by Chuck Cavaness - The demo application uses OJB and Hypersonic./p pa href=http://www.ehatchersolutions.com/JavaDevWithAnt/;bJavaDevWithAnt/b/a by Erik Hatchter - Demonstrates using Ant, XDoclet, Struts, JUnit, Cactus, and Lucene within the same application./p pa href=http://basicportal.sourceforge.net/;bbasicPortal/b/a by Vic Cekvenich - Sample Struts + JSTL Vertical apps/p pa href=http://geocities.yahoo.com/dominique_plante/sdstuff/strutsGuessingGame1.0.zip;bStruts Guessing Game v1.0/b/a by Dominique Plante - A guessing game written with Struts like the one that comes with Tomcat's examples, includes sources, ANT build script and a Struts jar distribution/p 1.7 +9 -25 jakarta-struts/doc/resources/projects.xml Index: projects.xml === RCS file: /home/cvs/jakarta-struts/doc/resources/projects.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- projects.xml 7 Aug 2003 00:30:56 - 1.6 +++ projects.xml 10 Aug 2003 09:29:50 - 1.7 @@ -1,32 +1,16 @@ ?xml version=1.0 encoding=ISO-8859-1? document url=./projects.xml properties -authorMike Schachter/author -authorTed Husted/author -authorJames Holmes/author -titleResources - Projects and Examples - Jakarta Struts/title +titlePage Moved - Jakarta Struts/title /properties body -chapter name=Struts Resources href=http://husted.com/struts/resources; +chapter name=Struts Resources -section name=Projects and Examples -pa href=http://http://www.reumann.net/do/struts/main;bStruttin' with Struts/b/a by Rick Reumann - Struts lessons and examples./p -pa href=http://www.ajug.org/meetings/download/struts_demo.zip;bAJUG Presentation Demo Application/b/a by Chuck Cavaness - The demo application uses OJB and Hypersonic./p -pa href=http://geocities.yahoo.com/dominique_plante/sdstuff/strutsGuessingGame1.0.zip;bStruts Guessing Game v1.0/b/a by Dominique Plante - A guessing game written with Struts like the one that comes with Tomcat's examples, includes sources, ANT build script and a Struts jar distribution/p -pa href=http://chiki.emaho.org/;bChiki/b/a by GhootEmaho - A Wiki-like webapp built using Struts and J2EE, and runs on Tomcat./p -pa href=http://sourceforge.net/projects/struts;bArtimus/b/a by Ted Husted - News poster application. Demonstrates using beans and a JDBC database with Struts, along with other niceties. WAR zipped for download. Uses Scaffold package. See WEB-INF/README.txt for setup./p -pa href=http://husted.com/struts/resources/scaffold.zip;bScaffold/b/a by Ted Husted - Utility package of classes that can be used with various Web applications./p -pa href=http://husted.com/struts/resources/polls-20011024.zip;bStruts Polls/b/a by Ted Husted - Simple poll application. Demonstrates using a database with Struts./p -pa href=http://www.raibledesigns.com/struts/;bStruts-example modified for iPlanet Application Server SP2/b/a by Matt Raible./p -pa href=http://www.newparticles.com/struts/;bThe Struts
cvs commit: jakarta-struts/doc volunteers.xml
sraeburn2003/08/13 23:15:57 Modified:doc volunteers.xml Log: Fixed typo Revision ChangesPath 1.29 +1 -1 jakarta-struts/doc/volunteers.xml Index: volunteers.xml === RCS file: /home/cvs/jakarta-struts/doc/volunteers.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- volunteers.xml13 Aug 2003 17:36:56 - 1.28 +++ volunteers.xml14 Aug 2003 06:15:56 - 1.29 @@ -149,7 +149,7 @@ /li li Leonardo Quijano -li +/li /ul /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/actions MappingDispatchAction.java LocalStrings.properties
sraeburn2003/08/11 20:26:53
Modified:src/share/org/apache/struts/actions LocalStrings.properties
Added: src/share/org/apache/struts/actions
MappingDispatchAction.java
Log:
Addition of MappingDispatchAction that dispatches to a method named by the
ActionMapping parameter
PR: 17117 Suggested by Anthony Kay
Revision ChangesPath
1.7 +2 -0
jakarta-struts/src/share/org/apache/struts/actions/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/actions/LocalStrings.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalStrings.properties 3 Jul 2003 03:14:14 - 1.6
+++ LocalStrings.properties 12 Aug 2003 03:26:53 - 1.7
@@ -10,3 +10,5 @@
include.rd=Cannot create request dispatcher for path {0}
switch.prefix=Invalid module prefix {0} was specified
switch.required=Switch requires both 'prefix' and 'page' request parameters
+success.required=SuccessAction could not find an ActionForward named 'success' for
path '{0}'
+mapping.parameter=ActionMapping[{0}] does not define a 'parameter' attribute
\ No newline at end of file
1.1
jakarta-struts/src/share/org/apache/struts/actions/MappingDispatchAction.java
Index: MappingDispatchAction.java
===
/*
* $Header$
* $Revision$
* $Date$
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2003 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.actions;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
/**
* pAn abstract strongAction/strong that dispatches to a public
* method that is named by the codeparameter/code attribute of
* the corresponding ActionMapping. This is useful for developers who prefer
cvs commit: jakarta-struts/web/tiles-documentation/doc/portal documentation.jsp
sraeburn2003/08/12 00:31:11 Modified:src/test/org/apache/struts/tiles/config tiles-defs.xml web/tiles-documentation/WEB-INF tiles-doc-defs.xml web/tiles-documentation/doc/portal documentation.jsp Log: Remove links to missing resources. This is a quick fix, tiles-documentation looks like it needs an overhaul. PR: 21090 See also PR: 12159 Revision ChangesPath 1.2 +2 -0 jakarta-struts/src/test/org/apache/struts/tiles/config/tiles-defs.xml Index: tiles-defs.xml === RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/tiles/config/tiles-defs.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tiles-defs.xml27 Dec 2002 11:02:54 - 1.1 +++ tiles-defs.xml12 Aug 2003 07:31:11 - 1.2 @@ -70,7 +70,9 @@ /item -- item value=Quick overview link=/doc/quickOverview.jsp / + !-- item value=Tutorial link=/doc/tutorial.jsp / + -- item value=Tutorial Live Examples link=/tutorial/index.jsp / item value=Download link=/doc/download.jsp / item value=Installation link=/doc/installation.jsp / 1.2 +2 -0 jakarta-struts/web/tiles-documentation/WEB-INF/tiles-doc-defs.xml Index: tiles-doc-defs.xml === RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/tiles-doc-defs.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tiles-doc-defs.xml5 Nov 2002 14:18:58 - 1.1 +++ tiles-doc-defs.xml12 Aug 2003 07:31:11 - 1.2 @@ -70,7 +70,9 @@ /item -- item value=Quick overview link=/doc/quickOverview.jsp / + !-- item value=Tutorial link=/doc/tutorial.jsp / + -- item value=Tutorial Live Examples link=/tutorial/index.jsp / item value=Download link=/doc/download.jsp / item value=Installation link=/doc/installation.jsp / 1.3 +0 -7 jakarta-struts/web/tiles-documentation/doc/portal/documentation.jsp Index: documentation.jsp === RCS file: /home/cvs/jakarta-struts/web/tiles-documentation/doc/portal/documentation.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- documentation.jsp 5 Nov 2002 14:18:58 - 1.2 +++ documentation.jsp 12 Aug 2003 07:31:11 - 1.3 @@ -3,15 +3,8 @@ th bgColor=#00 font size=+1strongDocumentation/strong/font/th /tr TR -TDdiv align=centerA href=%=request.getContextPath()%/doc/installation.jspFONT - size=2Installation / Requirements/FONT - /A/div/TD/TR - TR TDA href=http://www.lifl.fr/~dumoulin/tiles/tilesAdvancedFeatures.pdf;P align=centerFONT size=2tilesAdvancedFeatures.pdf (draft)/FONT/A/P/TD/TR - TR -TDA href=%=request.getContextPath()%/doc/tutorial.jspP align=centerFONT -size=2Tutorial/FONT/A/P/TD/TR TR TDdiv align=centerA href=%=request.getContextPath()%/api/index.htmlFONT size=2API/FONT/A/div/TD/TR - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/actions MappingDispatchAction.java
sraeburn2003/08/12 07:13:13 Modified:src/share/org/apache/struts/actions MappingDispatchAction.java Log: Changed log visibility to private Revision ChangesPath 1.3 +5 -5 jakarta-struts/src/share/org/apache/struts/actions/MappingDispatchAction.java Index: MappingDispatchAction.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/actions/MappingDispatchAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MappingDispatchAction.java12 Aug 2003 03:52:15 - 1.2 +++ MappingDispatchAction.java12 Aug 2003 14:13:13 - 1.3 @@ -177,7 +177,7 @@ /** * Commons Logging instance. */ - protected static Log log = + private static Log log = LogFactory.getLog(MappingDispatchAction.class); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib/struts-legacy/src/jdk/1.4/org/apache/struts/legacy GenericConnection.java
sraeburn2003/08/09 23:00:49
Modified:contrib/struts-el build-webapp.xml build-tests.xml
build.properties.sample
doc/userGuide installation.xml configuration.xml
.build-all-clean.bat.sample build.xml
build-webapp.xml build.properties.sample
build-tests.xml
src/share/org/apache/struts/config DataSourceConfig.java
conf/share MANIFEST.MF
src/share/org/apache/struts/action ActionServlet.java
doc/faqs database.xml
Removed: contrib/struts-legacy/src/conf MANIFEST.MF
contrib/struts-legacy build.xml LICENSE.txt STATUS.txt
build.properties.sample
contrib/struts-legacy/src/jdk/1.3/org/apache/struts/legacy
GenericConnection.java
src/share/org/apache/struts/util GenericDataSource.java
contrib/struts-legacy/src/java/org/apache/struts/legacy
package.html GenericDataSource.java
contrib/struts-legacy/src/jdk/1.4/org/apache/struts/legacy
GenericConnection.java
Log:
Removed GenericDataSource and struts-legacy
Revision ChangesPath
1.6 +0 -5 jakarta-struts/contrib/struts-el/build-webapp.xml
Index: build-webapp.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build-webapp.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-webapp.xml 7 Jun 2003 21:53:28 - 1.5
+++ build-webapp.xml 10 Aug 2003 06:00:48 - 1.6
@@ -77,10 +77,6 @@
servlet API classes you wish to
compile against.
-struts-legacy.jar (required). The path to the JAR file
- of the Jakarta Struts Legacy
- package (version 1.0 or later).
-
struts.libs If specified, must be the pathname of a
directory from which struts.jar will be
copied to your WEB-INF/lib directory, and
@@ -181,7 +177,6 @@
pathelement location=${commons-validator.jar}/
pathelement location=${jdbc20ext.jar}/
pathelement location=${servlet.jar}/
- pathelement location=${struts-legacy.jar}/
pathelement location=${struts.libs}/struts.jar/
pathelement location=${struts.libs}/struts-el.jar/
pathelement location=${webapp.libs}/
1.7 +0 -3 jakarta-struts/contrib/struts-el/build-tests.xml
Index: build-tests.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build-tests.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-tests.xml 7 Jun 2003 21:53:28 - 1.6
+++ build-tests.xml 10 Aug 2003 06:00:48 - 1.7
@@ -111,7 +111,6 @@
pathelement location=${xalanj.jar}/
pathelement location=${jtidy.jar}/
pathelement location=${servlet.jar}/
- pathelement location=${struts-legacy.jar}/
pathelement location=${struts.jar}/
pathelement location=${jstl.jar}/
pathelement location=${jstl-standard.jar}/
@@ -202,8 +201,6 @@
copy file=${commons-logging.jar}
todir=${out.test.dir}/lib/
copy file=${commons-validator.jar}
- todir=${out.test.dir}/lib/
-copy file=${struts-legacy.jar}
todir=${out.test.dir}/lib/
war warfile=${out.test.dir}/test.war
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties.sample 7 Jun 2003 21:53:28 - 1.5
+++ build.properties.sample 10 Aug 2003 06:00:48 - 1.6
@@ -48,10 +48,6 @@
# the the Jakarta ORO project.
jakarta-oro.jar = path to jakarta-oro.jar
-# The JAR file containing version 1.0 (or later) of the Struts Legacy package
-# from the Jakarta Struts contrib area.
-struts-legacy.jar= path to struts-legacy.jar
-
# Properties related to Struts unit testing
# -
1.32 +0 -2 jakarta-struts/doc/userGuide/installation.xml
Index: installation.xml
===
RCS file: /home
cvs commit: jakarta-struts/contrib/struts-legacy build.xml
sraeburn2003/07/31 13:15:50
Modified:contrib/struts-legacy build.xml
Log:
Don't create dist directory on clean
Revision ChangesPath
1.8 +1 -2 jakarta-struts/contrib/struts-legacy/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/contrib/struts-legacy/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 11 Jun 2003 17:51:37 - 1.7
+++ build.xml 31 Jul 2003 20:15:50 - 1.8
@@ -214,7 +214,6 @@
description=Prepare for clean build
delete dir=${build.home} verbose=true/
delete dir=${dist.home}/
- mkdir dir=${dist.home}/
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/contrib/struts-el .cvsignore
sraeburn2003/07/31 13:17:55 Added: contrib/struts-el .cvsignore Log: Ignore dist and target directories Revision ChangesPath 1.1 jakarta-struts/contrib/struts-el/.cvsignore Index: .cvsignore === dist target - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts build.xml
sraeburn2003/07/31 13:18:52
Modified:.build.xml
Log:
Clean contrib build artifacts (struts-el for now)
Revision ChangesPath
1.115 +8 -1 jakarta-struts/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- build.xml 10 Jul 2003 04:25:05 - 1.114
+++ build.xml 31 Jul 2003 20:18:52 - 1.115
@@ -744,11 +744,18 @@
inheritall=false target=clean/
/target
+!--
+ Clean contrib distribution
+--
+target name=clean.contrib
+ant dir=${basedir}/contrib/struts-el
+ target=clean inheritAll=false/
+ /target
!--
Clean up build and distribution directories
--
-target name=clean depends=clean.legacy
+target name=clean depends=clean.legacy, clean.contrib
description=Clean build and distribution directories
delete dir=${build.home}/
delete dir=${dist.home}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/tiles package.html
sraeburn2003/07/25 23:09:33 Modified:src/share/org/apache/struts/taglib/bean package.html src/share/org/apache/struts/taglib/logic package.html src/share/org/apache/struts/tiles package.html Log: Fixed broken links in Javadoc Revision ChangesPath 1.7 +1 -1 jakarta-struts/src/share/org/apache/struts/taglib/bean/package.html Index: package.html === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/package.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- package.html 19 May 2003 03:06:03 - 1.6 +++ package.html 26 Jul 2003 06:09:33 - 1.7 @@ -402,7 +402,7 @@ pemRender A Bean or Bean Property/em - The contents of a bean, or bean property, are converted to a String and then copied to the response currently being created. This tag understands the syntax for simple, nested, and indexed -property references described a href=#doc.Properties.Reference above/a +property references described a href=#doc.Properties.References above/a . Beans from any scope can be requested - by default, the scopes are searched in expanding visibility order (page, request, session, and application) to locate the requested bean./p 1.16 +124 -124 jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html Index: package.html === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/package.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- package.html 19 May 2003 03:31:22 - 1.15 +++ package.html 26 Jul 2003 06:09:33 - 1.16 @@ -1,25 +1,25 @@ body - + pThe struts-logic tag library contains tags that are useful in managing conditional generation of output text, looping over object collections for repetitive generation of output text, and application flow management. /p a name=doc.Description/a - + p /p div align=Center a href=#doc.Introduction[Introduction]/a a href=#doc.Functionality[Logic Functionality]/a a href=#doc.Properties[Logic Properties]/a a href=#doc.Examples[Logic Examples]/a /div - + p/p - + hr /= a name=doc.Intro/a - + h3Introductiona name=doc.Introduction/a /h3 - + p The Logic library supplies tags that are useful for manipulating presentation logic without the use of scriptlets./p pbr @@ -29,15 +29,15 @@ /div p/p a name=doc.Functionality/a - + h3Logic Tag Functionalitya name=doc.Functionality/a /h3 - + p The functionality of the logic tags can be divided into four groups:/p - + pbValue Comparisons -/b The purpose of these tags is to print out the body of the tag if the comparison evaluates to itrue. /i/p - + ul liba href=../../../../../../userGuide/struts-logic.html#equalequal,/a a href=../../../../../../userGuide/struts-logic.html#notEqualnotEqual/a @@ -48,48 +48,48 @@ liba href=../../../../../../userGuide/struts-logic.html#greaterThangreaterThan/a ,a href=../../../../../../userGuide/struts-logic.html#lessThan lessThan/a /b/li - + /ul - -pbSubstring Matching -/b The purpose of these tags is to match substrings + +pbSubstring Matching -/b The purpose of these tags is to match substrings inside of other Strings/p - + ul liba href=../../../../../../userGuide/struts-logic.html#matchmatch/a , a href=../../../../../../userGuide/struts-logic.html#notMatchnotMatch/a /b/li - + /ul - + pbPresentation Location -/b The purpose of these tags is to change the location of the presentation page/p - + ul lia href=../../../../../../userGuide/struts-logic.html#forwardbforward/b/a /li lia href=../../../../../../userGuide/struts-logic.html#redirectbredirect/b/a /li - + /ul - + pbCollection Utilities -/bThe purpose of these tags is to handle Collections/p - + ul lia href=../../../../../../userGuide/struts-logic.html#iteratebiterate/b/a /li - + /ul - + h3Logic Tag Propertiesa name=doc.Properties/a /h3 - + pEach of the four groups of logic tags have a common set of attributes associated with them. :/p - -blockquote + +blockquote pbValue Comparisons/b (equal, notEqual, greaterEqual, lessEqual, greaterThan, lessThan, present, notPresent)/p - + pEach of the value comparison tags takes a ivalue/i and compares it to the value of a comparison attribute. If the value given can be successfully converted to a ifloat/i or idouble/i, then a number @@ -99,52 +99,52 @@ , iproperty/i
cvs commit: jakarta-struts/src/test/org/apache/struts/util TestRequestUtils.java
sraeburn2003/07/25 00:19:48
Modified:src/test/org/apache/struts/util TestRequestUtils.java
Log:
Add initialisation of module prefixes for selectApplication tests
Revision ChangesPath
1.20 +9 -6
jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java
Index: TestRequestUtils.java
===
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TestRequestUtils.java 2 Jul 2003 03:09:47 - 1.19
+++ TestRequestUtils.java 25 Jul 2003 07:19:48 - 1.20
@@ -1503,8 +1503,10 @@
// Map to the second module -- direct
public void testSelectApplication1b() {
-
+String[] prefixes = { /1, /2 };
+context.setAttribute(Globals.MODULE_PREFIXES_KEY, prefixes);
request.setPathElements(/myapp, /2/noform.do, null, null);
+
RequestUtils.selectModule(request, context);
ApplicationConfig appConfig = (ApplicationConfig)
request.getAttribute(Globals.MODULE_KEY);
@@ -1535,7 +1537,8 @@
// Map to the second module -- include
public void testSelectApplication2b() {
-
+String[] prefixes = { /1, /2 };
+context.setAttribute(Globals.MODULE_PREFIXES_KEY, prefixes);
request.setPathElements(/myapp, /noform.do, null, null);
request.setAttribute(RequestProcessor.INCLUDE_SERVLET_PATH,
/2/noform.do);
-
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 ErrorMessages.java
sraeburn2003/07/25 00:26:53
Modified:src/share/org/apache/struts/util RequestUtils.java
Removed: src/share/org/apache/struts/util ErrorMessages.java
Log:
Remove deprecated ErrorMessages
Revision ChangesPath
1.111 +4 -20
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.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- RequestUtils.java 16 Jul 2003 05:10:37 - 1.110
+++ RequestUtils.java 25 Jul 2003 07:26:53 - 1.111
@@ -1874,14 +1874,6 @@
String keys[] = (String[]) value;
for (int i = 0; i keys.length; i++)
am.add(ActionMessages.GLOBAL_MESSAGE, new
ActionMessage(keys[i]));
-} else if (value instanceof ErrorMessages) {
-String keys[] = ((ErrorMessages) value).getErrors();
-if (keys == null) {
-keys = new String[0];
-}
-for (int i = 0; i keys.length; i++) {
-am.add(ActionErrors.GLOBAL_ERROR, new ActionError(keys[i]));
-}
} else if (value instanceof ActionMessages) {
am = (ActionMessages) value;
} else {
@@ -1920,14 +1912,6 @@
errors.add(ActionErrors.GLOBAL_ERROR, new ActionError((String)
value));
} else if (value instanceof String[]) {
String keys[] = (String[]) value;
-for (int i = 0; i keys.length; i++) {
-errors.add(ActionErrors.GLOBAL_ERROR, new ActionError(keys[i]));
-}
-} else if (value instanceof ErrorMessages) {
-String keys[] = ((ErrorMessages) value).getErrors();
-if (keys == null) {
-keys = new String[0];
-}
for (int i = 0; i keys.length; i++) {
errors.add(ActionErrors.GLOBAL_ERROR, new ActionError(keys[i]));
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/web/upload upload.jsp
sraeburn2003/07/25 01:59:32 Modified:web/upload upload.jsp Log: Updated to reference Globals constants. Revision ChangesPath 1.6 +4 -3 jakarta-struts/web/upload/upload.jsp Index: upload.jsp === RCS file: /home/cvs/jakarta-struts/web/upload/upload.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- upload.jsp10 Dec 2002 06:03:21 - 1.5 +++ upload.jsp25 Jul 2003 08:59:32 - 1.6 @@ -1,6 +1,7 @@ %@ page import=org.apache.struts.action.*, java.util.Iterator, - org.apache.struts.webapp.upload.UploadForm% + org.apache.struts.webapp.upload.UploadForm, + org.apache.struts.Globals% %@ page language=java % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic % @@ -13,9 +14,9 @@ body !-- Find out if the maximum length has been exceeded. -- -logic:present name=%= Action.ERROR_KEY % scope=request +logic:present name=%= Globals.ERROR_KEY % scope=request % -ActionErrors errors = (ActionErrors) request.getAttribute(Action.ERROR_KEY); +ActionErrors errors = (ActionErrors) request.getAttribute(Globals.ERROR_KEY); //note that this error is created in the validate() method of UploadForm Iterator iterator = errors.get(UploadForm.ERROR_PROPERTY_MAX_LENGTH_EXCEEDED); //there's only one possible error in this - 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
sraeburn2003/07/25 02:15:57
Modified:src/share/org/apache/struts/util RequestUtils.java
Log:
Backwards compatibility fix. Changed ModuleConfig lookups to use getModuleConfig so
that default module config is returned if one is not already present in the request.
PR #21821
Revision ChangesPath
1.112 +12 -19
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.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- RequestUtils.java 25 Jul 2003 07:26:53 - 1.111
+++ RequestUtils.java 25 Jul 2003 09:15:57 - 1.112
@@ -501,13 +501,7 @@
}
// Look up the module configuration for this request
-ModuleConfig config =
-(ModuleConfig)
pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
-if (config == null) { // Backwards compatibility hack
-config =
-(ModuleConfig)
pageContext.getServletContext().getAttribute(Globals.MODULE_KEY);
-pageContext.getRequest().setAttribute(Globals.MODULE_KEY, config);
-}
+ModuleConfig config = getModuleConfig(pageContext);
// Calculate the appropriate URL
StringBuffer url = new StringBuffer();
@@ -681,8 +675,7 @@
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
StringBuffer value = new StringBuffer(request.getContextPath());
-ModuleConfig config =
-(ModuleConfig)
pageContext.getRequest().getAttribute(Globals.MODULE_KEY);
+ModuleConfig config = getRequestModuleConfig(request);
if (config != null) {
value.append(config.getPrefix());
}
@@ -1085,8 +1078,7 @@
}
if (resources == null) {
-ModuleConfig config = (ModuleConfig) pageContext.getAttribute(
-Globals.MODULE_KEY, PageContext.REQUEST_SCOPE);
+ModuleConfig config = getModuleConfig(pageContext);
resources =
(MessageResources) pageContext.getAttribute(
bundle + config.getPrefix(),
@@ -1303,7 +1295,7 @@
}
}
-ModuleConfig moduleConfig = (ModuleConfig)
request.getAttribute(Globals.MODULE_KEY);
+ModuleConfig moduleConfig = getRequestModuleConfig(request);
multipartClass = moduleConfig.getControllerConfig().getMultipartClass();
// Try to initialize the global request handler
@@ -1457,7 +1449,7 @@
sb.append(pattern.substring(0, pattern.length() - 2));
sb.append(action.getPath());
} else if (pattern.startsWith(*.)) {
-ModuleConfig appConfig = (ModuleConfig)
request.getAttribute(Globals.MODULE_KEY);
+ModuleConfig appConfig = getRequestModuleConfig(request);
sb.append(appConfig.getPrefix());
sb.append(action.getPath());
sb.append(pattern.substring(1));
@@ -1524,7 +1516,7 @@
}
// Calculate a context relative path for this ForwardConfig
-ModuleConfig moduleConfig = (ModuleConfig)
request.getAttribute(Globals.MODULE_KEY);
+ModuleConfig moduleConfig = getRequestModuleConfig(request);
String forwardPattern =
moduleConfig.getControllerConfig().getForwardPattern();
if (forwardPattern == null) {
// Performance optimization for previous default behavior
@@ -1586,7 +1578,7 @@
public static String pageURL(HttpServletRequest request, String page) {
StringBuffer sb = new StringBuffer();
-ModuleConfig moduleConfig = (ModuleConfig)
request.getAttribute(Globals.MODULE_KEY);
+ModuleConfig moduleConfig = getRequestModuleConfig(request);
String pagePattern = moduleConfig.getControllerConfig().getPagePattern();
if (pagePattern == null) {
sb.append(moduleConfig.getPrefix());
@@ -1820,6 +1812,7 @@
ModuleConfig moduleConfig = (ModuleConfig)
request.getAttribute(Globals.MODULE_KEY);
if (moduleConfig == null) {
moduleConfig = (ModuleConfig) context.getAttribute(Globals.MODULE_KEY);
+request.setAttribute(Globals.MODULE_KEY, moduleConfig);
}
return moduleConfig;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/proposals todo-1.1.xml
sraeburn2003/07/25 20:56:26 Modified:doc/news index.xml news_2001.xml news_2002_q3.xml project.xml doc/userGuide installation.xml release-notes.xml building_view.xml installation-1.0.xml release-notes-1.0-b1.xml index.xml release-notes-1.1.xml release-notes-1.1-rc2.xml release-notes-1.1-b3.xml release-notes-1.1-rc1.xml release-notes-1.1-b2.xml doc/faqs index.xml actionForm.xml apps.xml helping.xml kickstart.xml newbie.xml doc using.xml learning.xml doc/resources taglibs.xml doc/stylesheets userGuide.xsl doc/proposals todo-1.1.xml Removed: doc/userGuide dev_utils.xml Log: Fixed / removed broken website links. No content changes. Revision ChangesPath 1.26 +7 -3 jakarta-struts/doc/news/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-struts/doc/news/index.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- index.xml 4 Jul 2003 17:39:11 - 1.25 +++ index.xml 26 Jul 2003 03:56:24 - 1.26 @@ -425,14 +425,18 @@ h3a name=20030204/a04 Feb 2003 - Struts Console v3.2/h3 p Struts Console version 3.2 is now available.br / -a href= http://www.jamesholmes.com/struts/;http://www.jamesholmes.com/struts//a +a href=http://www.jamesholmes.com/struts/;http://www.jamesholmes.com/struts//a /p p Download Now: br / -http://www.jamesholmes.com/struts/struts-console-3.2.zip +a href=http://www.jamesholmes.com/struts/struts-console-3.2.zip; +http://www.jamesholmes.com/struts/struts-console-3.2.zip +/a -- OR -- -http://www.jamesholmes.com/struts/struts-console-3.2.tar.gz +a href=http://www.jamesholmes.com/struts/struts-console-3.2.tar.gz; +http://www.jamesholmes.com/struts/struts-console-3.2.tar.gz +/a /p p 1.3 +2 -3 jakarta-struts/doc/news/news_2001.xml Index: news_2001.xml === RCS file: /home/cvs/jakarta-struts/doc/news/news_2001.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- news_2001.xml 24 Dec 2002 00:57:57 - 1.2 +++ news_2001.xml 26 Jul 2003 03:56:24 - 1.3 @@ -63,7 +63,7 @@ h3a name=2003/a13 Nov 2001 - Expresso version 4.0 released/h3 p Expresso version 4.0 is now available at -a href=www.jcorporate.com +a href=http://www.jcorporate.com/; bwww.jcorporate.com/b/a. For more information and to download the expresso4-00-complete.jar see a href=http://www.jcorporate.com/product/expresso.html; @@ -203,7 +203,6 @@ a href=http://www.apache.org/dist/jakarta/jakarta-struts/release/v1.0/;here/a and the source distribution is available a href=http://www.apache.org/dist/jakarta/jakarta-struts/release/v1.0/src/;here/a. -A a href=press.htmlpress release/a is also available. /p hr noshade= size=1/ @@ -228,7 +227,7 @@ pstrongStruts 1.0-b2/strong is an update release in preparation for a final release of Struts 1.0 prior to JavaOne 2001. The changes included are documented in the -a href=http://jakarta.apache.org/struts/release-notes-1.0-b2.html;Release +a href=../userGuide/release-notes-1.0-b2.htmlRelease Notes/a. Get your copy of this latest release a href=http://www.apache.org/dist/jakarta/jakarta-struts/release/v1.0-b2/;here/a. /p 1.3 +1 -1 jakarta-struts/doc/news/news_2002_q3.xml Index: news_2002_q3.xml === RCS file: /home/cvs/jakarta-struts/doc/news/news_2002_q3.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- news_2002_q3.xml 24 Dec 2002 00:57:57 - 1.2 +++ news_2002_q3.xml 26 Jul 2003 03:56:24 - 1.3 @@ -37,7 +37,7 @@ hr size=1 noshade=/ h3a name=20020831.4/a30 Aug 2002 - MockObjects 0.4 released/h3 -pUnit testing is a hot topic among Struts developers. a href=ttp://strutstestcase.sourceforge.net/StrutsTestCase/a provides a slick mock object for testing Struts Actions with JUnit (or Cactus). The MockObjects projects provides a base API for creating tests for the rest of the objects in your Java application. /p +pUnit testing is a hot topic among Struts developers. a href=http://strutstestcase.sourceforge.net/;StrutsTestCase/a provides a slick mock object for testing Struts Actions with JUnit (or Cactus). The MockObjects projects provides a base API for creating tests for the rest of the objects in your Java application. /p pa href=http
cvs commit: jakarta-struts/web/exercise-taglib html-messages.jsp
sraeburn2003/07/23 01:45:19 Modified:web/exercise-taglib html-messages.jsp Log: Updated to reference Globals constants. Revision ChangesPath 1.2 +3 -3 jakarta-struts/web/exercise-taglib/html-messages.jsp Index: html-messages.jsp === RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/html-messages.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- html-messages.jsp 16 Jul 2002 04:56:42 - 1.1 +++ html-messages.jsp 23 Jul 2003 08:45:19 - 1.2 @@ -1,4 +1,4 @@ -%@ page language=java import=org.apache.struts.action.* % +%@ page language=java import=org.apache.struts.action.*, org.apache.struts.Globals % %@ taglib uri=/WEB-INF/struts-html.tld prefix=html % html head @@ -12,7 +12,7 @@ errors.add(property3, new ActionError(property3error1)); errors.add(property3, new ActionError(property3error2)); errors.add(ActionErrors.GLOBAL_ERROR, new ActionError(globalError)); - request.setAttribute(Action.ERROR_KEY, errors); + request.setAttribute(Globals.ERROR_KEY, errors); ActionMessages messages = new ActionMessages(); messages.add(property1, new ActionMessage(property1message1)); @@ -22,7 +22,7 @@ messages.add(property3, new ActionMessage(property3message1)); messages.add(property3, new ActionMessage(property3message2)); messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(globalMessage)); - request.setAttribute(Action.MESSAGE_KEY, messages); + request.setAttribute(Globals.MESSAGE_KEY, messages); % /head body bgcolor=white - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/doc/userGuide building_view.xml
sraeburn2003/07/21 09:32:09 Modified:doc/userGuide building_view.xml Log: Updated User Guide XML to fix bug #21773 Revision ChangesPath 1.31 +1 -1 jakarta-struts/doc/userGuide/building_view.xml Index: building_view.xml === RCS file: /home/cvs/jakarta-struts/doc/userGuide/building_view.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- building_view.xml 24 May 2003 10:43:04 - 1.30 +++ building_view.xml 21 Jul 2003 16:32:09 - 1.31 @@ -705,7 +705,7 @@ Create your /index.jsp homepage file: precode![CDATA[ -h1This is my homepage!lt;/h1 +h1This is my homepage/h1 ]]/code/pre /li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
