From ba8bd4f95cd4b6f3b9e481dee24fa2f89cc3ef97 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 4 Jan 2014 08:56:09 -0500 Subject: [PATCH] moved several classes Former-commit-id: f2de931c7c093818a97149b0cefc22d7b3b9717f --- .../main/java/org/owasp/dependencycheck/Engine.java | 4 ++-- .../org/owasp/dependencycheck/data/package-info.java | 12 ------------ .../data/{ => update}/CachedWebDataSource.java | 2 +- .../dependencycheck/data/update/DatabaseUpdater.java | 1 - .../data/{ => update}/UpdateService.java | 3 ++- 5 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 dependency-check-core/src/main/java/org/owasp/dependencycheck/data/package-info.java rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/{ => update}/CachedWebDataSource.java (96%) rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/{ => update}/UpdateService.java (94%) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java index e71a9e9d3..facd5da02 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java @@ -33,10 +33,10 @@ import org.owasp.dependencycheck.analyzer.AnalysisException; import org.owasp.dependencycheck.analyzer.AnalysisPhase; import org.owasp.dependencycheck.analyzer.Analyzer; import org.owasp.dependencycheck.analyzer.AnalyzerService; -import org.owasp.dependencycheck.data.CachedWebDataSource; +import org.owasp.dependencycheck.data.update.CachedWebDataSource; import org.owasp.dependencycheck.exception.NoDataException; import org.owasp.dependencycheck.update.UpdateException; -import org.owasp.dependencycheck.data.UpdateService; +import org.owasp.dependencycheck.data.update.UpdateService; import org.owasp.dependencycheck.data.cpe.CpeMemoryIndex; import org.owasp.dependencycheck.data.cpe.IndexException; import org.owasp.dependencycheck.data.nvdcve.CveDB; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/package-info.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/package-info.java deleted file mode 100644 index 5da58d1e6..000000000 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * - * - * org.owasp.dependencycheck.data - * - * - * Contains classes used to work with the data sources. - * - * -*/ - -package org.owasp.dependencycheck.data; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/CachedWebDataSource.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java similarity index 96% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/CachedWebDataSource.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java index 73334e608..e09b9a5af 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/CachedWebDataSource.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java @@ -16,7 +16,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data; +package org.owasp.dependencycheck.data.update; import org.owasp.dependencycheck.update.UpdateException; 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 c2084dc7a..9a35da78d 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 @@ -18,7 +18,6 @@ */ package org.owasp.dependencycheck.data.update; -import org.owasp.dependencycheck.data.CachedWebDataSource; import java.net.MalformedURLException; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/UpdateService.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java similarity index 94% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/UpdateService.java rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java index 55fcd3c6c..5ccf91a62 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/UpdateService.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java @@ -16,8 +16,9 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.data; +package org.owasp.dependencycheck.data.update; +import org.owasp.dependencycheck.data.update.CachedWebDataSource; import java.util.Iterator; import java.util.ServiceLoader;