You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2014/04/17 20:07:08 UTC
svn commit: r1588326 - in /db/derby/code/branches/10.10: ./
java/testing/org/apache/derbyTesting/junit/XATestUtil.java
java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
Author: myrnavl
Date: Thu Apr 17 18:07:07 2014
New Revision: 1588326
URL: http://svn.apache.org/r1588326
Log:
DERBY-6532; sysinfo does not show derbyTesting package info if junit.jar not in classpath
merge of revision 1586158 from trunk
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/XATestUtil.java
db/derby/code/branches/10.10/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1586158
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/XATestUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/XATestUtil.java?rev=1588326&r1=1588325&r2=1588326&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/XATestUtil.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/XATestUtil.java Thu Apr 17 18:07:07 2014
@@ -31,6 +31,8 @@ import java.util.Arrays;
import javax.transaction.xa.XAException;
import javax.transaction.xa.Xid;
+// Note: this class is used as indicator class in sysinfo for the
+// presence of org.apache.derbyTesting package classes.
public class XATestUtil {
/**
Modified: db/derby/code/branches/10.10/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=1588326&r1=1588325&r2=1588326&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/branches/10.10/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Thu Apr 17 18:07:07 2014
@@ -753,7 +753,8 @@ public static void getMainInfo (java.io.
}
private static void tryTstingClasspath(StringBuffer successes, StringBuffer failures) {
- tryMyClasspath("org.apache.derbyTesting.junit.BaseTestCase", "", successes, failures);
+ // use a class that is not dependent on junit
+ tryMyClasspath("org.apache.derbyTesting.junit.XATestUtil", "", successes, failures);
}
private static void tryMyClasspath(String cn, String library, StringBuffer successes, StringBuffer failures) {