Author: lresende
Date: Fri Jan 29 02:23:48 2010
New Revision: 904353
URL: http://svn.apache.org/viewvc?rev=904353&view=rev
Log:
TUSCANY-3449 - Adding a new unpack-dojo-files-nomaven to handle different dojo
unpack schema, and also fixing couple samples that required dojo dijit
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build.xml
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml
Fri Jan 29 02:23:48 2010
@@ -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"/>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build.xml
Fri Jan 29 02:23:48 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml
Fri Jan 29 02:23:48 2010
@@ -20,19 +20,14 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="1.3.0"/>
+ <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/web/dojo"/>
<target name="check-dojo-installed">
<condition property="already.installed" >
- <available
file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
- </condition>
- <condition property="maven.suffix" value="">
- <os family="unix"/>
- </condition>
- <condition property="maven.suffix" value=".bat">
- <os family="windows"/>
+ <available
file="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
</condition>
</target>
@@ -43,48 +38,36 @@
</condition>
</target>
- <target name="install-dojo" 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"/>
- <exec executable="mvn${maven.suffix}" dir="${basedir}"
failonerror="false">
- <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo
-Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true
-Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
- </exec>
- </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}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
- </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/"/>
- <unzip
src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
- dest="${basedir}/target/dojo-unpack-temp/"
- overwrite="false">
- <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="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" 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-${dojo.version}/dojo/**"/>
+ <exclude name="dojo-${dojo.version}/dojo/tests/**"/>
+ <exclude name="dojo-${dojo.version}/dijit/**"/>
+ <exclude name="dojo-${dojo.version}/dojox/**"/>
+ <exclude name="dojo-${dojo.version}/util/**"/>
+ </patternset>
+ </unzip>
+ <move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}"
+ tofile="${unpack.location}"
+ verbose="true"/>
+ <delete dir="${basedir}/target/dojo-unpack-temp/"/>
+ </target>
<target name="clean-dojo-files">
<delete dir="${unpack.location}"/>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml
(original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml Fri
Jan 29 02:23:48 2010
@@ -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"/>
- </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/**"/>
+ <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"/>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml
(original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml Fri Jan
29 02:23:48 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/customer-dojo-webapp/build-dojo.xml
Fri Jan 29 02:23:48 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build-dojo.xml
Fri Jan 29 02:23:48 2010
@@ -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"/>
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml?rev=904353&r1=904352&r2=904353&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-dojo-webapp/build.xml
Fri Jan 29 02:23:48 2010
@@ -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>
