From 04dcd09976ecc5aa2948993b9a9a2d90d239ee44 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jul 2011 10:58:07 +0000 Subject: Delete old beta3 branch as its going to be recreated from the current trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68 --- .../provider/WidgetComponentScriptServlet.java | 62 -------- .../provider/WidgetImplementationInvoker.java | 101 ------------- .../provider/WidgetImplementationProvider.java | 157 --------------------- .../WidgetImplementationProviderFactory.java | 65 --------- 4 files changed, 385 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java (limited to 'sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation') diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java deleted file mode 100644 index a28e014b2e..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.widget.provider; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator; - - -/** - * Servlet to handle requests for the widget component .js script. - * - * @version $Rev$ $Date$ - */ -public class WidgetComponentScriptServlet extends HttpServlet { - private static final long serialVersionUID = 2454705532282398190L; - - private transient ComponentJavaScriptGenerator javaScriptgenerator; - private transient RuntimeComponent component; - - - /** - * Constructor receiving the runtimeComponent reference that is going to be used to generate the widget client js - * @param component - */ - public WidgetComponentScriptServlet(RuntimeComponent component, ComponentJavaScriptGenerator javaScriptgenerator) { - this.component = component; - this.javaScriptgenerator = javaScriptgenerator; - } - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { - ServletOutputStream os = response.getOutputStream(); - PrintWriter pw = new PrintWriter(os); - - javaScriptgenerator.generateJavaScriptCode(component, pw); - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java deleted file mode 100644 index 28a1f6d1db..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.implementation.widget.provider; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.net.MalformedURLException; -import java.net.URL; - -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator; - - -/** - * Implements an invoker for resource component implementations. - * - * @version $Rev$ $Date$ - */ -class WidgetImplementationInvoker implements Invoker { - private RuntimeComponent component; - private ComponentJavaScriptGenerator javaScriptGenerator; - private String widgetName; - private String widgetFolderURL; - private String widgetLocationURL; - - WidgetImplementationInvoker(RuntimeComponent component, ComponentJavaScriptGenerator javaScriptGenerator, String widgetName, String widgetFolderURL, String widgetLocationURL) { - this.component = component; - this.javaScriptGenerator = javaScriptGenerator; - this.widgetName = widgetName + ".js"; - this.widgetFolderURL = widgetFolderURL; - this.widgetLocationURL = widgetLocationURL; - } - - public Message invoke(Message msg) { - - // Get the resource id from the request message - String id = (String)((Object[])msg.getBody())[0]; - try { - - if (id.length() == 0) { - - // Return an input stream for the widget resource - URL url = new URL(widgetLocationURL); - InputStream is = url.openStream(); - msg.setBody(is); - - } else if (id.equals(widgetName)) { - - // Generate JavaScript header for use in the Widget - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - PrintWriter pw = new PrintWriter(bos); - - javaScriptGenerator.generateJavaScriptCode(component, pw); - - InputStream is = new ByteArrayInputStream(bos.toByteArray()); - - msg.setBody(is); - - } else { - - // Return an input stream for a resource inside the - // widget folder - URL url = new URL(widgetFolderURL +'/' + id); - InputStream is = url.openStream(); - msg.setBody(is); - } - } catch (MalformedURLException e) { - - // Report exception as a fault - msg.setFaultBody(e); - - } catch (IOException e) { - - // Report exception as a fault - msg.setFaultBody(e); - } - return msg; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java deleted file mode 100644 index 28f041b919..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.implementation.widget.provider; - -import java.net.URI; - -import javax.servlet.Servlet; -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.Base; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.implementation.widget.WidgetImplementation; -import org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator; - - -/** - * The model representing a resource implementation in an SCA assembly model. - * - * @version $Rev$ $Date$ - */ -class WidgetImplementationProvider implements ImplementationProvider { - private static final QName BINDING_HTTP = new QName(Base.SCA11_TUSCANY_NS, "binding.http"); - - private RuntimeComponent component; - - private WidgetImplementationJavascriptProvider javascriptProvider; - private ComponentJavaScriptGenerator javaScriptGenerator; - private ServletHost servletHost; - - private String widgetLocationURL; - private String widgetFolderURL; - private String widgetName; - - private String scriptURI; - - /** - * Constructs a new resource implementation provider. - */ - WidgetImplementationProvider(RuntimeComponent component, - WidgetImplementation implementation, - WidgetImplementationJavascriptProvider javascriptProvider, - ComponentJavaScriptGenerator javaScriptGenerator, - ServletHost servletHost) { - - this.component = component; - - this.javaScriptGenerator = javaScriptGenerator; - this.servletHost = servletHost; - - widgetLocationURL = implementation.getLocationURL().toString(); - int s = widgetLocationURL.lastIndexOf('/'); - widgetFolderURL = widgetLocationURL.substring(0, s); - widgetName = widgetLocationURL.substring(s +1); - widgetName = widgetName.substring(0, widgetName.lastIndexOf('.')); - } - - public Invoker createInvoker(RuntimeComponentService service, Operation operation) { - WidgetImplementationInvoker invoker = new WidgetImplementationInvoker(component, javaScriptGenerator, widgetName, widgetFolderURL, widgetLocationURL); - return invoker; - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - String baseURI = getBaseURI(); - - // this uses removeServletMapping / addServletMapping as there is no getServletMapping facility - scriptURI = URI.create(baseURI + "/" + this.widgetName + ".js").toString(); - Servlet servlet = servletHost.getServletMapping(scriptURI); - if (servlet == null /*|| servlet instanceof HTTPGetListenerServlet*/) { - WidgetComponentScriptServlet widgetScriptServlet; - widgetScriptServlet = new WidgetComponentScriptServlet(this.component, javaScriptGenerator); - servletHost.addServletMapping(scriptURI, widgetScriptServlet); - } - - // If added to the class path, start dojo provider - if(javascriptProvider != null) { - javascriptProvider.start(); - } - - } - - public void stop() { - // Unregister the component client script Servlet - WidgetComponentScriptServlet widgetScriptServlet = (WidgetComponentScriptServlet) servletHost.getServletMapping(scriptURI); - if (widgetScriptServlet != null) { - // Remove the Servlet mapping - servletHost.removeServletMapping(scriptURI); - } - - if(javascriptProvider != null) { - javascriptProvider.stop(); - } - } - - - /** - * Get the contextRoot considering the HTTP Binding URI when in a embedded environment - * @return - */ - private String getBaseURI() { - String baseURI = null; - String contextPath = "/"; - if (servletHost != null) { - contextPath = servletHost.getContextPath(); - } - if (!contextPath.endsWith("/")) { - contextPath = contextPath + "/"; - } - - ComponentService service = component.getService("Widget"); - if (service != null) { - for (Binding binding : service.getBindings()) { - if (binding.getType().equals(BINDING_HTTP)) { - String bindingURI = binding.getURI(); - URI uri = URI.create(bindingURI); - if (uri.isAbsolute()) { - return bindingURI; - } - if (bindingURI.startsWith("/")) { - bindingURI = bindingURI.substring(1); - } - baseURI = contextPath + bindingURI; - } - } - } - - return baseURI == null ? "" : baseURI; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java deleted file mode 100644 index 9c140f0913..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.implementation.widget.provider; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostHelper; -import org.apache.tuscany.sca.implementation.widget.WidgetImplementation; -import org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.provider.ImplementationProviderFactory; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator; -import org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint; - -/** - * The model representing a resource implementation in an SCA assembly model. - * - * @version $Rev$ $Date$ - */ -public class WidgetImplementationProviderFactory implements ImplementationProviderFactory { - private ServletHost servletHost; - - private WidgetImplementationJavascriptProvider javascriptProvider; - private ComponentJavaScriptGenerator javascriptGenerator; - - /** - * Constructs a resource implementation. - */ - public WidgetImplementationProviderFactory(ExtensionPointRegistry registry) { - this.servletHost = ServletHostHelper.getServletHost(registry); - - UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); - javascriptProvider = utilities.getUtility(WidgetImplementationJavascriptProvider.class); - - ComponentJavaScriptGeneratorExtensionPoint javascriptGeneratorExtensionPoint = registry.getExtensionPoint(ComponentJavaScriptGeneratorExtensionPoint.class); - javascriptGenerator = javascriptGeneratorExtensionPoint.getComponentJavaScriptGenerators().get(0); - - } - - public ImplementationProvider createImplementationProvider(RuntimeComponent component, WidgetImplementation implementation) { - return new WidgetImplementationProvider(component, implementation, javascriptProvider, javascriptGenerator, servletHost); - } - - public Class getModelType() { - return WidgetImplementation.class; - } -} -- cgit v1.2.3