You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/02/20 10:17:03 UTC
svn commit: r629392 -
/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Author: antelder
Date: Wed Feb 20 01:16:59 2008
New Revision: 629392
URL: http://svn.apache.org/viewvc?rev=629392&view=rev
Log:
Enable defining the contribution root
Modified:
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/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=629392&r1=629391&r2=629392&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 Wed Feb 20 01:16:59 2008
@@ -236,7 +236,11 @@
// ignore exception and use default location
try {
- String root = "/";
+
+ String root = servletContext.getInitParameter("contributionRoot");
+ if (root == null || root.length() < 1) {
+ root = "/";
+ }
URL rootURL = servletContext.getResource(root);
if (rootURL.getProtocol().equals("jndi")) {
//this is tomcat case, we should use getRealPath
@@ -246,6 +250,7 @@
//this is jetty case
contributionRoot = rootURL.toString();
}
+
} catch (MalformedURLException mf) {
//ignore, pass null
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org