You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/09/01 01:17:58 UTC

svn commit: r439090 - in /geronimo/server/trunk: ./ modules/ modules/geronimo-activation/ modules/geronimo-activemq-gbean-management/ modules/geronimo-activemq-gbean/ modules/geronimo-axis-builder/ modules/geronimo-axis/ modules/geronimo-client-builder...

Author: jdillon
Date: Thu Aug 31 16:17:56 2006
New Revision: 439090

URL: http://svn.apache.org/viewvc?rev=439090&view=rev
Log:
(GERONIMO-2352) Hooking up testsupport to the main build
Moved modules/geronimo-testsupport to testsupport/testsupport-common & hook up testsupport-common as a default test dep for all modules

Added:
    geronimo/server/trunk/testsupport/testsupport-common/
      - copied from r439049, geronimo/server/trunk/modules/geronimo-testsupport/
Removed:
    geronimo/server/trunk/modules/geronimo-testsupport/
    geronimo/server/trunk/testsupport/testsupport-common/src/site/
Modified:
    geronimo/server/trunk/modules/geronimo-activation/pom.xml
    geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml
    geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
    geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-axis/pom.xml
    geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-client/pom.xml
    geronimo/server/trunk/modules/geronimo-common/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-connector/pom.xml
    geronimo/server/trunk/modules/geronimo-converter/pom.xml
    geronimo/server/trunk/modules/geronimo-core/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
    geronimo/server/trunk/modules/geronimo-deployment/pom.xml
    geronimo/server/trunk/modules/geronimo-derby/pom.xml
    geronimo/server/trunk/modules/geronimo-directory/pom.xml
    geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
    geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty/pom.xml
    geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
    geronimo/server/trunk/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/modules/geronimo-mail/pom.xml
    geronimo/server/trunk/modules/geronimo-management/pom.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-naming/pom.xml
    geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-security/pom.xml
    geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-system/pom.xml
    geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
    geronimo/server/trunk/modules/geronimo-timer/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
    geronimo/server/trunk/modules/geronimo-transaction/pom.xml
    geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
    geronimo/server/trunk/modules/geronimo-util/pom.xml
    geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices/pom.xml
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsupport/pom.xml
    geronimo/server/trunk/testsupport/testsupport-common/NOTICE.txt
    geronimo/server/trunk/testsupport/testsupport-common/pom.xml
    geronimo/server/trunk/testsupport/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java

Modified: geronimo/server/trunk/modules/geronimo-activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activation/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activation/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activation/pom.xml Thu Aug 31 16:17:56 2006
@@ -48,13 +48,6 @@
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml Thu Aug 31 16:17:56 2006
@@ -39,13 +39,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml Thu Aug 31 16:17:56 2006
@@ -75,13 +75,6 @@
             <version>3.0-beta3</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <!--

Modified: geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -99,13 +99,6 @@
             <artifactId>wsdl4j</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Thu Aug 31 16:17:56 2006
@@ -109,13 +109,6 @@
             <artifactId>wsdl4j</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -51,13 +51,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client/pom.xml Thu Aug 31 16:17:56 2006
@@ -73,13 +73,6 @@
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-common/pom.xml Thu Aug 31 16:17:56 2006
@@ -39,13 +39,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -62,13 +62,6 @@
             <artifactId>tranql</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector/pom.xml Thu Aug 31 16:17:56 2006
@@ -117,13 +117,6 @@
             <artifactId>regexp</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
     
     <!--

Modified: geronimo/server/trunk/modules/geronimo-converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-converter/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-converter/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-converter/pom.xml Thu Aug 31 16:17:56 2006
@@ -45,13 +45,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-core/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-core/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-core/pom.xml Thu Aug 31 16:17:56 2006
@@ -45,13 +45,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml Thu Aug 31 16:17:56 2006
@@ -54,13 +54,6 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml Thu Aug 31 16:17:56 2006
@@ -69,13 +69,6 @@
             <artifactId>mx4j-remote</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml Thu Aug 31 16:17:56 2006
@@ -73,13 +73,6 @@
             <artifactId>jline</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml Thu Aug 31 16:17:56 2006
@@ -54,13 +54,6 @@
             <artifactId>xml-resolver</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-derby/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-derby/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-derby/pom.xml Thu Aug 31 16:17:56 2006
@@ -57,13 +57,6 @@
             <artifactId>derbynet</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/modules/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-directory/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-directory/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-directory/pom.xml Thu Aug 31 16:17:56 2006
@@ -150,13 +150,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Thu Aug 31 16:17:56 2006
@@ -68,13 +68,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-interceptor/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-interceptor/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-interceptor/pom.xml Thu Aug 31 16:17:56 2006
@@ -30,16 +30,5 @@
     
     <artifactId>geronimo-interceptor</artifactId>
     <name>Geronimo :: Interceptor</name>
-    
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-    
+
 </project>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -51,13 +51,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml Thu Aug 31 16:17:56 2006
@@ -71,13 +71,6 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Thu Aug 31 16:17:56 2006
@@ -50,13 +50,6 @@
             <artifactId>geronimo-ejb_2.1_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -45,13 +45,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty/pom.xml Thu Aug 31 16:17:56 2006
@@ -92,13 +92,6 @@
             <artifactId>commons-primitives</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml Thu Aug 31 16:17:56 2006
@@ -48,13 +48,6 @@
             <artifactId>mx4j-remote</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-kernel/pom.xml Thu Aug 31 16:17:56 2006
@@ -69,13 +69,6 @@
             <scope>test</scope>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-mail/pom.xml Thu Aug 31 16:17:56 2006
@@ -66,13 +66,6 @@
             <artifactId>geronimo-activation_1.0.2_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-management/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-management/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-management/pom.xml Thu Aug 31 16:17:56 2006
@@ -48,13 +48,6 @@
             <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -91,13 +91,6 @@
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming/pom.xml Thu Aug 31 16:17:56 2006
@@ -50,13 +50,6 @@
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -51,13 +51,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security/pom.xml Thu Aug 31 16:17:56 2006
@@ -83,13 +83,6 @@
             <artifactId>hsqldb</artifactId>
             <scope>test</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
     
     </dependencies>
     

Modified: geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-service-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -55,13 +55,6 @@
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-system/pom.xml Thu Aug 31 16:17:56 2006
@@ -72,13 +72,6 @@
             <scope>test</scope>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml Thu Aug 31 16:17:56 2006
@@ -50,13 +50,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-timer/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-timer/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-timer/pom.xml Thu Aug 31 16:17:56 2006
@@ -93,13 +93,6 @@
             <artifactId>concurrent</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -123,13 +123,6 @@
             <scope>test</scope>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Thu Aug 31 16:17:56 2006
@@ -229,13 +229,6 @@
             <artifactId>wadi-tomcat55</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Thu Aug 31 16:17:56 2006
@@ -70,13 +70,6 @@
             <artifactId>howl</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/pom.xml Thu Aug 31 16:17:56 2006
@@ -51,13 +51,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-util/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-util/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-util/pom.xml Thu Aug 31 16:17:56 2006
@@ -38,13 +38,6 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-builder/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-builder/pom.xml Thu Aug 31 16:17:56 2006
@@ -76,13 +76,6 @@
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml Thu Aug 31 16:17:56 2006
@@ -96,13 +96,6 @@
             <artifactId>scout</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Thu Aug 31 16:17:56 2006
@@ -33,8 +33,18 @@
     <name>Geronimo :: Modules</name>
     <packaging>pom</packaging>
     
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <version>${pom.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
     <modules>
-        <module>geronimo-testsupport</module>
         <module>geronimo-activation</module>
         <module>ge-activemq-rar</module>
         <module>geronimo-activemq-gbean</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Aug 31 16:17:56 2006
@@ -1023,6 +1023,7 @@
             </activation>
 
             <modules>
+                <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
                 <module>applications</module>
@@ -1055,6 +1056,7 @@
                       includes most modules, so for now just build everything.
                       Fix this when the modules are reorganized.
                 -->
+                <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
             </modules>
@@ -1088,6 +1090,7 @@
             </activation>
 
             <modules>
+                <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
                 <module>applications</module>
@@ -1112,6 +1115,7 @@
             </activation>
 
             <modules>
+                <module>testsupport</module>
                 <module>modules</module>
                 <module>maven-plugins</module>
                 <module>applications</module>

Modified: geronimo/server/trunk/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/pom.xml?rev=439090&r1=439089&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/pom.xml (original)
+++ geronimo/server/trunk/testsupport/pom.xml Thu Aug 31 16:17:56 2006
@@ -41,8 +41,9 @@
     </description>
 
     <modules>
-      <module>test-deployment-j2ee_1.3</module>
-      <module>test-deployment-j2ee_1.4</module>
+        <module>testsupport-common</module>
+        <module>test-deployment-j2ee_1.3</module>
+        <module>test-deployment-j2ee_1.4</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/testsupport/testsupport-common/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-common/NOTICE.txt?rev=439090&r1=439049&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-common/NOTICE.txt (original)
+++ geronimo/server/trunk/testsupport/testsupport-common/NOTICE.txt Thu Aug 31 16:17:56 2006
@@ -1,3 +1,5 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+Apache Geronimo
+Copyright 2006 The Apache Software Foundation
 
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/server/trunk/testsupport/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-common/pom.xml?rev=439090&r1=439049&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/testsupport/testsupport-common/pom.xml Thu Aug 31 16:17:56 2006
@@ -1,18 +1,21 @@
 <?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.
+    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$ -->
@@ -22,14 +25,14 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules</artifactId>
+        <groupId>org.apache.geronimo.testsupport</groupId>
+        <artifactId>testsupport</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>geronimo-testsupport</artifactId>
-    <name>Geronimo :: Test Support</name>
+    <artifactId>testsupport-common</artifactId>
+    <name>Geronimo Test Support :: Common</name>
     <packaging>jar</packaging>
     
     <dependencies>

Modified: geronimo/server/trunk/testsupport/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java?rev=439090&r1=439049&r2=439090&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java (original)
+++ geronimo/server/trunk/testsupport/testsupport-common/src/main/java/org/apache/geronimo/testsupport/TestSupport.java Thu Aug 31 16:17:56 2006
@@ -1,17 +1,20 @@
-/**
- *  Copyright 2006 The Apache Software Foundation
+/*
+ * 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
  *
- *  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
  *
- *     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.
+ * 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.
  */
 
 package org.apache.geronimo.testsupport;