tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Costin Manolache <cmanola...@yahoo.com>
Subject Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util CharsetMapper.java
Date Wed, 05 Jan 2005 04:08:23 GMT
Maybe:

* @author Jason Hunter, as part of the book "Java Servlet Programming"
* (O'Reilly). See <a href="http://www.servlets.com/book">
* http://www.servlets.com/book</a> for more information.

?

I think it is fair to respect the author wish for attribution.

Given that the board recomends against @author tags and they may be 
someday removed, it doesn't matter that much...

Costin

remm@apache.org wrote:
> remm        2005/01/04 14:14:42
> 
>   Modified:    util/java/org/apache/tomcat/util/http
>                         LocaleToCharsetMap.java
>                catalina/src/share/org/apache/catalina/util
>                         CharsetMapper.java
>   Log:
>   - Remove legally questionable comment. The code was properly donated to the ASF.
>   
>   Revision  Changes    Path
>   1.3       +2 -14     jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/LocaleToCharsetMap.java
>   
>   Index: LocaleToCharsetMap.java
>   ===================================================================
>   RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/LocaleToCharsetMap.java,v
>   retrieving revision 1.2
>   retrieving revision 1.3
>   diff -u -r1.2 -r1.3
>   --- LocaleToCharsetMap.java	24 Feb 2004 08:50:04 -0000	1.2
>   +++ LocaleToCharsetMap.java	4 Jan 2005 22:14:42 -0000	1.3
>   @@ -14,15 +14,6 @@
>     *  limitations under the License.
>     */
>    
>   -/*
>   - *
>   - * This class was originally written by Jason Hunter <jhunter@acm.org>
>   - * as part of the book "Java Servlet Programming" (O'Reilly).  
>   - * See http://www.servlets.com/book for more information.
>   - * Used by Sun Microsystems with permission.
>   - *
>   - */
>   -
>    package org.apache.tomcat.util.http;
>    
>    import java.util.*;
>   @@ -30,11 +21,8 @@
>    /** 
>     * A mapping to determine the (somewhat arbitrarily) preferred charset for 
>     * a given locale.  Supports all locales recognized in JDK 1.1.
>   - * This class was originally written by Jason Hunter [jhunter@acm.org]
>   - * as part of the book "Java Servlet Programming" (O'Reilly).
>   - * See <a href="http://www.servlets.com/book">
>   - * http://www.servlets.com/book</a> for more information.
>   - * Used by Sun Microsystems with permission.
>   + * 
>   + * @author Jason Hunter
>     */
>    public class LocaleToCharsetMap {
>    
>   
>   
>   
>   1.5       +2 -8      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CharsetMapper.java
>   
>   Index: CharsetMapper.java
>   ===================================================================
>   RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CharsetMapper.java,v
>   retrieving revision 1.4
>   retrieving revision 1.5
>   diff -u -r1.4 -r1.5
>   --- CharsetMapper.java	29 Aug 2004 16:46:13 -0000	1.4
>   +++ CharsetMapper.java	4 Jan 2005 22:14:42 -0000	1.5
>   @@ -14,13 +14,6 @@
>     * limitations under the License.
>     */
>    
>   -/*
>   - * This class is based on a class originally written by Jason Hunter
>   - * <jhunter@acm.org> as part of the book "Java Servlet Programming"
>   - * (O'Reilly).  See http://www.servlets.com/book for more information.
>   - * Used by Sun Microsystems with permission.
>   - */
>   -
>    package org.apache.catalina.util;
>    
>    
>   @@ -38,6 +31,7 @@
>     * it loads, or by subclassing it (to change the algorithm) and then using
>     * your own version for a particular web application.
>     *
>   + * @author Jason Hunter
>     * @author Craig R. McClanahan
>     * @version $Date$ $Version$
>     */


---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message