From 6168194541e736918cc5e3c84f3dc6880f3dc201 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 24 Oct 2014 21:54:44 -0400
Subject: [PATCH] Updated JUnit JAR file name.

The Eclipse classpath and the test scripts have been updated to
use junit.jar instead of junit4.jar to support Fedora 20 and 21.

https://fedorahosted.org/pki/ticket/1192
---
 .classpath                                     | 2 +-
 scripts/compose_pki_test_package               | 2 +-
 tests/dogtag/dev_java_tests/run_junit_tests.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.classpath b/.classpath
index 8d5aed01bba9d63807a1784bc29cba79391fde36..2908ed019e6951bc14b8249f3b8d4af7643709b1 100644
--- a/.classpath
+++ b/.classpath
@@ -28,7 +28,7 @@
 	<classpathentry kind="lib" path="/usr/share/java/idm-console-mcc.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/idm-console-nmclf.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/jakarta-commons-httpclient.jar"/>
-	<classpathentry kind="lib" path="/usr/share/java/junit4.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/jackson-annotations.jar"/>
 	<classpathentry kind="lib" path="/usr/share/java/jackson/jackson-core-asl.jar"/>
diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package
index 2614ead0bd3b17c38033a929199d7d4c0f00ce6e..524706875abfdbc9ff805dac5c4f4fdcd109060f 100755
--- a/scripts/compose_pki_test_package
+++ b/scripts/compose_pki_test_package
@@ -90,7 +90,7 @@ CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/kra/functional/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/ocsp/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tks/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tps/src
-CLASSPATH=$CLASSPATH:/usr/share/java/junit4.jar
+CLASSPATH=$CLASSPATH:/usr/share/java/junit.jar
 CLASSPATH=$CLASSPATH:`pwd`/src
 CLASSPATH=$CLASSPATH:/usr/lib64/jss/jss4.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/httpcomponents/httpclient.jar
diff --git a/tests/dogtag/dev_java_tests/run_junit_tests.sh b/tests/dogtag/dev_java_tests/run_junit_tests.sh
index 7b298a4b7fced7f7c65dc2ea0e6e0428fe570a68..60912af5c24d32c1fa19880cb9ab0ac686f300f5 100644
--- a/tests/dogtag/dev_java_tests/run_junit_tests.sh
+++ b/tests/dogtag/dev_java_tests/run_junit_tests.sh
@@ -26,7 +26,7 @@ run_dev_junit_tests() {
     export nss_db_dir nss_db_password admin_cert_nickname host CA_CLIENT_PKCS12_PASSWORD RUNNING_WITH_BEAKER
 
     ### Add all the pki packages and other dependent pki packages to the class path
-    CLASSPATH=/usr/share/java/junit4.jar
+    CLASSPATH=/usr/share/java/junit.jar
     CLASSPATH=$CLASSPATH:/usr/share/java/pki/*
     CLASSPATH=$CLASSPATH:/usr/lib64/jss/jss4.jar
     CLASSPATH=$CLASSPATH:/usr/share/java/httpcomponents/httpclient.jar
-- 
1.8.4.2