diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-21 08:38:02 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-21 08:38:02 +0000 |
| commit | d314996e645ac8cd42c7571e97de09c16195c1ec (patch) | |
| tree | 8cd1448299e78c4940b1e3537be1ee6dbf11e2b8 /sca-java-2.x/branches | |
| parent | 25475aae69e2cdd6fb23033b6497e828ec92c12f (diff) | |
Merge change in 1148838 to Add a domain.registry,uri param to beta3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1149072 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches')
| -rw-r--r-- | sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java b/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java index e9b8794d0f..231108bea2 100644 --- a/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java +++ b/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java @@ -49,6 +49,7 @@ public class WebAppHelper { private static final String CONTRIBUTION = "contribution"; private static final String NODE_CONFIGURATION = "node.configuration"; private static final String DOMAIN_URI = "domain.uri"; + private static final String DOMAIN_REGISTRY_URI = "domain.registry.uri"; 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"; @@ -323,6 +324,10 @@ public class WebAppHelper { configuration.setDomainRegistryURI(domainURI); } } + String domainRegistryURI = configurator.getInitParameter(DOMAIN_REGISTRY_URI); + if (domainRegistryURI != null) { + configuration.setDomainRegistryURI(domainRegistryURI); + } } configuration.setAttribute(ServletContext.class.getName(), servletContext); if(configurator instanceof ServletConfigurator) { |