The attached patch to commons-http makes the constants defined in BrowserDetector public and updates the licenses in all three classes.
I thought I would be able to commit these myself, but it seems that sandbox karma is not quite as automatic as is suggested on the commons home page.
Cheers,
Scott -- Scott Eade Backstage Technologies Pty. Ltd. http://www.backstagetech.com.au
Index: BrowserDetector.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/http/src/java/org/apache/commons/http/BrowserDetector.java,v retrieving revision 1.1 diff -u -r1.1 BrowserDetector.java --- BrowserDetector.java 22 Feb 2002 18:14:31 -0000 1.1 +++ BrowserDetector.java 20 Aug 2003 03:19:10 -0000 @@ -3,7 +3,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,7 +11,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 @@ -19,20 +19,20 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the + * if any, must include the following acknowledgement: + * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Turbine" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact [EMAIL PROTECTED] + * 4. The names "Apache", "The Jakarta Project", "Commons", 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", - * "Apache Turbine", nor may "Apache" appear in their name, without - * prior written permission of the Apache Software Foundation. + * "Apache" nor may "Apache" appear in their names 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 @@ -53,7 +53,7 @@ * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ - + /** * This class parses the user agent string and sets javasciptOK and * cssOK following the rules described below. If you want to check @@ -82,13 +82,13 @@ */ public class BrowserDetector { - protected static final String MSIE = "MSIE"; - protected static final String OPERA = "Opera"; - protected static final String MOZILLA = "Mozilla"; + public static final String MSIE = "MSIE"; + public static final String OPERA = "Opera"; + public static final String MOZILLA = "Mozilla"; - protected static final String WINDOWS = "Windows"; - protected static final String UNIX = "Unix"; - protected static final String MACINTOSH = "Macintosh"; + public static final String WINDOWS = "Windows"; + public static final String UNIX = "Unix"; + public static final String MACINTOSH = "Macintosh"; /** The user agent string. */ private String userAgentString = ""; Index: HttpHeaderTokenizer.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/http/src/java/org/apache/commons/http/HttpHeaderTokenizer.java,v retrieving revision 1.2 diff -u -r1.2 HttpHeaderTokenizer.java --- HttpHeaderTokenizer.java 11 Apr 2003 21:16:04 -0000 1.2 +++ HttpHeaderTokenizer.java 20 Aug 2003 03:19:11 -0000 @@ -1,9 +1,59 @@ package org.apache.commons.http; -/* - * Copyright (c) 2003 The Apache Jakarta Project. All rights reserved. +/* ==================================================================== + * 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 "Apache", "The Jakarta Project", "Commons", 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", + * "Apache" nor may "Apache" appear in their names 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/>. */ - + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; Index: HttpUtils.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/http/src/java/org/apache/commons/http/HttpUtils.java,v retrieving revision 1.1 diff -u -r1.1 HttpUtils.java --- HttpUtils.java 22 Feb 2002 18:14:31 -0000 1.1 +++ HttpUtils.java 20 Aug 2003 03:19:11 -0000 @@ -1,61 +1,59 @@ package org.apache.commons.http; -/* - * Copyright (c) 1997-2000 The Java Apache Project. All rights reserved. +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1997-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. + * 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. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the Java Apache - * Project for use in the Apache JServ servlet engine project - * <http://java.apache.org/>." - * - * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine", - * "Apache Turbine", "Turbine Project", "Apache Turbine Project" and - * "Java Apache Project" must not be used to endorse or promote products - * derived from this software without prior written permission. - * - * 5. Products derived from this software may not be called "Apache JServ" - * nor may "Apache" nor "Apache JServ" appear in their names without - * prior written permission of the Java Apache Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the Java Apache - * Project for use in the Apache JServ servlet engine project - * <http://java.apache.org/>." - * - * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 JAVA APACHE PROJECT OR + * 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 "Apache", "The Jakarta Project", "Commons", 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", + * "Apache" nor may "Apache" appear in their names 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. + * 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 Java Apache Group. For more information - * on the Java Apache Project and the Apache JServ Servlet Engine project, - * please see <http://java.apache.org/>. - * + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. */ - + import java.text.SimpleDateFormat; import java.util.Date;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
