You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/02/14 20:09:46 UTC
svn commit: r627842 - in /incubator/tuscany/java/sca/modules:
host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Author: rfeng
Date: Thu Feb 14 11:09:39 2008
New Revision: 627842
URL: http://svn.apache.org/viewvc?rev=627842&view=rev
Log:
Fix the problem that WebSCADomain is always not used for SCADomain injection
Modified:
incubator/tuscany/java/sca/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified: incubator/tuscany/java/sca/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java?rev=627842&r1=627841&r2=627842&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java Thu Feb 14 11:09:39 2008
@@ -146,9 +146,6 @@
testClassLoader = new URLClassLoader(new URL[] {url}, testClassLoader);
}
}
-
- // Configure the SCADomain implementation class
- config.getServletContext().setAttribute("SCADomain.Implementation", "org.apache.tuscany.sca.host.webapp.WebSCADomain");
}
/**
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=627842&r1=627841&r2=627842&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Thu Feb 14 11:09:39 2008
@@ -211,10 +211,7 @@
String domainURI = "http://localhost/" + contextPath;
contributionRoot = getContributionRoot(servletContext);
// logger.info("Contribution: " + contributionRoot);
- String implClass = (String) servletContext.getAttribute("SCADomain.Implementation");
- if(implClass!=null) {
- System.setProperty(SCADomain.class.getName(), WebSCADomain.class.getName());
- }
+ System.setProperty(SCADomain.class.getName(), WebSCADomain.class.getName());
this.scaDomain = SCADomain.newInstance(domainURI, contributionRoot);
servletContext.setAttribute(SCA_DOMAIN_ATTRIBUTE, scaDomain);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org