geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r653528 - in /geronimo/server/trunk/testsuite/corba-testsuite: ./ corba-helloworld/ corba-helloworld/corba-helloworld-client/ corba-helloworld/corba-helloworld-ear/ corba-helloworld/corba-helloworld-ejb/ corba-helloworld/corba-helloworld-wa...
Date Mon, 05 May 2008 17:09:17 GMT
Author: jdillon
Date: Mon May  5 10:09:16 2008
New Revision: 653528

URL: http://svn.apache.org/viewvc?rev=653528&view=rev
Log:
(GERONIMO-3980) Use shitty-maven-plugin instead of maven-maven-plugin to drive test builds

Added:
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt   (with props)
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt   (with props)
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt   (with props)
Modified:
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
Mon May  5 10:09:16 2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,6 +33,7 @@
     <artifactId>corba-helloworld-client</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World Client</name>
     <packaging>jar</packaging>
+    
     <description>Example using CORBA to access a stateless EJB</description>
 
     <dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
Mon May  5 10:09:16 2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,8 +33,13 @@
     <artifactId>corba-helloworld-ear</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World EAR</name>
     <packaging>ear</packaging>
+    
     <description>Example using CORBA to access a stateless EJB</description>
-
+    
+    <!--
+    FIXME: Split this module up... one to build the ear, one to run the tests.
+    -->
+    
     <properties>
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
Mon May  5 10:09:16 2008
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+    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$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -29,6 +33,7 @@
     <artifactId>corba-helloworld-ejb</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World EJB</name>
     <packaging>ejb</packaging>
+    
     <description>Geronimo Hello World Enterprise Stateless EJB</description>
 
     <dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
Mon May  5 10:09:16 2008
@@ -31,6 +31,7 @@
     <artifactId>corba-helloworld-war</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World WAR</name>
     <packaging>war</packaging>
+    
     <description>Geronimo Hello World Enterprise Web Application</description>
 
     <dependencies>

Added: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt?rev=653528&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt (added)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt Mon May  5
10:09:16 2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/pom.xml Mon May  5 10:09:16
2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -33,16 +35,11 @@
     <packaging>pom</packaging>
     <description>Geronimo JEE5 CORBA Hello World Tests</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            <modules>
-                <module>corba-helloworld-ejb</module>
-                <module>corba-helloworld-war</module>
-                <module>corba-helloworld-client</module>
-                <module>corba-helloworld-ear</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>corba-helloworld-ejb</module>
+        <module>corba-helloworld-war</module>
+        <module>corba-helloworld-client</module>
+        <module>corba-helloworld-ear</module>
+    </modules>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/pom.xml
Mon May  5 10:09:16 2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -30,7 +32,7 @@
 
     <artifactId>corba-marshal-client</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal Client</name>
-    <packaging>jar</packaging>
+    
     <description>Example using CORBA to access a stateless EJB</description>
 
     <dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/pom.xml
Mon May  5 10:09:16 2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,8 +33,13 @@
     <artifactId>corba-marshal-ear</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EAR</name>
     <packaging>ear</packaging>
+    
     <description>Example using CORBA to access a stateless EJB</description>
-
+    
+    <!--
+    FIXME: Split this module up... one to build the ear, one to run the tests.
+    -->
+    
     <properties>
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
@@ -44,6 +51,7 @@
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-marshal-client</artifactId>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
Mon May  5 10:09:16 2008
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+    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: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -29,6 +33,7 @@
     <artifactId>corba-marshal-ejb</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: Marshal EJB</name>
     <packaging>ejb</packaging>
+    
     <description>Geronimo Marshal Enterprise Stateless EJB</description>
 
     <dependencies>

Added: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt?rev=653528&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt (added)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt Mon May  5 10:09:16
2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/pom.xml Mon May  5 10:09:16
2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -33,15 +35,10 @@
     <packaging>pom</packaging>
     <description>Geronimo JEE5 CORBA Marshal Tests</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            <modules>
-                <module>corba-marshal-ejb</module>
-                <module>corba-marshal-client</module>
-                <module>corba-marshal-ear</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>corba-marshal-ejb</module>
+        <module>corba-marshal-client</module>
+        <module>corba-marshal-ear</module>
+    </modules>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
Mon May  5 10:09:16 2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,8 +33,13 @@
     <artifactId>corba-mytime-ear</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: My Time EAR</name>
     <packaging>ear</packaging>
+    
     <description>Example using CORBA to access a stateless EJB</description>
-
+    
+    <!--
+    FIXME: Split this module up... one to build the ear, one to run the tests.
+    -->
+    
     <properties>
         <container>jetty6</container>
     </properties>
@@ -116,12 +123,6 @@
                 </configuration>
             </plugin>
 
-            <!-- Start the selenium server for browser invocation and testing -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </plugin>
-
             <!-- Start the Geronimo server in the pre-integration-test and
                  stop  the Geronimo server in the post-integration-test phase -->
             <plugin>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ejb/pom.xml
Mon May  5 10:09:16 2008
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+    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$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -29,6 +33,7 @@
     <artifactId>corba-mytime-ejb</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: My Time EJB</name>
     <packaging>ejb</packaging>
+    
     <description>Geronimo My Time Enterprise Stateless EJB</description>
 
     <dependencies>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-war/pom.xml
Mon May  5 10:09:16 2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,20 +33,23 @@
     <artifactId>corba-mytime-war</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: My Time WAR</name>
     <packaging>war</packaging>
+    
     <description>Geronimo My Time Enterprise Web Application</description>
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>corba-mytime-ejb</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>

Added: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt?rev=653528&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt (added)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt Mon May  5 10:09:16
2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/pom.xml Mon May  5 10:09:16
2008
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,17 +33,13 @@
     <artifactId>corba-mytime</artifactId>
     <name>Geronimo TestSuite :: CORBA TestSuite :: My Time</name>
     <packaging>pom</packaging>
+    
     <description>Geronimo JEE5 CORBA My Time Tests</description>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            <modules>
-                <module>corba-mytime-ejb</module>
-                <module>corba-mytime-war</module>
-                <module>corba-mytime-ear</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>corba-mytime-ejb</module>
+        <module>corba-mytime-war</module>
+        <module>corba-mytime-ear</module>
+    </modules>
 
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/pom.xml?rev=653528&r1=653527&r2=653528&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/pom.xml Mon May  5 10:09:16 2008
@@ -7,9 +7,9 @@
     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
@@ -18,6 +18,8 @@
     under the License.
 -->
 
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -28,20 +30,108 @@
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <name>Geronimo TestSuite :: CORBA TestSuite</name>
-    <description>Test Geronimo CORBA Functions</description>
     <artifactId>corba-testsuite</artifactId>
+    <name>Geronimo TestSuite :: CORBA TestSuite</name>
     <packaging>pom</packaging>
 
+    <description>
+        Test Geronimo CORBA Functions
+    </description>
+
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                        <systemProperties>
+                            <property>
+                                <name>geronimoVersion</name>
+                                <value>${version}</value>
+                            </property>
+                        </systemProperties>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
-                <!--  This plugin is needed for all suite poms. -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>selenium-maven-plugin</artifactId>
+                <inherited>false</inherited>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>start</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start-server</goal>
+                        </goals>
+                        <configuration>
+                            <logOutput>true</logOutput>
+                            <background>true</background>
+                            <verifyTimeout>300</verifyTimeout>
+                            <optionSets>
+                                <optionSet>
+                                    <id>default</id>
+                                    <options>
+                                       <option>-XX:MaxPermSize=128m</option>
+                                    </options>
+                                </optionSet>
+                            </optionSets>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>stop-server</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>shitty-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <projects>
+                        <fileset>
+                            <directory>${project.basedir}</directory>
+                            <includes>
+                                <include>*/pom.xml</include>
+                            </includes>
+                        </fileset>
+                    </projects>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>clean</goal>
+                            <goal>install</goal>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>generate-surefire-xml</id>
                         <phase>install</phase>
                         <goals>
                             <goal>generate-surefire-xml</goal>
@@ -52,53 +142,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <!--
-            TODO: Hook up m-m-p to allow child modules to be built early during this modules
-                  compile (or something) phase.
-            -->
-            <build>
-                <plugins>
-                    <plugin>
-                        <!--
-                          One of the pom that this invokes using m-m-p has packaging set
to "pom".
-                          That expects it's parent (this pom) to be installed already.
-                          So installing it ahead before we invoke it in the integration-test
phase
-                        -->
-                        <artifactId>maven-install-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>install-ahead</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>install</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.buildsupport</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                        <artifactId>maven-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>child</id>
-        </profile>
-    </profiles>
-
 </project>



Mime
View raw message