diff options
Diffstat (limited to '')
7 files changed, 82 insertions, 9 deletions
diff --git a/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build-dojo.xml b/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build-dojo.xml index 01591d8253..87a1ddb89e 100644 --- a/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build-dojo.xml +++ b/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build-dojo.xml @@ -21,7 +21,7 @@ <property name="dojo.version" value="1.3.0"/> <property name="dojo.zip" value="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> - <property name="unpack.location" value="${basedir}/src/main/resources/dojo"/> + <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/> <target name="check-dojo-installed"> @@ -36,6 +36,37 @@ </condition> </target> + <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed"> + <mkdir dir="${basedir}/target/dojo-download/"/> + <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip" + dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" + verbose="true" + usetimestamp="true"/> + <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" + tofile="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> + </target> + + <target name="unpack-dojo-files-nomaven" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked"> + <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/> + <mkdir dir="${basedir}/target/dojo-unpack-temp/"/> + <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip" + dest="${basedir}/target/dojo-unpack-temp/" + overwrite="false" + encoding="native-encoding"> + <patternset> + <include name="dojo-release-${dojo.version}/dojo/**"/> + <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/> + <include name="dojo-release-${dojo.version}/dijit/**"/> + <exclude name="dojo-release-${dojo.version}/dojox/**"/> + <exclude name="dojo-release-${dojo.version}/util/**"/> + </patternset> + </unzip> + <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}" + tofile="${unpack.location}" + verbose="true"/> + <delete dir="${basedir}/target/dojo-unpack-temp/"/> + </target> + <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked"> <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/> <mkdir dir="${basedir}/target/dojo-unpack-temp/"/> diff --git a/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build.xml b/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build.xml index 4c06690d0a..9f62f46a60 100644 --- a/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build.xml +++ b/sca-java-1.x/trunk/demos/alert-aggregator-webapp/build.xml @@ -121,7 +121,7 @@ <property name="localRepository" value="${settings.localRepository}"/> </ant> - <ant antfile="./build-dojo.xml" target="unpack-dojo-files"> + <ant antfile="./build-dojo.xml" target="unpack-dojo-files-nomaven"> <property name="localRepository" value="${settings.localRepository}"/> <property name="artifactId" value="${artifactId}"/> </ant> diff --git a/sca-java-1.x/trunk/demos/bigbank/build-dojo.xml b/sca-java-1.x/trunk/demos/bigbank/build-dojo.xml index fb878bb143..5016b7b6ee 100644 --- a/sca-java-1.x/trunk/demos/bigbank/build-dojo.xml +++ b/sca-java-1.x/trunk/demos/bigbank/build-dojo.xml @@ -44,8 +44,29 @@ verbose="true" usetimestamp="true"/> <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" - tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> + tofile="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> </target> + + <target name="unpack-dojo-files-nomaven" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked"> + <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/> + <mkdir dir="${basedir}/target/dojo-unpack-temp/"/> + <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip" + dest="${basedir}/target/dojo-unpack-temp/" + overwrite="false" + encoding="native-encoding"> + <patternset> + <include name="dojo-release-${dojo.version}/dojo/**"/> + <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/> + <exclude name="dojo-release-${dojo.version}/dijit/**"/> + <exclude name="dojo-release-${dojo.version}/dojox/**"/> + <exclude name="dojo-release-${dojo.version}/util/**"/> + </patternset> + </unzip> + <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}" + tofile="${unpack.location}" + verbose="true"/> + <delete dir="${basedir}/target/dojo-unpack-temp/"/> + </target> <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked"> <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/> diff --git a/sca-java-1.x/trunk/demos/bigbank/build.xml b/sca-java-1.x/trunk/demos/bigbank/build.xml index f455448c66..697876bb07 100644 --- a/sca-java-1.x/trunk/demos/bigbank/build.xml +++ b/sca-java-1.x/trunk/demos/bigbank/build.xml @@ -39,7 +39,7 @@ <property name="localRepository" value="${settings.localRepository}"/> </ant> - <ant antfile="./build-dojo.xml" target="unpack-dojo-files"> + <ant antfile="./build-dojo.xml" target="unpack-dojo-files-nomaven"> <property name="localRepository" value="${settings.localRepository}"/> <property name="artifactId" value="${artifactId}"/> </ant> diff --git a/sca-java-1.x/trunk/samples/customer-dojo-webapp/build-dojo.xml b/sca-java-1.x/trunk/samples/customer-dojo-webapp/build-dojo.xml index 5a715b1e6b..0d84681360 100644 --- a/sca-java-1.x/trunk/samples/customer-dojo-webapp/build-dojo.xml +++ b/sca-java-1.x/trunk/samples/customer-dojo-webapp/build-dojo.xml @@ -21,7 +21,7 @@ <property name="dojo.version" value="1.3.0"/> <property name="dojo.zip" value="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> - <property name="unpack.location" value="${basedir}/src/main/resources/dojo"/> + <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/> <target name="check-dojo-installed"> @@ -46,7 +46,7 @@ <patternset> <include name="dojo-${dojo.version}/dojo/**"/> <exclude name="dojo-${dojo.version}/dojo/tests/**"/> - <exclude name="dojo-${dojo.version}/dijit/**"/> + <include name="dojo-${dojo.version}/dijit/**"/> <exclude name="dojo-${dojo.version}/dojox/**"/> <exclude name="dojo-${dojo.version}/util/**"/> </patternset> diff --git a/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build-dojo.xml index 97d85db33c..0e20f208e0 100644 --- a/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build-dojo.xml +++ b/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build-dojo.xml @@ -21,7 +21,7 @@ <property name="dojo.version" value="1.3.0"/> <property name="dojo.zip" value="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> - <property name="unpack.location" value="${basedir}/src/main/resources/dojo"/> + <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/> <target name="check-dojo-installed"> @@ -43,8 +43,29 @@ verbose="true" usetimestamp="true"/> <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" - tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> + tofile="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> </target> + + <target name="unpack-dojo-files-nomaven" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked"> + <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/> + <mkdir dir="${basedir}/target/dojo-unpack-temp/"/> + <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip" + dest="${basedir}/target/dojo-unpack-temp/" + overwrite="false" + encoding="native-encoding"> + <patternset> + <include name="dojo-release-${dojo.version}/dojo/**"/> + <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/> + <include name="dojo-release-${dojo.version}/dijit/**"/> + <exclude name="dojo-release-${dojo.version}/dojox/**"/> + <exclude name="dojo-release-${dojo.version}/util/**"/> + </patternset> + </unzip> + <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}" + tofile="${unpack.location}" + verbose="true"/> + <delete dir="${basedir}/target/dojo-unpack-temp/"/> + </target> <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked"> <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/> diff --git a/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build.xml b/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build.xml index 1a4a5a6f33..ebefa279f2 100644 --- a/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build.xml +++ b/sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build.xml @@ -42,7 +42,7 @@ <property name="localRepository" value="./target/repo"/> </ant> - <ant antfile="./build-dojo.xml" target="unpack-dojo-files"> + <ant antfile="./build-dojo.xml" target="unpack-dojo-files-nomaven"> <property name="localRepository" value="./target/repo"/> </ant> |