Author: lresende
Date: Fri Feb 26 00:58:02 2010
New Revision: 916514
URL: http://svn.apache.org/viewvc?rev=916514&view=rev
Log:
Properly handling contextRoot when retrieving dojo and extension resources
Modified:
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
Modified:
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/META-INF/MANIFEST.MF?rev=916514&r1=916513&r2=916514&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/META-INF/MANIFEST.MF
(original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/META-INF/MANIFEST.MF
Fri Feb 26 00:58:02 2010
@@ -22,3 +22,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+
Modified: tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml?rev=916514&r1=916513&r2=916514&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml Fri Feb 26
00:58:02 2010
@@ -111,5 +111,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified:
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java?rev=916514&r1=916513&r2=916514&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
Fri Feb 26 00:58:02 2010
@@ -30,6 +30,7 @@
import org.apache.tuscany.sca.common.http.HTTPConstants;
import org.apache.tuscany.sca.common.http.HTTPContentTypeMapper;
+import org.apache.tuscany.sca.common.http.HTTPUtil;
/**
@@ -46,14 +47,18 @@
@Override
public void doGet(HttpServletRequest request, HttpServletResponse
response) throws IOException {
+ String contextRoot =
URLDecoder.decode(HTTPUtil.getContextRoot(request),
HTTPConstants.CHARACTER_ENCODING_UTF8);
String path = URLDecoder.decode(request.getRequestURI(),
HTTPConstants.CHARACTER_ENCODING_UTF8);
- if( path.startsWith("/dojo") ) {
+ if( path.startsWith(contextRoot + "/dojo") ) {
if( ! path.contains("tuscany/AtomService.js")) {
//this is a workaround where we need to have dojo files in its
own folder
//to avoid clean target to clean other non dojo resources
+ path = path.substring(contextRoot.length());
path = "/dojo" + path;
}
+ } else if (path.startsWith(contextRoot)) {
+ path = path.substring(contextRoot.length() + 1);
} else if( path.startsWith("/")) {
path = path.substring(1);
}
