diff options
2 files changed, 6 insertions, 2 deletions
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 @@ <property name="dojo.version" value="1.3.0b3"/> - <property name="unpack.location" value="${basedir}/src/main/resources"/> + <property name="unpack.location" value="${basedir}/src/main/resources/dojo"/> <target name="check-dojo-installed"> 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); } |