tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r787187 - in /tuscany/java/sca: ./ distribution/all/src/main/release/launcher/ modules/assembly-xsd/ modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ modules/definitions-xml/
Date Mon, 22 Jun 2009 10:21:12 GMT
Author: slaws
Date: Mon Jun 22 10:21:11 2009
New Revision: 787187

URL: http://svn.apache.org/viewvc?rev=787187&view=rev
Log:
License/notice/header Changes from M3 branch r787159, r787162 and r787164

Modified:
    tuscany/java/sca/LICENSE
    tuscany/java/sca/NOTICE
    tuscany/java/sca/distribution/all/src/main/release/launcher/README
    tuscany/java/sca/modules/assembly-xsd/LICENSE
    tuscany/java/sca/modules/assembly-xsd/NOTICE
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
    tuscany/java/sca/modules/definitions-xml/LICENSE
    tuscany/java/sca/modules/definitions-xml/NOTICE

Modified: tuscany/java/sca/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/LICENSE?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/LICENSE (original)
+++ tuscany/java/sca/LICENSE Mon Jun 22 10:21:11 2009
@@ -297,7 +297,7 @@
 
 =================================================================================================================
 
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
+The module assembly-xsd includes XSD files under the following license:
 
 License for the Service Component Architecture JavaDoc, Interface 
 Definition files and XSD files.
@@ -341,6 +341,94 @@
 Revision level 1.1, last updated on 2007/11/19
 
 =================================================================================================================
+
+The modules assembly-xsd and definitions-xml includes XSD and XML files under the following
license:
+
+Copyright OASIS 2005, 2009. All Rights Reserved.
+All capitalized terms in the following text have the meanings assigned to them in the OASIS
Intellectual 
+Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS
website.
+This document and translations of it may be copied and furnished to others, and derivative
works that 
+comment on or otherwise explain it or assist in its implementation may be prepared, copied,
published, 
+and distributed, in whole or in part, without restriction of any kind, provided that the
above copyright 
+notice and this section are included on all such copies and derivative works. However, this
document 
+itself may not be modified in any way, including by removing the copyright notice or references
to OASIS, 
+except as needed for the purpose of developing any document or deliverable produced by an
OASIS 
+Technical Committee (in which case the rules applicable to copyrights, as set forth in the
OASIS IPR 
+Policy, must be followed) or as required to translate it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its
successors 
+or assigns.
+This document and the information contained herein is provided on an "AS IS" basis and OASIS

+DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 
+WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP 
+RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR 
+PURPOSE.
+OASIS requests that any OASIS Party or any other party that believes it has patent claims
that would 
+necessarily be infringed by implementations of this OASIS Committee Specification or OASIS
Standard, 
+to notify OASIS TC Administrator and provide an indication of its willingness to grant patent
licenses to 
+such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee
that 
+produced this specification.
+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of
ownership of 
+any patent claims that would necessarily be infringed by implementations of this specification
by a patent 
+holder that is not willing to provide a license to such patent claims in a manner consistent
with the IPR 
+Mode of the OASIS Technical Committee that produced this specification. OASIS may include
such 
+claims on its website, but disclaims any obligation to do so.
+OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that 
+might be claimed to pertain to the implementation or use of the technology described in this
document or 
+the extent to which any license under such rights might or might not be available; neither
does it represent 
+that it has made any effort to identify any such rights. Information on OASIS' procedures
with respect to 
+rights in any document or deliverable produced by an OASIS Technical Committee can be found
on the 
+OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses 
+to be made available, or the result of an attempt made to obtain a general license or permission
for the use 
+of such proprietary rights by implementers or users of this OASIS Committee Specification
or OASIS 
+Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation
that any 
+information or list of intellectual property rights will at any time be complete, or that
any claims in such list 
+are, in fact, Essential Claims.
+The names "OASIS",  are trademarks of OASIS, the owner and developer of this specification,
and should 
+be used only to refer to the organization and its official outputs. OASIS welcomes reference
to, and 
+implementation and use of, specifications, while reserving the right to enforce its marks
against misleading 
+uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
+
+=================================================================================================================
+
+The module assembly-xsd includes XSD files under the following license:
+
+http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+W3C® SOFTWARE NOTICE AND LICENSE
+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/
+
+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 (c) [$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.
+
+=================================================================================================================
+
+The module assembly-xsd includes XSD files under the following license:
+
 The modules 
 
 binding-ws-xml
@@ -357,7 +445,7 @@
 (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
 file ipo.xsd and extended with UK postcode structures.
 
-The ipo.xsd file is include under the following license:
+The ipo.xsd file is also included under the following license:
 
 W3C(c) SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231

Modified: tuscany/java/sca/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/NOTICE?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/NOTICE (original)
+++ tuscany/java/sca/NOTICE Mon Jun 22 10:21:11 2009
@@ -21,6 +21,12 @@
 Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
 2005, 2006. All rights reserved.
 
+This product includes software under the OASIS specification License
+with the following copyright:
+
+Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+OASIS trademark, IPR and other policies apply.
+
 This product includes software under the W3C(c) Software License
 with the following copyright:
     
@@ -32,4 +38,18 @@
 
 [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
+This product includes software under the W3C(c) Software License
+with the following copyright:
+
+Copyright 2001 The Internet Society and W3C (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 document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+
 

Modified: tuscany/java/sca/distribution/all/src/main/release/launcher/README
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/src/main/release/launcher/README?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/src/main/release/launcher/README (original)
+++ tuscany/java/sca/distribution/all/src/main/release/launcher/README Mon Jun 22 10:21:11
2009
@@ -15,7 +15,7 @@
 To simplify the use of the script add the absolute file path of the bin 
 folder to your environment path:
 
-set PATH=%PATH%;\Tuscany\tuscany-sca-2.0-M1\bin
+set PATH=%PATH%;\Tuscany\tuscany-sca-2.0-M3\bin
 
 and that enables running the script by just "tuscany", for example, in the 
 implementation-java-calculator sample again you can enter:

Modified: tuscany/java/sca/modules/assembly-xsd/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/LICENSE?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/LICENSE (original)
+++ tuscany/java/sca/modules/assembly-xsd/LICENSE Mon Jun 22 10:21:11 2009
@@ -298,3 +298,40 @@
 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 module includes XSD files under the following license:
+
+http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+W3C® SOFTWARE NOTICE AND LICENSE
+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/
+
+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 (c) [$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: tuscany/java/sca/modules/assembly-xsd/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/NOTICE?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/NOTICE (original)
+++ tuscany/java/sca/modules/assembly-xsd/NOTICE Mon Jun 22 10:21:11 2009
@@ -9,6 +9,7 @@
 copyright:
 
 Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.
+OASIS trademark, IPR and other policies apply.
 
 This product also includes software under the W3C(r) Software License
 (see the LICENSE file contained in this distribution), with the following
@@ -21,3 +22,17 @@
 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
     [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This product also includes software under the W3C(c) Software License
+with the following copyright:
+
+Copyright 2001 The Internet Society and W3C (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 document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD

Modified: tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
(original)
+++ tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
Mon Jun 22 10:21:11 2009
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, 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.
+ */
 package org.apache.tuscany.sca.contribution.java.impl;
 
 import java.io.File;

Modified: tuscany/java/sca/modules/definitions-xml/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/definitions-xml/LICENSE?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/modules/definitions-xml/LICENSE (original)
+++ tuscany/java/sca/modules/definitions-xml/LICENSE Mon Jun 22 10:21:11 2009
@@ -201,5 +201,53 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+=================================================================================================================
+
+This module also includes files under the following license:
+
+Copyright OASIS 2005, 2009. All Rights Reserved.
+All capitalized terms in the following text have the meanings assigned to them in the OASIS
Intellectual 
+Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS
website.
+This document and translations of it may be copied and furnished to others, and derivative
works that 
+comment on or otherwise explain it or assist in its implementation may be prepared, copied,
published, 
+and distributed, in whole or in part, without restriction of any kind, provided that the
above copyright 
+notice and this section are included on all such copies and derivative works. However, this
document 
+itself may not be modified in any way, including by removing the copyright notice or references
to OASIS, 
+except as needed for the purpose of developing any document or deliverable produced by an
OASIS 
+Technical Committee (in which case the rules applicable to copyrights, as set forth in the
OASIS IPR 
+Policy, must be followed) or as required to translate it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its
successors 
+or assigns.
+This document and the information contained herein is provided on an "AS IS" basis and OASIS

+DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 
+WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP 
+RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR 
+PURPOSE.
+OASIS requests that any OASIS Party or any other party that believes it has patent claims
that would 
+necessarily be infringed by implementations of this OASIS Committee Specification or OASIS
Standard, 
+to notify OASIS TC Administrator and provide an indication of its willingness to grant patent
licenses to 
+such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee
that 
+produced this specification.
+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of
ownership of 
+any patent claims that would necessarily be infringed by implementations of this specification
by a patent 
+holder that is not willing to provide a license to such patent claims in a manner consistent
with the IPR 
+Mode of the OASIS Technical Committee that produced this specification. OASIS may include
such 
+claims on its website, but disclaims any obligation to do so.
+OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that 
+might be claimed to pertain to the implementation or use of the technology described in this
document or 
+the extent to which any license under such rights might or might not be available; neither
does it represent 
+that it has made any effort to identify any such rights. Information on OASIS' procedures
with respect to 
+rights in any document or deliverable produced by an OASIS Technical Committee can be found
on the 
+OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses 
+to be made available, or the result of an attempt made to obtain a general license or permission
for the use 
+of such proprietary rights by implementers or users of this OASIS Committee Specification
or OASIS 
+Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation
that any 
+information or list of intellectual property rights will at any time be complete, or that
any claims in such list 
+are, in fact, Essential Claims.
+The names "OASIS",  are trademarks of OASIS, the owner and developer of this specification,
and should 
+be used only to refer to the organization and its official outputs. OASIS welcomes reference
to, and 
+implementation and use of, specifications, while reserving the right to enforce its marks
against misleading 
+uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
+
 
 

Modified: tuscany/java/sca/modules/definitions-xml/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/definitions-xml/NOTICE?rev=787187&r1=787186&r2=787187&view=diff
==============================================================================
--- tuscany/java/sca/modules/definitions-xml/NOTICE (original)
+++ tuscany/java/sca/modules/definitions-xml/NOTICE Mon Jun 22 10:21:11 2009
@@ -4,3 +4,9 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product also includes software under the OASIS specification License
+with the following copyright:
+
+Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+OASIS trademark, IPR and other policies apply.
+



Mime
View raw message