diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-25 21:39:01 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-25 21:39:01 +0000 |
| commit | 06aac6d79414b4b85f8f672356931c2a6a8ccea2 (patch) | |
| tree | 01a3d63dc21c49df756d89bdb40ca13b4ffd4ef3 /sca-java-1.x/trunk/samples/helloworld-dojo-webapp | |
| parent | b6b8ba46f01eadfdce147cfdfe5cedff9bb71602 (diff) | |
TUSCANY-3449: Merge r903639 and r904353 from 1.6 branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027278 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/samples/helloworld-dojo-webapp')
| -rw-r--r-- | sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build-dojo.xml | 25 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build.xml | 2 |
2 files changed, 24 insertions, 3 deletions
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> |