svn commit: r792033 - /tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java

[antelder]

Author: antelder
Date: Wed Jul  8 04:55:06 2009
New Revision: 792033

URL: http://svn.apache.org/viewvc?rev=792033&view=rev
Log:
Enable setting the domain used by the webapp via a context attribute

Modified:
    
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java

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=792033&r1=792032&r2=792033&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
 Wed Jul  8 04:55:06 2009
@@ -40,6 +40,7 @@
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 public class ServletHostHelper {
+    public static final String DOMAIN_NAME_ATTR = 
"org.apache.tuscany.sca.domain.name";
     public static final String SCA_NODE_ATTRIBUTE = Node.class.getName();
     private static NodeFactory factory;
 
@@ -85,6 +86,7 @@
             configuration = 
factory.loadConfiguration(openStream(servletContext, nodeConfigURI));
         } else {
             configuration = factory.createNodeConfiguration();
+            configuration.setDomainURI(factory.getDomainURI());
             Enumeration<String> names = servletContext.getInitParameterNames();
             while (names.hasMoreElements()) {
                 String name = names.nextElement();
@@ -120,7 +122,12 @@
         Node node = (Node)servletContext.getAttribute(SCA_NODE_ATTRIBUTE);
         if (node == null) {
             try {
-                factory = NodeFactory.newInstance();
+                String domainName = 
(String)servletContext.getAttribute(DOMAIN_NAME_ATTR);
+                if (domainName != null) {
+                    factory = NodeFactory.getInstance(domainName);
+                } else {
+                    factory = NodeFactory.newInstance();
+                }
                 node = createNode(servletContext);
                 servletContext.setAttribute(SCA_NODE_ATTRIBUTE, node);
                 getServletHost(node).init(new ServletConfig() {