Author: nash
Date: Fri May 7 20:19:51 2010
New Revision: 942202
URL: http://svn.apache.org/viewvc?rev=942202&view=rev
Log:
Use Base64 class from commons-codec instead of forbidden internal JRE class
(TUSCANY-3549)
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
Modified: tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/pom.xml?rev=942202&r1=942201&r2=942202&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/pom.xml Fri May
7 20:19:51 2010
@@ -102,6 +102,11 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
Modified:
tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java?rev=942202&r1=942201&r2=942202&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
(original)
+++
tuscany/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
Fri May 7 20:19:51 2010
@@ -50,7 +50,7 @@ import com.metaparadigm.jsonrpc.JSONRPCB
import com.metaparadigm.jsonrpc.JSONRPCResult;
import com.metaparadigm.jsonrpc.JSONRPCServlet;
-import com.sun.xml.internal.messaging.saaj.util.Base64;
+import org.apache.commons.codec.binary.Base64;
/**
* Servlet that handles JSON-RPC requests invoking SCA services.
@@ -137,7 +137,8 @@ public class JSONRPCServiceServlet exten
//parse the GET QueryString
try {
- String params =
Base64.base64Decode(URLDecoder.decode(request.getParameter("params"),charset));
+ String reqParams =
URLDecoder.decode(request.getParameter("params"),charset);
+ String params = new
String(Base64.decodeBase64(reqParams.getBytes()));
StringBuffer sb = new StringBuffer();
sb.append("{");