You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/11/21 13:19:56 UTC
svn commit: r719567 - in
/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp:
WebAppModuleActivator.java WebAppServletHost.java
Author: antelder
Date: Fri Nov 21 04:19:56 2008
New Revision: 719567
URL: http://svn.apache.org/viewvc?rev=719567&view=rev
Log:
Start getting the host-webapp module to work with the current stage 1 trunk modules
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified: tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java?rev=719567&r1=719566&r2=719567&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java (original)
+++ tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java Fri Nov 21 04:19:56 2008
@@ -39,7 +39,12 @@
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);
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=719567&r1=719566&r2=719567&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 Fri Nov 21 04:19:56 2008
@@ -217,7 +217,7 @@
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);
}