Merge r1030212 TUSCANY-3764: Fix problems and inconsistencies in LICENSE and NOTICE files

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030233 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 43 insertions, 1 deletions

diff --git a/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE
index 8aa906c321..ff88653d04 100644
--- a/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE
+++ b/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/LICENSE
@@ -202,4 +202,46 @@
    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 binding-jsonrpc-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
+ */
+
+================================================================================