diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 12:19:56 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-21 12:19:56 +0000 |
commit | 9794d53d0093c8be8da1642c70424cfa5f37ecf0 (patch) | |
tree | 68f949df6a1107af4cff4a2e0176016fdff8681a /java/sca/modules/host-webapp | |
parent | 65e3fd65b82c7cd08cfdeee8819f571212b3b1fe (diff) |
Start getting the host-webapp module to work with the current stage 1 trunk modules
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@719567 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/host-webapp')
2 files changed, 7 insertions, 2 deletions
diff --git a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java index 88caa33f2a..1b39b32d75 100644 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java +++ b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java @@ -39,7 +39,12 @@ public class WebAppModuleActivator implements ModuleActivator { extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class); List<ServletHost> hosts = servletHosts.getServletHosts(); - ServletHost host = TuscanyServletFilter.getServletHost(); + ServletHost host = null; + try { + host = TuscanyServletFilter.getServletHost(); + } catch (NoClassDefFoundError e) { + // ignore + } if (host != null) { hosts.clear(); hosts.add(host); diff --git a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java index 729810b0fb..118403fd67 100644 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java @@ -217,7 +217,7 @@ public class WebAppServletHost implements ServletHost { initContextPath(config); contributionRoot = getContributionRoot(servletContext); NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(null, new Contribution(contributionRoot, contributionRoot)); + node = factory.createNode("WEB-INF/web.composite", new Contribution(contributionRoot, contributionRoot)); node.start(); servletContext.setAttribute(SCA_NODE_ATTRIBUTE, node); } |