You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/11/08 19:31:00 UTC
svn commit: r472578 - in /incubator/openejb/trunk/openejb2/itests: ./
openejb-itests-core/ openejb-itests-core/src/ejb/
openejb-itests-core/src/itest/ openejb-itests-core/src/java/
openejb-itests-core/src/main/java/ openejb-itests-core/src/main/resourc...
Author: dblevins
Date: Wed Nov 8 10:30:59 2006
New Revision: 472578
URL: http://svn.apache.org/viewvc?view=rev&rev=472578
Log:
moved test code into maven2 style layout
Added:
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/java/
- copied from r472565, incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/java/
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/main/resources/
- copied from r472565, incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/ejb/
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/
- copied from r472565, incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/itest/
Removed:
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/ejb/
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/itest/
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/java/
Modified:
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/Main.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/PostgreSqlTestDatabase.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/RemoteTestServer.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestManager.java
incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestRunner.java
incubator/openejb/trunk/openejb2/itests/pom.xml
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml?view=diff&rev=472578&r1=472577&r2=472578
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/pom.xml Wed Nov 8 10:30:59 2006
@@ -1,18 +1,49 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
<version>2.2-incubating-SNAPSHOT</version>
- </parent>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-itests-core</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: iTests :: Core</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--
+ TODO: separate the test classes into the individual bean modules.
+ Skip tests here. They need to be executed under a framework, on a running server.
+ -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>2.2-incubating-SNAPSHOT</version>
+
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/Main.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/Main.java?view=diff&rev=472578&r1=472565&r2=472578
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/Main.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/Main.java Wed Nov 8 10:30:59 2006
@@ -23,8 +23,8 @@
public static void main(String args[]) {
try {
- org.openejb.util.ClasspathUtils.addJarsToPath("lib");
- org.openejb.util.ClasspathUtils.addJarsToPath("dist");
+ org.apache.openejb.util.ClasspathUtils.addJarsToPath("lib");
+ org.apache.openejb.util.ClasspathUtils.addJarsToPath("dist");
} catch (Exception e) {
e.printStackTrace();
}
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/PostgreSqlTestDatabase.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/PostgreSqlTestDatabase.java?view=diff&rev=472578&r1=472565&r2=472578
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/PostgreSqlTestDatabase.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/PostgreSqlTestDatabase.java Wed Nov 8 10:30:59 2006
@@ -101,7 +101,7 @@
public static void main(String[] args) {
System.out.println("Checking if driver is registered with DriverManager.");
try {
- ClassLoader cl = org.openejb.util.ClasspathUtils.getContextClassLoader();
+ ClassLoader cl = org.apache.openejb.util.ClasspathUtils.getContextClassLoader();
Class.forName("org.postgresql.Driver", true, cl);
} catch (ClassNotFoundException e) {
System.out.println("Couldn't find the driver!");
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/RemoteTestServer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/RemoteTestServer.java?view=diff&rev=472578&r1=472565&r2=472578
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/RemoteTestServer.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/RemoteTestServer.java Wed Nov 8 10:30:59 2006
@@ -23,7 +23,7 @@
import java.net.Socket;
import java.util.Properties;
-import org.openejb.util.Launcher;
+import org.apache.openejb.util.Launcher;
/**
*
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestManager.java?view=diff&rev=472578&r1=472565&r2=472578
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestManager.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestManager.java Wed Nov 8 10:30:59 2006
@@ -110,7 +110,7 @@
String className = (String) props.getProperty("openejb.test.server");
if (className == null) throw new IllegalArgumentException("Must specify a test server by setting its class name using the system property \"openejb.test.server\"");
- ClassLoader cl = org.openejb.util.ClasspathUtils.getContextClassLoader();
+ ClassLoader cl = org.apache.openejb.util.ClasspathUtils.getContextClassLoader();
Class testServerClass = Class.forName(className, true, cl);
server = (TestServer) testServerClass.newInstance();
server.init(props);
@@ -125,7 +125,7 @@
try {
String className = (String) props.getProperty("openejb.test.database");
if (className == null) throw new IllegalArgumentException("Must specify a test database by setting its class name using the system property \"openejb.test.database\"");
- ClassLoader cl = org.openejb.util.ClasspathUtils.getContextClassLoader();
+ ClassLoader cl = org.apache.openejb.util.ClasspathUtils.getContextClassLoader();
Class testDatabaseClass = Class.forName(className, true, cl);
database = (TestDatabase) testDatabaseClass.newInstance();
database.init(props);
Modified: incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestRunner.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestRunner.java?view=diff&rev=472578&r1=472565&r2=472578
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestRunner.java (original)
+++ incubator/openejb/trunk/openejb2/itests/openejb-itests-core/src/test/java/org/openejb/test/TestRunner.java Wed Nov 8 10:30:59 2006
@@ -52,9 +52,9 @@
public static void main(String args[]) {
try {
-// org.openejb.util.ClasspathUtils.addJarsToPath("lib");
-// org.openejb.util.ClasspathUtils.addJarsToPath("dist");
-// org.openejb.util.ClasspathUtils.addJarsToPath("beans");
+// org.apache.openejb.ClasspathUtils.addJarsToPath("lib");
+// org.apache.openejb.ClasspathUtils.addJarsToPath("dist");
+// org.apache.openejb.ClasspathUtils.addJarsToPath("beans");
TestRunner aTestRunner = new TestRunner();
TestResult r = aTestRunner.start(args);
Modified: incubator/openejb/trunk/openejb2/itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/itests/pom.xml?view=diff&rev=472578&r1=472577&r2=472578
==============================================================================
--- incubator/openejb/trunk/openejb2/itests/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/itests/pom.xml Wed Nov 8 10:30:59 2006
@@ -16,8 +16,8 @@
<name>OpenEJB :: iTests</name>
<packaging>pom</packaging>
-<!-- <modules>
+ <modules>
<module>openejb-itests-core</module>
</modules>
--->
+
</project>