From 06eb8f9c101cf074ce18aa941286bc27d96f649d Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 11 Jan 2014 12:41:58 -0500 Subject: [PATCH] added new property keys for database connection properties Former-commit-id: aa963014785ed1f49b0c53afa9481a0e46d196d2 --- .../owasp/dependencycheck/utils/Settings.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java index 26f364d2e..6f42abfab 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java @@ -57,14 +57,27 @@ public final class Settings { * The database driver class name. If this is not in the properties file * the embedded database is used. */ - public static final String DB_DRIVER = "database.drive"; + public static final String DB_DRIVER_NAME = "data.driver_name"; + /** + * The database driver class name. If this is not in the properties file + * the embedded database is used. + */ + public static final String DB_DRIVER_PATH = "data.driver_path"; /** * The database connection string. If this is not in the properties file * the embedded database is used. */ - public static final String DB_CONNECTION_STRING = "database.connectionstring"; + public static final String DB_CONNECTION_STRING = "data.connection_string"; /** - * The base path to use for the data directory. + * The username to use when connecting to the database. + */ + public static final String DB_USER = "data.user"; + /** + * The password to authenticate to the database. + */ + public static final String DB_PASSWORD = "data.password"; + /** + * The base path to use for the data directory (for embedded db). */ public static final String DATA_DIRECTORY = "data.directory"; /**