archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TUSCANY-3449: Merge r903639 and r904353 from 1.6 branch

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027278 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nash 2010-10-25 21:39:01 +00:00
parent b6b8ba46f0
commit 06aac6d794
7 changed files with 82 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sca-java-1.x/trunk/demos/alert-aggregator-webapp/build-dojo.xml
View file

@ -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/"/>

2
sca-java-1.x/trunk/demos/alert-aggregator-webapp/build.xml
View file

@ -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>

23
sca-java-1.x/trunk/demos/bigbank/build-dojo.xml
View file

@ -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"/>

2
sca-java-1.x/trunk/demos/bigbank/build.xml
View file

@ -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>

4
sca-java-1.x/trunk/samples/customer-dojo-webapp/build-dojo.xml
View file

@ -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>

25
sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build-dojo.xml
View file

@ -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"/>

2
sca-java-1.x/trunk/samples/helloworld-dojo-webapp/build.xml
View file

@ -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>