You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/08/12 23:24:24 UTC
svn commit: r1157257 - in
/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle:
tomee7/pom.xml utils/src/main/groovy/commands/SetupCommand.groovy
Author: dblevins
Date: Fri Aug 12 21:24:24 2011
New Revision: 1157257
URL: http://svn.apache.org/viewvc?rev=1157257&view=rev
Log:
use maven to download the tomcat zip files
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1157257&r1=1157256&r2=1157257&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml Fri Aug 12 21:24:24 2011
@@ -79,6 +79,13 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomcat</artifactId>
+ <version>7.0.16</version>
+ <type>zip</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.7.1</version>
@@ -88,6 +95,33 @@
</dependencies>
<build>
<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>apache-tomcat</artifactId>
+ <version>7.0.16</version>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy?rev=1157257&r1=1157256&r2=1157257&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy Fri Aug 12 21:24:24 2011
@@ -122,7 +122,7 @@ class SetupCommand {
source = "http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcatVersion}/bin/apache-tomcat-${tomcatVersion}.zip"
}
- ant.get(src: source, dest: dest)
+// ant.get(src: source, dest: dest)
ant.unzip(src: dest, dest: "${project.build.directory}")