diff --git a/build-spring-webflow/package-artifact.xml b/build-spring-webflow/package-artifact.xml index a1605c44..2719a7f0 100644 --- a/build-spring-webflow/package-artifact.xml +++ b/build-spring-webflow/package-artifact.xml @@ -30,7 +30,7 @@ - diff --git a/build-spring-webflow/dojo-build/README.txt b/spring-js/dojo-build/README.txt similarity index 61% rename from build-spring-webflow/dojo-build/README.txt rename to spring-js/dojo-build/README.txt index f2147c43..823f4fe8 100644 --- a/build-spring-webflow/dojo-build/README.txt +++ b/spring-js/dojo-build/README.txt @@ -1,3 +1,3 @@ This directory contains the custom build of Dojo that distributed with Spring JavaScript. -See ../../spring-js/scripts/dojo/README.txt for details. +See ../scripts/dojo/README.txt for details. diff --git a/build-spring-webflow/dojo-build/dojo-build.zip b/spring-js/dojo-build/dojo-build.zip similarity index 90% rename from build-spring-webflow/dojo-build/dojo-build.zip rename to spring-js/dojo-build/dojo-build.zip index 547f389a..ad72c9a5 100644 Binary files a/build-spring-webflow/dojo-build/dojo-build.zip and b/spring-js/dojo-build/dojo-build.zip differ diff --git a/spring-js/scripts/dojo/README.txt b/spring-js/scripts/dojo/README.txt index d23b34e0..82a7b6ae 100644 --- a/spring-js/scripts/dojo/README.txt +++ b/spring-js/scripts/dojo/README.txt @@ -5,7 +5,7 @@ Upgrade procedures: 1) Open build.properties and modify the dojo.version property 2) Run 'ant clean' from this directory 3) Run 'ant' - 4) Commit changes in build-spring-webflow/dojo-build directory + 4) Commit changes in build-spring-js/dojo-build directory Notes: Step 3) above creates a dojo-build.zip and copies it to build-spring-js/dojo-build. diff --git a/spring-js/scripts/dojo/build.xml b/spring-js/scripts/dojo/build.xml index 065bce63..9c3b904b 100644 --- a/spring-js/scripts/dojo/build.xml +++ b/spring-js/scripts/dojo/build.xml @@ -44,7 +44,7 @@ + toFile="${basedir}/../../../spring-js/dojo-build/dojo-build.zip" />