github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-23 17:41:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed references to CPE data directory as this has been moved to a RAMDisk directory

Browse Source 
Former-commit-id: 8f4dafe9a687f254bec75703a1f392333cfbde54
This commit is contained in:
Jeremy Long
2013-11-17 22:40:51 -05:00
parent dff0b497b0
commit acd118a58c
4 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/AbstractUpdateTask.java
View File

@@ -164,10 +164,6 @@ public abstract class AbstractUpdateTask implements UpdateTask {
if (data.exists()) { if (data.exists()) {
FileUtils.delete(data); FileUtils.delete(data);
} }
data = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY);
if (data.exists()) {
FileUtils.delete(data);
}
data = DataStoreMetaInfo.getPropertiesFile(); data = DataStoreMetaInfo.getPropertiesFile();
if (data.exists()) { if (data.exists()) {
FileUtils.delete(data); FileUtils.delete(data);

4
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/DatabaseUpdater.java
View File

@@ -79,10 +79,6 @@ public class DatabaseUpdater implements CachedWebDataSource {
if (data.exists()) { if (data.exists()) {
FileUtils.delete(data); FileUtils.delete(data);
} }
data = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY);
if (data.exists()) {
FileUtils.delete(data);
}
data = DataStoreMetaInfo.getPropertiesFile(); data = DataStoreMetaInfo.getPropertiesFile();
if (data.exists()) { if (data.exists()) {
FileUtils.delete(data); FileUtils.delete(data);

5
dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java
View File

@@ -72,11 +72,6 @@ public final class Settings {
* contains the contents of the data directory. * contains the contents of the data directory.
*/ */
public static final String BATCH_UPDATE_URL = "batch.update.url"; 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 * The properties key for the path where the CVE H2 database will be
* stored. * stored.

8
dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java
View File

@@ -57,8 +57,8 @@ public class SettingsTest {
*/ */
@Test @Test
public void testGetString() { public void testGetString() {
String key = Settings.KEYS.CPE_DATA_DIRECTORY; String key = Settings.KEYS.CVE_DATA_DIRECTORY;
String expResult = "cpe"; String expResult = "cve";
String result = Settings.getString(key); String result = Settings.getString(key);
Assert.assertTrue(result.endsWith(expResult)); Assert.assertTrue(result.endsWith(expResult));
} }
@@ -68,8 +68,8 @@ public class SettingsTest {
*/ */
@Test @Test
public void testGetFile() throws IOException { public void testGetFile() throws IOException {
String key = Settings.KEYS.CPE_DATA_DIRECTORY; String key = Settings.KEYS.CVE_DATA_DIRECTORY;
String expResult = "data" + File.separator + "cpe"; String expResult = "data" + File.separator + "cve";
File result = Settings.getFile(key); File result = Settings.getFile(key);
Assert.assertTrue(result.getAbsolutePath().endsWith(expResult)); Assert.assertTrue(result.getAbsolutePath().endsWith(expResult));