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

[rm...@apache.org]

Author: rmannibucau
Date: Sun Oct  7 22:03:14 2012
New Revision: 1395391

URL: http://svn.apache.org/viewvc?rev=1395391&view=rev
Log:
adding back apache-tomcat module (not activated since we use last release of tomcat) to ease version update - this module shouldn't be deleted but just commented when we don't need it

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

Added: openejb/trunk/openejb/tomee/apache-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomcat/pom.xml?rev=1395391&view=auto
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomcat/pom.xml (added)
+++ openejb/trunk/openejb/tomee/apache-tomcat/pom.xml Sun Oct  7 22:03:14 2012
@@ -0,0 +1,114 @@
+
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>tomee</artifactId>
+    <groupId>org.apache.openejb</groupId>
+    <version>1.5.i1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>apache-tomcat</artifactId>
+  <name>OpenEJB :: TomEE :: Apache Tomcat</name>
+  <version>7.0.32-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <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 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>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${tomcat.tmp}</file>
+                  <type>zip</type>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <properties>
+    <!-- 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>
+

Modified: openejb/trunk/openejb/tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/pom.xml?rev=1395391&r1=1395390&r2=1395391&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/pom.xml Sun Oct  7 22:03:14 2012
@@ -43,6 +43,7 @@
     <module>tomee-embedded</module>
     <module>tomee-jaxrs</module>
     <module>tomee-jaxrs-webapp</module>
+    <!--<module>apache-tomcat</module>-->
     <module>apache-tomee</module>
     <module>apache-tomee-deb</module>
     <module>apache-tomee-deb-package</module>