svn commit: r1384275 - /openejb/trunk/openejb/tomee/apache-tomcat/pom.xml

[rm...@apache.org]

Author: rmannibucau
Date: Thu Sep 13 11:21:10 2012
New Revision: 1384275

URL: http://svn.apache.org/viewvc?rev=1384275&view=rev
Log:
we only use tomcat release so don't try to download tomcat when we already have it

Modified:
    openejb/trunk/openejb/tomee/apache-tomcat/pom.xml

Modified: openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomcat/pom.xml?rev=1384275&r1=1384274&r2=1384275&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomcat/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomcat/pom.xml Thu Sep 13 11:21:10 2012
@@ -36,20 +36,45 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.6</version>
+        <version>1.7</version>
         <executions>
           <execution>
+            <id>check-tomcat</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target name="check-if-already-in-m2">
+                <available file="${artifact.path}" property="dont-download-tomcat" />
+              </target>
+              <exportAntProperties>true</exportAntProperties>
+            </configuration>
+          </execution>
+          <execution>
             <id>download-tomcat</id>
             <phase>package</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
-              <target>
+              <target name="download" unless="dont-download-tomcat">
                 <get src="${tomcat.url}" dest="${tomcat.tmp}" verbose="true" />
               </target>
             </configuration>
           </execution>
+          <execution>
+            <id>mock-tomcat</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target name="copy" if="dont-download-tomcat">
+                <copy file="${artifact.path}" tofile="${tomcat.tmp}"/>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -81,5 +106,6 @@
     <!-- using a proxy is generally better -->
     <tomcat.url>http://www.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</tomcat.url>
     <tomcat.tmp>${project.build.directory}/apache-tomcat-${tomcat.bundle.version}.zip</tomcat.tmp>
+    <artifact.path>${settings.localRepository}/org/apache/openejb/${project.artifactId}/${project.version}/${project.artifactId}-${project.version}.zip</artifact.path>
   </properties>
 </project>