Author: antelder
Date: Wed Feb 18 09:36:29 2009
New Revision: 745453
URL: http://svn.apache.org/viewvc?rev=745453&view=rev
Log:
Remove context script code as its not used presently, move JSP taglib from
host-webapp to implementation-web-runtime
Removed:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
tuscany/java/sca/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
tuscany/java/sca/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
Modified:
tuscany/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
tuscany/java/sca/modules/host-webapp/pom.xml
tuscany/java/sca/modules/implementation-web-runtime/pom.xml
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
tuscany/java/sca/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
Modified: tuscany/java/sca/modules/host-webapp/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/META-INF/MANIFEST.MF?rev=745453&r1=745452&r2=745453&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/host-webapp/META-INF/MANIFEST.MF Wed Feb 18
09:36:29 2009
@@ -26,8 +26,6 @@
Import-Package: javax.naming,
javax.servlet,
javax.servlet.http,
- javax.servlet.jsp,
- javax.servlet.jsp.tagext,
org.apache.tuscany.sca.core;version="2.0.0",
org.apache.tuscany.sca.host.http;version="2.0.0",
org.apache.tuscany.sca.host.webapp;version="2.0.0",
Modified: tuscany/java/sca/modules/host-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/pom.xml?rev=745453&r1=745452&r2=745453&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/pom.xml (original)
+++ tuscany/java/sca/modules/host-webapp/pom.xml Wed Feb 18 09:36:29 2009
@@ -76,12 +76,6 @@
<version>2.5</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
-
</dependencies>
</project>
Modified: tuscany/java/sca/modules/implementation-web-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/pom.xml?rev=745453&r1=745452&r2=745453&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/pom.xml Wed Feb 18
09:36:29 2009
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-http</artifactId>
+ <artifactId>tuscany-host-webapp</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
<scope>provided</scope>
</dependency>
Modified:
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java?rev=745453&r1=745452&r2=745453&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
(original)
+++
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
Wed Feb 18 09:36:29 2009
@@ -18,14 +18,7 @@
*/
package org.apache.tuscany.sca.implementation.web.runtime;
-import java.util.List;
-
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.implementation.web.ComponentContextServlet;
-import
org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint;
-import
org.apache.tuscany.sca.implementation.web.DefaultContextScriptProcessorExtensionPoint;
import org.apache.tuscany.sca.implementation.web.WebImplementation;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
@@ -33,30 +26,14 @@
import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-public class WebImplementationProviderFactory implements
ImplementationProviderFactory<WebImplementation> {
- private ServletHost servletHost;
- private ComponentContextServlet contextServlet;
+public class WebImplementationProviderFactory implements
ImplementationProviderFactory<WebImplementation> {
public WebImplementationProviderFactory(ExtensionPointRegistry
extensionPoints) {
- ServletHostExtensionPoint servletHosts =
extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
- List<ServletHost> hosts = servletHosts.getServletHosts();
- if (!hosts.isEmpty()) {
- this.servletHost = hosts.get(0);
- }
-
- contextServlet = new ComponentContextServlet();
-
- DefaultContextScriptProcessorExtensionPoint dcspep =
(DefaultContextScriptProcessorExtensionPoint)extensionPoints.getExtensionPoint(ContextScriptProcessorExtensionPoint.class);
- dcspep.setComponentContextServlet(contextServlet);
}
public ImplementationProvider
createImplementationProvider(RuntimeComponent component, WebImplementation
implementation) {
- servletHost.addServletMapping("org.osoa.sca.componentContext.js",
contextServlet);
- contextServlet.setAttribute("org.osoa.sca.ComponentContext", new
ComponentContextProxy(component));
-
contextServlet.setAttribute("org.apache.tuscany.sca.implementation.web.RuntimeComponent",
component);
-
return new ImplementationProvider() {
public Invoker createInvoker(RuntimeComponentService arg0,
Operation arg1) {
throw new UnsupportedOperationException("Components using
implementation.web have no services");
Modified:
tuscany/java/sca/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld?rev=745453&r1=745452&r2=745453&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
(original)
+++
tuscany/java/sca/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
Wed Feb 18 09:36:29 2009
@@ -7,8 +7,6 @@
see
http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
-->
-
-
<taglib version="2.1" xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd";>
<tlib-version>1.0</tlib-version>
@@ -20,8 +18,8 @@
<name>reference</name>
-
<tag-class>org.apache.tuscany.sca.implementation.web.taglib.ReferenceTag</tag-class>
-
<tei-class>org.apache.tuscany.sca.implementation.web.taglib.ReferenceTEI</tei-class>
+
<tag-class>org.apache.tuscany.sca.implementation.web.runtime.jsp.ReferenceTag</tag-class>
+
<tei-class>org.apache.tuscany.sca.implementation.web.runtime.jsp.ReferenceTEI</tei-class>
<attribute>
<name>name</name>
