Change to use maven instead of Ant to download file and use server www.eu.apache.org as the dist ones don't work, see the comment in the pom.xml

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

2 files changed, 25 insertions, 77 deletions

diff --git a/java/sca/distribution/tomcat/testing/download-tomcat/build.xml b/java/sca/distribution/tomcat/testing/download-tomcat/build.xml
deleted file mode 100644
index 18df3a6c68..0000000000
--- a/java/sca/distribution/tomcat/testing/download-tomcat/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<project name="getTomcat">

-

-    <property name="download.location" value="${basedir}/download"/>

-    <property name="downloaded.name" value="${download.location}/apache-tomcat-${tomcat.version}.zip"/>

-

-    <property name="unzip.location" value="${basedir}/target"/>

-    <property name="unzipped.name" value="${unzip.location}/apache-tomcat-${tomcat.version}"/>

-

-    <target name="check-downloaded">

-        <condition property="already.downloaded" >

-            <available file="${downloaded.name}"/>

-        </condition>

-    </target>

-

-    <target name="check-unziped">

-        <condition property="already.unziped" >

-            <available file="${unzipped.name}"/>

-        </condition>

-    </target>

-

-    <target name="download" depends="check-downloaded" unless="already.unziped">

-        <mkdir dir="${download.location}"/>

-        <get src="http://www.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip"

-            dest="${downloaded.name}"

-            verbose="true"

-            usetimestamp="true"/>

-    </target>

-

-    <target name="unzip-files" depends="download" unless="already.unziped">

-        <unzip src="${downloaded.name}"

-               dest="${unzip.location}"

-               overwrite="false">

-        </unzip>

-    </target>

-

-</project>

diff --git a/java/sca/distribution/tomcat/testing/download-tomcat/pom.xml b/java/sca/distribution/tomcat/testing/download-tomcat/pom.xml
index e0dbab2b2e..4c7e716572 100644
--- a/java/sca/distribution/tomcat/testing/download-tomcat/pom.xml
+++ b/java/sca/distribution/tomcat/testing/download-tomcat/pom.xml
@@ -30,31 +30,34 @@
     <packaging>pom</packaging>

     <name>Apache Tuscany SCA Tomcat Integration Testing Download Tomcat</name>

 

+    <properties>

+        <tomcat.version>6.0.18</tomcat.version>

+    </properties>

+

     <build>

         <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution> 

-                        <id>download-tomcat</id>                       

-                        <phase>validate</phase>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                        <configuration>

-                            <tasks>

-                                <ant antfile="./build.xml" target="unzip-files">

-                                    <property name="tomcat.version" value="6.0.18"/>

-                                    <property name="localRepository" value="${settings.localRepository}"/>

-                                </ant>

-                            </tasks>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin> 

+           <plugin>

+              <groupId>org.codehaus.mojo</groupId>

+              <artifactId>wagon-maven-plugin</artifactId>

+              <version>1.0-beta-1</version>

+              <executions>

+                 <execution>

+                    <id>download-tomcat</id>

+                    <phase>pre-integration-test</phase>

+                    <goals>

+                       <goal>download-single</goal>

+                    </goals>

+                    <configuration>

+                       <!-- Note: the url should be "archive.apache.org" but that is truncating the file at 4808k, 

+                                 no idea why but it sounds like an infra problem - https://issues.apache.org/jira/browse/LOG4NET-197 -->

+                       <url>http://www.eu.apache.org</url>

+                       <fromFile>dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</fromFile>

+                       <toDir>download</toDir>

+                    </configuration>

+                 </execution>

+              </executions>

+           </plugin>

         </plugins>

    </build>

 

 </project>

-