Author: antelder
Date: Thu Jul 21 08:38:02 2011
New Revision: 1149072
URL: http://svn.apache.org/viewvc?rev=1149072&view=rev
Log:
Merge change in 1148838 to Add a domain.registry,uri param to beta3
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/ (props
changed)
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jul 21 08:38:02 2011
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/host-webapp:671193
+/tuscany/sca-java-2.x/trunk/modules/host-webapp:1148838
Modified:
tuscany/sca-java-2.x/branches/2.0-Beta3/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/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java?rev=1149072&r1=1149071&r2=1149072&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
(original)
+++
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
Thu Jul 21 08:38:02 2011
@@ -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) {
