Move email/certs/mail to their own packages

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 7732f72553bc57fdb85d837b829279c12096cd90..c40ee4188029918c85528acd370079d4b5a3b662 100644 (file)
--- 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 3b076d416f86fe7ddc8d4fdc996a1854aeb767f3..317c6709ac6240363c5ed8775807801b700441e2 100644 (file)
--- 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 80eb67a7429e4185665d376fdecfed19d6979882..9d48b712be8ab176644bbab06722f9bec5408863 100644 (file)
--- 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 74848f24662ca5f51d2e37a21e3dfd07b28b7045..423ec72dd9cdad9d3c29259ea26373c4529460ad 100644 (file)
--- 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 b220dca347e95a5505d84b0aaa0b319a59e7bf84..7c198b726f2a39ac9cfc85d2bd3004226bb98b81 100644 (file)
--- 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 e6446642d5b1161eaec671662b8b5d320532612f..6965382fa7b54409c58934779d1820154ad99906 100644 (file)
--- 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 4d5439d01a6c80ebc592f113e50e604263b3f484..609a1184d17053f0cb6866afce1f2fcf49ec31a9 100644 (file)
--- 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 d91eb6d9683f112c60a3b0d8eb2c2bb9568fffc4..38be5d98c93550c30a672772c7872193c5a87117 100644 (file)
--- 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 51523cbb7090631e22d7fb359977cb8f4be7cde4..dd8444e6738a436681945c9e120bbc08e0c21e03 100644 (file)
--- 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 ad3344121f654466a035e4b7d7abfc1547698a9d..278892aae62fb422890b20da01931935620310b2 100644 (file)
--- 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 1bee5d2327ae7e2523d8f479d0bd9187a8fa65c8..4a6fcaefc280356361a65c03adf303ea28646a5c 100644 (file)
--- 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 6b9000c85d9977faa2b712986fd58e8082cf9f64..b875ded430123537b79c74d727047832a5d9cba1 100644 (file)
--- 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 4447957521fb8697933b38015c4c05e3dc053b8d..9adf7e73fdfa6e7289615c925fc1d4df6f1740ba 100644 (file)
--- 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 64cbab78d86a98ef0cd1dfdb940977a995a3b38f..0b82a56ba78f9c85223a7c8f26f453b1c585e383 100644 (file)
--- 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 9c8ce391eb905dfffb4acea727ab07e19818c468..190dd5a0237e4ba98d1751ba7ff9e99f7747a456 100644 (file)
--- 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 6cb97d7da083ae061d646147112c65265e14eeba..606efa29073f5c0e3afcf9a7d75c8b4827ae4314 100644 (file)
--- 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 d6718241f33479b1a3d8b1de414d3f50a2029ebd..ef780befe4b4158369558fd0ee531e67b9fb5db7 100644 (file)
--- 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 04b5a6468020dc983ed5b90973df29020036f386..2727fe05b4ede43d998f5f5d7a1814a4d2f7f43f 100644 (file)
--- 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 b8c0d9105211bae9b4c699601f803df84d213959..9007ec25811b5d4044bf3220a6ad95fecc35a480 100644 (file)
--- 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 {