tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r1527423 - in /tuscany/sca-java-2.x/branches/2.0: distribution/all/src/main/release/bin/ modules/binding-jsonrpc-runtime/ modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/ modules/binding-jsonrpc...
Date Sun, 29 Sep 2013 23:32:32 GMT
Author: lresende
Date: Sun Sep 29 23:32:31 2013
New Revision: 1527423

URL: http://svn.apache.org/r1527423
Log:
Replace json.org dependency with json4j

Modified:
    tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
    tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml
    tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java
    tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
    tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
    tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
    tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
    tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java

Modified: tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE (original)
+++ tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE Sun Sep
29 23:32:31 2013
@@ -263,7 +263,6 @@ The following components come under Apac
  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 Apac
  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 VERSI
 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

Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/pom.xml Sun Sep 29 23:32:31
2013
@@ -91,12 +91,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20090211</version>
-        </dependency>
-
         <!-- Explicitly add slf4j so that jabsorb uses the latest versions -->
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/protocol/JsonRpc20Request.java
Sun Sep 29 23:32:31 2013
@@ -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 {
 

Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
Sun Sep 29 23:32:31 2013
@@ -21,8 +21,8 @@ package org.apache.tuscany.sca.binding.j
 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

Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
Sun Sep 29 23:32:31 2013
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.node.Contr
 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;

Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
Sun Sep 29 23:32:31 2013
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.node.Contr
 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;

Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
Sun Sep 29 23:32:31 2013
@@ -28,8 +28,8 @@ import org.apache.tuscany.sca.node.Contr
 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;

Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java?rev=1527423&r1=1527422&r2=1527423&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
(original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
Sun Sep 29 23:32:31 2013
@@ -25,7 +25,7 @@ import org.apache.tuscany.sca.node.Contr
 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;



Mime
View raw message