diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml | 27 | ||||
-rw-r--r-- | sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml | 7 |
2 files changed, 9 insertions, 25 deletions
diff --git a/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml b/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml index f029ed7e87..18ea32a208 100644 --- a/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml +++ b/sca-java-2.x/trunk/modules/web-javascript-dojo/build-dojo.xml @@ -21,12 +21,13 @@ <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"/> <target name="check-dojo-installed"> <condition property="already.installed" > - <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/> + <available file="${dojo.zip}"/> </condition> <condition property="maven.suffix" value=""> <os family="unix"/> @@ -43,32 +44,10 @@ </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" + <unzip src="${dojo.zip}" dest="${basedir}/target/dojo-unpack-temp/" overwrite="false"> <patternset> diff --git a/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml b/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml index 82b53a0f86..8a339cc2e7 100644 --- a/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml +++ b/sca-java-2.x/trunk/modules/web-javascript-dojo/pom.xml @@ -41,6 +41,12 @@ <artifactId>tuscany-host-http</artifactId> <version>2.0-SNAPSHOT</version> </dependency> + + <dependency> + <groupId>org.dojotoolkit</groupId> + <artifactId>dojo</artifactId> + <version>1.3.0</version> + </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -55,7 +61,6 @@ <version>4.5</version> <scope>test</scope> </dependency> - </dependencies> |