From e409ba881965634f63f0b67824bc93dda4ec4327 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 4 Sep 2014 14:26:09 +0200 Subject: [PATCH] Move the "dbObject"s to their own package. --- src/org/cacert/gigi/Gigi.java | 1 + src/org/cacert/gigi/PermissionCheckable.java | 2 ++ src/org/cacert/gigi/{ => dbObjects}/Assurance.java | 2 +- .../cacert/gigi/{ => dbObjects}/Certificate.java | 3 ++- .../gigi/{ => dbObjects}/CertificateProfile.java | 2 +- src/org/cacert/gigi/{ => dbObjects}/Digest.java | 2 +- src/org/cacert/gigi/{ => dbObjects}/Domain.java | 3 ++- .../cacert/gigi/{ => dbObjects}/EmailAddress.java | 3 ++- .../cacert/gigi/{ => dbObjects}/IdCachable.java | 2 +- src/org/cacert/gigi/{ => dbObjects}/Name.java | 2 +- .../cacert/gigi/{ => dbObjects}/ObjectCache.java | 2 +- src/org/cacert/gigi/{ => dbObjects}/User.java | 3 ++- src/org/cacert/gigi/output/AssurancesDisplay.java | 2 +- .../cacert/gigi/output/CertificateIterable.java | 2 +- src/org/cacert/gigi/output/Menu.java | 2 +- src/org/cacert/gigi/output/PageMenuItem.java | 2 +- src/org/cacert/gigi/output/SimpleMenuItem.java | 2 +- .../gigi/output/template/HashAlgorithms.java | 2 +- src/org/cacert/gigi/pages/LoginPage.java | 2 +- src/org/cacert/gigi/pages/LogoutPage.java | 2 +- src/org/cacert/gigi/pages/Page.java | 2 +- src/org/cacert/gigi/pages/Verify.java | 4 ++-- .../cacert/gigi/pages/account/CertificateAdd.java | 2 +- .../gigi/pages/account/CertificateIssueForm.java | 14 +++++++------- .../cacert/gigi/pages/account/Certificates.java | 4 ++-- src/org/cacert/gigi/pages/account/ChangeForm.java | 2 +- .../cacert/gigi/pages/account/DomainAddForm.java | 4 ++-- .../gigi/pages/account/DomainManagementForm.java | 4 ++-- .../cacert/gigi/pages/account/DomainOverview.java | 4 ++-- src/org/cacert/gigi/pages/account/MailAddForm.java | 4 ++-- .../gigi/pages/account/MailManagementForm.java | 4 ++-- .../cacert/gigi/pages/account/MailOverview.java | 2 +- .../cacert/gigi/pages/account/MyDetailsForm.java | 2 +- .../cacert/gigi/pages/account/MyListingForm.java | 2 +- src/org/cacert/gigi/pages/main/RegisterPage.java | 2 +- src/org/cacert/gigi/pages/main/Signup.java | 4 ++-- src/org/cacert/gigi/pages/wot/AssuranceForm.java | 2 +- src/org/cacert/gigi/pages/wot/AssurePage.java | 2 +- src/org/cacert/gigi/pages/wot/MyPoints.java | 2 +- src/org/cacert/gigi/ping/DNSPinger.java | 4 ++-- src/org/cacert/gigi/ping/DomainPinger.java | 4 ++-- src/org/cacert/gigi/ping/EmailPinger.java | 4 ++-- src/org/cacert/gigi/ping/HTTPFetch.java | 4 ++-- src/org/cacert/gigi/ping/PingerDaemon.java | 5 +++-- src/org/cacert/gigi/ping/SSLPinger.java | 6 +++--- src/org/cacert/gigi/util/Job.java | 2 +- src/org/cacert/gigi/util/Notary.java | 2 +- .../cacert/gigi/util/PasswordStrengthChecker.java | 2 +- tests/org/cacert/gigi/TestCertificate.java | 10 ++++++---- tests/org/cacert/gigi/TestDomain.java | 2 ++ tests/org/cacert/gigi/TestLanguage.java | 1 + tests/org/cacert/gigi/TestObjectCache.java | 3 +++ .../org/cacert/gigi/TestSeparateSessionScope.java | 4 +++- tests/org/cacert/gigi/TestUser.java | 3 +++ .../gigi/pages/account/TestCertificateAdd.java | 4 ++-- .../gigi/pages/account/TestChangePassword.java | 2 +- .../org/cacert/gigi/pages/account/TestDomain.java | 2 +- .../gigi/pages/account/TestMailManagement.java | 4 ++-- .../gigi/pages/account/TestMyDetailsEdit.java | 2 +- tests/org/cacert/gigi/ping/TestSSL.java | 6 +++--- tests/org/cacert/gigi/testUtils/ManagedTest.java | 4 ++-- tests/org/cacert/gigi/util/TestNotary.java | 2 +- .../gigi/util/TestPasswordStrengthChecker.java | 3 ++- util/org/cacert/gigi/util/SimpleSigner.java | 2 +- 64 files changed, 109 insertions(+), 87 deletions(-) rename src/org/cacert/gigi/{ => dbObjects}/Assurance.java (96%) rename src/org/cacert/gigi/{ => dbObjects}/Certificate.java (99%) rename src/org/cacert/gigi/{ => dbObjects}/CertificateProfile.java (97%) rename src/org/cacert/gigi/{ => dbObjects}/Digest.java (94%) rename src/org/cacert/gigi/{ => dbObjects}/Domain.java (98%) rename src/org/cacert/gigi/{ => dbObjects}/EmailAddress.java (98%) rename src/org/cacert/gigi/{ => dbObjects}/IdCachable.java (62%) rename src/org/cacert/gigi/{ => dbObjects}/Name.java (98%) rename src/org/cacert/gigi/{ => dbObjects}/ObjectCache.java (92%) rename src/org/cacert/gigi/{ => dbObjects}/User.java (99%) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 9b3023b2..2a67dd96 100644 --- 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 a40c5acb..7dee6fd7 100644 --- 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 973f0ee8..b1c9ccd5 100644 --- 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 8094419b..59d0aded 100644 --- 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 845fa6ac..e771cd12 100644 --- 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 8c4644f7..edd8dcad 100644 --- 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 5dbbdaf0..056af154 100644 --- 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 07ebfcc9..f0ce010f 100644 --- 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 0d218d5d..cc083d25 100644 --- 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 93b361ef..512dc769 100644 --- 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 9d8e9367..5f445422 100644 --- 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 41396ae1..9166b044 100644 --- 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 6338ccce..78973d0a 100644 --- 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 41d046e7..ae359869 100644 --- 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 a57f5317..451cb47a 100644 --- 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 c40493a6..c483509e 100644 --- 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 4ac97c05..cccd3b11 100644 --- 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 ee2a4b14..e221aee3 100644 --- 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 4abe3950..2ece38d6 100644 --- 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 888ad0ef..3d82be78 100644 --- 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 0497dae2..0bd02f78 100644 --- 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 f64c2145..2ebd54c5 100644 --- 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 1e462273..3b076d41 100644 --- 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 ff659225..80eb67a7 100644 --- 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 0293d86a..74848f24 100644 --- 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 f43d62d0..ceaee92e 100644 --- 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 a9de7ce0..65e168c4 100644 --- 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 b3c212ed..e6446642 100644 --- 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 d8868f93..82151771 100644 --- 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 3500faae..f36fa35d 100644 --- 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 204bb927..1bee5d23 100644 --- 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 3261ca8d..6b9000c8 100644 --- 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 147fa950..848f3490 100644 --- 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 6b29aac2..e9fa9602 100644 --- 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 7d3b3e3f..55d44ed7 100644 --- 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 4fca9450..f62161fa 100644 --- 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 3368414a..3df39942 100644 --- 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 3aa41350..3c58b5bc 100644 --- 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 1e61bebe..7bb4ce6c 100644 --- 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 175b26b0..b1053c0e 100644 --- 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 c9b8a9bb..2a14cc1e 100644 --- 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 9dfa2958..449af0aa 100644 --- 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 5450f265..a4671bd2 100644 --- 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 91ddfbb0..4ed4eb4b 100644 --- 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 dc8cdd00..81eabbe9 100644 --- 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 6e502afd..e10a44d8 100644 --- 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 cda4ce5a..46a2c3ad 100644 --- 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 7df2e220..cc0acfa5 100644 --- 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 a1972304..c9ada288 100644 --- 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 936395db..582ecf33 100644 --- 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 f53b0ff9..d73f1fa2 100644 --- 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 d361c16b..525469a6 100644 --- 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 961b3e32..2da974ad 100644 --- 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 5831da1f..9e4a115c 100644 --- 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 abaa63c9..44479575 100644 --- 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 119df79f..21be9c15 100644 --- 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 3780366c..64cbab78 100644 --- 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 56ae01a0..6b213b45 100644 --- 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 7aa33290..19d5c745 100644 --- 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 9b0e928d..04b5a646 100644 --- 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 df19e0cf..ab3bfc23 100644 --- 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 9797a03e..5191b07d 100644 --- 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 e6cac695..5aedb1bf 100644 --- 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 ebc5db85..3b2a40fd 100644 --- 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 { -- 2.39.2