From acd118a58cc9c77acec3f41dc8fa8a288e0d7f30 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 17 Nov 2013 22:40:51 -0500 Subject: [PATCH] removed references to CPE data directory as this has been moved to a RAMDisk directory Former-commit-id: 8f4dafe9a687f254bec75703a1f392333cfbde54 --- .../dependencycheck/data/update/AbstractUpdateTask.java | 4 ---- .../dependencycheck/data/update/DatabaseUpdater.java | 4 ---- .../java/org/owasp/dependencycheck/utils/Settings.java | 5 ----- .../org/owasp/dependencycheck/utils/SettingsTest.java | 8 ++++---- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/AbstractUpdateTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/AbstractUpdateTask.java index 0e25e9e40..cb9429a72 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/AbstractUpdateTask.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/AbstractUpdateTask.java @@ -164,10 +164,6 @@ public abstract class AbstractUpdateTask implements UpdateTask { if (data.exists()) { FileUtils.delete(data); } - data = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY); - if (data.exists()) { - FileUtils.delete(data); - } data = DataStoreMetaInfo.getPropertiesFile(); if (data.exists()) { FileUtils.delete(data); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java index ff87d7f3e..55ab0ccfd 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java @@ -79,10 +79,6 @@ public class DatabaseUpdater implements CachedWebDataSource { if (data.exists()) { FileUtils.delete(data); } - data = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY); - if (data.exists()) { - FileUtils.delete(data); - } data = DataStoreMetaInfo.getPropertiesFile(); if (data.exists()) { FileUtils.delete(data); 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 43f1e95d7..ad42c4905 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 @@ -72,11 +72,6 @@ public final class Settings { * contains the contents of the data directory. */ public static final String BATCH_UPDATE_URL = "batch.update.url"; - /** - * The properties key for the path where the CPE Lucene Index will be - * stored. - */ - public static final String CPE_DATA_DIRECTORY = "data.cpe"; /** * The properties key for the path where the CVE H2 database will be * stored. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java index 4fcf15ab7..aa738e793 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java @@ -57,8 +57,8 @@ public class SettingsTest { */ @Test public void testGetString() { - String key = Settings.KEYS.CPE_DATA_DIRECTORY; - String expResult = "cpe"; + String key = Settings.KEYS.CVE_DATA_DIRECTORY; + String expResult = "cve"; String result = Settings.getString(key); Assert.assertTrue(result.endsWith(expResult)); } @@ -68,8 +68,8 @@ public class SettingsTest { */ @Test public void testGetFile() throws IOException { - String key = Settings.KEYS.CPE_DATA_DIRECTORY; - String expResult = "data" + File.separator + "cpe"; + String key = Settings.KEYS.CVE_DATA_DIRECTORY; + String expResult = "data" + File.separator + "cve"; File result = Settings.getFile(key); Assert.assertTrue(result.getAbsolutePath().endsWith(expResult));