geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r671702 - in /geronimo/server/trunk/testsuite: ./ concurrent-testsuite/ concurrent-testsuite/common-ejb/ concurrent-testsuite/common-jar/ concurrent-testsuite/concurrent-basic/ concurrent-testsuite/concurrent-basic/common-ejb/ concurrent-te...
Date Thu, 26 Jun 2008 01:37:55 GMT
Author: gawor
Date: Wed Jun 25 18:37:54 2008
New Revision: 671702

URL: http://svn.apache.org/viewvc?rev=671702&view=rev
Log:
restructure the concurrency testsuite

Added:
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/
      - copied from r671641, geronimo/server/trunk/testsuite/concurrent-testsuite/common-ejb/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
      - copied, changed from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/common-ejb/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/src/
      - copied from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/common-ejb/src/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/
      - copied from r671641, geronimo/server/trunk/testsuite/concurrent-testsuite/common-jar/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
      - copied, changed from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/common-jar/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/src/
      - copied from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/common-jar/src/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/
      - copied from r671641, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/
      - copied from r671641, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb-ear/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml
      - copied, changed from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb-ear/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/
      - copied from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb-ear/src/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
      - copied, changed from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/src/
      - copied from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/src/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/
      - copied from r671641, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
      - copied, changed from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/src/
      - copied from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/src/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/
      - copied from r671641, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-web-ear/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml
      - copied, changed from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-web-ear/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/
      - copied from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-web-ear/src/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/goals.txt
      - copied unchanged from r671674, geronimo/server/trunk/testsuite/concurrent-testsuite/goals.txt
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/pom.xml   (with
props)
Removed:
    geronimo/server/trunk/testsuite/concurrent-testsuite/common-ejb/
    geronimo/server/trunk/testsuite/concurrent-testsuite/common-jar/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb-ear/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-web-ear/
    geronimo/server/trunk/testsuite/concurrent-testsuite/goals.txt
Modified:
    geronimo/server/trunk/testsuite/concurrent-testsuite/pom.xml
    geronimo/server/trunk/testsuite/pom.xml

Copied: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
(from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/common-ejb/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml?p2=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml&p1=geronimo/server/trunk/testsuite/concurrent-testsuite/common-ejb/pom.xml&r1=671676&r2=671702&rev=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/common-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-ejb/pom.xml
Wed Jun 25 18:37:54 2008
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-testsuite</artifactId>
+        <artifactId>concurrent-basic</artifactId>
         <version>2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
(from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/common-jar/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml?p2=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml&p1=geronimo/server/trunk/testsuite/concurrent-testsuite/common-jar/pom.xml&r1=671676&r2=671702&rev=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/common-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/common-jar/pom.xml
Wed Jun 25 18:37:54 2008
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-testsuite</artifactId>
+        <artifactId>concurrent-basic</artifactId>
         <version>2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml
(from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb-ear/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml?p2=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml&p1=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb-ear/pom.xml&r1=671676&r2=671702&rev=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/pom.xml
Wed Jun 25 18:37:54 2008
@@ -26,7 +26,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-testsuite</artifactId>
+        <artifactId>concurrent-basic</artifactId>
         <version>2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -153,7 +153,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -166,13 +165,6 @@
                     </systemProperties>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>geronimo-maven-plugin</artifactId>

Copied: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
(from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml?p2=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml&p1=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/pom.xml&r1=671676&r2=671702&rev=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/pom.xml
Wed Jun 25 18:37:54 2008
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-testsuite</artifactId>
+        <artifactId>concurrent-basic</artifactId>
         <version>2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
(from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml?p2=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml&p1=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/pom.xml&r1=671676&r2=671702&rev=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-war/pom.xml
Wed Jun 25 18:37:54 2008
@@ -25,7 +25,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-testsuite</artifactId>
+        <artifactId>concurrent-basic</artifactId>
         <version>2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml
(from r671676, geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-web-ear/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml?p2=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml&p1=geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-web-ear/pom.xml&r1=671676&r2=671702&rev=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-web-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/pom.xml
Wed Jun 25 18:37:54 2008
@@ -26,7 +26,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>concurrent-testsuite</artifactId>
+        <artifactId>concurrent-basic</artifactId>
         <version>2.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -127,7 +127,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -140,13 +139,6 @@
                     </systemProperties>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>geronimo-maven-plugin</artifactId>

Added: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/pom.xml?rev=671702&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/pom.xml (added)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/pom.xml Wed Jun
25 18:37:54 2008
@@ -0,0 +1,44 @@
+<?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/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <artifactId>concurrent-testsuite</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>concurrent-basic</artifactId>
+    <packaging>pom</packaging>
+    <name>Geronimo TestSuite :: Concurrent TestSuite :: Basic Tests</name>
+    <description>Tests for Concurrency Utilities for Java EE implementation</description>
+
+    <modules>
+        <module>common-ejb</module>
+        <module>common-jar</module>
+        <module>concurrent-war</module>
+        <module>concurrent-ejb</module>
+        <module>concurrent-web-ear</module>
+        <module>concurrent-ejb-ear</module>
+    </modules>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/pom.xml?rev=671702&r1=671701&r2=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/pom.xml Wed Jun 25 18:37:54 2008
@@ -32,13 +32,23 @@
     <name>Geronimo TestSuite :: Concurrent TestSuite</name>
     <description>Tests for Concurrency Utilities for Java EE implementation</description>
 
-    <modules>
-        <module>common-ejb</module>
-        <module>common-jar</module>
-        <module>concurrent-war</module>
-        <module>concurrent-ejb</module>
-        <module>concurrent-web-ear</module>
-        <module>concurrent-ejb-ear</module>
-    </modules>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=671702&r1=671701&r2=671702&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Wed Jun 25 18:37:54 2008
@@ -238,11 +238,9 @@
                             <directory>${project.basedir}</directory>
                             <includes>
                                 <include>*/*/pom.xml</include>
-                                <include>concurrent-testsuite/pom.xml</include>
                             </includes>
                             <excludes>
                                 <exclude>${shittyTestExcludes}</exclude>
-                                <exclude>concurrent-testsuite/*/pom.xml</exclude>
                             </excludes>
                         </fileset>
                     </projects>



Mime
View raw message