You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/05/18 03:19:34 UTC
svn commit: r539208 -
/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
Author: lresende
Date: Thu May 17 18:19:33 2007
New Revision: 539208
URL: http://svn.apache.org/viewvc?view=rev&rev=539208
Log:
Fixing web-app support to be compatible with jetty and tc
Modified:
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java?view=diff&rev=539208&r1=539207&r2=539208
==============================================================================
--- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java (original)
+++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java Thu May 17 18:19:33 2007
@@ -19,7 +19,9 @@
package org.apache.tuscany.sca.webapp;
+import java.io.File;
import java.net.MalformedURLException;
+import java.net.URL;
import javax.servlet.ServletContext;
@@ -43,7 +45,15 @@
String contributionRoot = null;
try {
- contributionRoot = servletContext.getResource("/").toString();;
+ URL rootURL = servletContext.getResource("/");
+ if (rootURL.getProtocol().equals("jndi")) {
+ //this is tomcat case, we should use getRealPath
+ File warRootFile = new File(servletContext.getRealPath("/"));
+ contributionRoot = warRootFile.toURL().toString();
+ } else {
+ //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