Author: jboynes
Date: Sat Apr 22 14:43:14 2006
New Revision: 396165
URL: http://svn.apache.org/viewcvs?rev=396165&view=rev
Log:
make TuscanyHost implement ServletHost - stubbed out for now
Removed:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/config/WebServiceEntryPointContextFactory.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java?rev=396165&r1=396164&r2=396165&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/builder/WebServiceEntryPointBuilder.java
Sat Apr 22 14:43:14 2006
@@ -22,7 +22,6 @@
import java.util.Set;
import org.apache.tuscany.binding.axis2.assembly.WebServiceBinding;
-import
org.apache.tuscany.binding.axis2.config.WebServiceEntryPointContextFactory;
import org.apache.tuscany.core.builder.BuilderException;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
@@ -117,11 +116,7 @@
return;
}
- EntryPointContextFactory config
- = new WebServiceEntryPointContextFactory(entryPoint.getName(),
-
entryPoint.getConfiguredService()
- .getPort().getName(),
- messageFactory);
+ EntryPointContextFactory config = new
EntryPointContextFactory(entryPoint.getName(), messageFactory);
ConfiguredService configuredService =
entryPoint.getConfiguredService();
Service service = configuredService.getPort();
Modified:
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java?rev=396165&r1=396164&r2=396165&view=diff
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/java/org/apache/tuscany/binding/jsonrpc/builder/JSONRPCEntryPointConfigurationBuilder.java
Sat Apr 22 14:43:14 2006
@@ -104,7 +104,7 @@
return;
}
- EntryPointContextFactory config = new
EntryPointContextFactory(entryPoint.getName(), messageFactory){};
+ EntryPointContextFactory config = new
EntryPointContextFactory(entryPoint.getName(), messageFactory);
ConfiguredService configuredService =
entryPoint.getConfiguredService();
Service service = configuredService.getPort();
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java?rev=396165&r1=396164&r2=396165&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
Sat Apr 22 14:43:14 2006
@@ -29,11 +29,11 @@
import java.util.Map;
/**
- * Produces entry point contexts
+ * Default factory for contexts that represent entry points.
*
* @version $Rev$ $Date$
*/
-public abstract class EntryPointContextFactory implements
ContextFactory<EntryPointContext> {
+public class EntryPointContextFactory implements
ContextFactory<EntryPointContext> {
private String name;
Modified:
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java?rev=396165&r1=396164&r2=396165&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
(original)
+++
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/TuscanyHost.java
Sat Apr 22 14:43:14 2006
@@ -16,6 +16,8 @@
*/
package org.apache.tuscany.tomcat;
+import javax.servlet.Servlet;
+
import org.apache.catalina.Container;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.core.StandardContext;
@@ -33,20 +35,25 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.runtime.RuntimeContextImpl;
+import org.apache.tuscany.core.webapp.ServletHost;
import org.apache.tuscany.model.assembly.AssemblyContext;
import org.apache.tuscany.model.assembly.AssemblyFactory;
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.loader.AssemblyModelLoader;
/**
- * A Tomcat listener to be attached to a Host container to add SCA runtime
functionality.
- * The listener wraps a Tuscany runtime and listens for container events to
detect the
- * addition and removal of Context children.
+ * A specialied Tomcat Host that extends the Standardhost implementation and
adds SCA capabilities.
+ * <p/>
+ * As children are added, they are examined for the presence of SCA
configuration
+ * information and if any is found then the web application is treated as an
+ * SCA Module defintion which is used to create a ModuleComponent. The name of
the
+ * context is used as the name of the ModuleComponent and its context path is
used
+ * as the URI.
*
* @version $Rev$ $Date$
*/
@SuppressWarnings({"serial"})
-public class TuscanyHost extends StandardHost {
+public class TuscanyHost extends StandardHost implements ServletHost {
private static final String SYSTEM_MODULE_COMPONENT =
"org.apache.tuscany.core.system";
private static final StringManager sm =
StringManager.getManager("org.apache.tuscany.tomcat");
@@ -121,13 +128,17 @@
}
public String toString() {
-
- StringBuffer sb = new StringBuffer(132);
+ StringBuilder sb = new StringBuilder(132);
if (getParent() != null) {
sb.append(getParent().toString()).append('.');
}
sb.append("TuscanyHost[").append(getName()).append(']');
return (sb.toString());
+ }
+
+ public void registerMapping(String mapping, Servlet servlet) {
+ }
+ public void unregisterMapping(String mapping) {
}
}
