From cdc5060abcdf963ad1e1de02e7275f41dbca9707 Mon Sep 17 00:00:00 2001 From: antelder Date: Mon, 23 Mar 2009 08:00:46 +0000 Subject: Delete old m2 branch in the sandbox git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@757344 13f79535-47bb-0310-9956-ffa450edef68 --- .../NodeImplementationDaemonBootstrap.java | 111 ------ .../NodeImplementationLauncherBootstrap.java | 147 -------- .../launcher/NodeImplementationLauncherUtil.java | 51 --- .../node/provider/NodeImplementationInvoker.java | 44 --- .../node/provider/NodeImplementationProvider.java | 62 ---- .../NodeImplementationProviderFactory.java | 49 --- .../node/webapp/NodeWebAppRequestDispatcher.java | 119 ------- .../node/webapp/NodeWebAppServletHost.java | 396 --------------------- ...cany.sca.provider.ImplementationProviderFactory | 19 - .../node/NodeImplementationTestCase.java | 54 --- .../src/test/resources/TestComposite.composite | 29 -- .../src/test/resources/TestNode.composite | 30 -- 12 files changed, 1111 deletions(-) delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestComposite.composite delete mode 100644 sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestNode.composite (limited to 'sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src') diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java deleted file mode 100644 index 202514d89e..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java +++ /dev/null @@ -1,111 +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.node.launcher; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.oasisopen.sca.CallableReference; -import org.oasisopen.sca.ServiceReference; - -/** - * Bootstrap class for the SCA node daemon. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationDaemonBootstrap { - private Node node; - - /** - * A node wrappering an instance of a node daemon. - */ - public static class NodeFacade implements Node { - private ClassLoader threadContextClassLoader; - private ClassLoader runtimeClassLoader; - private Node daemon; - - private NodeFacade() { - runtimeClassLoader = Thread.currentThread().getContextClassLoader(); - } - - public void start() { - threadContextClassLoader = Thread.currentThread().getContextClassLoader(); - boolean started = false; - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - NodeFactory factory = NodeFactory.newInstance(); - String contribution = ContributionLocationHelper.getContributionLocation(getClass()); - daemon = factory.createNode("NodeDaemon.composite", new Contribution("node-runtime", contribution)); - started = true; - } finally { - if (!started) { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - } - - public void stop() { - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - daemon.stop(); - } finally { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - - public void destroy() { - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - daemon.destroy(); - } finally { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - - public > R cast(B target) throws IllegalArgumentException { - throw new UnsupportedOperationException(); - } - - public B getService(Class businessInterface, String serviceName) { - throw new UnsupportedOperationException(); - } - - public ServiceReference getServiceReference(Class businessInterface, String serviceName) { - throw new UnsupportedOperationException(); - } - } - - /** - * Constructs a new daemon bootstrap. - */ - public NodeImplementationDaemonBootstrap() throws Exception { - node = new NodeFacade(); - } - - /** - * Returns the node representing the daemon. - * @return - */ - public Node getNode() { - return node; - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java deleted file mode 100644 index 2daab36796..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java +++ /dev/null @@ -1,147 +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.node.launcher; - -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.oasisopen.sca.CallableReference; -import org.oasisopen.sca.ServiceReference; - -/** - * Bootstrap class for standalone SCA nodes. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationLauncherBootstrap { - - private Node node; - - /** - * A node facade. - */ - public static class NodeFacade implements Node, Client { - private ClassLoader threadContextClassLoader; - private ClassLoader runtimeClassLoader; - private Node delegate; - - private NodeFacade(Node delegate) { - runtimeClassLoader = Thread.currentThread().getContextClassLoader(); - this.delegate = delegate; - } - - public void start() { - threadContextClassLoader = Thread.currentThread().getContextClassLoader(); - boolean started = false; - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - delegate.start(); - started = true; - } finally { - if (!started) { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - } - - public void stop() { - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - delegate.stop(); - } finally { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - - public void destroy() { - try { - Thread.currentThread().setContextClassLoader(runtimeClassLoader); - delegate.destroy(); - } finally { - Thread.currentThread().setContextClassLoader(threadContextClassLoader); - } - } - - public > R cast(B target) throws IllegalArgumentException { - return (R)((Client)delegate).cast(target); - } - - public B getService(Class businessInterface, String serviceName) { - return (B)((Client)delegate).getService(businessInterface, serviceName); - } - - public ServiceReference getServiceReference(Class businessInterface, String referenceName) { - return (ServiceReference)((Client)delegate).getServiceReference(businessInterface, referenceName); - } - } - - /** - * Bootstrap a new SCA node. - * - * @param configurationURI - */ - public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception { - NodeFactory nodeFactory = NodeFactory.newInstance(); - node = new NodeFacade(nodeFactory.createNode(configurationURI)); - } - - /** - * Bootstrap a new SCA node. - * - * @param compositeURI - * @param uris - * @param locations - */ - public NodeImplementationLauncherBootstrap(String compositeURI, String[] uris, String[] locations) throws Exception { - NodeFactory nodeFactory = NodeFactory.newInstance(); - Contribution[] contributions = new Contribution[uris.length]; - for (int i = 0; i < uris.length; i++) { - contributions[i] = new Contribution(uris[i], locations[i]); - } - node = new NodeFacade(nodeFactory.createNode(compositeURI, contributions)); - } - - /** - * Bootstrap a new SCA node. - * - * @param compositeURI - * @param uris - * @param locations - */ - public NodeImplementationLauncherBootstrap(String compositeURI, String compositeContent, String[] uris, String[] locations) throws Exception { - NodeFactory nodeFactory = NodeFactory.newInstance(); - Contribution[] contributions = new Contribution[uris.length]; - for (int i = 0; i < uris.length; i++) { - contributions[i] = new Contribution(uris[i], locations[i]); - } - node = new NodeFacade(nodeFactory.createNode(compositeURI, compositeContent, contributions)); - } - - /** - * Returns the SCA node. - * - * @return - */ - public Node getNode() { - return node; - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java deleted file mode 100644 index 62a822a85e..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java +++ /dev/null @@ -1,51 +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.node.launcher; - -/** - * Utility methods for node implementation launchers. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationLauncherUtil { - - private static final String TUSCANY_DOMAIN = "TUSCANY_DOMAIN"; - private static final String DEFAULT_DOMAIN = "http://localhost:9990"; - - /** - * Determine the URI of a node configuration. The domain URI can be configured - * using a TUSCANY_DOMAIN system property or environment variable. - * - * @param nodeName - * @return - */ - public static String nodeConfigurationURI(String nodeName) { - String domain = System.getProperty(TUSCANY_DOMAIN); - if (domain == null || domain.length() == 0) { - domain = System.getenv(TUSCANY_DOMAIN); - } - if (domain == null || domain.length() ==0) { - domain = DEFAULT_DOMAIN; - } - String nodeConfiguration = domain + "/node-config/" + nodeName; - return nodeConfiguration; - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java deleted file mode 100644 index 5895a8614d..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java +++ /dev/null @@ -1,44 +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.node.provider; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; - -/** - * Implements an invoker for node component implementations. - * - * @version $Rev$ $Date$ - */ -class NodeImplementationInvoker implements Invoker { - private Composite composite; - - NodeImplementationInvoker(Composite composite) { - this.composite = composite; - } - - public Message invoke(Message msg) { - //FIXME Implement later - msg.setBody(composite); - return msg; - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java deleted file mode 100644 index 6cdb18938e..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.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.node.provider; - -import org.apache.tuscany.sca.implementation.node.NodeImplementation; -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; - -/** - * An implementation provider for node component implementations. - * - * @version $Rev$ $Date$ - */ -class NodeImplementationProvider implements ImplementationProvider { - - private NodeImplementation implementation; - - /** - * Constructs a new node implementation provider. - * - * @param component - * @param implementation - */ - NodeImplementationProvider(RuntimeComponent component, NodeImplementation implementation) { - this.implementation = implementation; - } - - public Invoker createInvoker(RuntimeComponentService service, Operation operation) { - NodeImplementationInvoker invoker = new NodeImplementationInvoker(implementation.getComposite()); - return invoker; - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - } - - public void stop() { - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java deleted file mode 100644 index e2a3e4df92..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java +++ /dev/null @@ -1,49 +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.node.provider; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.node.NodeImplementation; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.provider.ImplementationProviderFactory; -import org.apache.tuscany.sca.runtime.RuntimeComponent; - -/** - * Factory for node component implementation providers. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationProviderFactory implements ImplementationProviderFactory { - - /** - * Constructs a new factory. - * - * @param extensionPoints - */ - public NodeImplementationProviderFactory(ExtensionPointRegistry extensionPoints) { - } - - public ImplementationProvider createImplementationProvider(RuntimeComponent component, NodeImplementation implementation) { - return new NodeImplementationProvider(component, implementation); - } - - public Class getModelType() { - return NodeImplementation.class; - } -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java deleted file mode 100644 index f6a601a3cd..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java +++ /dev/null @@ -1,119 +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.node.webapp; - -import java.io.IOException; -import java.util.StringTokenizer; - -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -/** - * A Servlet request dispatcher that can be used to delegate requests to a - * Serlvet registered with the Webapp Servlet host. - * - * @version $Rev$ $Date$ - */ -class NodeWebAppRequestDispatcher implements RequestDispatcher { - private String servletPath; - private Servlet servlet; - - /** - * Constructs a new request dispatcher. - * - * @param mapping - * @param servlet - */ - public NodeWebAppRequestDispatcher(String mapping, Servlet servlet) { - if (mapping.endsWith("*")) { - mapping = mapping.substring(0, mapping.length()-1); - } - if (mapping.endsWith("/")) { - mapping = mapping.substring(0, mapping.length()-1); - } - this.servletPath = mapping; - this.servlet = servlet; - } - - /** - * Returns a request wrapper which will return the correct Servlet path - * and path info. - * - * @param request - * @return - */ - private HttpServletRequest createRequestWrapper(ServletRequest request) { - HttpServletRequest requestWrapper = new HttpServletRequestWrapper((HttpServletRequest)request) { - - @Override - public String getServletPath() { - return servletPath; - } - - @Override - public String getPathInfo() { - String path = super.getServletPath(); - if (path.length() == 0) { - path = super.getPathInfo(); - } - - // TODO: another context path hack, revisit when context path is sorted out - path = fiddlePath(path, servletPath); - - return path; - } - }; - return requestWrapper; - } - - /** - * Remove any path suffix thats part of the Servlet context path. - * - * @param path - * @param servletPath - */ - private static String fiddlePath(String path, String servletPath) { - StringTokenizer st = new StringTokenizer(path, "/"); - String root = ""; - while (st.hasMoreTokens()){ - String s = st.nextToken(); - if (servletPath.endsWith((root + "/" + s))) { - root += "/" + s; - } else { - break; - } - } - String fiddlePath = path.substring(root.length()); - return fiddlePath; - } - - public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } - - public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { - servlet.service(createRequestWrapper(request), response); - } -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java deleted file mode 100644 index 5bf4f188f4..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java +++ /dev/null @@ -1,396 +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.node.webapp; - -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.net.UnknownHostException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; -import java.util.logging.Logger; - -import javax.servlet.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -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.host.http.ServletMappingException; -import org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncherUtil; -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -/** - * ServletHost implementation for use in a Webapp Node environment. - * - * @version $Rev$ $Date$ - */ -public class NodeWebAppServletHost implements ServletHost, Filter { - private static final Logger logger = Logger.getLogger(NodeWebAppServletHost.class.getName()); - - private static final NodeWebAppServletHost servletHost = new NodeWebAppServletHost(); - - private Map servlets = new HashMap(); - private Node node; - - private String contextPath = "/"; - private int defaultPort = 8080; - - /** - * Constructs a new NodeWebAppServletHost. - */ - private NodeWebAppServletHost() { - } - - /** - * Returns the Servlet host for the current Web app. - * - * @return - */ - public static NodeWebAppServletHost servletHost() { - return servletHost; - } - - /** - * Initialize the Servlet host. - * - * @param filterConfig - * @throws ServletException - */ - public void init(final FilterConfig filterConfig) throws ServletException { - - // Create a Servlet config wrapping the given filter config - ServletConfig servletConfig = servletConfig(filterConfig); - - // Get the Servlet context - ServletContext servletContext = servletConfig.getServletContext(); - - // Initialize the context path - contextPath = contextPath(servletContext); - - // Derive the node name from the Webapp context path - String nodeName = contextPath; - if (nodeName.startsWith("/")) { - nodeName = nodeName.substring(1); - } - if (nodeName.endsWith("/")) { - nodeName = nodeName.substring(0, nodeName.length() - 1); - } - - // Determine the node configuration URI - String nodeConfiguration = NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName); - - // Create the SCA node - NodeFactory nodeFactory = NodeFactory.newInstance(); - node = nodeFactory.createNode(nodeConfiguration); - - // Register the Servlet host - ServletHostExtensionPoint servletHosts = servletHosts(node); - servletHosts.getServletHosts().clear(); - servletHosts.addServletHost(servletHost); - - // Save the node in the Servlet context - servletContext.setAttribute(Client.class.getName(), node); - - // Start the node - node.start(); - - // Initialize the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.init(servletConfig); - } - } - - public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException { - URI pathURI = URI.create(suri); - - // Make sure that the path starts with a / - suri = pathURI.getPath(); - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // In a webapp just use the given path and ignore the host and port - // as they are fixed by the Web container - servlets.put(suri, servlet); - - logger.info("Added Servlet mapping: " + suri); - } - - public Servlet removeServletMapping(String suri) throws ServletMappingException { - URI pathURI = URI.create(suri); - - // Make sure that the path starts with a / - suri = pathURI.getPath(); - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // In a webapp just use the given path and ignore the host and port - // as they are fixed by the Web container - return servlets.remove(suri); - } - - public Servlet getServletMapping(String suri) throws ServletMappingException { - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - if (!suri.startsWith(contextPath)) { - suri = contextPath + suri; - } - - // Get the Servlet mapped to the given path - Servlet servlet = servlets.get(suri); - return servlet; - } - - public URL getURLMapping(String suri) throws ServletMappingException { - URI uri = URI.create(suri); - - // Get the URI scheme and port - String scheme = uri.getScheme(); - if (scheme == null) { - scheme = "http"; - } - int portNumber = uri.getPort(); - if (portNumber == -1) { - portNumber = defaultPort; - } - - // Get the host - String host; - try { - host = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - host = "localhost"; - } - - // Construct the URL - String path = uri.getPath(); - if (!path.startsWith("/")) { - path = '/' + path; - } - - if (contextPath != null && !path.startsWith(contextPath)) { - path = contextPath + path; - } - - URL url; - try { - url = new URL(scheme, host, portNumber, path); - } catch (MalformedURLException e) { - throw new ServletMappingException(e); - } - return url; - } - - public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException { - - // Make sure that the path starts with a / - if (!suri.startsWith("/")) { - suri = '/' + suri; - } - - suri = contextPath + suri; - - // Get the Servlet mapped to the given path - Servlet servlet = servlets.get(suri); - if (servlet != null) { - return new NodeWebAppRequestDispatcher(suri, servlet); - } - - for (Map.Entry entry : servlets.entrySet()) { - String servletPath = entry.getKey(); - if (servletPath.endsWith("*")) { - servletPath = servletPath.substring(0, servletPath.length() - 1); - if (suri.startsWith(servletPath)) { - return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue()); - } else { - if ((suri + "/").startsWith(servletPath)) { - return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue()); - } - } - } - } - - // No Servlet found - return null; - } - - /** - * Destroy the Servlet host. - * - * @throws ServletException - */ - public void destroy() { - - // Destroy the registered Servlets - for (Servlet servlet : servlets.values()) { - servlet.destroy(); - } - - // Stop the node - if (node != null) { - node.stop(); - } - } - - public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain) - throws IOException, ServletException { - - // Get the Servlet path - HttpServletRequest httpRequest = (HttpServletRequest)request; - String path = httpRequest.getPathInfo(); - if (path == null) { - path = httpRequest.getServletPath(); - } - if (path == null) { - path = "/"; - } - - // Get a request dispatcher for the Servlet mapped to that path - RequestDispatcher dispatcher = getRequestDispatcher(path); - if (dispatcher != null) { - - // Let the dispatcher forward the request to the Servlet - dispatcher.forward(request, response); - - } else { - - // Proceed down the filter chain - chain.doFilter(request, response); - } - } - - public void setDefaultPort(int port) { - defaultPort = port; - } - - public int getDefaultPort() { - return defaultPort; - } - - public String getContextPath() { - return contextPath; - } - - public void setContextPath(String path) { - //this.contextPath = path; - } - - /** - * Initializes the contextPath - * The 2.5 Servlet API has a getter for this, for pre 2.5 Servlet - * containers use an init parameter. - */ - private static String contextPath(ServletContext context) { - String contextPath = "/"; - - // The getContextPath() is introduced since Servlet 2.5 - Method m; - try { - // Try to get the method anyway since some ServletContext impl has this method even before 2.5 - m = context.getClass().getMethod("getContextPath", new Class[] {}); - contextPath = (String)m.invoke(context, new Object[] {}); - } catch (Exception e) { - contextPath = context.getInitParameter("contextPath"); - if (contextPath == null) { - logger.warning("Servlet level is: " + context.getMajorVersion() + "." + context.getMinorVersion()); - throw new IllegalStateException( - "'contextPath' init parameter must be set for pre-2.5 servlet container"); - } - } - - logger.info("ContextPath: " + contextPath); - return contextPath; - } - - /** - * Returns the Servlet host extension point used by the given node. - * - * @return - */ - private static ServletHostExtensionPoint servletHosts(Node node) { - //FIXME Need a clean way to get the extension point registry - // from the node - ExtensionPointRegistry registry; - try { - registry = (ExtensionPointRegistry)node.getClass().getMethod("getExtensionPointRegistry").invoke(node); - } catch (Exception e) { - throw new RuntimeException(e); - } - ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class); - return servletHosts; - } - - /** - * Returns a Servlet config wrapping a filter config. - * - * @param filterConfig - * @return - */ - private static ServletConfig servletConfig(final FilterConfig filterConfig) { - ServletConfig servletConfig = new ServletConfig() { - public String getInitParameter(String name) { - return filterConfig.getInitParameter(name); - } - - public Enumeration getInitParameterNames() { - return filterConfig.getInitParameterNames(); - } - - public ServletContext getServletContext() { - return filterConfig.getServletContext(); - } - - public String getServletName() { - return filterConfig.getFilterName(); - } - }; - return servletConfig; - } - - public void setAttribute(String name, Object value) { - // TODO Auto-generated method stub - } -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory deleted file mode 100644 index 306b53be5b..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ /dev/null @@ -1,19 +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. - -# Implementation class for the implementation extension -org.apache.tuscany.sca.implementation.node.provider.NodeImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.node.NodeImplementation diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java deleted file mode 100644 index 6845dd679c..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java +++ /dev/null @@ -1,54 +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.node; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Test case for node component implementations. - * - * @version $Rev$ $Date$ - */ -public class NodeImplementationTestCase { - - private Node node; - - @Before - public void setUp() throws Exception { - String contribution = ContributionLocationHelper.getContributionLocation(getClass()); - node = NodeFactory.newInstance().createNode("TestNode.composite", new Contribution("test", contribution)); - node.start(); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - - @Test - public void testNode() { - } - -} diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestComposite.composite deleted file mode 100644 index b8f6dcceb9..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestComposite.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestNode.composite deleted file mode 100644 index 3e719ef6ab..0000000000 --- a/sandbox/ant/sca/branches/2.0-M2/modules/implementation-node-runtime/src/test/resources/TestNode.composite +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - -- cgit v1.2.3