geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r478187 - in /geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer: pom.xml src/test/resources/ src/test/resources/META-INF/ src/test/resources/META-INF/junit-plan.xml
Date Wed, 22 Nov 2006 15:13:23 GMT
Author: prasad
Date: Wed Nov 22 07:13:22 2006
New Revision: 478187

URL: http://svn.apache.org/viewvc?view=rev&rev=478187
Log:
* deploy junit before deploying openejb-itest-core.

Added:
    geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/
    geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/
    geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml
  (with props)
Modified:
    geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml

Modified: geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml?view=diff&rev=478187&r1=478186&r2=478187
==============================================================================
--- geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml (original)
+++ geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml Wed Nov
22 07:13:22 2006
@@ -17,55 +17,55 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <!-- $Rev$ $Date$ -->
-
 <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/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>ejbcontainer-testsuite</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
     <artifactId>test-ejbcontainer</artifactId>
     <name>Geronimo TestSuite, EJB Container :: Test ejb modules</name>
     <packaging>jar</packaging>
-
     <description>
         Tests for the ejb modules
     </description>
+    <properties>
+        <junitVersion>3.8.1</junitVersion>
+    </properties>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-itests-core</artifactId>
             <version>${openejbVersion}</version>
             <type>test-jar</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-itests-core</artifactId>
             <version>${openejbVersion}</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     
     <profiles>
         <profile>
             <id>child</id>
             <build>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                        <filtering>true</filtering>
+                    </testResource>
+                </testResources>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
-
                         <executions>
                             <execution>
                                 <id>deploy-ears</id>
@@ -76,11 +76,18 @@
                                 <configuration>
                                     <modules>
                                         <module>
-                                            <groupId>org.apache.openejb</groupId>
-                                            <artifactId>openejb-itests-core</artifactId>
-                                            <version>${openejbVersion}</version>
+                                            <groupId>junit</groupId>
+                                            <artifactId>junit</artifactId>
+                                            <version>${junitVersion}</version>
                                             <type>jar</type>
+                                            <plan>${project.build.directory}/test-classes/META-INF/junit-plan.xml</plan>
                                         </module>
+                                          <module>
+                                              <groupId>org.apache.openejb</groupId>
+                                              <artifactId>openejb-itests-core</artifactId>
+                                              <version>${openejbVersion}</version>
+                                              <type>jar</type>
+                                          </module>
                                     </modules>
                                 </configuration>
                             </execution>
@@ -93,11 +100,17 @@
                                 </goals>
                                 <configuration>
                                     <modules>
+                                          <module>
+                                              <groupId>org.apache.openejb</groupId>
+                                              <artifactId>openejb-itests-core</artifactId>
+                                              <version>${openejbVersion}</version>
+                                              <type>car</type>
+                                          </module>
                                         <module>
-                                            <groupId>org.apache.openejb</groupId>
-                                            <artifactId>openejb-itests-core</artifactId>
-                                            <version>${openejbVersion}</version>
-                                            <type>car</type>
+                                            <groupId>junit</groupId>
+                                            <artifactId>junit</artifactId>
+                                            <version>${junitVersion}</version>
+                                            <type>jar</type>
                                         </module>
                                     </modules>
                                 </configuration>
@@ -108,5 +121,4 @@
             </build>
         </profile>
     </profiles>
-
 </project>

Added: geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml?view=auto&rev=478187
==============================================================================
--- geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml
(added)
+++ geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml
Wed Nov 22 07:13:22 2006
@@ -0,0 +1,26 @@
+<?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.-->
+<!--$Rev$ $Date$-->
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <environment>
+        <moduleId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junitVersion}</version>
+            <type>jar</type>
+        </moduleId>
+    </environment>
+</module>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/src/test/resources/META-INF/junit-plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message