Author: rfeng
Date: Tue Oct 6 17:40:32 2009
New Revision: 822369
URL: http://svn.apache.org/viewvc?rev=822369&view=rev
Log:
Add missing files and use name attribute to identify the host
Added:
tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
Modified:
tuscany/java/sca/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
tuscany/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified:
tuscany/java/sca/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
(original)
+++
tuscany/java/sca/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
Tue Oct 6 17:40:32 2009
@@ -268,4 +268,8 @@
}
}
+ public String getName() {
+ return "osgi";
+ }
+
}
Modified:
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
(original)
+++
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
Tue Oct 6 17:40:32 2009
@@ -95,7 +95,7 @@
* A data binding facade allowing data bindings to be lazily loaded and
* initialized.
*/
- private class LazyServletHost implements ServletHost, LifeCycleListener {
+ public class LazyServletHost implements ServletHost, LifeCycleListener {
private ServiceDeclaration sd;
private ServletHost host;
@@ -107,7 +107,7 @@
this.sd = sd;
}
- private synchronized ServletHost getServletHost() {
+ public synchronized ServletHost getServletHost() {
if (host == null) {
try {
Class<?> cls = sd.loadClass();
@@ -168,6 +168,10 @@
public void setDefaultPort(int port) {
getServletHost().setDefaultPort(port);
}
+
+ public String getName() {
+ return sd.getAttributes().get("name");
+ }
public void start() {
}
Modified:
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
(original)
+++
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
Tue Oct 6 17:40:32 2009
@@ -124,4 +124,8 @@
public void setAttribute(String name, Object value) {
getDefaultServletHost().setAttribute(name, value);
}
+
+ public String getName() {
+ return getDefaultServletHost().getName();
+ }
}
Modified:
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
(original)
+++
tuscany/java/sca/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
Tue Oct 6 17:40:32 2009
@@ -115,4 +115,6 @@
* @param value the attribute value
*/
void setAttribute(String name, Object value);
+
+ String getName();
}
Modified:
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
(original)
+++
tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
Tue Oct 6 17:40:32 2009
@@ -127,6 +127,10 @@
}
});
}
+
+ public String getName() {
+ return "jetty";
+ }
public void setDefaultPort(int port) {
defaultPort = port;
Modified:
tuscany/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
(original)
+++
tuscany/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
Tue Oct 6 17:40:32 2009
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
# Implementation class for the ServletHost
-org.apache.tuscany.sca.http.jetty.JettyServer;ranking=100
\ No newline at end of file
+org.apache.tuscany.sca.http.jetty.JettyServer;name=jetty,ranking=100
\ No newline at end of file
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
(original)
+++
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
Tue Oct 6 17:40:32 2009
@@ -32,6 +32,7 @@
import javax.servlet.ServletException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.host.http.DefaultServletHostExtensionPoint;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
import org.apache.tuscany.sca.node.Node;
@@ -163,8 +164,12 @@
throw new IllegalStateException("No ServletHost found");
}
for (ServletHost servletHost : hosts) {
- if ((servletHost instanceof WebAppServletHost)) {
- return (WebAppServletHost)servletHost;
+ if ("webapp".equals(servletHost.getName())) {
+ if(servletHost instanceof
DefaultServletHostExtensionPoint.LazyServletHost) {
+ return (WebAppServletHost)
((DefaultServletHostExtensionPoint.LazyServletHost)
servletHost).getServletHost();
+ } else if(servletHost instanceof WebAppServletHost) {
+ return (WebAppServletHost) servletHost;
+ }
}
}
throw new IllegalStateException("No WebApp Servlet host is
configured");
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=822369&r1=822368&r2=822369&view=diff
==============================================================================
---
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
(original)
+++
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Tue Oct 6 17:40:32 2009
@@ -67,6 +67,10 @@
public int getDefaultPort() {
return defaultPortNumber;
}
+
+ public String getName() {
+ return "webapp";
+ }
public void addServletMapping(String suri, Servlet servlet) throws
ServletMappingException {
URI pathURI = URI.create(suri);
Added:
tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost?rev=822369&view=auto
==============================================================================
---
tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
(added)
+++
tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
Tue Oct 6 17:40:32 2009
@@ -0,0 +1,18 @@
+# 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 ServletHost
+org.apache.tuscany.sca.host.webapp.WebAppServletHost;name=webapp,ranking=0
\ No newline at end of file
