diff options
8 files changed, 108 insertions, 62 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml index bd738a89b0..117246048b 100644 --- a/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build-dojo.xml +++ b/sca-java-1.x/branches/sca-java-1.6/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"> @@ -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/demos/alert-aggregator-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build.xml index 793aa05c06..5f04c9d318 100644 --- a/sca-java-1.x/branches/sca-java-1.6/demos/alert-aggregator-webapp/build.xml +++ b/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml index 9cc60c3d96..aa35c6cb20 100644 --- a/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml +++ b/sca-java-1.x/branches/sca-java-1.6/demos/bigbank-account/build-dojo.xml @@ -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="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}/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="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}"/>
diff --git a/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml index 97acbfc417..335f910710 100644 --- a/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build-dojo.xml +++ b/sca-java-1.x/branches/sca-java-1.6/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"/> - </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"/> diff --git a/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml index 81fb704d4d..8d8537e8a4 100644 --- a/sca-java-1.x/branches/sca-java-1.6/demos/bigbank/build.xml +++ b/sca-java-1.x/branches/sca-java-1.6/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/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> |