You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2005/01/04 23:14:42 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util CharsetMapper.java

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 <jh...@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
  - * <jh...@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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util CharsetMapper.java

Posted by Remy Maucherat <re...@apache.org>.
Costin Manolache wrote:
> Remy Maucherat wrote:
> 
> There is no "advertising clause" in this. He made it clear that the code 
> is donated to ASF, under ASF license. Mentioning that the author 
> developed the code while working on a book or while being paid by a 
> company can't be that bad.
> 
> I don't understand why ASF is so advertising-fobic when it comes to 
> authors or companies that donate code or employee time to ASF, but until 
> recently strictly required advertisment for the code owner ( ASF ) not 
> only in the code, but also on the web site.

I suppose you're not the one getting the cellphone calls while on 
vacation about lawyers from large companies being very unhappy about 
this comment, which is anything but clear.

The ASF also doesn't do advertisements. This comment was an advertisment.

That's the end of the discussion as far as I am concerned.

Rémy

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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util CharsetMapper.java

Posted by Costin Manolache <cm...@yahoo.com>.
Remy Maucherat wrote:
> Costin Manolache wrote:
> 
>> 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...
> 
> 
> I am all in favor of giving proper attribution (author tags), but -1 on 
> anything which restricts the ASF's copyright on the code (like 
> advertising clauses in this case).
> 
> As a result, I have to agree with all that pointed out that the code 
> should be rewritten (in this case, the encoding list must be 
> reconstructed from scratch).
> 
> Rémy

There is no "advertising clause" in this. He made it clear that the code 
is donated to ASF, under ASF license. Mentioning that the author 
developed the code while working on a book or while being paid by a 
company can't be that bad.

I don't understand why ASF is so advertising-fobic when it comes to 
authors or companies that donate code or employee time to ASF, but until 
recently strictly required advertisment for the code owner ( ASF ) not 
only in the code, but also on the web site.



Costin




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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util CharsetMapper.java

Posted by Remy Maucherat <re...@apache.org>.
Costin Manolache wrote:
> 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...

I am all in favor of giving proper attribution (author tags), but -1 on 
anything which restricts the ASF's copyright on the code (like 
advertising clauses in this case).

As a result, I have to agree with all that pointed out that the code 
should be rewritten (in this case, the encoding list must be 
reconstructed from scratch).

Rémy

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


Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util CharsetMapper.java

Posted by Costin Manolache <cm...@yahoo.com>.
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 <jh...@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
>   - * <jh...@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