From f860c2f35b2f94e379d2ff7d5c13f54cd4a3132a Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:06:42 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835119 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/http/DefaultServletHostExtensionPoint.java | 45 ++++++++++++++++++ .../tuscany/sca/http/ExtensibleServletHost.java | 53 ++++++++++++++++++++++ .../org/apache/tuscany/sca/http/ServletHost.java | 53 ++++++++++++++++++++++ .../sca/http/ServletHostExtensionPoint.java | 51 +++++++++++++++++++++ .../tuscany/sca/http/ServletMappingException.java | 44 ++++++++++++++++++ .../http/module/HTTPRuntimeModuleActivator.java | 46 +++++++++++++++++++ 6 files changed, 292 insertions(+) create mode 100644 sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java create mode 100644 sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java create mode 100644 sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java create mode 100644 sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java create mode 100644 sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java create mode 100644 sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java (limited to 'sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org') diff --git a/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java new file mode 100644 index 0000000000..b3132438eb --- /dev/null +++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/DefaultServletHostExtensionPoint.java @@ -0,0 +1,45 @@ +/* + * 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.http; + +import java.util.ArrayList; +import java.util.List; + +/** + * Default implementation of a servlet host extension point. + * + * @version $Rev$ $Date$ + */ +public class DefaultServletHostExtensionPoint implements ServletHostExtensionPoint { + + private List servletHosts = new ArrayList(); + + public void addServletHost(ServletHost servletHost) { + servletHosts.add(servletHost); + } + + public void removeServletHost(ServletHost servletHost) { + servletHosts.remove(servletHost); + } + + public List getServletHosts() { + return servletHosts; + } +} diff --git a/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java new file mode 100644 index 0000000000..af28b6241c --- /dev/null +++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ExtensibleServletHost.java @@ -0,0 +1,53 @@ +/* + * 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.http; + +import javax.servlet.Servlet; + +/** + * Default implementation of an extensible servlet host. + * + * @version $Rev$ $Date$ + */ +public class ExtensibleServletHost implements ServletHost { + + private ServletHostExtensionPoint servletHosts; + + public ExtensibleServletHost(ServletHostExtensionPoint servletHosts) { + this.servletHosts = servletHosts; + } + + public void addServletMapping(String uri, Servlet servlet) throws ServletMappingException { + if (servletHosts.getServletHosts().isEmpty()) { + throw new ServletMappingException("No servlet host available"); + } + + // TODO implement selection of the correct servlet host based on the mapping + // For now just select the first one + servletHosts.getServletHosts().get(0).addServletMapping(uri, servlet); + } + + public Servlet removeServletMapping(String uri) throws ServletMappingException { + // TODO implement selection of the correct servlet host based on the mapping + // For now just select the first one + return servletHosts.getServletHosts().get(0).removeServletMapping(uri); + } + +} diff --git a/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java new file mode 100644 index 0000000000..eeab5d02eb --- /dev/null +++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHost.java @@ -0,0 +1,53 @@ +/* + * 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.http; + +import javax.servlet.Servlet; + +/** + * Interface implemented by host environments that allow Servlets to be + * registered. + *

+ * This interface allows a system service to register a servlet + * to handle inbound requests. + * + * @version $Rev$ $Date$ + */ +public interface ServletHost { + /** + * Add a mapping for an instance of a Servlet. This requests that the + * servlet container direct all requests to the designated mapping to the + * supplied Servlet instance. + * + * @param uri the uri-mapping for the Servlet + * @param servlet the Servlet that should be invoked + */ + void addServletMapping(String uri, Servlet servlet) throws ServletMappingException; + + /** + * Remove a servlet mapping. This directs the servlet contain not to direct + * any more requests to a previously registered Servlet. + * + * @param uri the uri-mapping for the Servlet + * @return the servlet that was registered to the mapping, null if nothing + * was registered to the mapping + */ + Servlet removeServletMapping(String uri) throws ServletMappingException; + +} diff --git a/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java new file mode 100644 index 0000000000..8c13844a5f --- /dev/null +++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletHostExtensionPoint.java @@ -0,0 +1,51 @@ +/* + * 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.http; + +import java.util.List; + +/** + * An extension point for servlet hosts. + * + * @version $Rev$ $Date$ + */ +public interface ServletHostExtensionPoint { + + /** + * Adds a servlet host extension. + * + * @param servletHost + */ + void addServletHost(ServletHost servletHost); + + /** + * Removes a servlet host extension. + * + * @param servletHost + */ + void removeServletHost(ServletHost servletHost); + + /** + * Returns a list of servlet host extensions. + * + * @return + */ + List getServletHosts(); + +} diff --git a/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java new file mode 100644 index 0000000000..2247d5f66c --- /dev/null +++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/ServletMappingException.java @@ -0,0 +1,44 @@ +/* + * 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.http; + +/** + * Indicates an exception while registering a servlet mapping. + * + * @version $Rev$ $Date$ + */ +public class ServletMappingException extends RuntimeException { + private static final long serialVersionUID = 1L; + + public ServletMappingException() { + super(); + } + + public ServletMappingException(String message) { + super(message); + } + + public ServletMappingException(String message, Throwable cause) { + super(message, cause); + } + + public ServletMappingException(Throwable cause) { + super(cause); + } +} diff --git a/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java new file mode 100644 index 0000000000..f5e6896b05 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-0.90/modules/host-http/src/main/java/org/apache/tuscany/sca/http/module/HTTPRuntimeModuleActivator.java @@ -0,0 +1,46 @@ +/* + * 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.http.module; + +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.ModuleActivator; +import org.apache.tuscany.sca.http.DefaultServletHostExtensionPoint; +import org.apache.tuscany.sca.http.ExtensibleServletHost; +import org.apache.tuscany.sca.http.ServletHostExtensionPoint; + +/** + * @version $Rev$ $Date$ + */ +public class HTTPRuntimeModuleActivator implements ModuleActivator { + + public Object[] getExtensionPoints() { + // Declare Servlet host extension point + ServletHostExtensionPoint hostExtensions = new DefaultServletHostExtensionPoint(); + ExtensibleServletHost host = new ExtensibleServletHost(hostExtensions); + return new Object[] { hostExtensions, host }; + } + + public void start(ExtensionPointRegistry extensionPointRegistry) { + } + + public void stop(ExtensionPointRegistry registry) { + } + +} -- cgit v1.2.3