commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/digester/src/examples/api/catalog AudioVisual.java Book.java BookFactory.java Catalog.java CatalogDigester.java Item.java
Date Sun, 05 Oct 2003 15:21:36 GMT
rdonkin     2003/10/05 08:21:36

  Modified:    digester/src/examples/api/catalog AudioVisual.java Book.java
                        BookFactory.java Catalog.java CatalogDigester.java
                        Item.java
  Log:
  Corrected licenses to match jakarta-commons standard.
  
  Revision  Changes    Path
  1.2       +58 -58    jakarta-commons/digester/src/examples/api/catalog/AudioVisual.java
  
  Index: AudioVisual.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/AudioVisual.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AudioVisual.java	25 Sep 2003 20:04:13 -0000	1.1
  +++ AudioVisual.java	5 Oct 2003 15:21:36 -0000	1.2
  @@ -1,63 +1,63 @@
   /*
  - *  $Header$
  - *  $Revision$
  - *  $Date$
  - *
  - *  ====================================================================
  - *
  - *  The Apache Software License, Version 1.1
  - *
  - *  Copyright (c) 1999-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 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", "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 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) 2001-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 apache@apache.org.
  + *
  + * 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/>.
    *
  - */
  + */ 
    
   /**
    *  See CatalogDigester.java.
  
  
  
  1.2       +15 -15    jakarta-commons/digester/src/examples/api/catalog/Book.java
  
  Index: Book.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/Book.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Book.java	25 Sep 2003 20:04:37 -0000	1.1
  +++ Book.java	5 Oct 2003 15:21:36 -0000	1.2
  @@ -4,10 +4,10 @@
    * $Date$
    *
    * ====================================================================
  - *
  + * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 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
  @@ -15,28 +15,28 @@
    * 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. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  + * 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", "Commons", and "Apache Software
  + * 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
  + *    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 Group.
  + * 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
  @@ -57,7 +57,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - */
  + */ 
   
   /**
    * See CatalogDigester.java.
  
  
  
  1.2       +15 -15    jakarta-commons/digester/src/examples/api/catalog/BookFactory.java
  
  Index: BookFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/BookFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BookFactory.java	25 Sep 2003 20:04:55 -0000	1.1
  +++ BookFactory.java	5 Oct 2003 15:21:36 -0000	1.2
  @@ -4,10 +4,10 @@
    * $Date$
    *
    * ====================================================================
  - *
  + * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 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
  @@ -15,28 +15,28 @@
    * 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. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  + * 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", "Commons", and "Apache Software
  + * 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
  + *    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 Group.
  + * 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
  @@ -57,7 +57,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - */
  + */ 
   
   import org.apache.commons.digester.AbstractObjectCreationFactory;
   
  
  
  
  1.2       +15 -15    jakarta-commons/digester/src/examples/api/catalog/Catalog.java
  
  Index: Catalog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/Catalog.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Catalog.java	25 Sep 2003 20:05:20 -0000	1.1
  +++ Catalog.java	5 Oct 2003 15:21:36 -0000	1.2
  @@ -4,10 +4,10 @@
    * $Date$
    *
    * ====================================================================
  - *
  + * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 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
  @@ -15,28 +15,28 @@
    * 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. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  + * 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", "Commons", and "Apache Software
  + * 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
  + *    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 Group.
  + * 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
  @@ -57,7 +57,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - */
  + */ 
   
   import java.util.LinkedList;
   import java.util.Iterator;
  
  
  
  1.2       +15 -15    jakarta-commons/digester/src/examples/api/catalog/CatalogDigester.java
  
  Index: CatalogDigester.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/CatalogDigester.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CatalogDigester.java	25 Sep 2003 20:05:47 -0000	1.1
  +++ CatalogDigester.java	5 Oct 2003 15:21:36 -0000	1.2
  @@ -4,10 +4,10 @@
    * $Date$
    *
    * ====================================================================
  - *
  + * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 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
  @@ -15,28 +15,28 @@
    * 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. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  + * 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", "Commons", and "Apache Software
  + * 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
  + *    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 Group.
  + * 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
  @@ -57,7 +57,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - */
  + */ 
   
   import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.AbstractObjectCreationFactory;
  
  
  
  1.2       +15 -15    jakarta-commons/digester/src/examples/api/catalog/Item.java
  
  Index: Item.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/examples/api/catalog/Item.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Item.java	25 Sep 2003 20:06:05 -0000	1.1
  +++ Item.java	5 Oct 2003 15:21:36 -0000	1.2
  @@ -4,10 +4,10 @@
    * $Date$
    *
    * ====================================================================
  - *
  + * 
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 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
  @@ -15,28 +15,28 @@
    * 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. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  + * 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", "Commons", and "Apache Software
  + * 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
  + *    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 Group.
  + * 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
  @@ -57,7 +57,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - */
  + */ 
   
   /**
    * See CatalogDigester.java.
  
  
  

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


Mime
View raw message