geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r386222 - in /geronimo/trunk/modules/connector-builder: pom.xml src/test/test-setup.xml
Date Wed, 15 Mar 2006 23:55:29 GMT
Author: jlaskowski
Date: Wed Mar 15 15:55:29 2006
New Revision: 386222

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

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

Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/pom.xml?rev=386222&r1=386221&r2=386222&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Wed Mar 15 15:55:29 2006
@@ -30,13 +30,26 @@
   <version>${geronimoVersion}</version>
   <name>Geronimo :: Connector :: Builder</name>
 
-  <!--  Tests not migrated to m2 -->
-  <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>
+                <ant antfile="${basedir}/src/test/test-setup.xml" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>xmlbeans-maven-plugin</artifactId>
         <version>${xmlbeansMavenPluginVersion}</version>
@@ -55,6 +68,16 @@
           </xmlConfigs>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <java.security.auth.login.config>${basedir}/src/test-data/data/login.config</java.security.auth.login.config>
+          </systemProperties>
+          <forkMode>pertest</forkMode>
+          <workingDirectory>${basedir}</workingDirectory>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   
@@ -82,30 +105,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- real stuff -->
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-naming</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-deployment</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-deploy-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-test-ddbean</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo</groupId>
@@ -113,100 +112,19 @@
     </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-j2ee-builder</artifactId>
+      <artifactId>geronimo-deploy-config</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-kernel</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.geronimo</groupId>
       <artifactId>geronimo-naming-builder</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-security</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-service-builder</artifactId>
-    </dependency>
-
-    <!-- test only-->
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-system</artifactId>
-    </dependency>
-
-    <!-- test only-->
     <dependency>
       <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-transaction</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo</groupId>
-      <artifactId>geronimo-j2ee-schema</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j</artifactId>
+      <artifactId>geronimo-test-ddbean</artifactId>
     </dependency>
-
     <dependency>
       <groupId>tranql</groupId>
       <artifactId>tranql</artifactId>
-    </dependency>
-
-    <!-- needed for passwordcredential realm-->
-    <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
     </dependency>
   </dependencies>
 </project>

Added: geronimo/trunk/modules/connector-builder/src/test/test-setup.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/test-setup.xml?rev=386222&view=auto
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/test-setup.xml (added)
+++ geronimo/trunk/modules/connector-builder/src/test/test-setup.xml Wed Mar 15 15:55:29 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    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-rar-10 -->
+    <mkdir dir="${basedir}/target/test-rar-10/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-10/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_0"/>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
+
+    <!-- Build test-rar-15 -->
+    <mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-15/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_5"/>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-15.rar" basedir="${basedir}/target/test-rar-15"/>
+
+    <!-- Build test-ear -->
+    <jar destfile="${basedir}/target/test-ear.ear">
+      <fileset dir="${basedir}/target">
+        <include name="test-rar-10.rar"/>
+        <include name="test-rar-15.rar"/>
+      </fileset>
+      <zipfileset dir="${basedir}/src/test-data/ear" prefix="META-INF"/>
+    </jar>
+    <!--do it again without geronimo dds-->
+    <!-- Build test-rar-10 -->
+    <mkdir dir="${basedir}/target/test-rar-10-noger/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-10-noger/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_0">
+        <exclude name="geronimo-ra.xml"/>
+      </fileset>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-10-noger.rar" basedir="${basedir}/target/test-rar-10"/>
+
+    <!-- Build test-rar-15 -->
+    <mkdir dir="${basedir}/target/test-rar-15-noger/META-INF"/>
+    <copy todir="${basedir}/target/test-rar-15-noger/META-INF">
+      <fileset dir="${basedir}/src/test-data/connector_1_5">
+        <exclude name="geronimo-ra.xml"/>
+      </fileset>
+    </copy>
+    <jar destfile="${basedir}/target/test-rar-15-noger.rar" basedir="${basedir}/target/test-rar-15"/>
+
+    <!-- Build test-ear -->
+    <jar destfile="${basedir}/target/test-ear-noger.ear">
+      <fileset dir="${basedir}/target">
+        <include name="test-rar-10-noger.rar"/>
+        <include name="test-rar-15-noger.rar"/>
+      </fileset>
+      <zipfileset dir="${basedir}/src/test-data/ear" prefix="META-INF">
+        <exclude name="geronimo-application.xml"/>
+      </zipfileset>
+    </jar>
+
+  </target>
+</project>

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

Propchange: geronimo/trunk/modules/connector-builder/src/test/test-setup.xml
------------------------------------------------------------------------------
    svn:executable = *

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

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



Mime
View raw message