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

Fix another dojo hudson build issue

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@891609 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
antelder 2009-12-17 09:51:09 +00:00
parent 98fbe603e4
commit 8386c74407
2 changed files with 24 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,23 +19,16 @@
-->
<project name="DojoZipInstaller">
<property name="dojo.version" value="1.3.0"/>
<property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
<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,50 +36,29 @@
</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/**"/>
<include 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>
</project>

29
sca-java-1.x/trunk/samples/customer-dojo-webapp/pom.xml
View file

@ -87,6 +87,13 @@
<version>10.3.1.4</version>
</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>
@ -111,22 +118,8 @@
</dependency>
</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>
<execution>
<id>copy-dojo-files</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
@ -140,8 +133,8 @@
</tasks>
</configuration>
</execution>
<execution>
<id>clean-dojo-files</id>
<execution>
<id>clean-dojo-files</id>
<phase>clean</phase>
<goals>
<goal>run</goal>