svn commit: r637871 - in /ant/core/branches/ANT_17_BRANCH: LICENSE LICENSE.dom LICENSE.junit.html LICENSE.sax NOTICE NOTICE.xerces lib/optional/LICENSE.junit.html

[bo...@apache.org]

Author: bodewig
Date: Mon Mar 17 06:03:53 2008
New Revision: 637871

URL: http://svn.apache.org/viewvc?rev=637871&view=rev
Log:
Make us compliant with ASF's policies as to where LICENSE and NOTICE information should go

Added:
    ant/core/branches/ANT_17_BRANCH/lib/optional/LICENSE.junit.html
      - copied unchanged from r637869, ant/core/branches/ANT_17_BRANCH/LICENSE.junit.html
Removed:
    ant/core/branches/ANT_17_BRANCH/LICENSE.dom
    ant/core/branches/ANT_17_BRANCH/LICENSE.junit.html
    ant/core/branches/ANT_17_BRANCH/LICENSE.sax
    ant/core/branches/ANT_17_BRANCH/NOTICE.xerces
Modified:
    ant/core/branches/ANT_17_BRANCH/LICENSE
    ant/core/branches/ANT_17_BRANCH/NOTICE

Modified: ant/core/branches/ANT_17_BRANCH/LICENSE
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/LICENSE?rev=637871&r1=637870&r2=637871&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/LICENSE (original)
+++ ant/core/branches/ANT_17_BRANCH/LICENSE Mon Mar 17 06:03:53 2008
@@ -201,3 +201,72 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
+
+W3C® SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and
+conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+  1. The full text of this NOTICE in a location viewable to users of the
+     redistributed or derivative work. 
+  2. Any pre-existing intellectual property disclaimers, notices, or terms
+     and conditions. If none exist, the W3C Software Short Notice should be
+     included (hypertext is preferred, text is permitted) within the body
+     of any redistributed or derivative code.
+  3. Notice of any changes or modifications to the files, including the date
+     changes were made. (We recommend you provide URIs to the location from
+     which the code is derived.)
+     
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at
+all times remain with copyright holders.
+
+____________________________________
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to site-policy@w3.org.
+ 
+Joseph Reagle <si...@w3.org> 
+
+This license came from: http://www.megginson.com/SAX/copying.html
+  However please note future versions of SAX may be covered 
+  under http://saxproject.org/?selected=pd
+
+SAX2 is Free!
+
+I hereby abandon any property rights to SAX 2.0 (the Simple API for
+XML), and release all of the SAX 2.0 source code, compiled code, and
+documentation contained in this distribution into the Public Domain.
+SAX comes with NO WARRANTY or guarantee of fitness for any
+purpose.
+
+David Megginson, david@megginson.com
+2000-05-05

Modified: ant/core/branches/ANT_17_BRANCH/NOTICE
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/NOTICE?rev=637871&r1=637870&r2=637871&view=diff
==============================================================================
--- ant/core/branches/ANT_17_BRANCH/NOTICE (original)
+++ ant/core/branches/ANT_17_BRANCH/NOTICE Mon Mar 17 06:03:53 2008
@@ -18,3 +18,9 @@
    Graphics Corp that has been kindly donated to the Apache Software
    Foundation.
 
+   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.