You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by GitBox <gi...@apache.org> on 2019/01/15 16:46:31 UTC
[tomee-tck] Diff for: [GitHub] jgallimore merged pull request #1: Updating
the harness for TomEE 8
diff --git a/pom.xml b/pom.xml
index 40276e3..ee7762d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>openejb-tck</artifactId>
<name>OpenEJB TCK Harness</name>
- <version>7.0.4-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<description>
OpenEJB TCK Harness
@@ -38,27 +38,22 @@
<properties>
<openejb.groupId>org.apache.tomee</openejb.groupId>
- <openejb.version>7.0.4-SNAPSHOT</openejb.version>
- <tomee.version>7.0.4-SNAPSHOT</tomee.version>
- <tomcat.version>8.5.20</tomcat.version>
+ <openejb.version>8.0.0-SNAPSHOT</openejb.version>
+ <tomee.version>8.0.0-SNAPSHOT</tomee.version>
+ <tomcat.version>9.0.12</tomcat.version>
- <!--<openejb.groupId>org.apache.openejb</openejb.groupId>-->
- <!--<openejb.version>4.7.4</openejb.version>-->
- <!--<tomee.version>1.7.4</tomee.version>-->
- <!--<tomcat.version>7.0.81</tomcat.version>-->
-
- <derby.version>10.12.1.1</derby.version>
+ <derby.version>10.7.1.1</derby.version>
<!--
- NOTE: User must define "javaee6.cts.home" and "javaee6.ri.home" in ~/.m2/settings.xml
+ NOTE: User must define "javaee8.cts.home" and "javaee8.ri.home" in ~/.m2/settings.xml
-->
- <javaee.cts.home>${javaee6.cts.home}</javaee.cts.home>
- <javaee.ri.home>${javaee6.ri.home}</javaee.ri.home>
- <javaee.tck.version>6.0a</javaee.tck.version>
+ <javaee.cts.home>${javaee8.cts.home}</javaee.cts.home>
+ <javaee.ri.home>${javaee8.ri.home}</javaee.ri.home>
+ <javaee.tck.version>8.0a</javaee.tck.version>
<localRepository>${settings.localRepository}</localRepository>
- <examples.version>1.1.0-SNAPSHOT</examples.version>
+ <examples.version>1.1-SNAPSHOT</examples.version>
<http.proxy.host>${settings.activeProxy.host}</http.proxy.host>
<http.proxy.port>${settings.activeProxy.port}</http.proxy.port>
<http.proxy.username>${settings.activeProxy.username}</http.proxy.username>
@@ -89,6 +84,9 @@
<maven.test.skip>true</maven.test.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.maven-dependency-plugin>2.9</version.maven-dependency-plugin>
+ <version.activemq>5.15.8</version.activemq>
+ <version.gmaven-plugin>1.5</version.gmaven-plugin>
</properties>
<dependencies>
@@ -101,7 +99,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>5.14.5</version>
+ <version>${version.activemq}</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
@@ -114,40 +112,46 @@
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tsharness</artifactId>
<version>${javaee.tck.version}</version>
+ <scope>system</scope>
+ <systemPath>${javaee.cts.home}/lib/tsharness.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>javatest</artifactId>
<version>${javaee.tck.version}</version>
+ <scope>system</scope>
+ <systemPath>${javaee.cts.home}/lib/javatest.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>cts</artifactId>
<version>${javaee.tck.version}</version>
+ <scope>system</scope>
+ <systemPath>${javaee.cts.home}/lib/cts.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>whitebox</artifactId>
<version>${javaee.tck.version}</version>
+ <scope>system</scope>
+ <systemPath>${javaee.cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>dbprocedures</artifactId>
<version>${javaee.tck.version}</version>
- <!-- this is for derby which supports BOOLEAN, version we were using was for derby supporting SMALLINT instead
- <systemPath>${javaee6.cts.home}/lib/dbprocedures.jar</systemPath>
<scope>system</scope>
- -->
+ <systemPath>${javaee.cts.home}/lib/dbprocedures.jar</systemPath>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>2.2</version>
+ <version>3.1</version>
</dependency>
<dependency>
@@ -297,6 +301,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>${version.maven-dependency-plugin}</version>
<executions>
<execution>
@@ -615,9 +620,16 @@
<onError>continue</onError>
<srcFiles>
<srcFile>src/test/sql/derby/derby.ddl.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.ddl.cmp.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.ddl.interop.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.ddl.jacc.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.ddl.jbatch-tck.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.jstl.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.ddl.persistence.sprocs.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.persistence.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.sprocs.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.dml.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.dml.jstl.sql</srcFile>
</srcFiles>
</configuration>
</execution>
@@ -773,76 +785,14 @@
<id>copy-dependencies</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>copy</goal>
+ <goal>copy-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${openejb.groupId}</groupId>
- <artifactId>openejb-lite</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>tsharness</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>cts</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>whitebox</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>dbprocedures</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-mail</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>${openejb.groupId}</groupId>
- <artifactId>openejb-derbynet</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>${openejb.groupId}</groupId>
- <artifactId>webdeployer</artifactId>
- <outputDirectory>${openejb.home}/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <outputDirectory>${openejb.home}/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <excludeTransitive>true</excludeTransitive>
+ <includeArtifactIds>openejb-lite,activemq-client,activemq-client,tsharness,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds>
</configuration>
</execution>
</executions>
@@ -880,7 +830,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.5</version>
+ <version>${version.gmaven-plugin}</version>
<dependencies>
<dependency>
diff --git a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
index 0ef72e0..5cef355 100644
--- a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
+++ b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
@@ -37,11 +37,15 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
+import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+@SuppressWarnings("unchecked")
public class DeploymentImpl implements TSDeploymentInterface2 {
private static final String HEAD = "OpenEJB - ";
private static final String FILENAME = "filename";
@@ -53,46 +57,28 @@
// System.setProperty("java.opts", "-Xmx128m -XX:MaxPermSize=128m");
// System.setProperty("java.opts", "-XX:MaxPermSize=64m");
// System.setProperty("openejb.server.profile", "true");
- System.setProperty("java.opts", System.getProperty("tck.java.opts", "-Dopenejb.deployer.jndiname=openejb/WebappDeployerRemote"));
- final String tckJavaHome = System.getProperty("tck.java.home");
- final String tckJavaVersion = System.getProperty("tck.java.version");
- final String oldJavaHome = System.getProperty("java.home");
- final String oldJavaVersion = System.getProperty("java.version");
- if (tckJavaHome != null) {
- System.setProperty("java.home", tckJavaHome);
- }
- if (tckJavaVersion != null) {
- System.setProperty("java.version", tckJavaVersion);
- }
- try {
- final RemoteServer remoteServer = new RemoteServer(250, true);
- // remoteServer.start(Arrays.asList("-Xmx128m", "-XX:MaxPermSize=128m"), "start", true);
- // remoteServer.start(Arrays.asList("-Djava.util.logging.config.file=/logging.properties"), "start", true);
- remoteServer.start();
-
- Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
- remoteServer.destroy();
- }
- });
- } finally {
- if (tckJavaHome != null) {
- System.setProperty("java.home", oldJavaHome);
- }
- if (tckJavaVersion != null) {
- System.setProperty("java.version", oldJavaVersion);
+ System.setProperty("java.opts", "-Dopenejb.deployer.jndiname=openejb/DeployerBusinessRemote");
+ final RemoteServer remoteServer = new RemoteServer(250, true);
+ // remoteServer.start(Arrays.asList("-Xmx128m", "-XX:MaxPermSize=128m"), "start", true);
+ // remoteServer.start(Arrays.asList("-Djava.util.logging.config.file=/logging.properties"), "start", true);
+ remoteServer.start();
+
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() {
+ remoteServer.destroy();
}
- }
+ });
}
private PrintWriter log;
- private File appsDir;
private File libDir;
+ private File appsDir;
+ private StringBuilder classpathBuilder = new StringBuilder();
public void init(final PrintWriter log) {
this.log = log;
- PropertyManagerInterface propMgr = null;
+ final PropertyManagerInterface propMgr;
try {
propMgr = DeliverableFactory.getDeliverableInstance().getPropertyManager();
@@ -109,12 +95,14 @@ public void init(final PrintWriter log) {
final String openejbUri = propMgr.getProperty("openejb.server.uri");
System.setProperty("openejb.uri", openejbUri);
} catch (final PropertyNotSetException e) {
+ //Ignore
}
try {
final String value = propMgr.getProperty("ts.run.classpath");
System.setProperty("ts.run.classpath", value);
} catch (final PropertyNotSetException e) {
+ //Ignore
}
this.log.println(HEAD + "Initialized Deployment helper");
@@ -130,7 +118,28 @@ public Hashtable getDependentValues(final DeploymentInfo[] infoArray) {
}
public InputStream getDeploymentPlan(final DeploymentInfo info) throws TSDeploymentException {
+ classpathBuilder = new StringBuilder();
final String earPath = info.getEarFile();
+ final String earDir = earPath.substring(0, earPath.lastIndexOf('.'));
+ try {
+ JarFile jarFile = new JarFile(earPath);
+ Enumeration<JarEntry> entries = jarFile.entries();
+ while (entries.hasMoreElements()) {
+ JarEntry jarEntry = entries.nextElement();
+ if (jarEntry.getName().startsWith("lib") && jarEntry.getName().endsWith(".jar")) {
+ if (classpathBuilder.toString().isEmpty()) {
+ classpathBuilder.append(String.format("%s%s", earDir, File.separator + jarEntry.getName()));
+ continue;
+ }
+
+ if (!classpathBuilder.toString().contains(jarEntry.getName())) {
+ classpathBuilder.append(String.format("%s%s%s", PATH_SEP, earDir, jarEntry.getName()));
+ }
+ }
+ }
+ } catch (IOException e) {
+ // do nop
+ }
if (earPath == null) {
throw new TSDeploymentException("EarFile is null");
}
@@ -200,11 +209,15 @@ public String getAppClientArgs(final Properties p) {
earFile = new File(earFile).getName();
earFile = earFile.substring(0, earFile.lastIndexOf('.'));
final File appClientJar = new File(new File(appsDir, earFile), clientname + ".jar");
- String classPath = appClientJar.getAbsolutePath();
- final String property = System.getProperty("ts.run.classpath");
- classPath += PATH_SEP + property;
+ if (!classpathBuilder.toString().contains(appClientJar.getAbsolutePath())) {
+ classpathBuilder.append(String.format("%s%s", PATH_SEP, appClientJar.getAbsolutePath()));
+ }
+ final String property = System.getProperty("ts.run.classpath");
+ if (!classpathBuilder.toString().contains(property)) {
+ classpathBuilder.append(String.format("%s%s", PATH_SEP, property));
+ }
// for (int i = 0; i < libDir.listFiles().length; i++) {
// File file = libDir.listFiles()[i];
// if (file.getName().endsWith(".jar")) {
@@ -257,7 +270,7 @@ public String getAppClientArgs(final Properties p) {
}
}*/
- return "-cp " + classPath + " -Dopenejb.client.moduleId=" + clientname + " " + CLIENT_MAIN + " " + executeArgs;
+ return "-cp " + classpathBuilder.toString() + " -Dopenejb.client.moduleId=" + clientname + " " + CLIENT_MAIN + " " + executeArgs;
}
public String getClientClassPath(final TargetModuleID[] targetIDs, final DeploymentInfo info, final DeploymentManager manager) throws TSDeploymentException {
diff --git a/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java b/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java
index 227bb1b..2dfe7d7 100644
--- a/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java
+++ b/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java
@@ -39,7 +39,7 @@ public void init(final PrintWriter writer) {
}
public void createQueueConnectionFactories(final String[] queueConnectionFactories, final String[] props)
- throws TSJMSAdminException {
+ throws TSJMSAdminException {
}
public void createQueues(final String[] queues) throws TSJMSAdminException {
@@ -51,24 +51,26 @@ public void removeQueues(final String[] queues) throws TSJMSAdminException {
final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
connection = (ActiveMQConnection) factory.createConnection();
connection.start();
- for (final String queue : queues) {
- log.println(HEAD + "Destroying Queue: " + queue);
- connection.destroyDestination(new ActiveMQQueue(queue));
+ for (int i = 0; i < queues.length; i++) {
+ log.println(HEAD + "Destroying Queue: " + queues[i]);
+ connection.destroyDestination(new ActiveMQQueue(queues[i]));
}
} catch (final JMSException e) {
e.printStackTrace();
} finally {
- if (null != connection) {
- try {
- connection.close();
- } catch (final Exception ignore) {
- }
+ try {
+ connection.close();
+ } catch (final Throwable ignore) {
}
}
}
public void createTopicConnectionFactories(final String[] topicConnectionFactories, final String[] props)
- throws TSJMSAdminException {
+ throws TSJMSAdminException {
+ }
+
+ public void createConnectionFactories(String[] strings, String[] strings1) throws TSJMSAdminException {
+
}
public void createTopics(final String[] topics) throws TSJMSAdminException {
@@ -80,18 +82,16 @@ public void removeTopics(final String[] topics) throws TSJMSAdminException {
final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
connection = (ActiveMQConnection) factory.createConnection();
connection.start();
- for (final String topic : topics) {
- log.println(HEAD + "Destroying Topic: " + topic);
- connection.destroyDestination(new ActiveMQTopic(topic));
+ for (int i = 0; i < topics.length; i++) {
+ log.println(HEAD + "Destroying Topic: " + topics[i]);
+ connection.destroyDestination(new ActiveMQTopic(topics[i]));
}
} catch (final JMSException e) {
e.printStackTrace();
} finally {
- if (null != connection) {
- try {
- connection.close();
- } catch (final Exception ignore) {
- }
+ try {
+ connection.close();
+ } catch (final Throwable ignore) {
}
}
}
diff --git a/src/main/resources/META-INF/org.apache.openejb.persistence.PersistenceBootstrap.provider b/src/main/resources/META-INF/org.apache.openejb.persistence.PersistenceBootstrap.provider
new file mode 100644
index 0000000..6077a33
--- /dev/null
+++ b/src/main/resources/META-INF/org.apache.openejb.persistence.PersistenceBootstrap.provider
@@ -0,0 +1 @@
+org.eclipse.persistence.jpa.PersistenceProvider
\ No newline at end of file
diff --git a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar b/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar
deleted file mode 100644
index f92c22f..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.jar and /dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom b/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom
deleted file mode 100644
index d43fcf9..0000000
--- a/src/test/repo/com/sun/javaee/tck/cts/6.0a/cts-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>cts</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.jar b/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.jar
deleted file mode 100644
index e50a7c9..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.jar and /dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.pom b/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.pom
deleted file mode 100644
index 374d257..0000000
--- a/src/test/repo/com/sun/javaee/tck/dbprocedures/6.0a/dbprocedures-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>dbprocedures</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar b/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar
deleted file mode 100644
index 338f985..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.jar and /dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom b/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom
deleted file mode 100644
index e1005f9..0000000
--- a/src/test/repo/com/sun/javaee/tck/javatest/6.0a/javatest-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>javatest</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar b/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar
deleted file mode 100644
index 810bde3..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.jar and /dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom b/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom
deleted file mode 100644
index c760d8f..0000000
--- a/src/test/repo/com/sun/javaee/tck/tsharness/6.0a/tsharness-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>tsharness</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar b/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar
deleted file mode 100644
index 1e60b25..0000000
Binary files a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.jar and /dev/null differ
diff --git a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom b/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom
deleted file mode 100644
index 26702a9..0000000
--- a/src/test/repo/com/sun/javaee/tck/whitebox/6.0a/whitebox-6.0a.pom
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.sun.javaee.tck</groupId>
- <artifactId>whitebox</artifactId>
- <version>6.0a</version>
-</project>
diff --git a/src/test/resources/signature_se8.properties b/src/test/resources/signature_se8.properties
new file mode 100644
index 0000000..9d9d5bc
--- /dev/null
+++ b/src/test/resources/signature_se8.properties
@@ -0,0 +1,4 @@
+##
+## $Revision$ $Date$
+##
+
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index 1bb0d20..b0c5858 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -27,8 +27,7 @@ import openejb.tck.util.TestListBuilder
*
* @version $Revision$ $Date$
*/
-abstract class CommandSupport
-{
+abstract class CommandSupport {
def source
def log
@@ -63,8 +62,7 @@ abstract class CommandSupport
adapter.emacsMode = true
if (log.debugEnabled) {
adapter.messageOutputLevel = p.MSG_VERBOSE
- }
- else {
+ } else {
adapter.messageOutputLevel = p.MSG_INFO
}
p.addBuildListener(adapter)
@@ -187,6 +185,9 @@ abstract class CommandSupport
builder.directory = "${project.build.directory}"
builder.append("openejb-tck-*.jar")
builder.directory = openejbLib
+
+
+
builder.appendAll("openejb-core-*.jar")
builder.directory = "${project.build.directory}/lib"
builder.appendAll("*.jar")
@@ -206,26 +207,44 @@ abstract class CommandSupport
builder.reference("openejb.porting.classes")
builder.directory = openejbLib
builder.appendAll("commons-logging-*.jar")
- builder.appendAll("openjpa-*.jar")
+
+ if (get("webcontainer").equals("tomee-plume")) {
+ builder.appendAll("eclipselink-*.jar")
+ } else {
+ builder.appendAll("openjpa-*.jar")
+ }
+
// builder.append("hsqldb-*.jar")
- builder.append("derby-*.jar")
- builder.append("derbyclient-*.jar")
+ builder.append("derby-*.jar")
+ builder.append("derbyclient-*.jar")
builder.append("openejb-client*.jar")
builder.directory = "${javaeetckHome}/lib"
builder.append("javatest.jar")
builder.append("tsharness.jar")
builder.append("cts.jar")
- builder.append("dbprocedures.jar")
+ builder.append("dbprocedures.jar")
builder.append("commons-httpclient*.jar")
- builder.append("jdom.jar")
- builder.append("dom4j.jar")
+ builder.append("jdom-1.1.3.jar")
+ //builder.append("dom4j.jar")
builder.append("jaxb-api.jar")
builder.append("jaxb-impl.jar")
builder.append("jaxb-xjc.jar")
builder.directory = "${openejbHome}/lib"
builder.append("jasper-el.jar")
- builder.getPath("ts.run.classpath")
+
+ // for CXF JAX-RS client
+ builder.append("cxf-rt-rs-client-*.jar")
+ builder.append("cxf-rt-transports-http-*.jar")
+ builder.append("cxf-core-*.jar")
+ builder.append("woodstox-core-*.jar")
+ builder.append("stax2-api-*.jar")
+ builder.append("xmlschema-core-*.jar")
+ builder.append("cxf-rt-frontend-jaxrs-*.jar")
+
+ // for jonzon
+ builder.appendAll("johnzon-*.jar")
+ builder.getPath("ts.run.classpath")
// ts.harness.classpath
builder = new PathBuilder(this)
builder.reference('ts.run.classpath')
@@ -235,7 +254,7 @@ abstract class CommandSupport
builder.directory = "$javaeetckHome/tools/ant/lib"
builder.append("ant.jar")
builder.append("ant-launcher.jar")
- builder.append("ant-nodeps.jar")
+ // builder.append("ant-nodeps.jar") - this seems to have disappeared with EE7
builder.directory = "$javaeeRiHome/lib"
builder.append("appserv-rt.jar")
builder.getPath('ts.harness.classpath')
@@ -252,14 +271,18 @@ abstract class CommandSupport
builder.append("tsharness.jar")
builder.append("cts.jar")
builder.append("commons-httpclient*.jar")
- builder.append("jdom.jar")
- builder.append("dom4j.jar")
+ builder.append("jdom-*.jar")
+ //builder.append("dom4j.jar")
builder.append("jaxb-api.jar")
builder.append("jaxb-impl.jar")
builder.append("jaxb-xjc.jar")
builder.directory = openejbLib
- builder.append("derby-*.jar")
- builder.append("derbyclient-*.jar")
+ builder.append("derby-*.jar")
+ builder.append("derbyclient-*.jar")
+ if (get("webcontainer").equals("tomee-plume")) {
+ builder.appendAll("eclipselink-*.jar")
+ }
+
builder.getPath("openejb.embedded.classpath")
}
@@ -276,7 +299,7 @@ abstract class CommandSupport
log.info("TCK pom version: " + require('javaee.tck.version'))
log.info("Start - Container libraries")
if (lib.exists() && lib.isDirectory()) {
- lib.listFiles().grep(~/.*.jar/).sort{ it.name }.each {
+ lib.listFiles().grep(~/.*.jar/).sort { it.name }.each {
log.info(" - $it.name")
}
}
diff --git a/src/test/script/openejb/tck/commands/SetupCommand.groovy b/src/test/script/openejb/tck/commands/SetupCommand.groovy
index 6269b18..47a3194 100644
--- a/src/test/script/openejb/tck/commands/SetupCommand.groovy
+++ b/src/test/script/openejb/tck/commands/SetupCommand.groovy
@@ -143,21 +143,21 @@ class SetupCommand
// Create backups first.
def javaeeCtsHome = requireDirectory('javaee.cts.home')
- // Backup the original sig-test_se6.map, load in the new props, and create
+ // Backup the original sig-test_se8.map, load in the new props, and create
// the modified file
- def originalSe6File = createOriginalFile("${javaeeCtsHome}/bin/sig-test_se6.map.orig", "${javaeeCtsHome}/bin/sig-test_se6.map")
+ def originalSe8File = createOriginalFile("${javaeeCtsHome}/bin/sig-test_se8.map.orig", "${javaeeCtsHome}/bin/sig-test_se8.map")
// Load original properties
- def props = loadProps(originalSe6File)
+ def props = loadProps(originalSe8File)
// Load custom properties
- def customProps = loadProps("${project.basedir}/src/test/resources/signature_se6.properties")
+ def customProps = loadProps("${project.basedir}/src/test/resources/signature_se8.properties")
// Merge the differences
props.putAll(customProps)
// Save the new properties file
- storeProps(props, "${javaeeCtsHome}/bin/sig-test_se6.map")
+ storeProps(props, "${javaeeCtsHome}/bin/sig-test_se8.map")
}
def createOriginalFile(newFileName, oldFileName) {
With regards,
Apache Git Services