You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2008/02/04 05:02:32 UTC

svn commit: r618164 [3/7] - in /geronimo/server/branches/2.1: ./ assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/underlay/ assemblies/geronimo-framework/ assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-...

Modified: geronimo/server/branches/2.1/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/NOTICE.txt?rev=618164&r1=618163&r2=618164&view=diff
==============================================================================
--- geronimo/server/branches/2.1/NOTICE.txt (original)
+++ geronimo/server/branches/2.1/NOTICE.txt Sun Feb  3 20:02:05 2008
@@ -4,7 +4,7 @@
 =========================================================================
 
 Apache Geronimo 
-Copyright 2003-2007 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
@@ -55,57 +55,62 @@
 Software Foundation, please see <http://www.apache.org/>.
 
 =========================================================================
-==  ANTLR Notice                                                       ==
+==  Apache ActiveMQ Notice                                             ==
 =========================================================================
 
-This product includes software developed by the ANTLR project
+Copyright 2005-2007 The Apache Software Foundation
 
-ANTLR 1989-2003 Developed by jGuru.com, 
-http://www.ANTLR.org  and http://www.jGuru.com
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
 
 
 =========================================================================
-==  Apache ActiveMQ Notice                                             ==
+==  Apache Ant Notice                                                  ==
 =========================================================================
 
-Copyright 2005-2007 The Apache Software Foundation
+Apache Ant
+Copyright 1999-2006 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes also software developed by :
+  - the W3C consortium (http://www.w3c.org) ,
+  - the SAX project (http://www.saxproject.org)
+
+The <sync> task is based on code Copyright (c) 2002, Landmark
+Graphics Corp that has been kindly donated to the Apache Software
+Foundation.
+
 
 =========================================================================
-==  Apache Commons BeanUtils Notice                                    ==
+==  Apache Axiom Notice                                                ==
 =========================================================================
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 Portions Copyright 2006 International Business Machines Corp.
 
+
 =========================================================================
-==  Apache Commons BeanUtils                                           ==
+==  Apache Commons BeanUtils Notice                                    ==
 =========================================================================
 
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/).
-
-Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
-reserved.
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+Portions Copyright 2006 International Business Machines Corp.
 
 
 =========================================================================
-==  Apache Commons CLI Notice                                          ==
+==  Apache Commons BeanUtils                                           ==
 =========================================================================
 
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/).
-
-Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
+Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
 reserved.
 
 
 =========================================================================
-==  Apache Commons Discovery Notice (included by xercesImpl)           ==
+==  Apache Commons CLI Notice                                          ==
 =========================================================================
 
 This product includes software developed by the Apache Software
@@ -127,7 +132,7 @@
 
 
 =========================================================================
-==  Apache Commons Resolver (included by xercesImpl)                   ==
+==  Apache Commons XML Resolver                                        ==
 =========================================================================
 
 This product includes software developed by the Apache Software
@@ -147,122 +152,98 @@
 This product includes software developed at
 Apache Software Foundation (http://www.apache.org/).
 
-This product includes/uses software, Web Services Metadata 2.0
-(http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec),
-developed by Apache Software Foundation (http://www.apache.org)
-License: The Apache Software License, Version 2.0
-(http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, AOP alliance
-(http://aopalliance.sourceforge.net) License: Public Domain
-
-This product includes/uses software, Apache CXF Common Schemas
-(http://cwiki.apache.org/CXF/cxf-common-schemas), developed by Apache
-Software Foundation (http://www.apache.org/) License: The Apache
-Software License, Version 2.0
-(http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Logging
-(http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/),
-developed by The Apache Software Foundation
-(http://jakarta.apache.org) License: The Apache Software License,
-Version 2.0 (/LICENSE.txt)
-
-This product includes/uses software, Sun JAXB Reference Implementation
-Runtime, developed by Sun Microsystems (http://www.sun.com/) License:
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-(http://www.sun.com/cddl/cddl.html)
-
-This product includes/uses software, Activation 1.1
-(http://geronimo.apache.org/specs/geronimo-activation_1.1_spec),
-developed by Apache Software Foundation (http://www.apache.org)
-License: The Apache Software License, Version 2.0
-(http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Woodstox
-(http://woodstox.codehaus.org), developed by Codehaus
-(http://www.codehaus.org/) License: The Apache Software License,
-Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Spring Framework: Core
-(http://www.springframework.org), developed by Spring Framework
-(http://www.springframework.org/) License: The Apache Software
-License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Apache CXF API
-(http://cwiki.apache.org/CXF), developed by Apache Software Foundation
-(http://www.apache.org/) License: The Apache Software License, Version
-2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, StAX API
-(http://stax.codehaus.org/) License: The Apache Software License,
-Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, JavaMail 1.4
-(http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec),
-developed by Apache Software Foundation (http://www.apache.org)
-License: The Apache Software License, Version 2.0
-(http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, WSDL4J
-(http://sf.net/projects/wsdl4j) License: CPL
-(http://www.opensource.org/licenses/cpl1.0.txt)
-
-This product includes/uses software, Neethi
-(http://ws.apache.org/commons/neethi/), developed by Apache Software
-Foundation (http://www.apache.org/) License: The Apache Software
-License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Java Architecture for XML Binding
-(JAXB API), developed by Sun Microsystems (http://www.sun.com/)
-License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version
-1.0 (http://www.sun.com/cddl/cddl.html)
-
-This product includes/uses software, XmlSchema
-(http://ws.apache.org/commons/XmlSchema), developed by Apache Software
-Foundation (http://www.apache.org/) License: The Apache Software
-License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, XML Commons Resolver Component
-(http://xml.apache.org/commons/components/resolver/), developed by
-Apache Software Foundation (http://www.apache.org/) License: The
-Apache Software License, Version 2.0
-(http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Apache CXF Common Utilities
-(http://cwiki.apache.org/CXF), developed by Apache Software Foundation
-(http://www.apache.org/) License: The Apache Software License, Version
-2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Spring Framework: Beans
-(http://www.springframework.org), developed by Spring Framework
-(http://www.springframework.org/) License: The Apache Software
-License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Annotation 1.0
-(http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec),
-developed by Apache Software Foundation (http://www.apache.org)
-License: The Apache Software License, Version 2.0
-(http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-This product includes/uses software, Spring Framework: Context
-(http://www.springframework.org), developed by Spring Framework
-(http://www.springframework.org/) License: The Apache Software
-License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes/uses software, Web Services Metadata 2.0 (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec),
+developed by Apache Software Foundation  (http://www.apache.org)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
+License: Public Domain 
+
+This product includes/uses software, Logging (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/),
+developed by The Apache Software Foundation  (http://jakarta.apache.org)
+License: The Apache Software License, Version 2.0  (/LICENSE.txt)
+
+This product includes/uses software, Woodstox (http://woodstox.codehaus.org),
+developed by Codehaus  (http://www.codehaus.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Activation 1.1 (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec),
+developed by Apache Software Foundation  (http://www.apache.org)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Spring Framework: Core (http://www.springframework.org),
+developed by Spring Framework  (http://www.springframework.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Lang (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/),
+developed by The Apache Software Foundation  (http://jakarta.apache.org)
+License: The Apache Software License, Version 2.0  (/LICENSE.txt)
+
+This product includes/uses software, StAX API (http://stax.codehaus.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, WSDL4J (http://sf.net/projects/wsdl4j)
+License: CPL  (http://www.opensource.org/licenses/cpl1.0.txt)
+
+This product includes/uses software, Neethi,
+developed by The Apache Software Foundation  (http://www.apache.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Java Architecture for XML Binding (JAXB API),
+developed by Sun Microsystems  (http://www.sun.com/)
+License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0  (http://www.sun.com/cddl/cddl.html)
+
+This product includes/uses software, XmlSchema (http://ws.apache.org/commons/XmlSchema),
+developed by Apache Software Foundation  (http://www.apache.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, XML Commons Resolver Component (http://xml.apache.org/commons/components/resolver/),
+developed by Apache Software Foundation  (http://www.apache.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Apache CXF Common Utilities (http://cwiki.apache.org/CXF),
+developed by Apache Software Foundation  (http://www.apache.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Spring Framework: Beans (http://www.springframework.org),
+developed by Spring Framework  (http://www.springframework.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Annotation 1.0 (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec),
+developed by Apache Software Foundation  (http://www.apache.org)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Apache CXF Common Schemas (http://cwiki.apache.org/CXF/cxf-common-schemas),
+developed by Apache Software Foundation  (http://www.apache.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes/uses software, Spring Framework: Context (http://www.springframework.org),
+developed by Spring Framework  (http://www.springframework.org/)
+License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 
 =========================================================================
 ==  Apache Derby Notice                                                ==
 =========================================================================
 
+Apache Derby
+Copyright 2004-2006 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-Portions of Derby were orginally developed by
+Portions of Derby were originally developed by
 International Business Machines Corporation and are
 licensed to the Apache Software Foundation under the
 "Software Grant and Corporate Contribution License Agreement",
 informally known as the "Derby CLA".
+The following copyright notice(s) were affixed to portions of the code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+(C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
+
+(C) Copyright IBM Corp. 2003. 
 
 The portion of the functionTests under 'nist' was originally 
 developed by the National Institute of Standards and Technology (NIST), 
@@ -273,41 +254,35 @@
 
 
 =========================================================================
-==  Apache Jakarta ORO Notice                                          ==
+==  Apache Geronimo Gshell Notice                                      ==
 =========================================================================
 
-This product includes software developed by the Apache Software 
-Foundation (http://www.apache.org/).
-
-Copyright (c) 2000-2002 The Apache Software Foundation.  All rights 
-reserved.
+Apache Geronimo
+Copyright 2007 The Apache Software Foundation
 
 
 =========================================================================
-==  Apache Jakarta Regexp Notice                                       ==
+==  Apache MyFaces Notice                                              ==
 =========================================================================
 
-This product includes software developed by the Apache Software 
-Foundation (http://www.apache.org/).
-
-Copyright (c) 1999-2002 The Apache Software Foundation.  All rights 
-reserved.
+This software includes Sun's web-facesconfig.dtd files 
+(see http://java.sun.com/dtd/).
 
 
 =========================================================================
-==  Apache MyFaces Notice                                              ==
+==  Apache OpenEJB Notice                                              ==
 =========================================================================
 
-This software includes Sun's web-facesconfig.dtd files 
-(see http://java.sun.com/dtd/).
+Apache OpenEJB
+Copyright 1999-2008 The Apache OpenEJB development community
 
 
 =========================================================================
 ==  Apache OpenJPA Notice                                              ==
 =========================================================================
 
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
 
 COPYRIGHT NOTICES
 
@@ -349,62 +324,51 @@
 
 
 =========================================================================
+==  Apache XmlBeans Notice                                             ==
+=========================================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were originally based on the following:
+  - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+
+Aside from contributions to the Apache XMLBeans project, this
+software also includes:
+
+ - one or more source files from the Apache Xerces-J and Apache Axis
+   products, Copyright (c) 1999-2003 Apache Software Foundation
+
+ - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+   Consortium (Massachusetts Institute of Technology, European Research
+   Consortium for Informatics and Mathematics, Keio University)
+
+ - resolver.jar from Apache Xml Commons project,
+   Copyright (c) 2001-2003 Apache Software Foundation
+
+ - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
+   Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0
+
+ - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/,
+   Copyright 2005 BEA under the terms of the Apache Software License 2.0
+
+
+=========================================================================
 ==  Apache Yoko Notice                                                 ==
 =========================================================================
 
-   Apache Yoko Project
-   Copyright 1999-2006 The Apache Software Foundation
+Apache Yoko Project
+Copyright 1999-2006 The Apache Software Foundation
 
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
 
-   ORB Portions of this software were developed at IONA Technologies.
+ORB Portions of this software were developed at IONA Technologies.
    
-   Object Management Group (OMG) classes used by the orb.
-   The original classes are available from www.org.omg.
-
-   The RMI over IIOP implementation were developed at Trifork Technologies.
+Object Management Group (OMG) classes used by the orb.
+The original classes are available from www.org.omg.
 
-   Command line tools and the corba binding infrastructure is provided by 
-   the celtix package, which is open source software, written at ObjectWeb 
-   open source Consortium. The original software is available from
-       http://forge.objectweb.org/project/showfiles.php?group_id=192
-    
-   IDL parser and the IDL grammar file used by the idltowsdl tool 
-   are provided by the antlr package, which is available under a BSD license.
-   The original software is available from
-       http://www.antlr.org/download.html
-
-   XMLSchema apache project is used by the tools & corba binding 
-   runtime to parse the schema used in the wsdl. This project is 
-   developed at the apache software foundation.
-   The original software is available from
-       http://www.apache.org/dyn/closer.cgi/ws/commons/XmlSchema
-
-   Wsdl4j (The Web Services Description Language for Java Toolkit) 
-   is the reference implementation for JSR110 'JWSDL'. It is open
-   source software and developed at Sourceforge. It is used by the 
-   tools to represent the WSDL documents. The original software is
-   available from 
-       http://sourceforge.net/projects/wsdl4j
-
-   SAAJ The SOAP with Attachments API for Java (SAAJ) provides a 
-   standard way to send XML documents over the Internet from 
-   the Java platform. The SAAJ specification is developed through 
-   the Java Community Process and the Expert Group lead is Sun 
-   MicroSystems Inc. The original software is availabe from
-   		http://saaj.dev.java.net/
-   		
-   JSR 181 Web Services Metadata for the Java Platform. This specification
-   is developed through the Java Community Process. The original software
-   is available as part of the project glassfish
-   		https://glassfish.dev.java.net/
-   		
-   JSR 250 Common Annotations for the JavaTM Platform.
-   This specification is developed through the Java 
-   Community Process. The original software is available 
-   as part of the project glassfish
-   		https://glassfish.dev.java.net/
+The RMI over IIOP implementation were developed at Trifork Technologies.
 
 
 =========================================================================
@@ -467,6 +431,15 @@
 
 
 =========================================================================
+==  jaxen  Notice                                                      ==
+=========================================================================
+
+This product includes software developed by the jaxen project
+(http://jaxen.org/). 
+
+ Copyright 2003-2006 The Werken Company. All Rights Reserved.
+
+=========================================================================
 ==  JDBM Notice                                                        ==
 =========================================================================
 
@@ -521,13 +494,9 @@
 
 
 =========================================================================
-==  Serp Notice                                                        ==
+==  SAAJ Notice                                                        ==
 =========================================================================
 
-Copyright (c) 2002, A. Abram White
-All rights reserved.
-
-
 =========================================================================
 ==  OGNL Notice                                                        ==
 =========================================================================
@@ -538,60 +507,51 @@
 Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
 
 =========================================================================
-==  SL4J Notice                                                        ==
+==  Plexus Notice                                                      ==
 =========================================================================
 
-Copyright (c) 2004-2005 SLF4J.ORG
-Copyright (c) 2004-2005 QOS.ch
-All rights reserved.
+This product includes software developed by the Plexus project
+(http://plexus.codehaus.org/)
 
+The source code for the Plexus project can be downloaded from:
 
-=========================================================================
-==  JAXB Notice                                                        ==
-=========================================================================
+http://plexus.codehaus.org/source-repository.html
 
-This product includes software developed for the JAXB Reference 
-Implementation project. (https://jaxb.dev.java.net/)
 
 =========================================================================
-==  JAF Notice                                                         ==
+==  Serp Notice                                                        ==
 =========================================================================
 
-This product includes software developed for the JavaBeans Activation
-Framework. The software is available from the GlassFish project
-(https://glassfish.dev.java.net/)
-
-=========================================================================
-==  JavaMail API Notice                                                ==
-=========================================================================
+Copyright (c) 2002, A. Abram White
+All rights reserved.
 
-This product includes software developed for JavaMail API. 
-The software is available from the GlassFish project 
-(https://glassfish.dev.java.net/)
 
 =========================================================================
-==  SAAJ Notice                                                        ==
+==  SL4J Notice                                                        ==
 =========================================================================
 
-This product includes software developed for SOAP with Attachments
-API for Java (SAAJ). The software is available from the GlassFish project 
-(https://glassfish.dev.java.net/)
+Copyright (c) 2004-2005 SLF4J.ORG
+Copyright (c) 2004-2005 QOS.ch
+All rights reserved.
+
 
 =========================================================================
-==  JAX-WS API Notice                                                  ==
+==  Sun CDDL Notice                                                    ==
 =========================================================================
 
+This product includes software developed for the JAXB Reference 
+Implementation project. (https://jaxb.dev.java.net/)
+
 This product includes software developed for Java API for XML Web Services
 project (JAX-WS) (https://jax-ws.dev.java.net/)
 
-=========================================================================
-==  jaxen  Notice                                                      ==
-=========================================================================
+This product includes software developed for the Java Server Pages Tag 
+Library project (https://jstl.dev.java.net/)
 
-This product includes software developed by the jaxen project
-(http://jaxen.org/). 
+This product includes software developed for SOAP with Attachments
+API for Java (SAAJ). The software is available from the GlassFish project 
+(https://saaj.dev.java.net/)
 
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
 
 =========================================================================
 ==  WADI Notice                                                        ==
@@ -600,13 +560,6 @@
 This product includes software developed by the WADI project
 (http://wadi.codehaus.org/)
 
-=========================================================================
-==  woden Notice                                                       ==
-=========================================================================
-
-This product includes also software developed by :
-  - the W3C consortium (http://www.w3c.org) ,
-  - the SAX project (http://www.saxproject.org)
 
 =========================================================================
 ==  Spring Notice                                                      ==
@@ -615,10 +568,6 @@
 This product also includes software developed by Spring Framework
 Project (http://www.springframework.org)
 
-=========================================================================
-==  W3C DOM Notice (xercesImpl)                                        ==
-=========================================================================
-
 This product includes software developed by
 the Apache Software Foundation (http://www.apache.org).
 
@@ -641,10 +590,9 @@
 
 
 =========================================================================
-==  W3C DOM Notice (xercesImpl)                                        ==
+==  W3C DOM Notice                                                     ==
 =========================================================================
 
-
 Copyright (c) 2000 World Wide Web Consortium, (Massachusetts Institute
 of Technology, Institut National de Recherche en Informatique et en
 Automatique, Keio University). All Rights Reserved.
@@ -669,29 +617,6 @@
 
 
 =========================================================================
-==  W3C Software Notice (xercesImpl and xmlParserAPIs)                 ==
-=========================================================================
-
-Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts
-Institute of Technology, Institut National de Recherche en
-Informatique et en Automatique, Keio University). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/
-
-
-=========================================================================
-==  WSDL4J Notice                                                      ==
-=========================================================================
-
-The Program includes all or portions of the following software which is 
-subject to the Common Public License ("CPL Code").  This software 
-consists of voluntary contributions made by many individuals on behalf of
-the WSDL4J project.
-
-You may download the source version of the WSDL4J component at 
-http://sourceforge.net/projects/wsdl4j
-
-
-=========================================================================
 ==  Woodstox Notice                                                    ==
 =========================================================================
 
@@ -706,73 +631,26 @@
 
 
 =========================================================================
-==  Xerces Notice                                                      ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software was originally based on the following:
-  - software copyright (c) 1999-2002, Lotus Development Corporation.,
-    http://www.lotus.com.
-  - software copyright (c) 2001-2002, Sun Microsystems.,
-    http://www.sun.com.
-  - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
-  - voluntary contributions made by Ovidiu Predescu <ov...@cup.hp.com> on
-    behalf of the Apache Software Foundation that was originally developed
-    at Hewlett Packard Company. 
-
-The binary distribution package (ie. jars, samples and documentation) of
-this product includes software developed by the following:
-       
-  - The Apache Software Foundation 
-      - Xerces Java - see xercesImpl.README.txt 
-      - JAXP 1.3 APIs - see xml-apis.README.txt
-      - Bytecode Engineering Library - see BCEL.README.txt
-      - Regular Expression - see regexp.README.txt
-       
-  - Scott Hudson, Frank Flannery, C. Scott Ananian 
-      - CUP Parser Generator runtime (javacup\runtime) - see runtime.README.txt 
- 
- 
-=========================================================================
-==  Xerces Notice                                                      ==
+==  W3C Software Notice                                                ==
 =========================================================================
 
-Portions of this software were originally based on the following:
-  - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-  - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-  - voluntary contributions made by Paul Eng on behalf of the 
-    Apache Software Foundation that were originally developed at 
-    iClick, Inc., software copyright (c) 1999.
+Copyright (c) 1994-2002 World Wide Web Consortium, (Massachusetts
+Institute of Technology, Institut National de Recherche en
+Informatique et en Automatique, Keio University). All Rights
+Reserved. http://www.w3.org/Consortium/Legal/
 
 
 =========================================================================
-==  XmlBeans Notice                                                    ==
+==  WSDL4J Notice                                                      ==
 =========================================================================
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-  - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-Aside from contributions to the Apache XMLBeans project, this
-software also includes:
-
- - one or more source files from the Apache Xerces-J and Apache Axis
-   products, Copyright (c) 1999-2003 Apache Software Foundation
-
- - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
-   Consortium (Massachusetts Institute of Technology, European Research
-   Consortium for Informatics and Mathematics, Keio University)
-
- - resolver.jar from Apache Xml Commons project,
-   Copyright (c) 2001-2003 Apache Software Foundation
+The Program includes all or portions of the following software which is 
+subject to the Common Public License ("CPL Code").  This software 
+consists of voluntary contributions made by many individuals on behalf of
+the WSDL4J project.
 
- - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
-   Copyright 2002 Yuval Oren under the terms of the Apache Software 
-   License 2.0
+You may download the source version of the WSDL4J component at 
+http://sourceforge.net/projects/wsdl4j
 
 
 =========================================================================
@@ -791,4 +669,3 @@
 
 Copyright (c) 2003-2006, Joe Walnes
 All rights reserved.
-

Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/NOTICE.txt?rev=618164&r1=618163&r2=618164&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/NOTICE.txt (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/NOTICE.txt Sun Feb  3 20:02:05 2008
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2007 The Apache Software Foundation
+Copyright 2003-2008 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).