Author: slaws
Date: Thu May 20 16:25:26 2010
New Revision: 946692
URL: http://svn.apache.org/viewvc?rev=946692&view=rev
Log:
Correct presentation of the OASIS license
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
tuscany/sca-java-2.x/trunk/modules/assembly-xsd/LICENSE
tuscany/sca-java-2.x/trunk/modules/sca-api/LICENSE
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE?rev=946692&r1=946691&r2=946692&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
(original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
Thu May 20 16:25:26 2010
@@ -1659,8 +1659,9 @@ Revision level 1.1, last updated on 2007
================================================================================
-The tuscany-assembly-xsd.jar includes XSD files under the following OASIS
license:
+The tuscany-assembly-xsd.jar and tuscany-sca-api.jar include files under the
following OASIS license:
+Copyright (C) OASIS(R) 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
@@ -1704,6 +1705,9 @@ be used only to refer to the organizatio
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 jruby-complete-1.4.0.jar includes files under the following licenses:
Common Public License - v 1.0
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xsd/LICENSE
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xsd/LICENSE?rev=946692&r1=946691&r2=946692&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xsd/LICENSE (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xsd/LICENSE Thu May 20 16:25:26
2010
@@ -217,6 +217,7 @@ conditions of the following licenses.
This module includes XSD files under the following OASIS license:
+Copyright (C) OASIS(R) 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
Modified: tuscany/sca-java-2.x/trunk/modules/sca-api/LICENSE
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-api/LICENSE?rev=946692&r1=946691&r2=946692&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-api/LICENSE (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-api/LICENSE Thu May 20 16:25:26 2010
@@ -201,4 +201,61 @@
See the License for the specific language governing permissions and
limitations under the License.
+===============================================================================
+
+Apache Tuscany SCA for Java Subcomponents
+=========================================:
+
+The Tuscany SCA for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+===============================================================================
+
+This module includes Java files under the following OASIS license:
+
+Copyright (C) OASIS(R) 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.