diff options
| -rw-r--r-- | sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java b/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java index 35d8c91750..6f2135ef50 100644 --- a/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java +++ b/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java @@ -130,16 +130,22 @@ public class WebAppHelper { public synchronized static ServletHost init(final ServletContext servletContext) { if (host == null) { try { - factory = NodeFactory.getInstance(); + + String configValue = servletContext.getInitParameter("org.apache.tuscany.sca.config"); + factory = NodeFactory.newInstance(configValue); ExtensionPointRegistry registry = factory.getExtensionPointRegistry(); ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class); servletHosts.setWebApp(true); + + // TODO: why are the init parameters copied to the attributes? for (Enumeration<String> e = servletContext.getInitParameterNames(); e.hasMoreElements();) { String name = e.nextElement(); String value = servletContext.getInitParameter(name); servletContext.setAttribute(name, value); } + host = getServletHost(servletContext); + } catch (ServletException e) { throw new RuntimeException(e); } |