From 44fe3587666a301ffc0ca7bbbe1eadb88c7d1419 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 4 Jan 2014 09:08:22 -0500
Subject: [PATCH] moved several classes

Former-commit-id: e15d111bab0061c89ef5d8cea518350fa901667e
---
 .../src/main/java/org/owasp/dependencycheck/Engine.java    | 2 +-
 .../dependencycheck/data/nvdcve/DatabaseProperties.java    | 2 +-
 .../dependencycheck/data/update/CachedWebDataSource.java   | 2 ++
 .../owasp/dependencycheck/data/update/NvdCveUpdater.java   | 1 +
 .../owasp/dependencycheck/data/update/StandardUpdate.java  | 4 ++++
 .../data/update/{ => exception}/InvalidDataException.java  | 2 +-
 .../data/update/{ => exception}/UpdateException.java       | 2 +-
 .../data/update/{ => task}/CallableDownloadTask.java       | 3 ++-
 .../data/update/{ => task}/ProcessTask.java                | 7 ++++++-
 .../data/update/{ => xml}/NvdCve12Handler.java             | 2 +-
 .../data/update/{ => xml}/NvdCve20Handler.java             | 2 +-
 ...egrationTest.java => NvdCveUpdaterIntegrationTest.java} | 4 ++--
 .../data/update/StandardUpdateIntegrationTest.java         | 1 +
 .../data/update/{ => xml}/NvdCve_1_2_HandlerTest.java      | 4 ++--
 .../data/update/{ => xml}/NvdCve_2_0_HandlerTest.java      | 4 ++--
 15 files changed, 28 insertions(+), 14 deletions(-)
 rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/{ => exception}/InvalidDataException.java (96%)
 rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/{ => exception}/UpdateException.java (96%)
 rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/{ => task}/CallableDownloadTask.java (98%)
 rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/{ => task}/ProcessTask.java (94%)
 rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/{ => xml}/NvdCve12Handler.java (99%)
 rename dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/{ => xml}/NvdCve20Handler.java (99%)
 rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/{DatabaseUpdaterIntegrationTest.java => NvdCveUpdaterIntegrationTest.java} (94%)
 rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/{ => xml}/NvdCve_1_2_HandlerTest.java (94%)
 rename dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/{ => xml}/NvdCve_2_0_HandlerTest.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 d807bf137..4104b2b6d 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
@@ -35,7 +35,7 @@ import org.owasp.dependencycheck.analyzer.Analyzer;
 import org.owasp.dependencycheck.analyzer.AnalyzerService;
 import org.owasp.dependencycheck.data.update.CachedWebDataSource;
 import org.owasp.dependencycheck.exception.NoDataException;
-import org.owasp.dependencycheck.data.update.UpdateException;
+import org.owasp.dependencycheck.data.update.exception.UpdateException;
 import org.owasp.dependencycheck.data.update.UpdateService;
 import org.owasp.dependencycheck.data.cpe.CpeMemoryIndex;
 import org.owasp.dependencycheck.data.cpe.IndexException;
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java
index cd42c5385..9f3bb57a2 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java
@@ -19,7 +19,7 @@
 package org.owasp.dependencycheck.data.nvdcve;
 
 import java.util.Properties;
-import org.owasp.dependencycheck.data.update.UpdateException;
+import org.owasp.dependencycheck.data.update.exception.UpdateException;
 import org.owasp.dependencycheck.data.update.NvdCveInfo;
 
 /**
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java
index 94a78f934..823e57c99 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java
@@ -18,6 +18,8 @@
  */
 package org.owasp.dependencycheck.data.update;
 
+import org.owasp.dependencycheck.data.update.exception.UpdateException;
+
 /**
  * Defines a data source who's data is retrieved from the Internet. This data
  * can be downloaded and the local cache updated.
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java
index fdc36f628..76359eb0f 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java
@@ -18,6 +18,7 @@
  */
 package org.owasp.dependencycheck.data.update;
 
+import org.owasp.dependencycheck.data.update.exception.UpdateException;
 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/update/StandardUpdate.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java
index bfcff1772..2828eeead 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java
@@ -18,6 +18,10 @@
  */
 package org.owasp.dependencycheck.data.update;
 
+import org.owasp.dependencycheck.data.update.task.ProcessTask;
+import org.owasp.dependencycheck.data.update.task.CallableDownloadTask;
+import org.owasp.dependencycheck.data.update.exception.UpdateException;
+import org.owasp.dependencycheck.data.update.exception.InvalidDataException;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/InvalidDataException.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java
similarity index 96%
rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/InvalidDataException.java
rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java
index 464aa8332..76dbeb898 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/InvalidDataException.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2012 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.exception;
 
 /**
  * An InvalidDataDataException is a generic exception used when trying to load
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateException.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java
similarity index 96%
rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateException.java
rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java
index 8de616eab..8cdb88948 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateException.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2012 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.exception;
 
 import java.io.IOException;
 
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CallableDownloadTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java
similarity index 98%
rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CallableDownloadTask.java
rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java
index 542c200be..9c258c0c3 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CallableDownloadTask.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2013 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.task;
 
 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
 import java.io.File;
@@ -28,6 +28,7 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.owasp.dependencycheck.data.nvdcve.CveDB;
+import org.owasp.dependencycheck.data.update.NvdCveInfo;
 import org.owasp.dependencycheck.utils.DownloadFailedException;
 import org.owasp.dependencycheck.utils.Downloader;
 
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/ProcessTask.java
similarity index 94%
rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java
rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/ProcessTask.java
index f0843d004..c5bbef8fd 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/ProcessTask.java
@@ -16,8 +16,12 @@
  *
  * Copyright (c) 2013 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.task;
 
+import org.owasp.dependencycheck.data.update.task.CallableDownloadTask;
+import org.owasp.dependencycheck.data.update.xml.NvdCve20Handler;
+import org.owasp.dependencycheck.data.update.xml.NvdCve12Handler;
+import org.owasp.dependencycheck.data.update.exception.UpdateException;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -33,6 +37,7 @@ import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import org.owasp.dependencycheck.data.nvdcve.CveDB;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
+import org.owasp.dependencycheck.data.update.StandardUpdate;
 import org.owasp.dependencycheck.dependency.VulnerableSoftware;
 import org.xml.sax.SAXException;
 
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCve12Handler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.java
similarity index 99%
rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCve12Handler.java
rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.java
index 9d5980c30..2eaa5d429 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCve12Handler.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve12Handler.java
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2012 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.xml;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCve20Handler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.java
similarity index 99%
rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCve20Handler.java
rename to dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.java
index f4867af56..4c6e1096d 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCve20Handler.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.java
@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2012 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.xml;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdaterIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
similarity index 94%
rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdaterIntegrationTest.java
rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
index 07f0582ed..8cebe38e3 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdaterIntegrationTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
@@ -29,9 +29,9 @@ import static org.junit.Assert.*;
  *
  * @author Jeremy Long (jeremy.long@owasp.org)
  */
-public class DatabaseUpdaterIntegrationTest {
+public class NvdCveUpdaterIntegrationTest {
 
-    public DatabaseUpdaterIntegrationTest() {
+    public NvdCveUpdaterIntegrationTest() {
     }
 
     @BeforeClass
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java
index ce5d4f2d3..edb851535 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java
@@ -18,6 +18,7 @@
  */
 package org.owasp.dependencycheck.data.update;
 
+import org.owasp.dependencycheck.data.update.exception.UpdateException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Calendar;
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCve_1_2_HandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_1_2_HandlerTest.java
similarity index 94%
rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCve_1_2_HandlerTest.java
rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_1_2_HandlerTest.java
index cbc7125f7..f336c2a11 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCve_1_2_HandlerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_1_2_HandlerTest.java
@@ -16,9 +16,9 @@
  *
  * Copyright (c) 2012 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.xml;
 
-import org.owasp.dependencycheck.data.update.NvdCve12Handler;
+import org.owasp.dependencycheck.data.update.xml.NvdCve12Handler;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCve_2_0_HandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_2_0_HandlerTest.java
similarity index 94%
rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCve_2_0_HandlerTest.java
rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_2_0_HandlerTest.java
index 0069b2f41..5f7e053f6 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCve_2_0_HandlerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_2_0_HandlerTest.java
@@ -16,9 +16,9 @@
  *
  * Copyright (c) 2012 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data.update;
+package org.owasp.dependencycheck.data.update.xml;
 
-import org.owasp.dependencycheck.data.update.NvdCve20Handler;
+import org.owasp.dependencycheck.data.update.xml.NvdCve20Handler;
 import java.io.File;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;