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 2006/05/07 14:46:16 UTC
svn commit: r404755 - in /incubator/tuscany/java/sca/tomcat: ./
src/main/java/org/apache/tuscany/tomcat/
src/test/java/org/apache/tuscany/tomcat/integration/
Author: antelder
Date: Sun May 7 05:46:15 2006
New Revision: 404755
URL: http://svn.apache.org/viewcvs?rev=404755&view=rev
Log:
Fixes for TUSCANY-63, TUSCANY-65
Move JSONRPC Binding to new servlet registration mechanisim
Modified:
incubator/tuscany/java/sca/tomcat/pom.xml
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java
incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
Modified: incubator/tuscany/java/sca/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/pom.xml?rev=404755&r1=404754&r2=404755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/pom.xml (original)
+++ incubator/tuscany/java/sca/tomcat/pom.xml Sun May 7 05:46:15 2006
@@ -39,19 +39,6 @@
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.bindings</groupId>
- <artifactId>tuscany-binding-jsonrpc</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>metaparadigm</groupId>
- <artifactId>jsonrpc</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>tomcat</groupId>
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java?rev=404755&r1=404754&r2=404755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TomcatHost.java Sun May 7 05:46:15 2006
@@ -46,4 +46,8 @@
public void unregisterMapping(String mapping) {
host.unregisterMapping(mapping);
}
+
+ public Servlet getMapping(String mapping) {
+ return host.getMapping(mapping);
+ }
}
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java?rev=404755&r1=404754&r2=404755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyContextListener.java Sun May 7 05:46:15 2006
@@ -23,13 +23,11 @@
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Valve;
-import org.apache.catalina.util.StringManager;
import org.apache.catalina.core.StandardWrapper;
+import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tuscany.binding.axis2.entrypoint.WebServiceEntryPointServlet;
-import org.apache.tuscany.binding.jsonrpc.handler.JSONRPCEntryPointServlet;
-import org.apache.tuscany.binding.jsonrpc.handler.ScriptGetterServlet;
import org.apache.tuscany.common.resource.ResourceLoader;
import org.apache.tuscany.common.resource.impl.ResourceLoaderImpl;
import org.apache.tuscany.core.client.BootstrapHelper;
@@ -40,7 +38,6 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.model.assembly.AssemblyFactory;
-import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.impl.AssemblyContextImpl;
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
@@ -108,7 +105,6 @@
// add the web service servlet wrapper
addWebServiceWrapper(ctx);
- addJSONRPCServiceWrapper(ctx);
// add the RuntimeContext in as a servlet context parameter
ServletContext servletContext = ctx.getServletContext();
@@ -121,7 +117,7 @@
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
try {
- AssemblyContext modelContext = new AssemblyContextImpl(modelFactory, modelLoader, resourceLoader);
+ AssemblyContextImpl modelContext = new AssemblyContextImpl(modelFactory, modelLoader, resourceLoader, ctx.getName());
ModuleComponentConfigurationLoader loader = BootstrapHelper.getConfigurationLoader(runtime.getSystemContext(), modelContext);
@@ -159,29 +155,4 @@
ctx.addServletMapping("/services/*", wrapper.getName());
}
- private static void addJSONRPCServiceWrapper(Context ctx) {
- // todo this should not depend on jsonrpc, we need an API in the model for embedders
- // todo should only add this servlet if we need it
- // todo servlet implementation should be determined by the binding implementation
- // todo should get path from entry point definition and not hard code to /services
-
- {
- Class<JSONRPCEntryPointServlet> servletClass = JSONRPCEntryPointServlet.class;
- StandardWrapper wrapper = new StandardWrapper();
- wrapper.setName("TuscanyJSONRPCServlet");
- wrapper.setLoader(new ContainerLoader(servletClass.getClassLoader()));
- wrapper.setServletClass(servletClass.getName());
- ctx.addChild(wrapper);
- ctx.addServletMapping("/SCA/jsonrpc/*", wrapper.getName());
- }
- {
- Class<ScriptGetterServlet> servletClass = ScriptGetterServlet.class;
- StandardWrapper wrapper = new StandardWrapper();
- wrapper.setName("TuscanyJSONRPCScriptServlet");
- wrapper.setLoader(new ContainerLoader(servletClass.getClassLoader()));
- wrapper.setServletClass(servletClass.getName());
- ctx.addChild(wrapper);
- ctx.addServletMapping("/SCA/scripts/*", wrapper.getName());
- }
- }
}
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java?rev=404755&r1=404754&r2=404755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java Sun May 7 05:46:15 2006
@@ -25,7 +25,6 @@
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.util.StringManager;
-
import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
@@ -147,11 +146,16 @@
assert mapping.startsWith(contextPath);
mapping = mapping.substring(contextPath.length());
Wrapper wrapper = new TuscanyWrapper(servlet);
+ wrapper.setName(mapping.substring(0,mapping.lastIndexOf('/')));
ctx.addChild(wrapper);
wrapper.addMapping(mapping);
ctx.getMapper().addWrapper(mapping, wrapper, false);
}
public void unregisterMapping(String mapping) {
+ }
+
+ public Servlet getMapping(String mapping) {
+ return null;
}
}
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java?rev=404755&r1=404754&r2=404755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyWrapper.java Sun May 7 05:46:15 2006
@@ -25,6 +25,8 @@
* @version $Rev$ $Date$
*/
public class TuscanyWrapper extends StandardWrapper {
+ private static final long serialVersionUID = 1L;
+
private final Servlet servlet;
public TuscanyWrapper(Servlet servlet) {
Modified: incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java?rev=404755&r1=404754&r2=404755&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/test/java/org/apache/tuscany/tomcat/integration/AbstractTomcatTest.java Sun May 7 05:46:15 2006
@@ -40,8 +40,6 @@
import org.apache.catalina.core.ApplicationFilterFactory;
import org.apache.catalina.core.StandardEngine;
-import org.apache.tuscany.tomcat.TuscanyHost;
-
/**
* @version $Rev$ $Date$
*/
@@ -89,7 +87,7 @@
private String scheme;
private String requestURI;
private String contentType;
- private Map<String,String> headers = new HashMap();
+ private Map<String,String> headers = new HashMap<String,String>();
private ServletInputStream inputStream;
public void setScheme(String scheme) {
@@ -210,7 +208,7 @@
private boolean suspended;
private String contentType;
private int status = 200;
- private Map headers = new HashMap();
+ private Map<String, String> headers = new HashMap<String, String>();
private MockOutputStream outputStream = new MockOutputStream();
public boolean isCommitted() {