From 67215d97b5a431c4101f42b049041553fa00fbd7 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 3 Apr 2009 20:17:13 +0000 Subject: TUSCANY-2878 - Moving dojo resources to it's own folder to avoid issues with clean target that was removing other non-dojo resources. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@761776 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.x/modules/core-web-dojo/build-dojo.xml | 2 +- .../org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'branches') diff --git a/branches/sca-java-1.x/modules/core-web-dojo/build-dojo.xml b/branches/sca-java-1.x/modules/core-web-dojo/build-dojo.xml index 612ddcf18e..60f0657d68 100644 --- a/branches/sca-java-1.x/modules/core-web-dojo/build-dojo.xml +++ b/branches/sca-java-1.x/modules/core-web-dojo/build-dojo.xml @@ -21,7 +21,7 @@ - + diff --git a/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java b/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java index 3618d6af0e..ce037283f6 100644 --- a/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java +++ b/branches/sca-java-1.x/modules/core-web-dojo/src/main/java/org/apache/tuscany/sca/core/web/dojo/DojoResourceServlet.java @@ -46,7 +46,11 @@ public class DojoResourceServlet extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { String path = URLDecoder.decode(request.getRequestURI(), "UTF-8"); - if( path.startsWith("/")) { + if( path.startsWith("/dojo")) { + //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 = "dojo" + path; + } else if( path.startsWith("/")) { path = path.substring(1); } -- cgit v1.2.3