renamed and moved classes

Former-commit-id: b0e9d931be4d61eb25178182e8602a0c0be4b6b9

dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java

@@ -34,8 +34,8 @@ 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.NoDataException;
-import org.owasp.dependencycheck.data.UpdateException;
+import org.owasp.dependencycheck.exception.NoDataException;
+import org.owasp.dependencycheck.update.UpdateException;
 import org.owasp.dependencycheck.data.UpdateService;
 import org.owasp.dependencycheck.data.cpe.CpeMemoryIndex;
 import org.owasp.dependencycheck.data.cpe.IndexException;

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/CachedWebDataSource.java

@@ -18,6 +18,8 @@
  */
 package org.owasp.dependencycheck.data;
 
+import org.owasp.dependencycheck.update.UpdateException;
+
 /**
  * Defines an Index who's data is retrieved from the Internet. This data can be
  * downloaded and the index updated.

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.UpdateException;
+import org.owasp.dependencycheck.update.UpdateException;
 import org.owasp.dependencycheck.data.update.NvdCveInfo;
 
 /**

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

@@ -22,7 +22,7 @@ import org.owasp.dependencycheck.data.CachedWebDataSource;
 import java.net.MalformedURLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.owasp.dependencycheck.data.UpdateException;
+import org.owasp.dependencycheck.update.UpdateException;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
 import org.owasp.dependencycheck.utils.DownloadFailedException;
 

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/ProcessTask.java

@@ -31,7 +31,7 @@ import java.util.logging.Logger;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import org.owasp.dependencycheck.data.UpdateException;
+import org.owasp.dependencycheck.update.UpdateException;
 import org.owasp.dependencycheck.data.nvdcve.CveDB;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
 import org.owasp.dependencycheck.dependency.VulnerableSoftware;

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java

@@ -32,7 +32,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.owasp.dependencycheck.data.UpdateException;
+import org.owasp.dependencycheck.update.UpdateException;
 import org.owasp.dependencycheck.data.nvdcve.CveDB;
 import org.owasp.dependencycheck.utils.DownloadFailedException;
 import org.owasp.dependencycheck.utils.Settings;
@@ -59,7 +59,7 @@ public class StandardUpdate {
     /**
      * A collection of updateable NVD CVE items.
      */
-    private Updateable updateable;
+    private UpdateableNvdCve updateable;
     /**
      * A flag indicating whether or not the current data store should be
      * deleted; this only occurs if the database schema has been updated.
@@ -223,8 +223,8 @@ public class StandardUpdate {
      * @throws UpdateException Is thrown if there is an issue with the last
      * updated properties file
      */
-    protected final Updateable updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
-        Updateable updates = null;
+    protected final UpdateableNvdCve updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
+        UpdateableNvdCve updates = null;
         try {
             updates = retrieveCurrentTimestampsFromWeb();
         } catch (InvalidDataException ex) {
@@ -319,10 +319,10 @@ public class StandardUpdate {
      * timestamps
      * @throws InvalidSettingException thrown if the settings are invalid
      */
-    private Updateable retrieveCurrentTimestampsFromWeb()
+    private UpdateableNvdCve retrieveCurrentTimestampsFromWeb()
             throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {
 
-        final Updateable updates = new Updateable();
+        final UpdateableNvdCve updates = new UpdateableNvdCve();
         updates.add(MODIFIED, Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL),
                 Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),
                 false);

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateableNvdCve.java

@@ -33,7 +33,7 @@ import org.owasp.dependencycheck.utils.Downloader;
  *
  * @author Jeremy Long (jeremy.long@owasp.org)
  */
-public class Updateable implements java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {
+public class UpdateableNvdCve implements java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {
 
     /**
      * A collection of sources of data.

dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/NoDataException.java

@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2013 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data;
+package org.owasp.dependencycheck.exception;
 
 import java.io.IOException;
 

dependency-check-core/src/main/java/org/owasp/dependencycheck/update/UpdateException.java

@@ -16,7 +16,7 @@
  *
  * Copyright (c) 2012 Jeremy Long. All Rights Reserved.
  */
-package org.owasp.dependencycheck.data;
+package org.owasp.dependencycheck.update;
 
 import java.io.IOException;