geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r924623 [1/2] - in /geronimo/server/branches/2.1: ./ buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/ buildsupport/testsuite-archetype-plugin/ framework/modules/geronimo-kernel/ repository/ testsuite/ testsui...
Date Thu, 18 Mar 2010 03:22:31 GMT
Author: rwonly
Date: Thu Mar 18 03:22:30 2010
New Revision: 924623

URL: http://svn.apache.org/viewvc?rev=924623&view=rev
Log:
remove tools-maven-plugin and some testsuite code cleanup

Modified:
    geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/pom.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/repository/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
    geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
    geronimo/server/branches/2.1/testsuite/pom.xml
    geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-myfaces/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml

Modified: geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml Thu Mar 18 03:22:30 2010
@@ -65,43 +65,6 @@
         </resources>
 -->
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-<!--
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            -->
-<!-- Fail the build if no legal files were copied -->
-<!--
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            -->
-<!-- Fail the build if no legal files were found -->
-<!--
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
--->
-            </plugin>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/testsuite-archetype-plugin/pom.xml Thu Mar 18 03:22:30 2010
@@ -30,8 +30,7 @@
     
     <artifactId>geronimo-archetype-testsuite</artifactId>
     <name>Geronimo Build Support :: Testsuite Archetype</name>
-    <packaging>maven-plugin</packaging>
-    
+    <!--<packaging>maven-plugin</packaging>-->
     <description>Plugin to help create a testsuite</description>
 
 </project>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml Thu Mar 18 03:22:30 2010
@@ -129,44 +129,10 @@
                     </execution>
                 </executions>
             </plugin>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-
-                <executions>
-                    <!--<execution>-->
-                        <!--<id>install-legal-files</id>-->
-                        <!--<phase>generate-resources</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>copy-legal-files</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<strict>true</strict>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.1</version>
                 <configuration>
                     <archive>
                         <!-- Do not include META-INF/maven to avoid long file problems on windows -->

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Mar 18 03:22:30 2010
@@ -2473,40 +2473,6 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were copied -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -2673,11 +2639,6 @@
 
                     <plugin>
                         <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                        <artifactId>tools-maven-plugin</artifactId>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
                         <artifactId>maven-maven-plugin</artifactId>
                     </plugin>
 

Modified: geronimo/server/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/pom.xml (original)
+++ geronimo/server/branches/2.1/repository/pom.xml Thu Mar 18 03:22:30 2010
@@ -188,40 +188,4 @@
         </repository>
     </repositories>
 
-    <build>
-        <plugins>
-            <!--
-            HACK: No legal files needed here... so don't fail the build if they are missing
-            -->
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <strict>false</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml Thu Mar 18 03:22:30 2010
@@ -33,10 +33,7 @@
     <packaging>jar</packaging>
     <description>Example using CORBA to access a stateless EJB</description>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-            
+
             <dependencies>
                 <dependency>
                     <groupId>${pom.groupId}</groupId>
@@ -59,7 +56,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+            
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,9 +37,7 @@
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>child</id>
+
             
             <dependencies>
                 <dependency>
@@ -61,7 +59,11 @@
                     <type>jar</type>
                 </dependency>
             </dependencies>
-        
+            
+    <profiles>
+        <profile>
+            <id>child</id>
+            
             <build>
                 <plugins>
                   <plugin>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -31,10 +31,6 @@
     <packaging>ejb</packaging>
     <description>Geronimo Hello World Enterprise Stateless EJB</description>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-            
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -43,6 +39,4 @@
                 </dependency>
             </dependencies>
 
-        </profile>
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -32,10 +32,6 @@
     <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World WAR</name>
     <packaging>war</packaging>
     <description>Geronimo Hello World Enterprise Web Application</description>
-
-    <profiles>
-        <profile>
-            <id>child</id>
             
             <dependencies>
                 <dependency>
@@ -56,6 +52,4 @@
                 </dependency>
             </dependencies>
 
-        </profile>
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml Thu Mar 18 03:22:30 2010
@@ -33,10 +33,6 @@
     <packaging>jar</packaging>
     <description>Example using CORBA to access a stateless EJB</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            
             <dependencies>
                 <dependency>
                     <groupId>${pom.groupId}</groupId>
@@ -51,7 +47,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+              
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,9 +37,7 @@
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>child</id>
+
             
             <dependencies>
                 <dependency>
@@ -55,7 +53,11 @@
                     <type>jar</type>
                 </dependency>
             </dependencies>
-        
+            
+    <profiles>
+        <profile>
+            <id>child</id>
+            
             <build>
                 <plugins>
                   <plugin>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -30,11 +30,7 @@
     <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EJB</name>
     <packaging>ejb</packaging>
     <description>Geronimo Marshal Enterprise Stateless EJB</description>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-            
+   
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -43,6 +39,4 @@
                 </dependency>
             </dependencies>
 
-        </profile>
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,9 +37,6 @@
         <container>jetty6</container>
     </properties>
     
-    <profiles>
-        <profile>
-            <id>child</id>
 
             <dependencies>
                 <dependency>
@@ -61,6 +58,10 @@
                 </dependency>
             </dependencies>
         
+    <profiles>
+        <profile>
+            <id>child</id>
+
             <build>
                 <plugins>
         

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -31,10 +31,6 @@
     <packaging>ejb</packaging>
     <description>Geronimo My Time Enterprise Stateless EJB</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -42,7 +38,5 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-
-        </profile>
-    </profiles>
+            
 </project>

Modified: geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -32,10 +32,6 @@
     <name>Geronimo TestSuite :: CORBA TestSuite :: My Time WAR</name>
     <packaging>war</packaging>
     <description>Geronimo My Time Enterprise Web Application</description>
-
-    <profiles>
-        <profile>
-            <id>child</id>
             
             <dependencies>
                 <dependency>
@@ -56,6 +52,4 @@
                 </dependency>
             </dependencies>
 
-        </profile>
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -27,10 +27,6 @@
     <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security EAR</name>
     <packaging>ear</packaging>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-
             <dependencies>
                 <dependency>
                     <groupId>org.tranql</groupId>
@@ -44,7 +40,11 @@
                     <type>war</type>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -28,10 +28,6 @@
     <name>Geronimo TestSuite :: Deployment Testsuite :: J2CA Container Managed Security WAR</name>
     <packaging>war</packaging>
     
-    <profiles>
-        <profile>
-            <id>child</id>   
-            
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -50,6 +46,10 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
+
+    <profiles>
+        <profile>
+            <id>child</id> 
             
             <build>
                 <plugins>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -26,11 +26,7 @@
     <artifactId>manifestcp-ear</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EAR</name>
     <packaging>ear</packaging>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-            
+  
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.testsuite</groupId>
@@ -55,7 +51,11 @@
                     <type>war</type>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -26,11 +26,20 @@
     <artifactId>manifestcp-ejb</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath EJB</name>
     <packaging>ejb</packaging>
+            
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-jar</artifactId>
+                    <version>${version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
     
     <profiles>
         <profile>
             <id>child</id>
-            
+                        
             <build>
                 <plugins>
                     <plugin>
@@ -46,16 +55,6 @@
                     </plugin>
                 </plugins>
             </build>
-        
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.testsuite</groupId>
-                    <artifactId>manifestcp-jar</artifactId>
-                    <version>${version}</version>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-            
 
         </profile>
     </profiles>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml Thu Mar 18 03:22:30 2010
@@ -26,10 +26,6 @@
     <artifactId>manifestcp-jar</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath JAR</name>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-            
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -43,7 +39,4 @@
                 </dependency>
             </dependencies>
             
-
-        </profile>
-    </profiles> 
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml Thu Mar 18 03:22:30 2010
@@ -26,10 +26,6 @@
     <artifactId>manifestcp-jar2</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath JAR</name>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            
             <dependencies>
                 <dependency>
                     <groupId>junit</groupId>
@@ -39,6 +35,4 @@
                 </dependency>
             </dependencies>
             
-        </profile>
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war-jar/pom.xml Thu Mar 18 03:22:30 2010
@@ -27,10 +27,6 @@
     <artifactId>manifestcp-war-jar</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR-JAR</name>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -45,6 +41,4 @@
                 </dependency>
             </dependencies>
 
-        </profile>
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -27,7 +27,16 @@
     <artifactId>manifestcp-war</artifactId>
     <name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath WAR</name>
     <packaging>war</packaging>
-
+        
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.testsuite</groupId>
+                    <artifactId>manifestcp-war-jar</artifactId>
+                    <version>${version}</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+            
     <profiles>
         <profile>
             <id>child</id>
@@ -48,15 +57,6 @@
                     </plugin>
                 </plugins>
             </build>
-        
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.geronimo.testsuite</groupId>
-                    <artifactId>manifestcp-war-jar</artifactId>
-                    <version>${version}</version>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
             
         </profile>
     </profiles>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,10 +37,6 @@
     <description>
         Geronimo test EAR for EJB Tests
     </description>
-    
-    <profiles>
-        <profile>
-            <id>child</id>
             
             <dependencies>
                 <dependency>
@@ -68,7 +64,11 @@
                    <scope>test</scope>
                 </dependency>
             </dependencies>
-        
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+              
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -38,10 +38,6 @@
         Geronimo test WAR for EJB Tests
     </description>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-            
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.testsuite</groupId>
@@ -51,7 +47,4 @@
                 </dependency>
             </dependencies>
     
-        </profile>      
-    </profiles>
-    
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -38,12 +38,8 @@
         Geronimo test EAR for JMS.
     </description>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-            
+          
             <dependencies>
-        
                 <dependency>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>jms-war</artifactId>
@@ -68,6 +64,11 @@
                     <scope>test</scope>
                 </dependency>
             </dependencies>
+
+
+    <profiles>
+        <profile>
+            <id>child</id>
             
             <build>
                 <plugins>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -26,11 +26,7 @@
   <artifactId>jms-ejb</artifactId>
   <name>jms-ejb</name>
     <packaging>ejb</packaging>
-    
-    <profiles>
-        <profile>
-            <id>child</id>
-  
+
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -50,8 +46,12 @@
                     <version>1.1.1</version>
                     <scope>provided</scope>
                 </dependency>
-        
             </dependencies>
+    
+    <profiles>
+        <profile>
+            <id>child</id>
+  
             <build>
                 <plugins>
                   <plugin>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,13 +37,8 @@
     <description>
         Geronimo test WAR for JMS
     </description>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+       
             <dependencies>
-                
               <!--
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -51,28 +46,22 @@
                     <scope>provided</scope>
                 </dependency>
                 -->
-                
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-servlet_2.5_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
-                
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-jms_1.1_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
-        
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-annotation_1.0_spec</artifactId>
                     <version>1.1.1</version>
                     <scope>provided</scope>
                 </dependency>
-        
             </dependencies>
 
-        </profile>      
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -28,11 +28,7 @@
     <artifactId>jpa-ear</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</name>
     <packaging>ear</packaging>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+          
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.testsuite</groupId>
@@ -47,7 +43,11 @@
                     <type>war</type>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+           
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -28,11 +28,7 @@
     <artifactId>jpa-ejb</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - JAR</name>
     <packaging>ejb</packaging>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+   
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -64,9 +60,12 @@
                     <artifactId>xercesImpl</artifactId>
                     <scope>provided</scope>
                 </dependency>
-        
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                 
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -29,11 +29,7 @@
     <artifactId>jpa-war</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - WAR</name>
     <packaging>war</packaging>
-    
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+
              <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.testsuite</groupId>
@@ -68,6 +64,4 @@
                 </dependency>
             </dependencies>
 
-        </profile>      
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -29,10 +29,6 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - EAR</name>
     <packaging>ear</packaging>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.testsuite</groupId>
@@ -47,7 +43,11 @@
                     <type>war</type>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -29,10 +29,6 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - JAR</name>
     <packaging>ejb</packaging>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -66,7 +62,11 @@
                     <!--<scope>provided</scope>-->
                 <!--</dependency>-->
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -30,10 +30,6 @@
     <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - WAR</name>
     <packaging>war</packaging>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
              <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.testsuite</groupId>
@@ -63,7 +59,5 @@
                      <scope>provided</scope>
                  </dependency>
             </dependencies>
-            
-        </profile>      
-    </profiles>
+
 </project>

Modified: geronimo/server/branches/2.1/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/pom.xml Thu Mar 18 03:22:30 2010
@@ -235,6 +235,15 @@
                 </configuration>
             </plugin>
             
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
+                <configuration>
+                    <!-- Don't bother checking legal muck here, we never publish them. -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            
             <!-- Add this so that this should not get deployed during release plugin processing-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/security-testsuite/test-security/pom.xml Thu Mar 18 03:22:30 2010
@@ -83,6 +83,7 @@
     <profiles>
         <profile>
             <id>child</id>
+            
             <build>
                 <plugins>
                    <plugin>
@@ -129,6 +130,7 @@
                     </plugin>
                 </plugins>
             </build>
+            
         </profile>
     </profiles>
 

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.1-jsps/pom.xml Thu Mar 18 03:22:30 2010
@@ -65,12 +65,6 @@
                       <artifactId>selenium-maven-plugin</artifactId>
                    </plugin>
 
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-2.5-servlets/pom.xml Thu Mar 18 03:22:30 2010
@@ -60,12 +60,6 @@
                       <artifactId>selenium-maven-plugin</artifactId>
                    </plugin>
 
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-myfaces/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-myfaces/pom.xml Thu Mar 18 03:22:30 2010
@@ -66,12 +66,6 @@
                       <artifactId>selenium-maven-plugin</artifactId>
                    </plugin>
 
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -33,13 +33,8 @@
     <description>
         Geronimo test EAR for Servlet forwarding
     </description>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+                 
             <dependencies>
-        
                 <dependency>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>web-forward-war-1</artifactId>
@@ -53,9 +48,12 @@
                     <version>${version}</version>
                     <type>war</type>
                 </dependency>
-        
             </dependencies>
-            
+
+    <profiles>
+        <profile>
+            <id>child</id>
+   
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml Thu Mar 18 03:22:30 2010
@@ -34,12 +34,7 @@
         Geronimo test WAR for Servlet forwarding
     </description>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
-                
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-jsp_2.1_spec</artifactId>
@@ -51,9 +46,6 @@
                     <artifactId>geronimo-servlet_2.5_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
-                        
             </dependencies>
 
-        </profile>      
-    </profiles>    
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml Thu Mar 18 03:22:30 2010
@@ -33,13 +33,8 @@
     <description>
         Geronimo test WAR for Servlet forwarding
     </description>
-    
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+           
             <dependencies>
-                
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-jsp_2.1_spec</artifactId>
@@ -50,10 +45,7 @@
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-servlet_2.5_spec</artifactId>
                     <scope>provided</scope>
-                </dependency>
-                        
+                </dependency>     
             </dependencies>
-
-        </profile>      
-    </profiles>            
+          
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml Thu Mar 18 03:22:30 2010
@@ -33,13 +33,8 @@
     <description>
         Geronimo test EAR for Web References
     </description>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-                        
+ 
             <dependencies>
-                
                 <dependency>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>web-references-war</artifactId>
@@ -53,9 +48,12 @@
                     <version>${version}</version>
                     <type>ejb</type>
                 </dependency>
-                
             </dependencies>
-            
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                       
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -38,20 +38,12 @@
         Geronimo test EJBs for J2EE 1.4.
     </description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
-                
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-ejb_3.0_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
-                
             </dependencies>
 
-        </profile>      
-    </profiles>
 </project>

Modified: geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -34,12 +34,7 @@
         Geronimo test WAR for web references
     </description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
-                
                 <dependency>
                     <groupId>${pom.groupId}</groupId>
                     <artifactId>web-references-ejb</artifactId>
@@ -77,9 +72,6 @@
                     <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
                     <scope>provided</scope>
                 </dependency>
-                
             </dependencies>
-
-        </profile>      
-    </profiles>            
+         
 </project>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,10 +37,6 @@
        <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>javax.xml.bind</groupId>
@@ -48,7 +44,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
         
@@ -87,12 +87,6 @@
                     </plugin>
         
                     <plugin>
-                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                        <artifactId>tools-maven-plugin</artifactId>
-                        <extensions>true</extensions>
-                    </plugin>
-        
-                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
@@ -147,7 +141,6 @@
                     </plugin>
                 </plugins>
             </build>
-
     
         </profile>      
     </profiles>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -34,11 +34,7 @@
     <packaging>jar</packaging>
 
     <description>This project executes testcases for your testsuite</description>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+     
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -73,15 +69,14 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+               
             <build>
                 <plugins>
-                    <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>testsuite-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -34,10 +34,6 @@
 
     <description>This project executes testcases for your testsuite</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>javax.xml.bind</groupId>
@@ -45,7 +41,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>
@@ -84,12 +84,6 @@
                     </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>
                         <executions>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,10 +37,6 @@
        <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                     <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
@@ -48,7 +44,11 @@
                         <scope>provided</scope>
                     </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
         
@@ -100,12 +100,6 @@
                     </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>
                         <executions>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -35,10 +35,6 @@
 
     <description>This project executes testcases for your testsuite</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -73,15 +69,14 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
-                    <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>testsuite-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -33,10 +33,6 @@
 
     <description>This project executes testcases for your testsuite</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                     <dependency>
                         <groupId>org.apache.geronimo.specs</groupId>
@@ -44,7 +40,11 @@
                         <scope>provided</scope>
                     </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>
@@ -83,12 +83,6 @@
                     </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>
                         <executions>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -27,10 +27,6 @@
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC - JAX-WS WAR</name>
     <packaging>war</packaging>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.axis2</groupId>
@@ -53,7 +49,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>
@@ -92,12 +92,6 @@
                     </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>
                         <executions>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -27,10 +27,6 @@
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC EJB</name>
     <packaging>jar</packaging>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -65,7 +61,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>
@@ -104,12 +104,6 @@
                     </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>
                         <executions>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -27,10 +27,6 @@
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC WAR</name>
     <packaging>war</packaging>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>wsdl4j</groupId>
@@ -38,7 +34,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>
@@ -75,13 +75,7 @@
                             </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>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml Thu Mar 18 03:22:30 2010
@@ -32,10 +32,7 @@
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
     
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.testsuite</groupId>
@@ -60,6 +57,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
+            
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <plugins>
                     <plugin>
@@ -106,11 +108,7 @@
                             </execution>
                         </executions>
                     </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>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Thu Mar 18 03:22:30 2010
@@ -35,10 +35,6 @@
 
     <description>This project executes testcases for your testsuite</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.axis2</groupId>
@@ -101,7 +97,11 @@
                 </dependency>
         
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
         
                 <resources>
@@ -114,12 +114,7 @@
                 </resources>
         
                 <plugins>
-                    <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>testsuite-maven-plugin</artifactId>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml Thu Mar 18 03:22:30 2010
@@ -33,12 +33,7 @@
     <artifactId>jaxws-partial</artifactId>
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Partial</name>
     <packaging>war</packaging>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-            
-                    
+         
             <dependencies>
                 <dependency>
                     <groupId>org.apache.axis2</groupId>
@@ -64,7 +59,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            
             <build>
                 <plugins>
                     <plugin>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -26,11 +26,7 @@
     <artifactId>jaxws-rest-war</artifactId>
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS REST WAR</name>
     <packaging>war</packaging>
-
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
+      
             <dependencies>
                 <dependency>
                     <groupId>org.apache.axis2</groupId>
@@ -48,7 +44,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+              
             <build>
                 <resources>
                     <resource>
@@ -91,13 +91,7 @@
                             </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>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml Thu Mar 18 03:22:30 2010
@@ -27,10 +27,6 @@
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WAR</name>
     <packaging>war</packaging>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-                    
             <dependencies>
                 <dependency>
                     <groupId>org.apache.axis2</groupId>
@@ -53,7 +49,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+                    
             <build>
                 <resources>
                     <resource>
@@ -96,13 +96,7 @@
                             </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>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml?rev=924623&r1=924622&r2=924623&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml Thu Mar 18 03:22:30 2010
@@ -37,10 +37,6 @@
        <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            
                     
             <dependencies>
                 <dependency>
@@ -49,7 +45,11 @@
                     <scope>provided</scope>
                 </dependency>
             </dependencies>
-        
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            
             <build>
                 <plugins>
         
@@ -99,13 +99,7 @@
                             </execution>
                         </executions>
                     </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>



Mime
View raw message