From 644fcb88d354efce36ad91898661983a3696888a Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Tue, 3 Feb 2004 22:34:44 +0000 Subject: [PATCH] Switch to Apache Licence 2.0 git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137770 13f79535-47bb-0310-9956-ffa450edef68 --- .../lang/util/IdentifierUtilsTest.java | 63 ++++--------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/src/test/org/apache/commons/lang/util/IdentifierUtilsTest.java b/src/test/org/apache/commons/lang/util/IdentifierUtilsTest.java index bcf436e8e..34d87207e 100644 --- a/src/test/org/apache/commons/lang/util/IdentifierUtilsTest.java +++ b/src/test/org/apache/commons/lang/util/IdentifierUtilsTest.java @@ -1,55 +1,17 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 +/* + * Copyright 2002-2004 The Apache Software Foundation * - * Copyright (c) 2002 The Apache Software Foundation. All rights - * reserved. + * 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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 acknowledgement may appear in the software itself, - * if and wherever such third-party acknowledgements normally appear. - * - * 4. The names "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 apache@apache.org. - * - * 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 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 - * . + * 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.commons.lang.util; @@ -63,8 +25,9 @@ /** * Tests the org.apache.commons.lang.util.IdentifierUtils class. * + * @deprecated WILL BE REMOVED SOON * @author Stephen Colebourne - * @version $Id: IdentifierUtilsTest.java,v 1.4 2003/08/18 02:22:28 bayard Exp $ + * @version $Id: IdentifierUtilsTest.java,v 1.5 2004/02/03 22:34:44 scolebourne Exp $ */ public class IdentifierUtilsTest extends junit.framework.TestCase {