You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/08/22 01:40:59 UTC

svn commit: r433430 [3/4] - in /incubator/servicemix/trunk: ./ servicemix-jsr181/src/main/jbi/META-INF/ servicemix-shared/src/main/jbi/META-INF/ servicemix-wsn2005/src/main/jbi/META-INF/

Modified: incubator/servicemix/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/NOTICE?rev=433430&r1=433429&r2=433430&view=diff
==============================================================================
--- incubator/servicemix/trunk/NOTICE (original)
+++ incubator/servicemix/trunk/NOTICE Mon Aug 21 16:40:58 2006
@@ -3,29 +3,141 @@
    ==  in this case for the Apache ServiceMix distribution.               ==
    =========================================================================
 
-   This product includes software developed by
+   This product contains software developed by
    The Apache Software Foundation (http://www.apache.org/).
 
 
-   NOTICE for spring
-   
-       This product includes software developed by
-       the Apache Software Foundation (http://www.apache.org).
-    
-       This product also includes software developed by
-       Clinton Begin (http://www.ibatis.com).
-    
-       The end-user documentation included with a redistribution, if any,
-       must include the following acknowledgement:
-    
-         "This product includes software developed by the Spring Framework
-          Project (http://www.springframework.org)."
-    
-       Alternately, this acknowledgement may appear in the software itself,
-       if and wherever such third-party acknowledgements normally appear.
-    
-       The names "Spring" and "Spring Framework" must not be used to
-       endorse or promote products derived from this software without
-       prior written permission. For written permission, please contact
-       rod.johnson@interface21.com or juergen.hoeller@interface21.com.
+
+=========================================================================
+==  Bouncy Castle Notice                                               ==
+=========================================================================
+
+This product includes software (the ASN1 codec in the org.apache.geronimo.asn1
+package) which was developed by the Bouncy Castle project. 
+(http://www.bouncycastle.org/) 
+
+     Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+
+=========================================================================
+==  Derby Notice                                                       ==
+=========================================================================
+
+Portions of Derby were orginally 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 portion of the functionTests under 'nist' was originally 
+developed by the National Institute of Standards and Technology (NIST), 
+an agency of the United States Department of Commerce, and adapted by
+International Business Machines Corporation in accordance with the NIST
+Software Acknowledgment and Redistribution document at
+http://www.itl.nist.gov/div897/ctg/sql_form.htm
+
+
+=========================================================================
+==  Spring Notice                                                      ==
+=========================================================================
+
+This product includes software developed by
+the Apache Software Foundation (http://www.apache.org).
+
+This product also includes software developed by
+Clinton Begin (http://www.ibatis.com).
+
+The end-user documentation included with a redistribution, if any,
+must include the following acknowledgement:
+
+ "This product includes software developed by the Spring Framework
+  Project (http://www.springframework.org)."
+
+Alternately, this acknowledgement may appear in the software itself,
+if and wherever such third-party acknowledgements normally appear.
+
+The names "Spring" and "Spring Framework" must not be used to
+endorse or promote products derived from this software without
+prior written permission. For written permission, please contact
+rod.johnson@interface21.com or juergen.hoeller@interface21.com.
    
+=========================================================================
+==  MX4J Notice                                                        ==
+=========================================================================
+
+This product includes software developed by the MX4J project 
+(http://sourceforge.net/projects/mx4j).
+
+
+=========================================================================
+==  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
+
+
+=========================================================================
+==  Xerces 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.
+
+
+=========================================================================
+==  XmlBeans Notice                                                    ==
+=========================================================================
+
+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
+
+
+=========================================================================
+==  XmlSecurity Notice                                                 ==
+=========================================================================
+
+It was originally based on software copyright (c) 2001, Institute for
+Data Communications Systems, <http://www.nue.et-inf.uni-siegen.de/>.
+
+The development of this software was partly funded by the European 
+Commission in the <WebSig> project in the ISIS Programme. 
+
+=========================================================================
+==  OpenSaml Notice                                                    ==
+=========================================================================
+
+We wish to acknowledge the following copyrighted works that make up
+portions of this software:
+
+This product includes software developed by the Apache Software
+Foundation (http://www.apache.org/).
+
+We also thank Tom Scavo for donating the original SAML artifact
+implementation.

Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/LICENSE?rev=433430&r1=433429&r2=433430&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/LICENSE (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/LICENSE Mon Aug 21 16:40:58 2006
@@ -202,508 +202,524 @@
    limitations under the License.
 
 
+################################################################################
 
-   LICENSE for xfire
-   
-      Copyright (c) 2005 Envoi Solutions LLC
-
-      Permission is hereby granted, free of charge, to any person obtaining a 
-      copy of this software and associated documentation files (the "Software"), 
-      to deal in the Software without restriction, including without limitation 
-      the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-      and/or sell copies of the Software, and to permit persons to whom the 
-      Software is furnished to do so, subject to the following conditions:
-      
-      The above copyright notice and this permission notice shall be included in 
-      all copies or substantial portions of the Software.
-      
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-      THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-      FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-      DEALINGS IN THE SOFTWARE.
-      
-   LICENSE for jdom
-   
-      /*-- 
-      
-       $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-      
-       Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
-       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 disclaimer that follows 
-          these conditions in the documentation and/or other materials 
-          provided with the distribution.
-      
-       3. The name "JDOM" must not be used to endorse or promote products
-          derived from this software without prior written permission.  For
-          written permission, please contact <request_AT_jdom_DOT_org>.
-       
-       4. Products derived from this software may not be called "JDOM", nor
-          may "JDOM" appear in their name, without prior written permission
-          from the JDOM Project Management <request_AT_jdom_DOT_org>.
-       
-       In addition, we request (but do not require) that you include in the 
-       end-user documentation provided with the redistribution and/or in the 
-       software itself an acknowledgement equivalent to the following:
-           "This product includes software developed by the
-            JDOM Project (http://www.jdom.org/)."
-       Alternatively, the acknowledgment may be graphical using the logos 
-       available at http://www.jdom.org/images/logos.
-      
-       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 JDOM AUTHORS OR THE PROJECT
-       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 JDOM Project and was originally 
-       created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
-       Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
-       on the JDOM Project, please see <http://www.jdom.org/>. 
-      
-       */
-      
-   LICENSE for jaxb
-   
-      COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-      1. Definitions.
-
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
+APACHE SERVICEMIX PACKAGES
 
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
+The Apache ServiceMix distribution includes a number of dependent packages with
+separate copyright notices and license terms. Your use of the source code for 
+these subcomponents is subject to the terms and conditions of the following 
+licenses. 
+
+=========================================================================
+==  XFire License                                                       ==
+=========================================================================
+
+Copyright (c) 2005 Envoi Solutions LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+DEALINGS IN THE SOFTWARE.
+
+
+=========================================================================
+== JAXB License                                                        ==
+=========================================================================
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+      1.1. "Contributor" means each individual or entity that
+      creates or contributes to the creation of Modifications.
+
+      1.2. "Contributor Version" means the combination of the
+      Original Software, prior Modifications used by a
+      Contributor (if any), and the Modifications made by that
+      particular Contributor.
+
+      1.3. "Covered Software" means (a) the Original Software, or
+      (b) Modifications, or (c) the combination of files
+      containing Original Software with files containing
+      Modifications, in each case including portions thereof.
+
+      1.4. "Executable" means the Covered Software in any form
+      other than Source Code. 
+
+      1.5. "Initial Developer" means the individual or entity
+      that first makes Original Software available under this
+      License. 
+      
+      1.6. "Larger Work" means a work which combines Covered
+      Software or portions thereof with code not governed by the
+      terms of this License.
+
+      1.7. "License" means this document.
+
+      1.8. "Licensable" means having the right to grant, to the
+      maximum extent possible, whether at the time of the initial
+      grant or subsequently acquired, any and all of the rights
+      conveyed herein.
+      
+      1.9. "Modifications" means the Source Code and Executable
+      form of any of the following: 
+
+            A. Any file that results from an addition to,
+            deletion from or modification of the contents of a
+            file containing Original Software or previous
+            Modifications; 
+
+            B. Any new file that contains any part of the
+            Original Software or previous Modification; or 
+
+            C. Any new file that is contributed or otherwise made
+            available under the terms of this License.
+
+      1.10. "Original Software" means the Source Code and
+      Executable form of computer software code that is
+      originally released under this License. 
+
+      1.11. "Patent Claims" means any patent claim(s), now owned
+      or hereafter acquired, including without limitation,
+      method, process, and apparatus claims, in any patent
+      Licensable by grantor. 
+
+      1.12. "Source Code" means (a) the common form of computer
+      software code in which modifications are made and (b)
+      associated documentation included in or with such code.
+
+      1.13. "You" (or "Your") means an individual or a legal
+      entity exercising rights under, and complying with all of
+      the terms of, this License. For legal entities, "You"
+      includes any entity which controls, is controlled by, or is
+      under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or
+      indirect, to cause the direction or management of such
+      entity, whether by contract or otherwise, or (b) ownership
+      of more than fifty percent (50%) of the outstanding shares
+      or beneficial ownership of such entity.
+
+2. License Grants. 
+
+      2.1. The Initial Developer Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and
+      subject to third party intellectual property claims, the
+      Initial Developer hereby grants You a world-wide,
+      royalty-free, non-exclusive license: 
+
+            (a) under intellectual property rights (other than
+            patent or trademark) Licensable by Initial Developer,
+            to use, reproduce, modify, display, perform,
+            sublicense and distribute the Original Software (or
+            portions thereof), with or without Modifications,
+            and/or as part of a Larger Work; and 
+
+            (b) under Patent Claims infringed by the making,
+            using or selling of Original Software, to make, have
+            made, use, practice, sell, and offer for sale, and/or
+            otherwise dispose of the Original Software (or
+            portions thereof). 
+
+            (c) The licenses granted in Sections 2.1(a) and (b)
+            are effective on the date Initial Developer first
+            distributes or otherwise makes the Original Software
+            available to a third party under the terms of this
             License. 
-            
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-
-            1.7. "License" means this document.
-
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-
-      2. License Grants. 
-
-            2.1. The Initial Developer Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-
-            2.2. Contributor Grant.
-
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  
-
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-
-      3. Distribution Obligations.
-
-            3.1. Availability of Source Code.
-
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-
-            3.2. Modifications.
-
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-
-            3.3. Required Notices.
-
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-
-            3.4. Application of Additional Terms.
-
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipientsÕ
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-          
-
-            3.5. Distribution of Executable Versions.
-
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipientÕs rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-
-            3.6. Larger Works.
-
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-            
-      4. Versions of the License. 
 
-            4.1. New Versions.
-
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-
-            4.2. Effect of New Versions.
-
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-
-            4.3. Modified Versions.
-
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
+            (d) Notwithstanding Section 2.1(b) above, no patent
+            license is granted: (1) for code that You delete from
+            the Original Software, or (2) for infringements
+            caused by: (i) the modification of the Original
+            Software, or (ii) the combination of the Original
+            Software with other software or devices. 
+
+      2.2. Contributor Grant.
+
+      Conditioned upon Your compliance with Section 3.1 below and
+      subject to third party intellectual property claims, each
+      Contributor hereby grants You a world-wide, royalty-free,
+      non-exclusive license:
+
+            (a) under intellectual property rights (other than
+            patent or trademark) Licensable by Contributor to
+            use, reproduce, modify, display, perform, sublicense
+            and distribute the Modifications created by such
+            Contributor (or portions thereof), either on an
+            unmodified basis, with other Modifications, as
+            Covered Software and/or as part of a Larger Work; and
             
 
-      5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-
-      6. TERMINATION. 
-
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-
-      7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTYÕS NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-      8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. ¤
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-
-      9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdictionÕs conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneysÕ fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-      10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-   
-   LICENSE for jaxen
-   
-      /*
-       $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $
-      
-       Copyright 2003-2006 The Werken Company. All Rights Reserved.
-       
-       Redistribution and use in source and binary forms, with or without
-       modification, are permitted provided that the following conditions are
-       met:
-      
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-      
-        * 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.
-      
-        * Neither the name of the Jaxen Project nor the names of its
-          contributors may be used to endorse or promote products derived 
-          from this software without specific prior written permission.
-      
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-      IS" AND ANY EXPRESS 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 COPYRIGHT OWNER
-      OR 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.
-      
-       */
+            (b) under Patent Claims infringed by the making,
+            using, or selling of Modifications made by that
+            Contributor either alone and/or in combination with
+            its Contributor Version (or portions of such
+            combination), to make, use, sell, offer for sale,
+            have made, and/or otherwise dispose of: (1)
+            Modifications made by that Contributor (or portions
+            thereof); and (2) the combination of Modifications
+            made by that Contributor with its Contributor Version
+            (or portions of such combination). 
+
+            (c) The licenses granted in Sections 2.2(a) and
+            2.2(b) are effective on the date Contributor first
+            distributes or otherwise makes the Modifications
+            available to a third party. 
+
+            (d) Notwithstanding Section 2.2(b) above, no patent
+            license is granted: (1) for any code that Contributor
+            has deleted from the Contributor Version; (2) for
+            infringements caused by: (i) third party
+            modifications of Contributor Version, or (ii) the
+            combination of Modifications made by that Contributor
+            with other software (except as part of the
+            Contributor Version) or other devices; or (3) under
+            Patent Claims infringed by Covered Software in the
+            absence of Modifications made by that Contributor. 
+
+3. Distribution Obligations.
+
+      3.1. Availability of Source Code.
+
+      Any Covered Software that You distribute or otherwise make
+      available in Executable form must also be made available in
+      Source Code form and that Source Code form must be
+      distributed only under the terms of this License. You must
+      include a copy of this License with every copy of the
+      Source Code form of the Covered Software You distribute or
+      otherwise make available. You must inform recipients of any
+      such Covered Software in Executable form as to how they can
+      obtain such Covered Software in Source Code form in a
+      reasonable manner on or through a medium customarily used
+      for software exchange.
+
+      3.2. Modifications.
+
+      The Modifications that You create or to which You
+      contribute are governed by the terms of this License. You
+      represent that You believe Your Modifications are Your
+      original creation(s) and/or You have sufficient rights to
+      grant the rights conveyed by this License.
+
+      3.3. Required Notices.
+
+      You must include a notice in each of Your Modifications
+      that identifies You as the Contributor of the Modification.
+      You may not remove or alter any copyright, patent or
+      trademark notices contained within the Covered Software, or
+      any notices of licensing or any descriptive text giving
+      attribution to any Contributor or the Initial Developer.
+
+      3.4. Application of Additional Terms.
+
+      You may not offer or impose any terms on any Covered
+      Software in Source Code form that alters or restricts the
+      applicable version of this License or the recipientsÕ
+      rights hereunder. You may choose to offer, and to charge a
+      fee for, warranty, support, indemnity or liability
+      obligations to one or more recipients of Covered Software.
+      However, you may do so only on Your own behalf, and not on
+      behalf of the Initial Developer or any Contributor. You
+      must make it absolutely clear that any such warranty,
+      support, indemnity or liability obligation is offered by
+      You alone, and You hereby agree to indemnify the Initial
+      Developer and every Contributor for any liability incurred
+      by the Initial Developer or such Contributor as a result of
+      warranty, support, indemnity or liability terms You offer.
+    
+
+      3.5. Distribution of Executable Versions.
+
+      You may distribute the Executable form of the Covered
+      Software under the terms of this License or under the terms
+      of a license of Your choice, which may contain terms
+      different from this License, provided that You are in
+      compliance with the terms of this License and that the
+      license for the Executable form does not attempt to limit
+      or alter the recipientÕs rights in the Source Code form
+      from the rights set forth in this License. If You
+      distribute the Covered Software in Executable form under a
+      different license, You must make it absolutely clear that
+      any terms which differ from this License are offered by You
+      alone, not by the Initial Developer or Contributor. You
+      hereby agree to indemnify the Initial Developer and every
+      Contributor for any liability incurred by the Initial
+      Developer or such Contributor as a result of any such terms
+      You offer.
+
+      3.6. Larger Works.
+
+      You may create a Larger Work by combining Covered Software
+      with other code not governed by the terms of this License
+      and distribute the Larger Work as a single product. In such
+      a case, You must make sure the requirements of this License
+      are fulfilled for the Covered Software. 
+      
+4. Versions of the License. 
+
+      4.1. New Versions.
+
+      Sun Microsystems, Inc. is the initial license steward and
+      may publish revised and/or new versions of this License
+      from time to time. Each version will be given a
+      distinguishing version number. Except as provided in
+      Section 4.3, no one other than the license steward has the
+      right to modify this License. 
+
+      4.2. Effect of New Versions.
+
+      You may always continue to use, distribute or otherwise
+      make the Covered Software available under the terms of the
+      version of the License under which You originally received
+      the Covered Software. If the Initial Developer includes a
+      notice in the Original Software prohibiting it from being
+      distributed or otherwise made available under any
+      subsequent version of the License, You must distribute and
+      make the Covered Software available under the terms of the
+      version of the License under which You originally received
+      the Covered Software. Otherwise, You may also choose to
+      use, distribute or otherwise make the Covered Software
+      available under the terms of any subsequent version of the
+      License published by the license steward. 
+
+      4.3. Modified Versions.
+
+      When You are an Initial Developer and You want to create a
+      new license for Your Original Software, You may create and
+      use a modified version of this License if You: (a) rename
+      the license and remove any references to the name of the
+      license steward (except to note that the license differs
+      from this License); and (b) otherwise make it clear that
+      the license contains terms which differ from this License.
+      
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+DISCLAIMER. 
+
+6. TERMINATION. 
+
+      6.1. This License and the rights granted hereunder will
+      terminate automatically if You fail to comply with terms
+      herein and fail to cure such breach within 30 days of
+      becoming aware of the breach. Provisions which, by their
+      nature, must remain in effect beyond the termination of
+      this License shall survive.
+
+      6.2. If You assert a patent infringement claim (excluding
+      declaratory judgment actions) against Initial Developer or
+      a Contributor (the Initial Developer or Contributor against
+      whom You assert such claim is referred to as "Participant")
+      alleging that the Participant Software (meaning the
+      Contributor Version where the Participant is a Contributor
+      or the Original Software where the Participant is the
+      Initial Developer) directly or indirectly infringes any
+      patent, then any and all rights granted directly or
+      indirectly to You by such Participant, the Initial
+      Developer (if the Initial Developer is not the Participant)
+      and all Contributors under Sections 2.1 and/or 2.2 of this
+      License shall, upon 60 days notice from Participant
+      terminate prospectively and automatically at the expiration
+      of such 60 day notice period, unless if within such 60 day
+      period You withdraw Your claim with respect to the
+      Participant Software against such Participant either
+      unilaterally or pursuant to a written agreement with
+      Participant.
+
+      6.3. In the event of termination under Sections 6.1 or 6.2
+      above, all end user licenses that have been validly granted
+      by You or any distributor hereunder prior to termination
+      (excluding licenses granted to You by any distributor)
+      shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTYÕS NEGLIGENCE TO THE EXTENT
+APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a "commercial item," as that term is
+defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+computer software" (as that term is defined at 48 C.F.R. ¤
+252.227-7014(a)(1)) and "commercial computer software
+documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+through 227.7202-4 (June 1995), all U.S. Government End Users
+acquire Covered Software with only those rights set forth herein.
+This U.S. Government Rights clause is in lieu of, and supersedes,
+any other FAR, DFAR, or other clause or provision that addresses
+Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the
+extent necessary to make it enforceable. This License shall be
+governed by the law of the jurisdiction specified in a notice
+contained within the Original Software (except to the extent
+applicable law, if any, provides otherwise), excluding such
+jurisdictionÕs conflict-of-law provisions. Any litigation
+relating to this License shall be subject to the jurisdiction of
+the courts located in the jurisdiction and venue specified in a
+notice contained within the Original Software, with the losing
+party responsible for costs, including, without limitation, court
+costs and reasonable attorneysÕ fees and expenses. The
+application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or
+regulation which provides that the language of a contract shall
+be construed against the drafter shall not apply to this License.
+You agree that You alone are responsible for compliance with the
+United States export administration regulations (and the export
+control laws and regulation of any other countries) when You use,
+distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is
+responsible for claims and damages arising, directly or
+indirectly, out of its utilization of rights under this License
+and You agree to work with Initial Developer and Contributors to
+distribute such responsibility on an equitable basis. Nothing
+herein is intended or shall be deemed to constitute any admission
+of liability.
+
+
+=========================================================================
+== Jaxen License                                                       ==
+=========================================================================
+
+/*
+ $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $
+
+ Copyright 2003-2006 The Werken Company. All Rights Reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * 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.
+
+  * Neither the name of the Jaxen Project nor the names of its
+    contributors may be used to endorse or promote products derived 
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS 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 COPYRIGHT OWNER
+OR 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.
+
+ */
+
+
+=========================================================================
+== JDom License                                                        ==
+=========================================================================
+
+/*-- 
+
+ $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
+
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ 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 disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ 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 JDOM AUTHORS OR THE PROJECT
+ 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 JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>. 
 
-   Other included software are licensed under ASL 2.
-   
+ */

Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/NOTICE?rev=433430&r1=433429&r2=433430&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/NOTICE (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/jbi/META-INF/NOTICE Mon Aug 21 16:40:58 2006
@@ -6,3 +6,28 @@
    This product contains software developed by
    The Apache Software Foundation (http://www.apache.org/).
 
+=========================================================================
+==  XmlBeans Notice                                                    ==
+=========================================================================
+
+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
+
+

Modified: incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/LICENSE?rev=433430&r1=433429&r2=433430&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/LICENSE (original)
+++ incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/LICENSE Mon Aug 21 16:40:58 2006
@@ -201,3 +201,37 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+################################################################################
+
+APACHE SERVICEMIX PACKAGES
+
+The Apache ServiceMix distribution includes a number of dependent packages with
+separate copyright notices and license terms. Your use of the source code for 
+these subcomponents is subject to the terms and conditions of the following 
+licenses. 
+
+=========================================================================
+==  Bouncy Castle License                                              ==
+=========================================================================
+
+The Bouncy Castle License
+
+Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+

Modified: incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/NOTICE?rev=433430&r1=433429&r2=433430&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/NOTICE (original)
+++ incubator/servicemix/trunk/servicemix-shared/src/main/jbi/META-INF/NOTICE Mon Aug 21 16:40:58 2006
@@ -7,24 +7,36 @@
    The Apache Software Foundation (http://www.apache.org/).
 
 
-   NOTICE for xmlsec.jar
+=========================================================================
+==  Bouncy Castle Notice                                               ==
+=========================================================================
 
-      This product contains software developed by
-      The Apache Software Foundation (http://www.apache.org/).
+This product includes software (the ASN1 codec in the org.apache.geronimo.asn1
+package) which was developed by the Bouncy Castle project. 
+(http://www.bouncycastle.org/) 
 
-      It was originally based on software copyright (c) 2001, Institute for
-      Data Communications Systems, <http://www.nue.et-inf.uni-siegen.de/>.
+     Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 
-      The development of this software was partly funded by the European 
-      Commission in the <WebSig> project in the ISIS Programme. 
 
-   NOTICE for opensaml.jar
-   
-      We wish to acknowledge the following copyrighted works that make up
-      portions of this software:
+=========================================================================
+==  XmlSecurity Notice                                                 ==
+=========================================================================
 
-      This product includes software developed by the Apache Software
-      Foundation (http://www.apache.org/).
+It was originally based on software copyright (c) 2001, Institute for
+Data Communications Systems, <http://www.nue.et-inf.uni-siegen.de/>.
 
-      We also thank Tom Scavo for donating the original SAML artifact
-      implementation.
+The development of this software was partly funded by the European 
+Commission in the <WebSig> project in the ISIS Programme. 
+
+=========================================================================
+==  OpenSaml Notice                                                    ==
+=========================================================================
+
+We wish to acknowledge the following copyrighted works that make up
+portions of this software:
+
+This product includes software developed by the Apache Software
+Foundation (http://www.apache.org/).
+
+We also thank Tom Scavo for donating the original SAML artifact
+implementation.