You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/06 16:14:10 UTC
svn commit: r653784 - in /geronimo/server/trunk/testsuite: ./
console-testsuite/ corba-testsuite/ deployment-testsuite/
enterprise-testsuite/ enterprise-testsuite/ejb-tests/ejb-ear/
enterprise-testsuite/ejbcontainer-tests/ enterprise-testsuite/jms-test...
Author: jdillon
Date: Tue May 6 07:14:10 2008
New Revision: 653784
URL: http://svn.apache.org/viewvc?rev=653784&view=rev
Log:
Tidy up testsuite
Removed:
geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/
Modified:
geronimo/server/trunk/testsuite/console-testsuite/pom.xml
geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
geronimo/server/trunk/testsuite/pom.xml
geronimo/server/trunk/testsuite/security-testsuite/pom.xml
geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Tue May 6 07:14:10 2008
@@ -105,25 +105,6 @@
<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>
Modified: geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/pom.xml Tue May 6 07:14:10 2008
@@ -105,25 +105,6 @@
<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>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Tue May 6 07:14:10 2008
@@ -105,25 +105,6 @@
<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>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Tue May 6 07:14:10 2008
@@ -60,14 +60,9 @@
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Tue May 6 07:14:10 2008
@@ -58,8 +58,9 @@
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Tue May 6 07:14:10 2008
@@ -113,32 +113,6 @@
<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>
-
- <!--
- FIXME: Why is this excluded? If its bunk, then delete it.
- -->
- <excludes>
- <exclude>ejbcontainer-tests/pom.xml</exclude>
- </excludes>
- </fileset>
- </projects>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- <goal>install</goal>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Tue May 6 07:14:10 2008
@@ -79,7 +79,31 @@
<artifactId>testsuite-maven-plugin</artifactId>
<version>${version}</version>
</plugin>
-
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>shitty-maven-plugin</artifactId>
+ <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.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
Modified: geronimo/server/trunk/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/pom.xml Tue May 6 07:14:10 2008
@@ -105,25 +105,6 @@
<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>
Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Tue May 6 07:14:10 2008
@@ -57,20 +57,10 @@
<scope>provided</scope>
</dependency>
- <!--
- TODO: Depend upon the geronimo-openejb plugin here instead to avoid needing
- to reference these dependencies directly.
- -->
-
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/main/java/org/apache/myfaces/blank/HelloWorldBacking.java Tue May 6 07:14:10 2008
@@ -32,7 +32,8 @@
*/
public class HelloWorldBacking {
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private static final Logger log = LoggerFactory.getLogger(HelloWorldBacking.class);
+
//properties
private String name;
private String greeting;
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Tue May 6 07:14:10 2008
@@ -43,13 +43,9 @@
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Tue May 6 07:14:10 2008
@@ -43,15 +43,11 @@
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml Tue May 6 07:14:10 2008
@@ -41,13 +41,9 @@
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Tue May 6 07:14:10 2008
@@ -60,15 +60,11 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml Tue May 6 07:14:10 2008
@@ -102,25 +102,6 @@
<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>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml?rev=653784&r1=653783&r2=653784&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml Tue May 6 07:14:10 2008
@@ -43,15 +43,11 @@
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-client</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb</artifactId>
+ <version>${version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>