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 2011/11/11 01:52:57 UTC
svn commit: r1200668 - in
/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo: build-dojo.xml
src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
Author: lresende
Date: Fri Nov 11 00:52:57 2011
New Revision: 1200668
URL: http://svn.apache.org/viewvc?rev=1200668&view=rev
Log:
Adding dojox and dijit to web-javascript-dojo
Modified:
tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.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/build-dojo.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml?rev=1200668&r1=1200667&r2=1200668&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml Fri Nov 11 00:52:57 2011
@@ -51,7 +51,7 @@
<exclude name="dojo-${dojo.version}/dojo/tests/**"/>
<include name="dojo-${dojo.version}/dijit/**"/>
<include name="dojo-${dojo.version}/dojox/**"/>
- <exclude name="dojo-${dojo.version}/util/**"/>
+ <include name="dojo-${dojo.version}/util/**"/>
</patternset>
</unzip>
<move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}"
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=1200668&r1=1200667&r2=1200668&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 Nov 11 00:52:57 2011
@@ -50,15 +50,21 @@ public class DojoResourceServlet extends
String contextRoot = URLDecoder.decode(HTTPUtils.getContextRoot(request), HTTPConstants.CHARACTER_ENCODING_UTF8);
String path = URLDecoder.decode(request.getRequestURI(), HTTPConstants.CHARACTER_ENCODING_UTF8);
- if( path.startsWith(contextRoot + "/dojo")||
- path.startsWith(contextRoot + "/dojox")||
+ if( path.startsWith(contextRoot + "/dojo") ||
+ path.startsWith(contextRoot + "/dojox") ||
path.startsWith(contextRoot + "/dijit")) {
- if( ! path.contains("tuscany/")) {
+ //is they are dojo modules
+
+ if( (! path.contains("tuscany/AtomService.js")) &&
+ (! path.contains("tuscany/RestService.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;
}
+
+ System.out.println(">>>Path :" + path);
} else if (path.startsWith(contextRoot)) {
path = path.substring(contextRoot.length() + 1);
} else if( path.startsWith("/")) {