refactor: move job to dbObjects Package

diff --git a/src/org/cacert/gigi/api/GigiAPI.java b/src/org/cacert/gigi/api/GigiAPI.java
index 744432f43fd7a1b02d4a7bbef561a89b43e85720..3af4714c2fdd7affbeee73c2039f56d555dce2db 100644 (file)
--- a/src/org/cacert/gigi/api/GigiAPI.java
+++ b/src/org/cacert/gigi/api/GigiAPI.java
@@ -13,11 +13,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Job;
 import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.account.certs.CertificateRequest;
-import org.cacert.gigi.util.Job;
 import org.cacert.gigi.util.PEM;
 
 public class GigiAPI extends HttpServlet {

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 7cbdeb592fa9f298c4f52c61de4ee267018b76e7..4d672572aa2432cf8cc4da508a1aa0e87f567d5d 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -20,7 +20,6 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.util.Job;
 import org.cacert.gigi.util.KeyStorage;
 import org.cacert.gigi.util.Notary;
 

diff --git a/src/org/cacert/gigi/util/Job.java b/src/org/cacert/gigi/dbObjects/Job.java
similarity index 96%
rename from src/org/cacert/gigi/util/Job.java
rename to src/org/cacert/gigi/dbObjects/Job.java
index e6f50140f35862f8a534b85759ca58ed291685a4..321b89d0c6dd83343b99f49ef6635d66539433a4 100644 (file)
--- a/src/org/cacert/gigi/util/Job.java
+++ b/src/org/cacert/gigi/dbObjects/Job.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.util;
+package org.cacert.gigi.dbObjects;
 
 import java.sql.Date;
 
@@ -6,7 +6,6 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.output.CertificateValiditySelector;
 
 public class Job {

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
index 14e6c2fbd3e9827a68814c7a54ad7232855df660..8449c20f019e961b5c49dea34fab52b846f7a6f3 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
@@ -7,13 +7,13 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Job;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.CertificateIterable;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
-import org.cacert.gigi.util.Job;
 
 public class CertificateModificationForm extends Form {
 

diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java
index 66688ebd6ed331912908dc6e32cf6683b42757b6..c82f8e07d51a5c18b14484fa4c2e50bf6159fdad 100644 (file)
--- a/tests/org/cacert/gigi/TestSeparateSessionScope.java
+++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java
@@ -16,9 +16,9 @@ import java.sql.SQLException;
 import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.Certificate.CSRType;
 import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Job;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
-import org.cacert.gigi.util.Job;
 import org.junit.Test;
 
 public class TestSeparateSessionScope extends ManagedTest {