svn commit: r724595 - in /geronimo/specs/trunk/geronimo-concurrent_1.0_spec: LICENSE NOTICE

[ke...@apache.org]

Author: kevan
Date: Mon Dec  8 19:42:47 2008
New Revision: 724595

URL: http://svn.apache.org/viewvc?rev=724595&view=rev
Log:
Fix license and notice files for concurrent spec

Modified:
    geronimo/specs/trunk/geronimo-concurrent_1.0_spec/LICENSE
    geronimo/specs/trunk/geronimo-concurrent_1.0_spec/NOTICE

Modified: geronimo/specs/trunk/geronimo-concurrent_1.0_spec/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-concurrent_1.0_spec/LICENSE?rev=724595&r1=724594&r2=724595&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-concurrent_1.0_spec/LICENSE (original)
+++ geronimo/specs/trunk/geronimo-concurrent_1.0_spec/LICENSE Mon Dec  8 19:42:47 2008
@@ -200,58 +200,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
-#########################################################################
-## ADDITIONAL LICENSES                                                 ##
-#########################################################################
-
-The XMLSchema.dtd included in this project was developed by the
-W3C Consortium (http://www.w3c.org/).
-Use of the source code, thus licensed, and the resultant binary are
-subject to the terms and conditions of the following license.
-
-W3C¨ SOFTWARE NOTICE AND LICENSE
-Copyright © 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/
-
-This W3C work (including software, documents, 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 use, 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, that you make:
-
-   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, a short notice of the following form
-         (hypertext is preferred, text is permitted) should be used within
-         the body of any redistributed or derivative code: "Copyright ©
-         [$date-of-software] 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/"
-   3. Notice of any changes or modifications to the W3C 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.

Modified: geronimo/specs/trunk/geronimo-concurrent_1.0_spec/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-concurrent_1.0_spec/NOTICE?rev=724595&r1=724594&r2=724595&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-concurrent_1.0_spec/NOTICE (original)
+++ geronimo/specs/trunk/geronimo-concurrent_1.0_spec/NOTICE Mon Dec  8 19:42:47 2008
@@ -3,19 +3,3 @@
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed by
-The Object Management Group.
-
-Copyright (c) 1999-2000 Object Management Group. Unlimited rights to
-duplicate and use this code are hereby granted provided that this
-copyright notice is included.
-
-This product includes software developed by
-The W3C Consortium (http://www.w3.org/).
-
-Copyright © 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/
\ No newline at end of file