diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 20:55:15 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 20:55:15 +0000 |
| commit | 4be971f98025e5d7dbf1031eafb1fa400b35a0f2 (patch) | |
| tree | d47f2b91017117ab5d847e6d716a4d36c7d22827 /sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web | |
| parent | de4d84a0893946dfb8126dd4589e364f3b168701 (diff) | |
TUSCANY-3764: Fix problems and inconsistencies in LICENSE and NOTICE files
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030212 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/LICENSE | 44 | ||||
| -rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/NOTICE | 3 |
2 files changed, 44 insertions, 3 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/LICENSE index 6b0b1270ff..6e42c7155c 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/LICENSE @@ -201,3 +201,47 @@ See the License for the specific language governing permissions and limitations under the License. + +================================================================================ + +APACHE TUSCANY SCA SUBCOMPONENTS: + +Apache Tuscany SCA for Java includes a number of subcomponents with +separate copyright notices and license terms. Your use of these subcomponents +is subject to the terms and conditions of the following licenses. + +================================================================================ + +This module implementation-web-runtime includes the file jsonrpc.js under the +following copyright and license: + +/* + * JSON-RPC JavaScript client + * + * $Id: jsonrpc.js,v 1.36.2.3 2006/03/08 15:09:37 mclark Exp $ + * + * Copyright (c) 2003-2004 Jan-Klaas Kollhof + * Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd + * + * This code is based on Jan-Klaas' JavaScript o lait library (jsolait). + * + * Licensed 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. + * + */ + +/* + * Modifications for Apache Tuscany: + * - JSONRpcClient_createMethod changed so callback is last arg + */ + +================================================================================ diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/NOTICE index b8f34569f0..ad2ba40961 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/implementation-web-runtime/NOTICE @@ -4,6 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) - Copyright (c) 2003-2004 Jan-Klaas Kollhof - Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd |