Re: @author tags in Struts code
That means a lot coming from you Craig! I want to get some feedback on some other changes I'd like to suggest: on http://jakarta.apache.org/struts/volunteers.html (volunteer.xml) the current section order is: Source Code Contributers Documentation Contributers Active Committers Emeritus Committers how about reordering the sections to Active Committers Emeritus Committers Source Code Contributers Documentation Contributers I don't know if there's already some other convention on that, but developers are listed before contributers in project.xml, so it seems like a logical ordering. It also highlights those first who made very important contributions. I noticed that a couple of active committers were not listed in the source code contributers! That will be fixed when I update the list. This includes James Mitchell, Joe Germuska and David M. Karr.*** *I'm grabbing all the author tags under /src. Should the same be done under contrib as well? The scope of files involved in src is already several hundred, so If that's required I'll do that seperately as a seperate item. I think it would be good to mention the new policy on @author tags and that we're including people on the volunteer page in the documentation on how to help. Anyone have some good wording for that? Paul Sundling Craig R. McClanahan wrote: Quoting Paul Sundling [EMAIL PROTECTED]: If the group was interested in removing all author tags and consolidating all the names onto volunteer.html I would be willing to make a tar of patches or whatever format is most convenient. If you're interested, let me know if that would be useful and I'll try to give you 24 hour or less tournaround time. I'd probably have to ask for couple questions and then I'd submit it through bugzilla. It's in the realm of busy work, but I'm very detail oriented and pretty good with a CLI. :) +1 on such a patch, attached to a Bugzilla ticket in cvs diff -u format as David pointed out. Ironically, this would definitely count as enough work to get you added to the contributor list if you are not already :-). Paul Sundling Craig - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
list of authors
I forgot to attach the list of author tags and their status for the curious. Paul Sundling * @author Anthony Kay [ADD] * @author Arron Bates [listed] * @author Cedric Dumoulin [listed] * @author Craig McClanahan [on list already as Craig McClanahan] * @author Craig R. McClanahan [listed] * @author David Geary [listed] * @author David Graham [listed] * @author David Wintefeldt [mispelled version] * @author David Winterfeldt [listed] * @author Dominique Plante [listed] * @author Don Brown [listed] * @author Don Clasen [listed] * @author Eddie Bush [ADD] * @author Erik Hatcher [ADD] * @author Florent Carpentier [listed] * @author James Mitchell [ADD] (listed only as Active Committer) * @author James Turner [listed] * @author Jea-noel Ribette [ADD] * @author Jeff Hutchinson [listed] * @author Jimmy Larsson [listed] * @author Joe Germuska [ADD] (listed only as Active Committer) * @author Leonardo Quijano [listed] * @author Luis Arias [EMAIL PROTECTED] [listed] * @author Marius Barduta [listed] * @author Martin Cooper [listed] * @author Martin F N Cooper [on list already as Martin Cooper] * @author Michael Westbay [ADD] * @author Mike Schachter [listed] * @author Niall Pemberton [EMAIL PROTECTED] * @author Oleg V Alexeev [ADD] * @author Paul Sundling [ADD] * @author Ralph Schaer [listed] * @author Robert Leland [on list already as Rob Leland] * @author Rob Leland [listed] * @author Scott Carlson [ADD] * @author Steve Raeburn [listed] * @author Ted Husted [listed] * @author a href=mailto:[EMAIL PROTECTED]Berin Loritsch/a [ADD] * @author a href=mailto:[EMAIL PROTECTED]Giacomo Pati/a [ADD] * @author a href=mailto:[EMAIL PROTECTED]Pierpaolo Fumagalli/a [ADD] * @author a href=mailto:[EMAIL PROTECTED]Stefano Mazzocchi/a [ADD] From Committers List Only: * David M. Karr (dmkarr at apache.org) [ADD] (listed only as Active Committer) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26036] New: - Remove author tag and consolidate under volunteer.html
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html Summary: Remove author tag and consolidate under volunteer.html Product: Struts Version: Nightly Build Platform: All OS/Version: All Status: NEW Severity: Enhancement Priority: Other Component: Web Site AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] On developer list it was discussed that it would be better to remove author tags as they represent ownership. Instead it should be more evident that we are all part of a shared community. Using the centralized volunteer.html we can still recognize people for their contributions. This patch includes an updated volunteer.html and source files with @author removed. Paul Sundling - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26036] - Remove author tag and consolidate under volunteer.html
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 09:00 --- Created an attachment (id=9893) list of people with @author tags and their disposition - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26036] - Remove author tag and consolidate under volunteer.html
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 09:01 --- Created an attachment (id=9894) cvs diff -u of changes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: @author tags in Struts code
On Fri, 9 Jan 2004, Paul Sundling wrote: That means a lot coming from you Craig! I want to get some feedback on some other changes I'd like to suggest: on http://jakarta.apache.org/struts/volunteers.html (volunteer.xml) the current section order is: Source Code Contributers Documentation Contributers Active Committers Emeritus Committers how about reordering the sections to Active Committers Emeritus Committers Source Code Contributers Documentation Contributers I don't know if there's already some other convention on that, but developers are listed before contributers in project.xml, so it seems like a logical ordering. It also highlights those first who made very important contributions. I'm not sure how the list originally got into the order it is in today, but I have a theory. ;-) If we put non-committers first, it might give newcomers more visibility, encouraging them to keep contributing, and eventually, perhaps, become committers. Also, since emeritus committers are not really around Struts any more, it kinda makes sense for them to be at the bottom of the page. That said, however, I don't have a problem with changing the order as you describe. I noticed that a couple of active committers were not listed in the source code contributers! That will be fixed when I update the list. This includes James Mitchell, Joe Germuska and David M. Karr.*** I have a theory about how this happened as well. ;-) We have not always been prompt and religious about updating the lists, but I suspect we've always added new committers fairly promptly. Hence the names listed in the committers list who are not listed elsewhere. On the other hand, I'm not sure how important it is for committers to be also listed as source and/or documentation contributors, since it's sort of assumed. Those who are listed as both probably got there by being added to the contributors list prior to becoming committers, rather than the other way around. ;-) But again, I have no objection to ensuring that all of the committers are also listed as contributors. *I'm grabbing all the author tags under /src. Should the same be done under contrib as well? The scope of files involved in src is already several hundred, so If that's required I'll do that seperately as a seperate item. Ultimately, yes, I think authors of code under contrib should be recognised in the same way as authors in the rest of the code base. We have, after all, accepted the code into the Struts repo, even if not (yet) into the core itself. But, as we say here, it's your itch, so however you wish to scratch it - or not - is entirely up to you. (Which is just another way of saying feel free to do this however you want, or not at all.) I think it would be good to mention the new policy on @author tags and that we're including people on the volunteer page in the documentation on how to help. Anyone have some good wording for that? Not off the top of my head, but I agree it's a good idea. -- Martin Cooper Paul Sundling Craig R. McClanahan wrote: Quoting Paul Sundling [EMAIL PROTECTED]: If the group was interested in removing all author tags and consolidating all the names onto volunteer.html I would be willing to make a tar of patches or whatever format is most convenient. If you're interested, let me know if that would be useful and I'll try to give you 24 hour or less tournaround time. I'd probably have to ask for couple questions and then I'd submit it through bugzilla. It's in the realm of busy work, but I'm very detail oriented and pretty good with a CLI. :) +1 on such a patch, attached to a Bugzilla ticket in cvs diff -u format as David pointed out. Ironically, this would definitely count as enough work to get you added to the contributor list if you are not already :-). Paul Sundling Craig - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26036] - Remove author tag and consolidate under volunteer.html
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 20:36 --- Created an attachment (id=9897) patchfile with cvs diff -u for real this time. :) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: begining with struts
Have you tried the struts user list? That's a more appropriate place to address a question like this. You emailed the developer list. Since the root cause is not finding a class you might start by making sure that you have the struts.jar and other dependent libraries somewhere that tomcat can find them. I've noticed that tomcat5 didn't seem to find stuff in my jre/lib/ext directory, like tomcat 4 did. So you need to have it in either $TOMCAT_HOME/common/lib or $TOMCAT_HOME/webapps/yourWebAppName/WEB-INF/lib. If you started with struts-blank.war file that will have the jars in the right place already. As far as tuturials and documentation, http://jakarta.apache.org/struts/faqs/index.html is a good place to start. Paul Sundling gabriel eduardo oliveros valencia wrote: hi i'm starting to program with java struts i'm following a struts tutorial than i downloaded from the web i'm doing a example hello world and it don't work the error than i get is the follow: type Exception report message description The server encountered an internal error () that prevented it from fulfilling this request. exception org.apache.jasper.JasperException: No se puedee cargar la clase TagExtraInfo llamada: org.apache.struts.taglib.bean.CookieTei org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:94) org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:404) org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:319) org.apache.jasper.compiler.TagLibraryInfoImpl.createTagInfo(TagLibraryInfoImpl.java:453) org.apache.jasper.compiler.TagLibraryInfoImpl.parseTLD(TagLibraryInfoImpl.java:290) org.apache.jasper.compiler.TagLibraryInfoImpl.(TagLibraryInfoImpl.java:204) org.apache.jasper.compiler.Parser.parseTaglibDirective(Parser.java:458) org.apache.jasper.compiler.Parser.parseDirective(Parser.java:523) org.apache.jasper.compiler.Parser.parseElements(Parser.java:1577) org.apache.jasper.compiler.Parser.parse(Parser.java:171) org.apache.jasper.compiler.ParserController.parse(ParserController.java:247) org.apache.jasper.compiler.ParserController.parse(ParserController.java:149) org.apache.jasper.compiler.ParserController.parse(ParserController.java:135) org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:237) org.apache.jasper.compiler.Compiler.compile(Compiler.java:456) org.apache.jasper.compiler.Compiler.compile(Compiler.java:439) org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:552) org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:291) org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:301) org.apache.jasper.servlet.JspServlet.service(JspServlet.java:248) javax.servlet.http.HttpServlet.service(HttpServlet.java:856) root cause java.lang.ClassNotFoundException: org.apache.struts.taglib.bean.CookieTei org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1366) org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1213) org.apache.jasper.compiler.TagLibraryInfoImpl.createTagInfo(TagLibraryInfoImpl.java:450) org.apache.jasper.compiler.TagLibraryInfoImpl.parseTLD(TagLibraryInfoImpl.java:290) org.apache.jasper.compiler.TagLibraryInfoImpl.(TagLibraryInfoImpl.java:204) org.apache.jasper.compiler.Parser.parseTaglibDirective(Parser.java:458) org.apache.jasper.compiler.Parser.parseDirective(Parser.java:523) org.apache.jasper.compiler.Parser.parseElements(Parser.java:1577) org.apache.jasper.compiler.Parser.parse(Parser.java:171) org.apache.jasper.compiler.ParserController.parse(ParserController.java:247) org.apache.jasper.compiler.ParserController.parse(ParserController.java:149) org.apache.jasper.compiler.ParserController.parse(ParserController.java:135) org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:237) org.apache.jasper.compiler.Compiler.compile(Compiler.java:456) org.apache.jasper.compiler.Compiler.compile(Compiler.java:439) org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:552) org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:291) org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:301) org.apache.jasper.servlet.JspServlet.service(JspServlet.java:248) javax.servlet.http.HttpServlet.service(HttpServlet.java:856) somebody have a struts tutorial than help me to learn about java struts? i have jakarta-tomcat-5.0.16 and j2sdk1.4.1_06 thx for your colaborations Gabriel Oliveros _ Tired of spam? Get advanced junk mail protection with MSN 8. http://join.msn.com/?page=features/junkmail - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands,
DO NOT REPLY [Bug 26036] - Remove author tag and consolidate under volunteer.html
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 21:05 --- Fixed...thanks for the patch! - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 26036] - Remove author tag and consolidate under volunteer.html
I got an error email response from the apache mail server because the commit message was so large so I don't think struts-dev will receive notification. The patch and commit worked flawlessly though. David --- [EMAIL PROTECTED] wrote: DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 21:05 --- Fixed...thanks for the patch! - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 26036] - Remove author tag and consolidate under volunteer.html
That's probably just as well. Otherwise everyone would get like 385 commit messages.Glad to hear it went OK. Paul Sundling David Graham wrote: I got an error email response from the apache mail server because the commit message was so large so I don't think struts-dev will receive notification. The patch and commit worked flawlessly though. David --- [EMAIL PROTECTED] wrote: DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 21:05 --- Fixed...thanks for the patch! - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util ServletContextWriter.java TokenProcessor.java
dgraham 2004/01/10 13:19:57
Modified:src/share/org/apache/struts/util ServletContextWriter.java
TokenProcessor.java
Log:
Fixed Apache license.
Revision ChangesPath
1.4 +13 -17
jakarta-struts/src/share/org/apache/struts/util/ServletContextWriter.java
Index: ServletContextWriter.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/ServletContextWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServletContextWriter.java 10 Jan 2004 21:03:36 - 1.3
+++ ServletContextWriter.java 10 Jan 2004 21:19:57 - 1.4
@@ -4,10 +4,10 @@
* $Date$
*
*
- *
+ *
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
+ *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
@@ -23,20 +23,20 @@
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
- *any, must include the following acknowlegement:
- * This product includes software developed by the
+ *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
+ *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.
+ *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
@@ -57,17 +57,14 @@
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
- */
-
+ */
package org.apache.struts.util;
-
import java.io.PrintWriter;
import java.io.StringWriter;
import javax.servlet.ServletContext;
-
/**
* A PrintWriter implementation that uses the logging facilities of a
* codejavax.servlet.ServletContext/code to output its results. Output
@@ -77,7 +74,6 @@
*
* @version $Revision$ $Date$
*/
-
public class ServletContextWriter extends PrintWriter {
1.5 +7 -7
jakarta-struts/src/share/org/apache/struts/util/TokenProcessor.java
Index: TokenProcessor.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/TokenProcessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TokenProcessor.java 10 Jan 2004 21:03:36 - 1.4
+++ TokenProcessor.java 10 Jan 2004 21:19:57 - 1.5
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
- *any, must include the following acknowlegement:
+ *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,
@@ -35,8 +35,8 @@
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
- *nor may Apache appear in their
cvs commit: jakarta-struts/src/share/org/apache/struts/util WildcardHelper.java
dgraham 2004/01/10 13:20:48 Modified:src/share/org/apache/struts/util WildcardHelper.java Log: Fixed Apache license. Revision ChangesPath 1.3 +59 -56 jakarta-struts/src/share/org/apache/struts/util/WildcardHelper.java Index: WildcardHelper.java === RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/WildcardHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- WildcardHelper.java 10 Jan 2004 21:03:36 - 1.2 +++ WildcardHelper.java 10 Jan 2004 21:20:48 - 1.3 @@ -1,64 +1,67 @@ /* - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999-2001 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/). - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Struts, and Apache Software - * Foundation must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - * nor may Apache appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. + * $Header$ + * $Revision$ + * $Date$ + * + * + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2003-2004 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]
cvs commit: jakarta-struts/src/share/org/apache/struts/config ActionConfigMatcher.java
dgraham 2004/01/10 13:29:12
Modified:src/share/org/apache/struts/util WildcardHelper.java
src/share/org/apache/struts/config ActionConfigMatcher.java
Log:
Changed WildcardHelper methods from statics to instance methods to
allow subclasses to override and customize behavior. Changed
WildcardHelper.match() to accept a generic Map parameter rather than
HashMap.
Revision ChangesPath
1.4 +19 -16
jakarta-struts/src/share/org/apache/struts/util/WildcardHelper.java
Index: WildcardHelper.java
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/WildcardHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WildcardHelper.java 10 Jan 2004 21:20:48 - 1.3
+++ WildcardHelper.java 10 Jan 2004 21:29:12 - 1.4
@@ -61,25 +61,29 @@
package org.apache.struts.util;
-import java.util.HashMap;
+import java.util.Map;
/**
* This class is an utility class that perform wilcard-patterns matching and
* isolation taken from Apache Cocoon.
*
- * (Apache Software Foundation)
+ * @since Struts 1.2
* @version CVS $Id$
*/
public class WildcardHelper {
/** The int representing '*' in the pattern codeint []/code. */
protected static final int MATCH_FILE = -1;
+
/** The int representing '**' in the pattern codeint []/code. */
protected static final int MATCH_PATH = -2;
+
/** The int representing begin in the pattern codeint []/code. */
protected static final int MATCH_BEGIN = -4;
+
/** The int representing end in pattern codeint []/code. */
protected static final int MATCH_THEEND = -5;
+
/** The int value that terminates the pattern codeint []/code. */
protected static final int MATCH_END = -3;
@@ -117,8 +121,7 @@
* value (don't consider the array length).
* @exception NullPointerException If data is null.
*/
-public static int[] compilePattern(String data)
-throws NullPointerException {
+public int[] compilePattern(String data) {
// Prepare the arrays
int expr[] = new int[data.length() + 2];
@@ -182,8 +185,7 @@
* @return True if a match
* @throws NullPointerException If any parameters are null
*/
-public static boolean match (HashMap map, String data,
-int[] expr) throws NullPointerException {
+public boolean match(Map map, String data, int[] expr) {
if (map == null) {
throw new NullPointerException (No map provided);
}
@@ -315,7 +317,7 @@
}
}
-/**
+ /**
* Get the offset of a part of an int array within a char array.
* br
* This method return the index in d of the first occurrence after dpos of
@@ -330,8 +332,9 @@
* @return The offset in d of the part of r matched in d or -1 if that was
* not found.
*/
-protected static int indexOfArray (int r[], int rpos, int rend,
+protected int indexOfArray (int r[], int rpos, int rend,
char d[], int dpos) {
+
// Check if pos and len are legal
if (rend rpos) {
throw new IllegalArgumentException (rend rpos);
@@ -372,7 +375,7 @@
return (-1);
}
-/**
+ /**
* Get the offset of a last occurance of an int array within a char array.
* br
* This method return the index in d of the last occurrence after dpos of
@@ -387,7 +390,7 @@
* @return The offset in d of the last part of r matched in d or -1 if
* that was not found.
*/
-protected static int lastIndexOfArray (int r[], int rpos, int rend,
+protected int lastIndexOfArray (int r[], int rpos, int rend,
char d[], int dpos) {
// Check if pos and len are legal
if (rend rpos) {
@@ -432,7 +435,7 @@
return (-1);
}
-/**
+ /**
* Matches elements of array r from rpos to rend with array d, starting
* from dpos.
* br
@@ -446,7 +449,7 @@
* @param dpos The starting offset in d for the matching.
* @return true if array d starts from portion of array r.
*/
-protected static boolean matchArray (int r[], int rpos, int rend,
+protected boolean matchArray (int r[], int rpos, int rend,
char d[], int dpos) {
if (d.length - dpos rend - rpos) {
return (false);
1.7 +17 -12
jakarta-struts/src/share/org/apache/struts/config/ActionConfigMatcher.java
Index: ActionConfigMatcher.java
Re: DO NOT REPLY [Bug 26036] - Remove author tag and consolidate under volunteer.html
--- Paul Sundling [EMAIL PROTECTED] wrote: That's probably just as well. Otherwise everyone would get like 385 commit messages.Glad to hear it went OK. No, it's just one huge commit email because I committed all the changes at once. Thanks again for the patch. David Paul Sundling David Graham wrote: I got an error email response from the apache mail server because the commit message was so large so I don't think struts-dev will receive notification. The patch and commit worked flawlessly though. David --- [EMAIL PROTECTED] wrote: DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26036 Remove author tag and consolidate under volunteer.html [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 21:05 --- Fixed...thanks for the patch! - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: maven checkstyle report
1. License file check errors: There is a check to make sure all the source code begins with the license. This is generating errors because the copyrights don't all follow the same years as what it expects to find. It does lead me to question how the years in the copyrights are updated. This is now 2004 and I wonder if any files have 2004 in them for instance. There are at least two approachs to fix the checkstyle issue: Option 1 (easy way) we modify conf/qa/CheckStyle.xml and add 10 to ignoreLines (already has 2,3,4,5). I can submit a patch for that today if there is a go ahead. Option 2 we could make another copy of the license file with a regular expression for the years in the file. I'm leaning towards option 1 on this myself and it seems consistent with solutions that have been applied in the past. I agree, option 1 is much simpler. 2. Tab errors: It has an error for tabs in the files. Option 1 we remove the tabs check from checkStyle. Option 2 we replace tabs with spaces and do a quick visual check to see how everything lines up. Which approach to take here isn't as obvious. How important is it wether there are tabs or spaces? That's not really my call, but I'm willing to take care of it either way. This is the stuff religious wars are made of; it is true, though, things like diff work much better if indentation is done consistently, whichever character is used. I don't recall if there's an official preference in Struts, but I imagine someone will pipe in if it's important to them. If it turns into a big debate, better to disable the tabs check, because as you say, it'll improve the signal-to-noise ratio in the checkstyle reports. Joe -- Joe Germuska [EMAIL PROTECTED] http://blog.germuska.com We want beef in dessert if we can get it there. -- Betty Hogan, Director of New Product Development, National Cattlemen's Beef Association - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: maven checkstyle report
Actually, I was realizing that Option 2 is only a quick fix, not a solution and that eventually there will still be a bunch of tab errors. Realizing that we'll be accepting code from people who may or may not be using tabs, it's likely to be a persistant error... Some assistance could be provided by an ant target like this that I used to package my own code for a client who hated tabs: target name=notabs description=Replace tab with 4 spaces replaceregexp match=\t replace= flags=g fileset dir=web excludes=**/images/* / /replaceregexp /target Even that assumes a tab is always the same number of spaces, which is the whole issue with tabs in the first place. I personally like tabs, but not as much as I like consistency. :) Paul Joe Germuska wrote: 2. Tab errors: It has an error for tabs in the files. Option 1 we remove the tabs check from checkStyle. Option 2 we replace tabs with spaces and do a quick visual check to see how everything lines up. Which approach to take here isn't as obvious. How important is it wether there are tabs or spaces? That's not really my call, but I'm willing to take care of it either way. This is the stuff religious wars are made of; it is true, though, things like diff work much better if indentation is done consistently, whichever character is used. I don't recall if there's an official preference in Struts, but I imagine someone will pipe in if it's important to them. If it turns into a big debate, better to disable the tabs check, because as you say, it'll improve the signal-to-noise ratio in the checkstyle reports. Joe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: maven checkstyle report
--- Joe Germuska [EMAIL PROTECTED] wrote: 1. License file check errors: There is a check to make sure all the source code begins with the license. This is generating errors because the copyrights don't all follow the same years as what it expects to find. It does lead me to question how the years in the copyrights are updated. This is now 2004 and I wonder if any files have 2004 in them for instance. There are at least two approachs to fix the checkstyle issue: Option 1 (easy way) we modify conf/qa/CheckStyle.xml and add 10 to ignoreLines (already has 2,3,4,5). I can submit a patch for that today if there is a go ahead. Option 2 we could make another copy of the license file with a regular expression for the years in the file. I'm leaning towards option 1 on this myself and it seems consistent with solutions that have been applied in the past. I agree, option 1 is much simpler. 2. Tab errors: It has an error for tabs in the files. Option 1 we remove the tabs check from checkStyle. Option 2 we replace tabs with spaces and do a quick visual check to see how everything lines up. Which approach to take here isn't as obvious. How important is it wether there are tabs or spaces? That's not really my call, but I'm willing to take care of it either way. This is the stuff religious wars are made of; it is true, though, things like diff work much better if indentation is done consistently, whichever character is used. I don't recall if there's an official preference in Struts, but I imagine someone will pipe in if it's important to them. If it turns into a big debate, better to disable the tabs check, because as you say, it'll improve the signal-to-noise ratio in the checkstyle reports. We need to keep the tab check because we only use spaces in Struts code. David Joe -- Joe Germuska [EMAIL PROTECTED] http://blog.germuska.com We want beef in dessert if we can get it there. -- Betty Hogan, Director of New Product Development, National Cattlemen's Beef Association - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - 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]
Maven status
We have duplicate documentation files in the maven xdocs directory and in the usual docs directory. I updated the docs version of volunteers.xml today and am not looking forward to updating the xdocs version of the same file. What is the status of the Maven build and when are we completely switching? Are we even updating the Maven files? Maintaining two versions of the documentation is a pain and will lead to one of the versions becoming outdated. David __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Maven status
The Maven xdocs are not supposed to be maintained (yet). I only copied them there originally to experiment with the Maven build process. When we're happy with the Maven build, the documentation will be automatically converted so there is no need to maintain both. Steve -Original Message- From: David Graham [mailto:[EMAIL PROTECTED] Sent: January 10, 2004 3:52 PM To: [EMAIL PROTECTED] Subject: Maven status We have duplicate documentation files in the maven xdocs directory and in the usual docs directory. I updated the docs version of volunteers.xml today and am not looking forward to updating the xdocs version of the same file. What is the status of the Maven build and when are we completely switching? Are we even updating the Maven files? Maintaining two versions of the documentation is a pain and will lead to one of the versions becoming outdated. David __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: maven checkstyle report
- Original Message -
From: Paul Sundling [EMAIL PROTECTED]
To: Struts Developers List [EMAIL PROTECTED]
Sent: Sunday, 11 January, 2004 04:27
Subject: Re: maven checkstyle report
Actually, I was realizing that Option 2 is only a quick fix, not a
solution and that eventually there will still be a bunch of tab errors.
Realizing that we'll be accepting code from people who may or may not be
using tabs, it's likely to be a persistant error... Some assistance
could be provided by an ant target like this that I used to package my
own code for a client who hated tabs:
target name=notabs description=Replace tab with 4 spaces
replaceregexp match=\t
replace=
flags=g
fileset dir=web excludes=**/images/* /
/replaceregexp
/target
Even that assumes a tab is always the same number of spaces, which is
the whole issue with tabs in the first place.
You could also use the Ant task fixcrlf/
For example (assuming Struts convention of '4 whitespaces per tab'), we
could have
fixcrlf
srcdir=${src.java.dir}
tab=remove
tablength=4/
- Indrajit
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
