geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r386771 - in /geronimo/trunk/modules/j2ee-builder: pom.xml src/test/test-setup.xml
Date Sat, 18 Mar 2006 00:23:39 GMT
Author: jlaskowski
Date: Fri Mar 17 16:23:38 2006
New Revision: 386771

URL: http://svn.apache.org/viewcvs?rev=386771&view=rev
Log:
GERONIMO-1713 - Module migration to Maven2: j2ee-builder
Submitted by: Prasad Kashyap

Added:
    geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml   (with props)
Modified:
    geronimo/trunk/modules/j2ee-builder/pom.xml

Modified: geronimo/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/pom.xml?rev=386771&r1=386770&r2=386771&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/pom.xml Fri Mar 17 16:23:38 2006
@@ -29,14 +29,32 @@
   <name>Geronimo :: J2EE :: Builder</name>
   <version>${geronimoVersion}</version>
   
-  <!-- Tests not migrated to m2, skipping -->
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
-  
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>process-test-resources</id>
+            <phase>process-test-resources</phase>
+            <configuration>
+              <tasks>
+                <echo message="classpath=${project.compileClasspathElements}" file="classpath.properties"/>
+                <ant antfile="${basedir}/src/test/test-setup.xml">
+                  <property name="maven.compile.source" value="1.4"/>
+                  <property name="maven.compile.target" value="1.4"/>
+                </ant>
+                <delete file="classpath.properties" failonerror="false" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
         <version>${xmlbeansMavenPluginVersion}</version>
@@ -77,73 +95,10 @@
           <artifactId>xmlbeans-jsr173-api</artifactId>
         </exclusion>
       </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-deployment</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-security</artifactId>
-    </dependency>
+    </dependency> 
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-security-builder</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-service-builder</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-j2ee</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-management</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-kernel</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-system</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-j2ee-schema</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-ejb_2.1_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j</artifactId>
     </dependency>
   </dependencies>
 </project>

Added: geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml?rev=386771&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml (added)
+++ geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml Fri Mar 17 16:23:38 2006
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+    Copyright 2006 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project name="test-setup" default="default" basedir=".">
+
+  <target name="default">
+    <!-- Build test-ejb-jar -->
+    <antcall target="setupEar">
+      <param name="ear.src.base.dir" value="${basedir}/src/test-ear"/>
+      <param name="ear.target.base.dir" value="${basedir}/target/test-ear14"/>
+    </antcall>
+
+    <!-- Build test-ejb-jar -->
+    <antcall target="setupEar">
+      <param name="ear.src.base.dir" value="${basedir}/src/test-ear13"/>
+      <param name="ear.target.base.dir" value="${basedir}/target/test-ear13"/>
+    </antcall>
+
+    <antcall target="setupUnpackedEar"/>
+
+    <copy todir="${basedir}/target/plans">
+      <fileset dir="${basedir}/src/test-plan">
+        <include name="*.xml" />
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="setupEar">
+    <mkdir dir="${ear.target.base.dir}/test-ejb-jar/META-INF"/>
+    <mkdir dir="${ear.target.base.dir}/test-ejb-jar/META-INF"/>
+    <copy todir="${ear.target.base.dir}/test-ejb-jar/META-INF">
+      <fileset dir="${ear.src.base.dir}/test-ejb-jar/META-INF"/>
+    </copy>
+
+    <replace file="classpath.properties" token="\" value="/"/>
+    <replace file="classpath.properties" token=", " value=";"/>
+    <replace file="classpath.properties" token="[" value=""/>
+    <replace file="classpath.properties" token="] " value=""/>
+    <loadproperties srcFile="classpath.properties">
+      <filterchain>
+        <linecontains>
+          <contains value="classpath"/>
+        </linecontains>
+      </filterchain>
+    </loadproperties>
+
+    <javac srcdir="${ear.src.base.dir}/test-ejb-jar"
+            destdir="${ear.target.base.dir}/test-ejb-jar"
+            source="${maven.compile.source}"
+            target="${maven.compile.target}"
+            debug="on"
+            fork="true">
+      <classpath path="${classpath}" />
+    </javac>
+
+    <jar destfile="${ear.target.base.dir}/test-ejb-jar.jar" basedir="${ear.target.base.dir}/test-ejb-jar"/>
+    <!-- Build test-war -->
+    <jar destfile="${ear.target.base.dir}/test-war.war" basedir="${ear.src.base.dir}/test-war"/>
+    <!-- Build test-rar -->
+    <jar destfile="${ear.target.base.dir}/test-rar.rar" basedir="${ear.src.base.dir}/test-rar"/>
+    <!-- Build test-ear -->
+    <jar destfile="${ear.target.base.dir}/test-ear.ear">
+      <fileset dir="${ear.target.base.dir}">
+        <include name="test-ejb-jar.jar"/>
+        <include name="test-war.war"/>
+        <include name="test-rar.rar"/>
+      </fileset>
+      <fileset dir="${ear.src.base.dir}">
+        <include name="META-INF/*"/>
+      </fileset>
+    </jar>
+    <!-- Build test-naked-ear -->
+    <jar destfile="${ear.target.base.dir}/test-naked-ear.ear">
+      <fileset dir="${ear.target.base.dir}">
+        <include name="test-ejb-jar.jar"/>
+        <include name="test-war.war"/>
+        <include name="test-rar.rar"/>
+      </fileset>
+      <fileset dir="${ear.src.base.dir}">
+        <include name="META-INF/*"/>
+        <exclude name="META-INF/geronimo-application.xml"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="setupUnpackedEar">
+    <antcall target="setupBaseUnpackedEar">
+      <param name="ear.unpacked.relative" value="full"/>
+    </antcall>
+    <copy todir="${basedir}/target/test-unpacked-ear/full/META-INF">
+      <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
+        <include name="application.xml"/>
+        <include name="geronimo-application.xml"/>
+      </fileset>
+    </copy>
+    
+
+    <antcall target="setupBaseUnpackedEar">
+      <param name="ear.unpacked.relative" value="naked"/>
+    </antcall>
+    <copy todir="${basedir}/target/test-unpacked-ear/naked/META-INF">
+      <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
+        <include name="application.xml"/>
+      </fileset>
+    </copy>
+
+    <property name="relative" value="alt-dd"/>
+    <antcall target="setupBaseUnpackedEar">
+      <param name="ear.unpacked.relative" value="${relative}"/>
+    </antcall>
+    <copy todir="${basedir}/target/test-unpacked-ear/${relative}/META-INF">
+      <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
+        <include name="application-alt-dd.xml"/>
+      </fileset>
+      <mapper type="merge" to="application.xml"/>
+    </copy>
+    <copy todir="${basedir}/target/test-unpacked-ear/${relative}/META-INF">
+      <fileset dir="${basedir}/src/test-unpacked-ear/META-INF">
+        <include name="geronimo-application-alt-dd.xml"/>
+      </fileset>
+      <mapper type="merge" to="geronimo-application.xml"/>
+    </copy>
+    <copy todir="${basedir}/target/test-unpacked-ear/${relative}">
+      <fileset dir="${basedir}/src/test-unpacked-ear">
+        <include name="*.xml"/>
+      </fileset>
+    </copy>
+    <jar destfile="${basedir}/target/test-unpacked-ear/alt-dd.ear">
+      <fileset dir="${basedir}/target/test-unpacked-ear/${relative}"/>
+    </jar>
+  </target>
+
+  <target name="setupBaseUnpackedEar">
+    <mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/META-INF"/>
+    <mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/test-ejb-jar"/>
+    <mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/test-war"/>
+    <mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/test-rar"/>
+  </target>
+</project>

Propchange: geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/modules/j2ee-builder/src/test/test-setup.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message