From b1092da65fd373d945343e01dd8975ec3b84db0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Mon, 8 Sep 2014 21:31:05 +0200 Subject: [PATCH] Move email/certs/mail to their own packages --- src/org/cacert/gigi/Gigi.java | 8 ++++---- .../gigi/pages/account/{ => certs}/CertificateAdd.java | 2 +- .../pages/account/{ => certs}/CertificateDisplay.templ | 0 .../pages/account/{ => certs}/CertificateIssueForm.java | 2 +- .../pages/account/{ => certs}/CertificateIssueForm.templ | 0 .../gigi/pages/account/{ => certs}/Certificates.java | 2 +- .../pages/account/{ => certs}/RequestCertificate.templ | 0 .../gigi/pages/account/{ => domain}/DomainAddForm.java | 2 +- .../gigi/pages/account/{ => domain}/DomainAddForm.templ | 0 .../pages/account/{ => domain}/DomainManagementForm.java | 2 +- .../pages/account/{ => domain}/DomainManagementForm.templ | 0 .../gigi/pages/account/{ => domain}/DomainOverview.java | 3 ++- .../gigi/pages/account/{ => domain}/DomainOverview.templ | 0 .../pages/account/{ => domain}/DomainPinglogForm.java | 2 +- .../pages/account/{ => domain}/DomainPinglogForm.templ | 0 .../gigi/pages/account/{ => domain}/PingconfigForm.java | 2 +- .../gigi/pages/account/{ => domain}/PingconfigForm.templ | 0 .../cacert/gigi/pages/account/{ => mail}/MailAddForm.java | 3 ++- .../gigi/pages/account/{ => mail}/MailAddForm.templ | 0 .../gigi/pages/account/{ => mail}/MailManagementForm.java | 3 ++- .../pages/account/{ => mail}/MailManagementForm.templ | 0 .../gigi/pages/account/{ => mail}/MailOverview.java | 2 +- .../gigi/pages/account/{ => mail}/MailOverview.templ | 0 .../org/cacert/gigi/pages/account/TestCertificateAdd.java | 2 ++ tests/org/cacert/gigi/pages/account/TestDomain.java | 1 + .../org/cacert/gigi/pages/account/TestMailManagement.java | 1 + tests/org/cacert/gigi/ping/TestDNS.java | 2 +- tests/org/cacert/gigi/ping/TestHTTP.java | 2 +- tests/org/cacert/gigi/ping/TestSSL.java | 2 +- tests/org/cacert/gigi/testUtils/PingTest.java | 2 +- 30 files changed, 26 insertions(+), 19 deletions(-) rename src/org/cacert/gigi/pages/account/{ => certs}/CertificateAdd.java (96%) rename src/org/cacert/gigi/pages/account/{ => certs}/CertificateDisplay.templ (100%) rename src/org/cacert/gigi/pages/account/{ => certs}/CertificateIssueForm.java (99%) rename src/org/cacert/gigi/pages/account/{ => certs}/CertificateIssueForm.templ (100%) rename src/org/cacert/gigi/pages/account/{ => certs}/Certificates.java (98%) rename src/org/cacert/gigi/pages/account/{ => certs}/RequestCertificate.templ (100%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainAddForm.java (97%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainAddForm.templ (100%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainManagementForm.java (98%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainManagementForm.templ (100%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainOverview.java (98%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainOverview.templ (100%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainPinglogForm.java (98%) rename src/org/cacert/gigi/pages/account/{ => domain}/DomainPinglogForm.templ (100%) rename src/org/cacert/gigi/pages/account/{ => domain}/PingconfigForm.java (99%) rename src/org/cacert/gigi/pages/account/{ => domain}/PingconfigForm.templ (100%) rename src/org/cacert/gigi/pages/account/{ => mail}/MailAddForm.java (92%) rename src/org/cacert/gigi/pages/account/{ => mail}/MailAddForm.templ (100%) rename src/org/cacert/gigi/pages/account/{ => mail}/MailManagementForm.java (97%) rename src/org/cacert/gigi/pages/account/{ => mail}/MailManagementForm.templ (100%) rename src/org/cacert/gigi/pages/account/{ => mail}/MailOverview.java (97%) rename src/org/cacert/gigi/pages/account/{ => mail}/MailOverview.templ (100%) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 7732f725..c40ee418 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -36,12 +36,12 @@ import org.cacert.gigi.pages.RootCertPage; import org.cacert.gigi.pages.StaticPage; import org.cacert.gigi.pages.TestSecure; import org.cacert.gigi.pages.Verify; -import org.cacert.gigi.pages.account.CertificateAdd; -import org.cacert.gigi.pages.account.Certificates; import org.cacert.gigi.pages.account.ChangePasswordPage; -import org.cacert.gigi.pages.account.DomainOverview; -import org.cacert.gigi.pages.account.MailOverview; import org.cacert.gigi.pages.account.MyDetails; +import org.cacert.gigi.pages.account.certs.CertificateAdd; +import org.cacert.gigi.pages.account.certs.Certificates; +import org.cacert.gigi.pages.account.domain.DomainOverview; +import org.cacert.gigi.pages.account.mail.MailOverview; import org.cacert.gigi.pages.error.PageNotFound; import org.cacert.gigi.pages.main.RegisterPage; import org.cacert.gigi.pages.wot.AssurePage; diff --git a/src/org/cacert/gigi/pages/account/CertificateAdd.java b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java similarity index 96% rename from src/org/cacert/gigi/pages/account/CertificateAdd.java rename to src/org/cacert/gigi/pages/account/certs/CertificateAdd.java index 3b076d41..317c6709 100644 --- a/src/org/cacert/gigi/pages/account/CertificateAdd.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateAdd.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.certs; import java.io.IOException; import java.util.Collections; diff --git a/src/org/cacert/gigi/pages/account/CertificateDisplay.templ b/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/CertificateDisplay.templ rename to src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java similarity index 99% rename from src/org/cacert/gigi/pages/account/CertificateIssueForm.java rename to src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java index 80eb67a7..9d48b712 100644 --- a/src/org/cacert/gigi/pages/account/CertificateIssueForm.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.certs; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/CertificateIssueForm.templ rename to src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ diff --git a/src/org/cacert/gigi/pages/account/Certificates.java b/src/org/cacert/gigi/pages/account/certs/Certificates.java similarity index 98% rename from src/org/cacert/gigi/pages/account/Certificates.java rename to src/org/cacert/gigi/pages/account/certs/Certificates.java index 74848f24..423ec72d 100644 --- a/src/org/cacert/gigi/pages/account/Certificates.java +++ b/src/org/cacert/gigi/pages/account/certs/Certificates.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.certs; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/org/cacert/gigi/pages/account/RequestCertificate.templ b/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/RequestCertificate.templ rename to src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ diff --git a/src/org/cacert/gigi/pages/account/DomainAddForm.java b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java similarity index 97% rename from src/org/cacert/gigi/pages/account/DomainAddForm.java rename to src/org/cacert/gigi/pages/account/domain/DomainAddForm.java index b220dca3..7c198b72 100644 --- a/src/org/cacert/gigi/pages/account/DomainAddForm.java +++ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Map; diff --git a/src/org/cacert/gigi/pages/account/DomainAddForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/DomainAddForm.templ rename to src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ diff --git a/src/org/cacert/gigi/pages/account/DomainManagementForm.java b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java similarity index 98% rename from src/org/cacert/gigi/pages/account/DomainManagementForm.java rename to src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java index e6446642..6965382f 100644 --- a/src/org/cacert/gigi/pages/account/DomainManagementForm.java +++ b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Map; diff --git a/src/org/cacert/gigi/pages/account/DomainManagementForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/DomainManagementForm.templ rename to src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ diff --git a/src/org/cacert/gigi/pages/account/DomainOverview.java b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java similarity index 98% rename from src/org/cacert/gigi/pages/account/DomainOverview.java rename to src/org/cacert/gigi/pages/account/domain/DomainOverview.java index 4d5439d0..609a1184 100644 --- a/src/org/cacert/gigi/pages/account/DomainOverview.java +++ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.java @@ -1,7 +1,8 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.domain; import java.io.IOException; import java.util.HashMap; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/org/cacert/gigi/pages/account/DomainOverview.templ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/DomainOverview.templ rename to src/org/cacert/gigi/pages/account/domain/DomainOverview.templ diff --git a/src/org/cacert/gigi/pages/account/DomainPinglogForm.java b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java similarity index 98% rename from src/org/cacert/gigi/pages/account/DomainPinglogForm.java rename to src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java index d91eb6d9..38be5d98 100644 --- a/src/org/cacert/gigi/pages/account/DomainPinglogForm.java +++ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Map; diff --git a/src/org/cacert/gigi/pages/account/DomainPinglogForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/DomainPinglogForm.templ rename to src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ diff --git a/src/org/cacert/gigi/pages/account/PingconfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingconfigForm.java similarity index 99% rename from src/org/cacert/gigi/pages/account/PingconfigForm.java rename to src/org/cacert/gigi/pages/account/domain/PingconfigForm.java index 51523cbb..dd8444e6 100644 --- a/src/org/cacert/gigi/pages/account/PingconfigForm.java +++ b/src/org/cacert/gigi/pages/account/domain/PingconfigForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.domain; import java.io.PrintWriter; import java.util.Arrays; diff --git a/src/org/cacert/gigi/pages/account/PingconfigForm.templ b/src/org/cacert/gigi/pages/account/domain/PingconfigForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/PingconfigForm.templ rename to src/org/cacert/gigi/pages/account/domain/PingconfigForm.templ diff --git a/src/org/cacert/gigi/pages/account/MailAddForm.java b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java similarity index 92% rename from src/org/cacert/gigi/pages/account/MailAddForm.java rename to src/org/cacert/gigi/pages/account/mail/MailAddForm.java index ad334412..278892aa 100644 --- a/src/org/cacert/gigi/pages/account/MailAddForm.java +++ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.mail; import java.io.PrintWriter; import java.util.Map; @@ -11,6 +11,7 @@ import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.Form; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.pages.account.ChangePasswordPage; public class MailAddForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/MailAddForm.templ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MailAddForm.templ rename to src/org/cacert/gigi/pages/account/mail/MailAddForm.templ diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java similarity index 97% rename from src/org/cacert/gigi/pages/account/MailManagementForm.java rename to src/org/cacert/gigi/pages/account/mail/MailManagementForm.java index 1bee5d23..4a6fcaef 100644 --- a/src/org/cacert/gigi/pages/account/MailManagementForm.java +++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.mail; import java.io.PrintWriter; import java.util.Map; @@ -13,6 +13,7 @@ import org.cacert.gigi.output.Form; import org.cacert.gigi.output.template.IterableDataset; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.pages.account.ChangePasswordPage; public class MailManagementForm extends Form { diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.templ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MailManagementForm.templ rename to src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/mail/MailOverview.java similarity index 97% rename from src/org/cacert/gigi/pages/account/MailOverview.java rename to src/org/cacert/gigi/pages/account/mail/MailOverview.java index 6b9000c8..b875ded4 100644 --- a/src/org/cacert/gigi/pages/account/MailOverview.java +++ b/src/org/cacert/gigi/pages/account/mail/MailOverview.java @@ -1,4 +1,4 @@ -package org.cacert.gigi.pages.account; +package org.cacert.gigi.pages.account.mail; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/org/cacert/gigi/pages/account/MailOverview.templ b/src/org/cacert/gigi/pages/account/mail/MailOverview.templ similarity index 100% rename from src/org/cacert/gigi/pages/account/MailOverview.templ rename to src/org/cacert/gigi/pages/account/mail/MailOverview.templ diff --git a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java index 44479575..9adf7e73 100644 --- a/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java +++ b/tests/org/cacert/gigi/pages/account/TestCertificateAdd.java @@ -32,6 +32,8 @@ import java.util.regex.Pattern; import org.cacert.gigi.crypto.SPKAC; import org.cacert.gigi.dbObjects.Digest; import org.cacert.gigi.dbObjects.User; +import org.cacert.gigi.pages.account.certs.CertificateAdd; +import org.cacert.gigi.pages.account.certs.CertificateIssueForm; 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/TestDomain.java b/tests/org/cacert/gigi/pages/account/TestDomain.java index 64cbab78..0b82a56b 100644 --- a/tests/org/cacert/gigi/pages/account/TestDomain.java +++ b/tests/org/cacert/gigi/pages/account/TestDomain.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.net.URLEncoder; import org.cacert.gigi.dbObjects.User; +import org.cacert.gigi.pages.account.domain.DomainOverview; 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 9c8ce391..190dd5a0 100644 --- a/tests/org/cacert/gigi/pages/account/TestMailManagement.java +++ b/tests/org/cacert/gigi/pages/account/TestMailManagement.java @@ -13,6 +13,7 @@ import org.cacert.gigi.dbObjects.EmailAddress; import org.cacert.gigi.dbObjects.ObjectCache; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; +import org.cacert.gigi.pages.account.mail.MailOverview; import org.cacert.gigi.testUtils.ManagedTest; import org.junit.Test; diff --git a/tests/org/cacert/gigi/ping/TestDNS.java b/tests/org/cacert/gigi/ping/TestDNS.java index 6cb97d7d..606efa29 100644 --- a/tests/org/cacert/gigi/ping/TestDNS.java +++ b/tests/org/cacert/gigi/ping/TestDNS.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; import javax.naming.NamingException; -import org.cacert.gigi.pages.account.DomainOverview; +import org.cacert.gigi.pages.account.domain.DomainOverview; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.PingTest; import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; diff --git a/tests/org/cacert/gigi/ping/TestHTTP.java b/tests/org/cacert/gigi/ping/TestHTTP.java index d6718241..ef780bef 100644 --- a/tests/org/cacert/gigi/ping/TestHTTP.java +++ b/tests/org/cacert/gigi/ping/TestHTTP.java @@ -12,7 +12,7 @@ import java.util.regex.Pattern; import javax.naming.NamingException; -import org.cacert.gigi.pages.account.DomainOverview; +import org.cacert.gigi.pages.account.domain.DomainOverview; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.PingTest; import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; diff --git a/tests/org/cacert/gigi/ping/TestSSL.java b/tests/org/cacert/gigi/ping/TestSSL.java index 04b5a646..2727fe05 100644 --- a/tests/org/cacert/gigi/ping/TestSSL.java +++ b/tests/org/cacert/gigi/ping/TestSSL.java @@ -31,7 +31,7 @@ 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.pages.account.domain.DomainOverview; import org.cacert.gigi.testUtils.IOUtils; import org.cacert.gigi.testUtils.PingTest; import org.cacert.gigi.testUtils.TestEmailReciever.TestMail; diff --git a/tests/org/cacert/gigi/testUtils/PingTest.java b/tests/org/cacert/gigi/testUtils/PingTest.java index b8c0d910..9007ec25 100644 --- a/tests/org/cacert/gigi/testUtils/PingTest.java +++ b/tests/org/cacert/gigi/testUtils/PingTest.java @@ -14,7 +14,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.cacert.gigi.database.DatabaseConnection; -import org.cacert.gigi.pages.account.DomainOverview; +import org.cacert.gigi.pages.account.domain.DomainOverview; import org.junit.Before; public abstract class PingTest extends ClientTest { -- 2.39.2