From 26501e1b626bc50f5b823dc12b8050de22ca8457 Mon Sep 17 00:00:00 2001 From: lresende Date: Sun, 29 Sep 2013 23:32:31 +0000 Subject: Replace json.org dependency with json4j git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1527423 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0/distribution/all/src/main/release/bin/LICENSE | 18 ++---------------- .../2.0/modules/binding-jsonrpc-runtime/pom.xml | 6 ------ .../sca/binding/jsonrpc/protocol/JsonRpc20Request.java | 2 +- .../sca/binding/jsonrpc/provider/JavaToSmd.java | 4 ++-- .../sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java | 2 +- .../sca/binding/jsonrpc/JSONRPCExceptionTestCase.java | 2 +- .../sca/binding/jsonrpc/JSONRPCServiceTestCase.java | 4 ++-- .../sca/binding/jsonrpc/JSONRPCSmdTestCase.java | 2 +- 8 files changed, 10 insertions(+), 30 deletions(-) diff --git a/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE index 51a6ecff8f..1b03695991 100644 --- a/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE @@ -263,7 +263,6 @@ The following components come under Apache Software License 2.0 jackson-core-asl-1.9.4.jar jackson-mapper-asl-1.9.4.jar jackson-xc-1.9.4.jar - jackson-module-json-org-0.9.1.jar jettison-1.2.jar jetty-6.1.26.jar jetty-util-6.1.26.jar @@ -310,6 +309,7 @@ The following components come under Apache Software License 2.0 tranql-connector-1.1.jar tribes-6.0.26.jar wink-common-1.2.0-incubating.jar + wink-json4j-1.2.0-incubating.jar wink-client-1.2.0-incubating.jar wink-client-apache-httpclient-1.2.0-incubating.jar wink-server-1.2.0-incubating.jar @@ -2229,18 +2229,4 @@ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. 8. By copying, installing or otherwise using Jython, Licensee agrees to be bound by the terms and conditions of this License Agreement. -======================================================================================================== - -The json-20090211.jar includes files under the following licenses: -======================================================================================================== -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -======================================================================================================== - +======================================================================================================== \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml index 380c2020e3..80e68d4334 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml +++ b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml @@ -91,12 +91,6 @@ test - - org.json - json - 20090211 - - org.slf4j diff --git a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java index 22b3b7057f..596ba65449 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java +++ b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java @@ -31,7 +31,7 @@ import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.node.ArrayNode; import org.codehaus.jackson.node.JsonNodeFactory; import org.codehaus.jackson.node.ObjectNode; -import org.json.JSONException; +import org.apache.wink.json4j.JSONException; public class JsonRpc20Request extends JsonRpcRequest { diff --git a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java index 3cbcdf735d..12fe6836c6 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java +++ b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.binding.jsonrpc.provider; import java.lang.reflect.Method; import java.util.Collection; -import org.json.JSONArray; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONArray; +import org.apache.wink.json4j.JSONObject; /** * Utility class to create a Simple Method Description (SMD) descriptor diff --git a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java index 107866137d..7b918c934e 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java +++ b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONObject; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java index 037c6f3ad0..bed6cc4739 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java +++ b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONObject; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java index bbf8d4cee7..67285cb583 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java +++ b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java @@ -28,8 +28,8 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.json.JSONArray; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONArray; +import org.apache.wink.json4j.JSONObject; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java index 0ee1643243..4794fbf147 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java +++ b/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONObject; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -- cgit v1.2.3