You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by kk...@apache.org on 2005/02/19 01:56:39 UTC

svn commit: r154376 - in xmlbeans/branches/1.x-jdk1.3: NOTICE.txt build.xml src/license/

Author: kkrouse
Date: Fri Feb 18 16:56:38 2005
New Revision: 154376

URL: http://svn.apache.org/viewcvs?view=rev&rev=154376
Log:
fixing NOTICE.txt for 1.0.4-jdk1.3 release

Removed:
    xmlbeans/branches/1.x-jdk1.3/src/license/
Modified:
    xmlbeans/branches/1.x-jdk1.3/NOTICE.txt
    xmlbeans/branches/1.x-jdk1.3/build.xml

Modified: xmlbeans/branches/1.x-jdk1.3/NOTICE.txt
URL: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x-jdk1.3/NOTICE.txt?view=diff&r1=154375&r2=154376
==============================================================================
--- xmlbeans/branches/1.x-jdk1.3/NOTICE.txt (original)
+++ xmlbeans/branches/1.x-jdk1.3/NOTICE.txt Fri Feb 18 16:56:38 2005
@@ -1,3 +1,25 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+   =========================================================================
+   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+   ==  Version 2.0, in this case for the Apache XmlBeans distribution.    ==
+   =========================================================================
 
+   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)
+
+    - jaxen, Copyright 2003 (c) The Werken Company.
+
+    - resolver.jar from Apache Xml Commons project,
+      Copyright (c) 2001-2003 Apache Software Foundation

Modified: xmlbeans/branches/1.x-jdk1.3/build.xml
URL: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x-jdk1.3/build.xml?view=diff&r1=154375&r2=154376
==============================================================================
--- xmlbeans/branches/1.x-jdk1.3/build.xml (original)
+++ xmlbeans/branches/1.x-jdk1.3/build.xml Fri Feb 18 16:56:38 2005
@@ -683,7 +683,7 @@
      <copy todir="build/private/xmlbeans-${version.base}">
         <fileset dir="xkit"/>
         <fileset dir="." includes="bin/**" />
-        <fileset file="CHANGES.txt" />
+        <fileset dir="." includes="LICENSE.txt, NOTICE.txt, CHANGES.txt" />
      </copy>
      <copy todir="build/private/xmlbeans-${version.base}/schemas/s4s">
         <fileset dir="src/xsdschema/schema" includes="XMLSchema.xsd,w3c-schema-license.html"/>
@@ -718,8 +718,6 @@
           excludes="xmlbeans-${version.base}/bin/dumpxsb, 
                     xmlbeans-${version.base}/bin/scomp, 
                     xmlbeans-${version.base}/bin/validate">
-         <zipfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
-         <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
          <zipfileset dir="build/private/xmlbeans-${version.base}/bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.base}/bin" filemode="755"/>
      </zip>
      <tar destfile="build/private/xmlbeans-${version.base}.tgz"
@@ -729,8 +727,6 @@
                     xmlbeans-${version.base}/bin/scomp, 
                     xmlbeans-${version.base}/bin/validate"
           compression="gzip">
-         <tarfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
-         <tarfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
          <tarfileset dir="build/private/xmlbeans-${version.base}/bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.base}/bin" mode="755"/>
      </tar>
   </target>
@@ -746,8 +742,6 @@
                 excludes="build/**, test/src/teststore/**, test/src/easypouse/**, test/src/nameworlduse/**,
                 test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar, bin/dumpxsb, bin/scomp, bin/validate"
        		prefix="xmlbeans-${version.base}" />
-         <zipfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
-         <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
          <zipfileset dir="bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.base}/bin" filemode="755"/>
      </zip>
      <tar destfile="build/private/xmlbeans-${version.base}-src.tgz"
@@ -758,8 +752,6 @@
        		excludes="build/**, test/src/teststore/**, test/src/easypouse/**, test/src/nameworlduse/**,
                 test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar, bin/dumpxsb, bin/scomp, bin/validate"
        		prefix="xmlbeans-${version.base}"/>
-         <tarfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
-         <tarfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
          <tarfileset dir="bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.base}/bin" mode="755"/>
      </tar>
   </target>
@@ -785,7 +777,8 @@
       <fileset dir="build/classes/xmlstore"/>
       <fileset dir="build/classes/xmlinputstream"/>
       <fileset dir="build/classes/repackage"/>
-      <fileset dir="src/license"/>
+      <fileset file="LICENSE.txt"/>
+      <fileset file="NOTICE.txt"/>
       <manifest>
         <section name="${manifest.name}">
           <attribute name="Comment" value="${manifest.comment}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org