TUSCANY-3449: Merge r903639 and r904353 from 1.6 branch
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1027278 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/demos/alert-aggregator-webapp/build-dojo.xml b/demos/alert-aggregator-webapp/build-dojo.xml
index 01591d8..87a1ddb 100644
--- a/demos/alert-aggregator-webapp/build-dojo.xml
+++ b/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/demos/alert-aggregator-webapp/build.xml b/demos/alert-aggregator-webapp/build.xml
index 4c06690..9f62f46 100644
--- a/demos/alert-aggregator-webapp/build.xml
+++ b/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/demos/bigbank/build-dojo.xml b/demos/bigbank/build-dojo.xml
index fb878bb..5016b7b 100644
--- a/demos/bigbank/build-dojo.xml
+++ b/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/demos/bigbank/build.xml b/demos/bigbank/build.xml
index f455448..697876b 100644
--- a/demos/bigbank/build.xml
+++ b/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/samples/customer-dojo-webapp/build-dojo.xml b/samples/customer-dojo-webapp/build-dojo.xml
index 5a715b1..0d84681 100644
--- a/samples/customer-dojo-webapp/build-dojo.xml
+++ b/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/samples/helloworld-dojo-webapp/build-dojo.xml b/samples/helloworld-dojo-webapp/build-dojo.xml
index 97d85db..0e20f20 100644
--- a/samples/helloworld-dojo-webapp/build-dojo.xml
+++ b/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/samples/helloworld-dojo-webapp/build.xml b/samples/helloworld-dojo-webapp/build.xml
index 1a4a5a6..ebefa27 100644
--- a/samples/helloworld-dojo-webapp/build.xml
+++ b/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>
