Update to get the dojotoolkit zip from the Maven repository to try to fix the 1.x Hudson build failure

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@802314 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 24 insertions, 30 deletions

diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
index f029ed7e87..2ca64ded99 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
@@ -26,8 +26,8 @@
 
     <target name="check-dojo-installed">
         <condition property="already.installed" >
-            <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
+            <available file="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
+        </condition>                            
         <condition property="maven.suffix" value="">
             <os family="unix"/>
         </condition>
@@ -45,41 +45,41 @@
 
     <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"
+        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}.zip"
+            dest="${basedir}/target/dojo-download/dojo-${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"/>
+            <arg line="install:install-file -DgroupId=dojo  -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-${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"
+        <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}.zip"
+            dest="${basedir}/target/dojo-download/dojo-${dojo.version}.zip"
             verbose="true"
             usetimestamp="true"/>
-        <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip" 
+        <copy file="${basedir}/target/dojo-download/dojo-${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"/>
+        <fail message="dojo zip file not installed in local repository: ${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip" 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">
             <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/"/>
diff --git a/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml b/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml
index 47460d3005..3abaab8636 100644
--- a/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml
+++ b/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml
@@ -30,6 +30,14 @@
     <name>Apache Tuscany SCA Web JavaScript for DOJO</name>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.dojotoolkit</groupId>
+            <artifactId>dojo</artifactId>
+            <version>1.3.0</version>
+            <type>zip</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
@@ -74,20 +82,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>