Author: antelder
Date: Tue Mar 29 14:59:32 2011
New Revision: 1086613
URL: http://svn.apache.org/viewvc?rev=1086613&view=rev
Log:
Update to support a default domain URI set via a system property. (we need to
clean up the webapp host domain uri support because it now looks like there are
several ways to set the domain uri all slightly different. I'll do some
investigation on what they all do)
Modified:
tuscany/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
Modified:
tuscany/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java?rev=1086613&r1=1086612&r2=1086613&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
Tue Mar 29 14:59:32 2011
@@ -52,6 +52,7 @@ public class WebAppHelper {
private static final String NODE_URI = "node.uri";
private static final String COMPOSITE_URI = "composite.uri";
public static final String DOMAIN_NAME_ATTR =
"org.apache.tuscany.sca.domain.name";
+ public static final String DOMAIN_URI_PROP = "domainURI";
public static final String SCA_NODE_ATTRIBUTE = Node.class.getName();
private static NodeFactory factory;
private static WebAppServletHost host;
@@ -314,6 +315,9 @@ public class WebAppHelper {
configuration.setDomainURI(domainURI);
} else {
domainURI =
configurator.getInitParameter("org.apache.tuscany.sca.defaultDomainURI");
+ if (domainURI == null) {
+ domainURI = System.getProperty(DOMAIN_URI_PROP);
+ }
if (domainURI != null) {
configuration.setDomainURI(getDomainName(domainURI));
configuration.setDomainRegistryURI(domainURI);
