You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/04/08 15:36:28 UTC
svn commit: r931936 - in /tuscany/sca-java-2.x/trunk: ./ distribution/
modules/
modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/
modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/
Author: antelder
Date: Thu Apr 8 13:36:27 2010
New Revision: 931936
URL: http://svn.apache.org/viewvc?rev=931936&view=rev
Log:
As a trial to see if we can rule out the tuscany eclipse compiler causing the too many open files problem on Hudson try changing to use the regular maven compiler
Modified:
tuscany/sca-java-2.x/trunk/distribution/pom.xml
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
tuscany/sca-java-2.x/trunk/modules/pom.xml
tuscany/sca-java-2.x/trunk/pom.xml
Modified: tuscany/sca-java-2.x/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/pom.xml?rev=931936&r1=931935&r2=931936&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/pom.xml Thu Apr 8 13:36:27 2010
@@ -32,7 +32,7 @@
<modules>
<module>all</module>
- <!-- module>tomcat</module -->
+ <module>tomcat</module>
</modules>
</project>
Modified: tuscany/sca-java-2.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-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java?rev=931936&r1=931935&r2=931936&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java Thu Apr 8 13:36:27 2010
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletReq
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 exten
//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") + "\",");
Modified: tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=931936&r1=931935&r2=931936&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java Thu Apr 8 13:36:27 2010
@@ -507,7 +507,7 @@ public class DeployerImpl implements Dep
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 Dep
}
@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);
Modified: tuscany/sca-java-2.x/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/pom.xml?rev=931936&r1=931935&r2=931936&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/pom.xml Thu Apr 8 13:36:27 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=931936&r1=931935&r2=931936&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Thu Apr 8 13:36:27 2010
@@ -828,22 +828,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <compilerId>tuscany-eclipse</compilerId>
- <source>1.5</source>
- <target>1.5</target>
- <compilerArguments>
- <osgi>true</osgi>
- </compilerArguments>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-eclipse-compiler</artifactId>
- <version>1.0.2</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
<!-- surefire plugin configuration -->