You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ra...@apache.org on 2018/12/17 22:44:39 UTC
[1/2] tomee git commit: Fix test for TomEECliIT
Repository: tomee
Updated Branches:
refs/heads/master 0cc1119b6 -> da545a8d6
Fix test for TomEECliIT
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7621c3d2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7621c3d2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7621c3d2
Branch: refs/heads/master
Commit: 7621c3d282bdb600ae8ce81857d430c4fb4c1a3a
Parents: 0cc1119
Author: Daniel Cunha (soro) <da...@apache.org>
Authored: Mon Dec 17 14:19:49 2018 -0300
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Mon Dec 17 22:42:04 2018 +0000
----------------------------------------------------------------------
.../test/java/org/apache/tomee/TomEECliIT.java | 57 +++++++++++++++++---
1 file changed, 51 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7621c3d2/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java b/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java
index bff58c4..453e21a 100644
--- a/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java
+++ b/tomee/apache-tomee/src/test/java/org/apache/tomee/TomEECliIT.java
@@ -26,6 +26,7 @@ import org.junit.Test;
import java.io.File;
import java.io.FileFilter;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.nio.file.Files;
@@ -65,11 +66,33 @@ public class TomEECliIT {
fail("Failed to find Tomcat directory required for this test - Ensure you have run at least the maven phase: mvn process-resources");
}
+ final File libDir = new File(tomee.getAbsolutePath() + File.separator + "lib");
+ final String[] openejbCore = libDir.list(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("openejb-core");
+ }
+ });
+
+ final String[] commonsCli = libDir.list(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("commons-cli");
+ }
+ });
+
+ final String[] commonsLang = libDir.list(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("commons-lang");
+ }
+ });
+
final ProcessBuilder builder = new ProcessBuilder()
.command("java", "-cp", jar.getAbsolutePath() + File.pathSeparator +
- tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "openejb-core-8.0.0-SNAPSHOT.jar" + File.pathSeparator +
- tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-cli-1.2.jar" + File.pathSeparator +
- tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-lang3-3.8.1.jar",
+ tomee.getAbsolutePath() + File.separator + "lib" + File.separator + openejbCore[0] + File.pathSeparator +
+ tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsCli[0] + File.pathSeparator +
+ tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsLang[0],
"org.apache.openejb.cli.Bootstrap", "classloadertest");
final Process start = builder.start();
@@ -159,12 +182,34 @@ public class TomEECliIT {
fail("Failed to find Tomcat directory required for this test - Ensure you have run at least the maven phase: mvn process-resources");
}
+ final File libDir = new File(tomee.getAbsolutePath() + File.separator + "lib");
+ final String[] openejbCore = libDir.list(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("openejb-core");
+ }
+ });
+
+ final String[] commonsCli = libDir.list(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("commons-cli");
+ }
+ });
+
+ final String[] commonsLang = libDir.list(new FilenameFilter() {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith("commons-lang");
+ }
+ });
+
final ProcessBuilder builder = new ProcessBuilder()
.command("java", "-cp", jar.getAbsolutePath() + File.pathSeparator +
jar2.getAbsolutePath() + File.pathSeparator +
- tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "openejb-core-8.0.0-SNAPSHOT.jar" + File.pathSeparator +
- tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-cli-1.2.jar" + File.pathSeparator +
- tomee.getAbsolutePath() + File.separator + "lib" + File.separator + "commons-lang3-3.8.1.jar",
+ tomee.getAbsolutePath() + File.separator + "lib" + File.separator + openejbCore[0] + File.pathSeparator +
+ tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsCli[0] + File.pathSeparator +
+ tomee.getAbsolutePath() + File.separator + "lib" + File.separator + commonsLang[0],
"org.apache.openejb.cli.Bootstrap", "classloadertest2");
final Process start = builder.start();
[2/2] tomee git commit: closes apache/tomee#288 *Merged*
Posted by ra...@apache.org.
closes apache/tomee#288 *Merged*
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/da545a8d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/da545a8d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/da545a8d
Branch: refs/heads/master
Commit: da545a8d614b4f82cf6606fb93187e8a0f5a92de
Parents: 7621c3d
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Mon Dec 17 22:44:28 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Mon Dec 17 22:44:28 2018 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------