diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-29 02:23:48 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-29 02:23:48 +0000 |
commit | 4e4a1eba0fb4c69f725a6b3b6b1c55a7408b6cf6 (patch) | |
tree | ee2e05332b49f806dbb8f5893a0adb1085ab20f9 /sca-java-1.x/branches/sca-java-1.6/samples | |
parent | 98802478a84a42af4a4bf7c28a815ade993eab6a (diff) |
TUSCANY-3449 - Adding a new unpack-dojo-files-nomaven to handle different dojo unpack schema, and also fixing couple samples that required dojo dijit
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@904353 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/branches/sca-java-1.6/samples')
3 files changed, 27 insertions, 6 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml index 5a715b1e6b..0d84681360 100644 --- a/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml +++ b/sca-java-1.x/branches/sca-java-1.6/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/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml index 07cd8a8a63..b16ab95d1a 100644 --- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml +++ b/sca-java-1.x/branches/sca-java-1.6/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"/> - </target> + 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/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml index 95813af65a..edfeb06195 100644 --- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml +++ b/sca-java-1.x/branches/sca-java-1.6/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> |