You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/12/17 10:50:07 UTC
svn commit: r891607 - in
/tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo: build-dojo.xml
pom.xml
Author: antelder
Date: Thu Dec 17 09:50:07 2009
New Revision: 891607
URL: http://svn.apache.org/viewvc?rev=891607&view=rev
Log:
Fix another dojo hudson build issue
Modified:
tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/build-dojo.xml
tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/pom.xml
Modified: tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/build-dojo.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/build-dojo.xml?rev=891607&r1=891606&r2=891607&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/build-dojo.xml (original)
+++ tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/build-dojo.xml Thu Dec 17 09:50:07 2009
@@ -18,24 +18,16 @@
* under the License.
-->
<project name="DojoZipInstaller">
-
-
<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"/>
- </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>
-
<target name="check-dojo-unpacked">
<condition property="already.unpacked" >
@@ -43,49 +35,27 @@
</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="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"
dest="${basedir}/target/dojo-unpack-temp/"
- overwrite="false">
+ 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/**"/>
+ <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-release-${dojo.version}"
+ <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}"/>
</target>
Modified: tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/pom.xml?rev=891607&r1=891606&r2=891607&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/modules/web-javascript-dojo/pom.xml Thu Dec 17 09:50:07 2009
@@ -50,6 +50,13 @@
</dependency>
<dependency>
+ <groupId>org.dojotoolkit</groupId>
+ <artifactId>dojo</artifactId>
+ <version>1.3.0</version>
+ <type>zip</type>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
@@ -74,20 +81,6 @@
</dependencies>
<executions>
<execution>
- <id>install-dojo</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="install-dojo">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
<id>copy-dojo-files</id>
<phase>generate-resources</phase>
<goals>