Return-Path: Delivered-To: apmail-jakarta-ecs-dev-archive@apache.org Received: (qmail 92861 invoked from network); 27 Apr 2003 09:44:42 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 27 Apr 2003 09:44:42 -0000 Received: (qmail 14196 invoked by uid 97); 27 Apr 2003 09:46:53 -0000 Delivered-To: qmlist-jakarta-archive-ecs-dev@nagoya.betaversion.org Received: (qmail 14189 invoked from network); 27 Apr 2003 09:46:53 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 27 Apr 2003 09:46:53 -0000 Received: (qmail 92735 invoked by uid 500); 27 Apr 2003 09:44:40 -0000 Mailing-List: contact ecs-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "ECS Developers List" Reply-To: "ECS Developers List" Delivered-To: mailing list ecs-dev@jakarta.apache.org Received: (qmail 92724 invoked by uid 500); 27 Apr 2003 09:44:40 -0000 Received: (qmail 92721 invoked from network); 27 Apr 2003 09:44:40 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 27 Apr 2003 09:44:40 -0000 Received: (qmail 72876 invoked by uid 1289); 27 Apr 2003 09:44:39 -0000 Date: 27 Apr 2003 09:44:39 -0000 Message-ID: <20030427094439.72875.qmail@icarus.apache.org> From: rdonkin@apache.org To: jakarta-ecs-cvs@apache.org Subject: cvs commit: jakarta-ecs/src/java/org/apache/ecs AlignType.java Attributes.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N rdonkin 2003/04/27 02:44:39 Modified: src/java/org/apache/ecs AlignType.java Attributes.java Log: Updated license to ASL 1.1. Revision Changes Path 1.2 +40 -35 jakarta-ecs/src/java/org/apache/ecs/AlignType.java Index: AlignType.java =================================================================== RCS file: /home/cvs/jakarta-ecs/src/java/org/apache/ecs/AlignType.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AlignType.java 22 Jun 1999 02:15:10 -0000 1.1 +++ AlignType.java 27 Apr 2003 09:44:39 -0000 1.2 @@ -1,53 +1,58 @@ /* - * Copyright (c) 1999 The Java Apache Project. All rights reserved. + * ==================================================================== + * + * 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. + * 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. " - * - * 4. The names "Java Apache Element Construction Set", "Java Apache ECS" 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 - * "Java Apache Element Construction Set" nor "Java Apache ECS" 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. " - * - * 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 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", "Jakarta Element Construction Set", + * "Jakarta ECS" , 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", + * "Jakarta Element Construction Set" nor "Jakarta ECS" 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. + * 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 Project. For more information - * on the Java Apache Project please see . + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . * */ package org.apache.ecs; 1.5 +40 -35 jakarta-ecs/src/java/org/apache/ecs/Attributes.java Index: Attributes.java =================================================================== RCS file: /home/cvs/jakarta-ecs/src/java/org/apache/ecs/Attributes.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Attributes.java 10 Apr 2000 17:46:56 -0000 1.4 +++ Attributes.java 27 Apr 2003 09:44:39 -0000 1.5 @@ -1,53 +1,58 @@ /* - * Copyright (c) 1999 The Java Apache Project. All rights reserved. + * ==================================================================== + * + * 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. + * 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. " - * - * 4. The names "Java Apache Element Construction Set", "Java Apache ECS" 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 - * "Java Apache Element Construction Set" nor "Java Apache ECS" 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. " - * - * 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 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", "Jakarta Element Construction Set", + * "Jakarta ECS" , 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", + * "Jakarta Element Construction Set" nor "Jakarta ECS" 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. + * 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 Project. For more information - * on the Java Apache Project please see . + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . * */ package org.apache.ecs; --------------------------------------------------------------------- To unsubscribe, e-mail: ecs-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: ecs-dev-help@jakarta.apache.org