diff options
Diffstat (limited to '')
3 files changed, 7 insertions, 9 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java index a792d167a4..1177940891 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java +++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.codec.binary.Base64; import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Message; @@ -48,8 +49,6 @@ import org.json.JSONException; import org.json.JSONObject; import org.oasisopen.sca.ServiceRuntimeException; -import com.sun.xml.internal.messaging.saaj.util.Base64; - /** * Servlet that handles JSON-RPC requests invoking SCA services. * @@ -127,8 +126,7 @@ public class JSONRPCServiceServlet extends JSONRPCServlet { //parse the GET QueryString try { - String params = Base64.base64Decode(URLDecoder.decode(request.getParameter("params"),charset)); - + String params = new String(Base64.decodeBase64(URLDecoder.decode(request.getParameter("params"),charset).getBytes())); StringBuffer sb = new StringBuffer(); sb.append("{"); sb.append("\"method\": \"" + request.getParameter("method") + "\","); diff --git a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java index f65371ac5f..a510219501 100644 --- a/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java +++ b/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java @@ -507,7 +507,7 @@ public class DeployerImpl implements Deployer { return (T)model; } - public <T> T loadXMLDocument(URL document, Monitor monitor) throws XMLStreamException, ContributionReadException { + public Object loadXMLDocument(URL document, Monitor monitor) throws XMLStreamException, ContributionReadException { init(); XMLStreamReader reader = staxHelper.createXMLStreamReader(document); reader.nextTag(); @@ -533,13 +533,13 @@ public class DeployerImpl implements Deployer { } @SuppressWarnings("unchecked") - public <T> T loadXMLElement(XMLStreamReader reader, Monitor monitor) throws ContributionReadException, + public Object loadXMLElement(XMLStreamReader reader, Monitor monitor) throws ContributionReadException, XMLStreamException { init(); - return (T)staxProcessor.read(reader, new ProcessorContext(monitor)); + return staxProcessor.read(reader, new ProcessorContext(monitor)); } - public <T> T loadXMLDocument(Reader document, Monitor monitor) throws XMLStreamException, ContributionReadException { + public Object loadXMLDocument(Reader document, Monitor monitor) throws XMLStreamException, ContributionReadException { init(); XMLStreamReader reader = staxHelper.createXMLStreamReader(document); ValidatingXMLInputFactory.setMonitor(reader, monitor); diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml index a689391ca3..4e4a0cf403 100644 --- a/sca-java-2.x/trunk/modules/pom.xml +++ b/sca-java-2.x/trunk/modules/pom.xml @@ -113,7 +113,7 @@ <module>policy-transaction-runtime-geronimo</module> <module>sca-api</module> <module>sca-client-impl</module> - <module>sca-client-javascript</module> + <!-- module>sca-client-javascript</module --> <module>stripes</module> <module>tracing-aspectj</module> <module>xsd</module> |