Move the "dbObject"s to their own package.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 9b3023b25f0626eb87562106b13601cc6c1860b0..2a67dd9602305923db63a48c53a53d8a89d3b4ac 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form.CSRFException;
 import org.cacert.gigi.output.Menu;

diff --git a/src/org/cacert/gigi/PermissionCheckable.java b/src/org/cacert/gigi/PermissionCheckable.java
index a40c5acb590b2e8b13ada3b505e021fc397646c5..7dee6fd7c950deace3b11698137dcc6d5b4b1687 100644 (file)
--- a/src/org/cacert/gigi/PermissionCheckable.java
+++ b/src/org/cacert/gigi/PermissionCheckable.java
@@ -1,5 +1,7 @@
 package org.cacert.gigi;
 
+import org.cacert.gigi.dbObjects.User;
+
 
 public interface PermissionCheckable {
 

diff --git a/src/org/cacert/gigi/Assurance.java b/src/org/cacert/gigi/dbObjects/Assurance.java
similarity index 96%
rename from src/org/cacert/gigi/Assurance.java
rename to src/org/cacert/gigi/dbObjects/Assurance.java
index 973f0ee87c5c212a6f9711690501f37aa51f3f7c..b1c9ccd507c79fc4981ea7d364ff8280e67a7f79 100644 (file)
--- a/src/org/cacert/gigi/Assurance.java
+++ b/src/org/cacert/gigi/dbObjects/Assurance.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
similarity index 99%
rename from src/org/cacert/gigi/Certificate.java
rename to src/org/cacert/gigi/dbObjects/Certificate.java
index 8094419ba3473f2c95f43bc0f3ac461519ca2e52..59d0aded9b329c9396c5690d5690c5d84f1b3f3e 100644 (file)
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,6 +17,7 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.util.Job;
 import org.cacert.gigi.util.KeyStorage;

diff --git a/src/org/cacert/gigi/CertificateProfile.java b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
similarity index 97%
rename from src/org/cacert/gigi/CertificateProfile.java
rename to src/org/cacert/gigi/dbObjects/CertificateProfile.java
index 845fa6acb04d93eb53028c11fad148349e487f66..e771cd12750bcfcfd87ad46f521403c23cce2321 100644 (file)
--- a/src/org/cacert/gigi/CertificateProfile.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

diff --git a/src/org/cacert/gigi/Digest.java b/src/org/cacert/gigi/dbObjects/Digest.java
similarity index 94%
rename from src/org/cacert/gigi/Digest.java
rename to src/org/cacert/gigi/dbObjects/Digest.java
index 8c4644f72dc9dd38a6397634a4ab00d57b30520d..edd8dcad907dd54d7fce1a5952aae09f541fcefd 100644 (file)
--- a/src/org/cacert/gigi/Digest.java
+++ b/src/org/cacert/gigi/dbObjects/Digest.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 public enum Digest {
     SHA256("Currently recommended, because the other algorithms" + " might break on some older versions of the GnuTLS library" + " (older than 3.x) still shipped in Debian for example."), SHA384(null), SHA512("Highest protection against hash collision attacks of the algorithms offered here.");

diff --git a/src/org/cacert/gigi/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
similarity index 98%
rename from src/org/cacert/gigi/Domain.java
rename to src/org/cacert/gigi/dbObjects/Domain.java
index 5dbbdaf0203d52036a0b504c1c196c2304e94e82..056af154173b7ae9616c1f7c0b4eb07528997e4f 100644 (file)
--- a/src/org/cacert/gigi/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -1,9 +1,10 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 
 public class Domain implements IdCachable {

diff --git a/src/org/cacert/gigi/EmailAddress.java b/src/org/cacert/gigi/dbObjects/EmailAddress.java
similarity index 98%
rename from src/org/cacert/gigi/EmailAddress.java
rename to src/org/cacert/gigi/dbObjects/EmailAddress.java
index 07ebfcc9a6258f53dc8146f100edd528a1a6037a..f0ce010f5ed4fedd559906832c44ff4f04a67de3 100644 (file)
--- a/src/org/cacert/gigi/EmailAddress.java
+++ b/src/org/cacert/gigi/dbObjects/EmailAddress.java
@@ -1,10 +1,11 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.io.IOException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.email.MailProbe;

diff --git a/src/org/cacert/gigi/IdCachable.java b/src/org/cacert/gigi/dbObjects/IdCachable.java
similarity index 62%
rename from src/org/cacert/gigi/IdCachable.java
rename to src/org/cacert/gigi/dbObjects/IdCachable.java
index 0d218d5d359510ce354fc294eeceae431a95f00e..cc083d2592c152b8abe7112d6fc48ee8a68227c9 100644 (file)
--- a/src/org/cacert/gigi/IdCachable.java
+++ b/src/org/cacert/gigi/dbObjects/IdCachable.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 public interface IdCachable {
 

diff --git a/src/org/cacert/gigi/Name.java b/src/org/cacert/gigi/dbObjects/Name.java
similarity index 98%
rename from src/org/cacert/gigi/Name.java
rename to src/org/cacert/gigi/dbObjects/Name.java
index 93b361efb377afd2c329215778e676f6e01a0041..512dc769b7ca0fbc69f22ae100ddddcfd01c02d5 100644 (file)
--- a/src/org/cacert/gigi/Name.java
+++ b/src/org/cacert/gigi/dbObjects/Name.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.io.PrintWriter;
 import java.util.Map;

diff --git a/src/org/cacert/gigi/ObjectCache.java b/src/org/cacert/gigi/dbObjects/ObjectCache.java
similarity index 92%
rename from src/org/cacert/gigi/ObjectCache.java
rename to src/org/cacert/gigi/dbObjects/ObjectCache.java
index 9d8e9367acf45f2be272ad68744ed81a2034e251..5f44542200458467c535b959266dde527e4a098b 100644 (file)
--- a/src/org/cacert/gigi/ObjectCache.java
+++ b/src/org/cacert/gigi/dbObjects/ObjectCache.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;

diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/dbObjects/User.java
similarity index 99%
rename from src/org/cacert/gigi/User.java
rename to src/org/cacert/gigi/dbObjects/User.java
index 41396ae102e53ea121ad67364d764f78f3af6469..9166b0443f4b564bb8f37894c01592ba515e7508 100644 (file)
--- a/src/org/cacert/gigi/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.dbObjects;
 
 import java.sql.Date;
 import java.sql.PreparedStatement;
@@ -7,6 +7,7 @@ import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.Locale;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.util.Notary;

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 6338ccce283d70cb57a2b97b144500b345380e5d..78973d0ace887834814b020a3e6139ee55887a0e 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -4,7 +4,7 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Assurance;
+import org.cacert.gigi.dbObjects.Assurance;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 41d046e72020f0bf35a435283b76d11f82b7b954..ae359869362a7a8580ca47fa88b3f921ba837deb 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output;
 import java.sql.SQLException;
 import java.util.Map;
 
-import org.cacert.gigi.Certificate;
+import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 

diff --git a/src/org/cacert/gigi/output/Menu.java b/src/org/cacert/gigi/output/Menu.java
index a57f531764467f413082f85fb07d9c87dfe2afd6..451cb47a478cc95070a849c1f7d8f9a3a9b38bd1 100644 (file)
--- a/src/org/cacert/gigi/output/Menu.java
+++ b/src/org/cacert/gigi/output/Menu.java
@@ -4,7 +4,7 @@ import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 
 public class Menu implements IMenuItem {

diff --git a/src/org/cacert/gigi/output/PageMenuItem.java b/src/org/cacert/gigi/output/PageMenuItem.java
index c40493a6fbbd8b849bee78d2cf8d0b2b6ef17535..c483509e2a2e635fa73fb15d5b59e9c5e3f9b7d7 100644 (file)
--- a/src/org/cacert/gigi/output/PageMenuItem.java
+++ b/src/org/cacert/gigi/output/PageMenuItem.java
@@ -1,7 +1,7 @@
 package org.cacert.gigi.output;
 
 import org.cacert.gigi.Gigi;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.ServerConstants;
 

diff --git a/src/org/cacert/gigi/output/SimpleMenuItem.java b/src/org/cacert/gigi/output/SimpleMenuItem.java
index 4ac97c0578c60a594b443303d957aaddd64b9ae4..cccd3b11f8e21d625b98839a434324a76e2d687c 100644 (file)
--- a/src/org/cacert/gigi/output/SimpleMenuItem.java
+++ b/src/org/cacert/gigi/output/SimpleMenuItem.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.output;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 
 public class SimpleMenuItem implements IMenuItem {

diff --git a/src/org/cacert/gigi/output/template/HashAlgorithms.java b/src/org/cacert/gigi/output/template/HashAlgorithms.java
index ee2a4b14281ff379598d245181c592b51b5586da..e221aee36e95cd71abe2c299fc227e083657ab0f 100644 (file)
--- a/src/org/cacert/gigi/output/template/HashAlgorithms.java
+++ b/src/org/cacert/gigi/output/template/HashAlgorithms.java
@@ -2,7 +2,7 @@ package org.cacert.gigi.output.template;
 
 import java.util.Map;
 
-import org.cacert.gigi.Digest;
+import org.cacert.gigi.dbObjects.Digest;
 import org.cacert.gigi.localisation.Language;
 
 public class HashAlgorithms implements IterableDataset {

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 4abe3950d4debb737275f6b2a83d68be5d364cd5..2ece38d6c8f1ee838bbdee01c8af4bf50cead72f 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.util.PasswordHash;
 

diff --git a/src/org/cacert/gigi/pages/LogoutPage.java b/src/org/cacert/gigi/pages/LogoutPage.java
index 888ad0efddef1b22fde6b9a76a0776ed8874589b..3d82be788599963a09c48052ca14ae6a1aa6baad 100644 (file)
--- a/src/org/cacert/gigi/pages/LogoutPage.java
+++ b/src/org/cacert/gigi/pages/LogoutPage.java
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.Gigi;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 
 public class LogoutPage extends Page {
 

diff --git a/src/org/cacert/gigi/pages/Page.java b/src/org/cacert/gigi/pages/Page.java
index 0497dae28b1722323d30fe0d8d33a4c2e0ebf8d8..0bd02f789f115022277cd02391f41e676970b1c3 100644 (file)
--- a/src/org/cacert/gigi/pages/Page.java
+++ b/src/org/cacert/gigi/pages/Page.java
@@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.PermissionCheckable;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Template;
 

diff --git a/src/org/cacert/gigi/pages/Verify.java b/src/org/cacert/gigi/pages/Verify.java
index f64c21458ef991241c0af2fa06682d0c4f99da6c..2ebd54c5f2d4447ae9fe5a8352a05c53229c8300 100644 (file)
--- a/src/org/cacert/gigi/pages/Verify.java
+++ b/src/org/cacert/gigi/pages/Verify.java
@@ -6,9 +6,9 @@ import java.io.PrintWriter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.EmailAddress;
 
 public class Verify extends Page {
 

diff --git a/src/org/cacert/gigi/pages/account/CertificateAdd.java b/src/org/cacert/gigi/pages/account/CertificateAdd.java
index 1e462273a9edd841a9d6994140b1750a02d6a438..3b076d416f86fe7ddc8d4fdc996a1854aeb767f3 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/CertificateAdd.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.Certificate;
+import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;
 

diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index ff659225976a77a21106597e1ea23cf4e8655382..80eb67a7429e4185665d376fdecfed19d6979882 100644 (file)
--- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -17,15 +17,15 @@ import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.Certificate.CSRType;
-import org.cacert.gigi.Certificate.SANType;
-import org.cacert.gigi.Certificate.SubjectAlternateName;
-import org.cacert.gigi.CertificateProfile;
-import org.cacert.gigi.Digest;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
 import org.cacert.gigi.crypto.SPKAC;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Digest;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.dbObjects.Certificate.CSRType;
+import org.cacert.gigi.dbObjects.Certificate.SANType;
+import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.CertificateValiditySelector;
 import org.cacert.gigi.output.Form;

diff --git a/src/org/cacert/gigi/pages/account/Certificates.java b/src/org/cacert/gigi/pages/account/Certificates.java
index 0293d86afe6ae460b825b7bc532aa310173d8658..74848f24662ca5f51d2e37a21e3dfd07b28b7045 100644 (file)
--- a/src/org/cacert/gigi/pages/account/Certificates.java
+++ b/src/org/cacert/gigi/pages/account/Certificates.java
@@ -12,8 +12,8 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.CertificateIterable;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;

diff --git a/src/org/cacert/gigi/pages/account/ChangeForm.java b/src/org/cacert/gigi/pages/account/ChangeForm.java
index f43d62d02b0f5a69e7731f251a8fc66487d71ef9..ceaee92e57e3441fbc5a1b34395598c9353e5127 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangeForm.java
+++ b/src/org/cacert/gigi/pages/account/ChangeForm.java
@@ -6,7 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/account/DomainAddForm.java b/src/org/cacert/gigi/pages/account/DomainAddForm.java
index a9de7ce0b1684ad29195d3ff08c26df13a65362c..65e168c4f8ab5ecf671b67a833854418e9f96490 100644 (file)
--- a/src/org/cacert/gigi/pages/account/DomainAddForm.java
+++ b/src/org/cacert/gigi/pages/account/DomainAddForm.java
@@ -7,10 +7,10 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.Domain;
 import org.cacert.gigi.Gigi;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;

diff --git a/src/org/cacert/gigi/pages/account/DomainManagementForm.java b/src/org/cacert/gigi/pages/account/DomainManagementForm.java
index b3c212ed7c39fcf34070a7b22f4b370d12106998..e6446642d5b1161eaec671662b8b5d320532612f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/DomainManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/DomainManagementForm.java
@@ -5,9 +5,9 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.Domain;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;

diff --git a/src/org/cacert/gigi/pages/account/DomainOverview.java b/src/org/cacert/gigi/pages/account/DomainOverview.java
index d8868f93817178023661515cec0879012785a39b..821517714f15c3c371bb710bbfdde590b1679752 100644 (file)
--- a/src/org/cacert/gigi/pages/account/DomainOverview.java
+++ b/src/org/cacert/gigi/pages/account/DomainOverview.java
@@ -7,9 +7,9 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.Domain;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;

diff --git a/src/org/cacert/gigi/pages/account/MailAddForm.java b/src/org/cacert/gigi/pages/account/MailAddForm.java
index 3500faaeb8e080cbe00ee0fbba4fe655487174c8..f36fa35d2c61a0601bdd1f940182ff3092b76b31 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailAddForm.java
+++ b/src/org/cacert/gigi/pages/account/MailAddForm.java
@@ -5,8 +5,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.EmailAddress;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.java b/src/org/cacert/gigi/pages/account/MailManagementForm.java
index 204bb927a46a3db8ae4b783511fb8ef968ae6245..1bee5d2327ae7e2523d8f479d0bd9187a8fa65c8 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/MailManagementForm.java
@@ -5,9 +5,9 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.IterableDataset;

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index 3261ca8d5f87a46e0da34f6326c772874ffe1bdd..6b9000c85d9977faa2b712986fd58e8082cf9f64 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 147fa95008b219c669d061e1ea4e26df34446f15..848f349069bc21458b160c46721611c733107b93 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;

diff --git a/src/org/cacert/gigi/pages/account/MyListingForm.java b/src/org/cacert/gigi/pages/account/MyListingForm.java
index 6b29aac25947323eb5667dfad8f1a7a67452381f..e9fa960292c2766c56d36d2c02a2148afc0a9c27 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyListingForm.java
+++ b/src/org/cacert/gigi/pages/account/MyListingForm.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java
index 7d3b3e3f10b627694055f2c1dee6b386d6bcfb87..55d44ed79c26d190bb7adf5f80d796cab3f18931 100644 (file)
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;
 

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 4fca9450613f3cebe1deed54237e11292d14752c..f62161fa6016a55309e75d09a208d0d4027b2102 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -13,10 +13,10 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 3368414af45443bbe88519beecc833b05fdc9bbe..3df399426afb2411fd15b3e4fd8e3e1375e8773a 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -10,7 +10,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index 3aa413503f68571ee714844e04834611a800742a..3c58b5bca30ba16b33cf0cc594250d83c1f5c129 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -10,8 +10,8 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

diff --git a/src/org/cacert/gigi/pages/wot/MyPoints.java b/src/org/cacert/gigi/pages/wot/MyPoints.java
index 1e61bebebe324bc39008222053443d55f441cad7..7bb4ce6cf6ff7066db79bddb88f198d26deb43c5 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/MyPoints.java
+++ b/src/org/cacert/gigi/pages/wot/MyPoints.java
@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.AssurancesDisplay;
 import org.cacert.gigi.pages.Page;
 

diff --git a/src/org/cacert/gigi/ping/DNSPinger.java b/src/org/cacert/gigi/ping/DNSPinger.java
index 175b26b042708bdc033e6b9c128ad71fb03452f0..b1053c0e7f5b9d6beb51187235c3891b6914714f 100644 (file)
--- a/src/org/cacert/gigi/ping/DNSPinger.java
+++ b/src/org/cacert/gigi/ping/DNSPinger.java
@@ -5,8 +5,8 @@ import java.util.List;
 
 import javax.naming.NamingException;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.util.DNSUtil;
 
 public class DNSPinger extends DomainPinger {

diff --git a/src/org/cacert/gigi/ping/DomainPinger.java b/src/org/cacert/gigi/ping/DomainPinger.java
index c9b8a9bb976dc65e6e280b980080d33d8fe556df..2a14cc1e8ff97f2b3c28a67fc4ea3b1b1bd52e79 100644 (file)
--- a/src/org/cacert/gigi/ping/DomainPinger.java
+++ b/src/org/cacert/gigi/ping/DomainPinger.java
@@ -1,7 +1,7 @@
 package org.cacert.gigi.ping;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 
 public abstract class DomainPinger {
 

diff --git a/src/org/cacert/gigi/ping/EmailPinger.java b/src/org/cacert/gigi/ping/EmailPinger.java
index 9dfa29587b55454630ecc2c1ae325f2c67c23572..449af0aa2c8e8e1ec8b17252358c414d061e76cd 100644 (file)
--- a/src/org/cacert/gigi/ping/EmailPinger.java
+++ b/src/org/cacert/gigi/ping/EmailPinger.java
@@ -2,8 +2,8 @@ package org.cacert.gigi.ping;
 
 import java.io.IOException;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.MailProbe;
 import org.cacert.gigi.localisation.Language;
 

diff --git a/src/org/cacert/gigi/ping/HTTPFetch.java b/src/org/cacert/gigi/ping/HTTPFetch.java
index 5450f265181520b169f7e8dc8e00f5e8ae064d5c..a4671bd23bb8090fff2cca74ee3c66176e9b41f5 100644 (file)
--- a/src/org/cacert/gigi/ping/HTTPFetch.java
+++ b/src/org/cacert/gigi/ping/HTTPFetch.java
@@ -6,8 +6,8 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 
 public class HTTPFetch extends DomainPinger {
 

diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java
index 91ddfbb0b5a2188a8da3910c03971330b2abcf87..4ed4eb4bcdfef020a920ef09534d45f32303beeb 100644 (file)
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -5,9 +5,10 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.util.RandomToken;
 
 public class PingerDaemon extends Thread {

diff --git a/src/org/cacert/gigi/ping/SSLPinger.java b/src/org/cacert/gigi/ping/SSLPinger.java
index dc8cdd0074c1d5b7163bfc00c0c2ca49ca484954..81eabbe97ed8d794bc0ec30f9cf5d8e309c15d9a 100644 (file)
--- a/src/org/cacert/gigi/ping/SSLPinger.java
+++ b/src/org/cacert/gigi/ping/SSLPinger.java
@@ -26,9 +26,9 @@ import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLParameters;
 import javax.security.cert.X509Certificate;
 
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.Domain;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 
 public class SSLPinger extends DomainPinger {
 

diff --git a/src/org/cacert/gigi/util/Job.java b/src/org/cacert/gigi/util/Job.java
index 6e502afd6627f41e028f4eb6f5396f2f2b8e72e5..e10a44d87c5b013ac43bdaea6a8787e0201554e6 100644 (file)
--- a/src/org/cacert/gigi/util/Job.java
+++ b/src/org/cacert/gigi/util/Job.java
@@ -5,9 +5,9 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.cacert.gigi.Certificate;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.output.CertificateValiditySelector;
 
 public class Job {

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index cda4ce5a1ac222f925057d761d617cfd35706c71..46a2c3ade06881a8d8acf32e663f7b15d774dd9f 100644 (file)
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -4,8 +4,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.User;
 
 public class Notary {
 

diff --git a/src/org/cacert/gigi/util/PasswordStrengthChecker.java b/src/org/cacert/gigi/util/PasswordStrengthChecker.java
index 7df2e220c7ed1d2d5e594546ddc64be64eefdb9b..cc0acfa5b673e9097d957e5ab8dda6c29cce1b05 100644 (file)
--- a/src/org/cacert/gigi/util/PasswordStrengthChecker.java
+++ b/src/org/cacert/gigi/util/PasswordStrengthChecker.java
@@ -3,7 +3,7 @@ package org.cacert.gigi.util;
 import java.util.regex.Pattern;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 
 public class PasswordStrengthChecker {
 

diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java
index a1972304e95cc55f7b4157481498b4b10febeeea..c9ada28899711068f748f625e74ac8f728b932f9 100644 (file)
--- a/tests/org/cacert/gigi/TestCertificate.java
+++ b/tests/org/cacert/gigi/TestCertificate.java
@@ -9,10 +9,12 @@ import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
 
-import org.cacert.gigi.Certificate.CSRType;
-import org.cacert.gigi.Certificate.CertificateStatus;
-import org.cacert.gigi.Certificate.SANType;
-import org.cacert.gigi.Certificate.SubjectAlternateName;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Certificate.CSRType;
+import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
+import org.cacert.gigi.dbObjects.Certificate.SANType;
+import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/TestDomain.java b/tests/org/cacert/gigi/TestDomain.java
index 936395db3dc193b1d6740786b1fd3a07537796c9..582ecf33da24a4736ced0c3e1aa45ff8995cd7d1 100644 (file)
--- a/tests/org/cacert/gigi/TestDomain.java
+++ b/tests/org/cacert/gigi/TestDomain.java
@@ -2,6 +2,8 @@ package org.cacert.gigi;
 
 import static org.junit.Assert.*;
 
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/TestLanguage.java b/tests/org/cacert/gigi/TestLanguage.java
index f53b0ff9c199d90d358a79b0c4730b8e58171fb4..d73f1fa2281533635a1ac733e3e7166e026f4d2a 100644 (file)
--- a/tests/org/cacert/gigi/TestLanguage.java
+++ b/tests/org/cacert/gigi/TestLanguage.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Locale;
 
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.ManagedTest;

diff --git a/tests/org/cacert/gigi/TestObjectCache.java b/tests/org/cacert/gigi/TestObjectCache.java
index d361c16b923e783a110d34a302199ecca8c874c6..525469a65f87d8d33092d48be5cf72cf2cb0bb69 100644 (file)
--- a/tests/org/cacert/gigi/TestObjectCache.java
+++ b/tests/org/cacert/gigi/TestObjectCache.java
@@ -8,6 +8,9 @@ import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.Locale;
 
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;

diff --git a/tests/org/cacert/gigi/TestSeparateSessionScope.java b/tests/org/cacert/gigi/TestSeparateSessionScope.java
index 961b3e32c5d80dbc6657c27a875d8a0cd29403e2..2da974ad3ad03b089555250bee01b44343d88437 100644 (file)
--- a/tests/org/cacert/gigi/TestSeparateSessionScope.java
+++ b/tests/org/cacert/gigi/TestSeparateSessionScope.java
@@ -11,7 +11,9 @@ import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.sql.SQLException;
 
-import org.cacert.gigi.Certificate.CSRType;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Certificate.CSRType;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java
index 5831da1f9a5310616eaac9df15515ae009cf65fa..9e4a115cc1398158672155e615db44f94467f6f9 100644 (file)
--- a/tests/org/cacert/gigi/TestUser.java
+++ b/tests/org/cacert/gigi/TestUser.java
@@ -3,6 +3,9 @@ package org.cacert.gigi;
 import java.sql.SQLException;
 import java.util.Locale;
 
+import org.cacert.gigi.dbObjects.Domain;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;

diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
index abaa63c961f4236a6ef0bbbc17272558be37003e..4447957521fb8697933b38015c4c05e3dc053b8d 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
+++ b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java
@@ -29,9 +29,9 @@ import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.cacert.gigi.Digest;
-import org.cacert.gigi.User;
 import org.cacert.gigi.crypto.SPKAC;
+import org.cacert.gigi.dbObjects.Digest;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.cacert.gigi.util.PEM;

diff --git a/tests/org/cacert/gigi/pages/account/TestChangePassword.java b/tests/org/cacert/gigi/pages/account/TestChangePassword.java
index 119df79f1e33df23723ef0596dd917b0195fc1c0..21be9c15113f343171ad17b457fc914b72d35ac9 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestChangePassword.java
+++ b/tests/org/cacert/gigi/pages/account/TestChangePassword.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.net.URLEncoder;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/pages/account/TestDomain.java b/tests/org/cacert/gigi/pages/account/TestDomain.java
index 3780366c353144e95109094aa0055778a337f3b4..64cbab78d86a98ef0cd1dfdb940977a995a3b38f 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestDomain.java
+++ b/tests/org/cacert/gigi/pages/account/TestDomain.java
@@ -5,7 +5,7 @@ import static org.junit.Assert.*;
 import java.io.IOException;
 import java.net.URLEncoder;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/pages/account/TestMailManagement.java b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
index 56ae01a0640d72fba4a76f314c492cfdb5f5a577..6b213b45c4026051cc9ead129df1f14f1617023f 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java
+++ b/tests/org/cacert/gigi/pages/account/TestMailManagement.java
@@ -8,9 +8,9 @@ import java.net.MalformedURLException;
 import java.net.URLEncoder;
 import java.util.Locale;
 
-import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;

diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
index 7aa33290ff1d60918fb0baae3944f41cdc8a927b..19d5c7451de0ee890d14160c410c620d95888f18 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
@@ -7,7 +7,7 @@ import java.sql.Date;
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java
index 9b0e928d424eaf88e15adf262f0a35af62cd76df..04b5a6468020dc983ed5b90973df29020036f386 100644 (file)
--- a/tests/org/cacert/gigi/ping/TestSSL.java
+++ b/tests/org/cacert/gigi/ping/TestSSL.java
@@ -27,10 +27,10 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
 
-import org.cacert.gigi.Certificate;
-import org.cacert.gigi.CertificateProfile;
-import org.cacert.gigi.Certificate.CSRType;
 import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Certificate.CSRType;
 import org.cacert.gigi.pages.account.DomainOverview;
 import org.cacert.gigi.testUtils.IOUtils;
 import org.cacert.gigi.testUtils.PingTest;

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index df19e0cff3680139f8060a2421abf743bda2ffb4..ab3bfc2344f25973f51b802fed61f650f0c88a30 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -45,10 +45,10 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509KeyManager;
 
 import org.cacert.gigi.DevelLauncher;
-import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.main.RegisterPage;

diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java
index 9797a03eea4016a74dd756bac81bd0f7d58abd52..5191b07d2109d808e815a7d37e6b706a3409ddcc 100644 (file)
--- a/tests/org/cacert/gigi/util/TestNotary.java
+++ b/tests/org/cacert/gigi/util/TestNotary.java
@@ -3,8 +3,8 @@ package org.cacert.gigi.util;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.cacert.gigi.util.Notary.AssuranceResult;
 import org.junit.Test;

diff --git a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java
index e6cac695d91874d4d1fc62d83f4555fc1b578d74..5aedb1bf61eddda700ad2e807b1824a102cbf2bd 100644 (file)
--- a/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java
+++ b/tests/org/cacert/gigi/util/TestPasswordStrengthChecker.java
@@ -1,7 +1,8 @@
 package org.cacert.gigi.util;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class TestPasswordStrengthChecker {

diff --git a/util/org/cacert/gigi/util/SimpleSigner.java b/util/org/cacert/gigi/util/SimpleSigner.java
index ebc5db85f30333a98c2b04fdc52e2ddce58252c1..3b2a40fdf87cbd0c3d258d8c6a92430cb74d7403 100644 (file)
--- a/util/org/cacert/gigi/util/SimpleSigner.java
+++ b/util/org/cacert/gigi/util/SimpleSigner.java
@@ -23,8 +23,8 @@ import java.util.Calendar;
 import java.util.Properties;
 import java.util.TimeZone;
 
-import org.cacert.gigi.Certificate.CSRType;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.Certificate.CSRType;
 import org.cacert.gigi.output.DateSelector;
 
 public class SimpleSigner {