summaryrefslogtreecommitdiffstats
path: root/tests/dogtag/dev_java_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/dogtag/dev_java_tests')
-rw-r--r--tests/dogtag/dev_java_tests/.classpath52
-rw-r--r--tests/dogtag/dev_java_tests/.project17
-rw-r--r--tests/dogtag/dev_java_tests/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--tests/dogtag/dev_java_tests/conf/deploy.cfg9
-rw-r--r--tests/dogtag/dev_java_tests/conf/test.cfg76
-rw-r--r--tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java2
6 files changed, 1 insertions, 166 deletions
diff --git a/tests/dogtag/dev_java_tests/.classpath b/tests/dogtag/dev_java_tests/.classpath
deleted file mode 100644
index d40b7a3b1..000000000
--- a/tests/dogtag/dev_java_tests/.classpath
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-certsrv.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-ca.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-cms.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-cmsbundle.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-cmscore.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-cmsutil.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-console-theme.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-kra.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-nsutil.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-ocsp.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-silent.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-tks.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-tomcat.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-tools.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/pki/pki-tps.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/jss/jss4.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/httpcomponents/httpclient.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/httpcomponents/httpcore.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/resteasy/jaxrs-api.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-atom-provider.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxb-provider.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxrs.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jaxrs-jandex.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/resteasy/resteasy-jettison-provider.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/apache-commons-cli.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/apache-commons-codec.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/apache-commons-logging.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/commons-codec.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/commons-httpclient.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/idm-console-base-1.1.7.jar"/>
- <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/jaxb-api.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/apache-commons-lang.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/istack-commons-runtime.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/scannotation.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/servlet.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/velocity.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/xerces-j2.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/xml-commons-apis.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/tomcat/catalina.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/tomcat/tomcat-util.jar"/>
- <classpathentry kind="lib" path="/usr/share/java/commons-io.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/dogtag/dev_java_tests/.project b/tests/dogtag/dev_java_tests/.project
deleted file mode 100644
index 84a4ea49a..000000000
--- a/tests/dogtag/dev_java_tests/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>PKIUnitTests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/dogtag/dev_java_tests/.settings/org.eclipse.jdt.core.prefs b/tests/dogtag/dev_java_tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7341ab168..000000000
--- a/tests/dogtag/dev_java_tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/tests/dogtag/dev_java_tests/conf/deploy.cfg b/tests/dogtag/dev_java_tests/conf/deploy.cfg
deleted file mode 100644
index e6f1d5449..000000000
--- a/tests/dogtag/dev_java_tests/conf/deploy.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-pki_client_pkcs12_password=Secret123
-pki_ds_password=
-
-[CA]
-pki_admin_name=caadmin
-pki_admin_nickname=caadmin
-pki_admin_password=Secret123
-pki_admin_uid=caadmin
diff --git a/tests/dogtag/dev_java_tests/conf/test.cfg b/tests/dogtag/dev_java_tests/conf/test.cfg
deleted file mode 100644
index de1e690a2..000000000
--- a/tests/dogtag/dev_java_tests/conf/test.cfg
+++ /dev/null
@@ -1,76 +0,0 @@
-### The configuration file used when running the tests in eclipse.
-### For compatibility with QE beaker tests, the same parameter names are to be used.
-
-### Configuration entries specific to the local setup.
-### The comments above a parameter contain the corresponding name of the
-### entry in the deployment config file to be passed to pkispawn.
-### The deploment configuration to be used for creating the subsystems
-### for running these tests is deploy.cfg,
-### present in the same folder as this file.
-
-host=localhost
-# Provide the details of the nssdb which contains the admin cert.
-nss_db_dir=/tmp/nssdb
-nss_db_password=XXXXXXXX
-# pki_admin_nickname
-admin_cert_nickname=caadmin
-# Default location = ~/.dogtag/pki-tomcat/ca_admin_cert.p12
-CA_ADMIN_CERT_LOCATION=
-# pki_client_pkcs12_password
-CA_CLIENT_PKCS12_PASSWORD=Secret123
-
-### Configuration entries used in QE tests.
-# pki_https_port
-CA_SECURE_PORT=8443
-LDAP_ROOTDN=
-LDAP_ROOTDNPWD=
-LDAP_BASEDN=
-LDAP_ADMINPW=
-CERTDB_DIR=
-CERTDB_DIR_PASSWORD=
-CA_LDAP_INSTANCE_NAME=
-CA_ADMIN_USER=
-CA_ADMIN_PASSWORD=
-CA_KEY_TYPE=
-CA_KEY_SIZE=
-CA_INSTANCE_ID=
-CA_DB_SUFFIX=
-CA_LDAP_PORT=
-CA_CLIENT_PKCS12_PASSWORD=
-CA_SECURITY_DOMAIN_PASSWORD=
-CA_UNSECURE_PORT=
-CA_AJP_PORT=
-CA_MANAGEMENT_PORT=
-CA_AGENT_CERT_NICKNAME=
-CA_AGENT_CERT_SUBJECT_NAME=
-CA_SIGNING_CERT_SUBJECT_NAME=
-CA_SUBSYSTEM_CERT_SUBJECT_NAME=
-CA_OCSP_SIGNING_CERT_SUBJECT_NAME=
-CA_AUDIT_SIGNING_CERT_SUBJECT_NAME=
-CA_SUBSYSTEM_NAME=
-CA_AGENT_KEY_SIZE=
-CA_AGENT_KEY_TYPE=
-CA_BACKUP_PASSWORD=
-CA_TOKEN_NAME=
-CA_TOKEN_PASSWORD=
-CA_KEY_ALGORITHM=SHA512withRSA
-CA_SIGNING_ALGORITHM=SHA512withRSA
-CA_SIGNING_SIGNING_ALGORITHM=SHA512withRSA
-CA_OCSP_SIGNING_ALGORITHM=SHA512withRSA
-CA_BACKUP_FILE_NAME="$CERTDB_DIR/$CA_INSTANCE_ID.p12"
-KRA_LDAP_INSTANCE_NAME="pki-kra1-ldap"
-KRA_INSTANCE_ID="pki-kra1"
-KRA_DB_SUFFIX="dc=pki-kra1"
-KRA_LDAP_PORT=1501
-KRA_ADMIN_PASSWORD="Secret123"
-KRA_ADMIN_USER="kraadmin"
-KRA_BACKUP_PASSWORD=redhat123
-KRA_CLIENT_PKCS12_PASSWORD=Secret123
-OCSP_LDAP_INSTANCE_NAME="pki-ocsp1-ldap"
-OCSP_INSTANCE_ID="pki-ocsp1"
-OCSP_DB_SUFFIX="dc=pki-ocsp1"
-OCSP_LDAP_PORT=1502
-OCSP_ADMIN_PASSWORD="Secret123"
-OCSP_ADMIN_USER="ocspadmin"
-OCSP_BACKUP_PASSWORD=redhat123
-OCSP_CLIENT_PKCS12_PASSWORD=Secret123
diff --git a/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java b/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java
index 0ce46c752..aae090674 100644
--- a/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java
+++ b/tests/dogtag/dev_java_tests/src/com/netscape/beakertests/PKIJUnitTest.java
@@ -30,7 +30,7 @@ public class PKIJUnitTest {
if (runWithBeaker == null || (! runWithBeaker.toLowerCase().equals("true"))) {
properties = new Properties();
try {
- properties.load(new BufferedReader(new FileReader("tests/dogtag/dev_java_tests/conf/test.cfg")));
+ properties.load(new BufferedReader(new FileReader("tests/dogtag/conf/test.cfg")));
} catch (IOException e) {
e.printStackTrace();
System.err.println("Cannot read the configuration file");