Move mail certificates -> certificates.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 54e1ebfe68b8e48f7631e14354623bd7dc7d90dd..f7a82d6632e95b123398404a088a6f73b7aadc3f 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -27,8 +27,8 @@ import org.cacert.gigi.pages.TestSecure;
 import org.cacert.gigi.pages.Verify;
 import org.cacert.gigi.pages.account.ChangePasswordPage;
 import org.cacert.gigi.pages.account.DomainOverview;
-import org.cacert.gigi.pages.account.MailCertificateAdd;
-import org.cacert.gigi.pages.account.MailCertificates;
+import org.cacert.gigi.pages.account.CertificateAdd;
+import org.cacert.gigi.pages.account.Certificates;
 import org.cacert.gigi.pages.account.MailOverview;
 import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.error.PageNotFound;
@@ -63,11 +63,11 @@ public class Gigi extends HttpServlet {
         pages.put("/secure", new TestSecure());
         pages.put(Verify.PATH, new Verify());
         pages.put(AssurePage.PATH + "/*", new AssurePage());
-        pages.put(MailCertificates.PATH + "/*", new MailCertificates());
+        pages.put(Certificates.PATH + "/*", new Certificates());
         pages.put(MyDetails.PATH, new MyDetails());
         pages.put(ChangePasswordPage.PATH, new ChangePasswordPage());
         pages.put(RegisterPage.PATH, new RegisterPage());
-        pages.put(MailCertificateAdd.PATH, new MailCertificateAdd());
+        pages.put(CertificateAdd.PATH, new CertificateAdd());
         pages.put(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"));
         pages.put(DomainOverview.PATH, new DomainOverview("Domains"));
         baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));

diff --git a/src/org/cacert/gigi/output/CertificateTable.java b/src/org/cacert/gigi/output/CertificateTable.java
index 1b478f0906115d1fd151cc6beb575d3cfb204702..d64fb2578bceb34c03c5f53fda07b65a58a1d48a 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -6,7 +6,7 @@ import java.sql.SQLException;
 import java.util.Map;
 
 import org.cacert.gigi.Language;
-import org.cacert.gigi.pages.account.MailCertificates;
+import org.cacert.gigi.pages.account.Certificates;
 
 public class CertificateTable implements Outputable {
 
@@ -42,7 +42,7 @@ public class CertificateTable implements Outputable {
                 out.print("<tr><td>&nbsp;</td><td>State</td><td>");
                 out.println(rs.getString("CN"));
                 out.print("</td><td><a href='");
-                out.print(MailCertificates.PATH);
+                out.print(Certificates.PATH);
                 out.print("/");
                 out.print(rs.getString("serial"));
                 out.print("'>");

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/CertificateAdd.java
similarity index 67%
rename from src/org/cacert/gigi/pages/account/MailCertificateAdd.java
rename to src/org/cacert/gigi/pages/account/CertificateAdd.java
index 5f281c9b3f0173c610fc63a8563ec4d9a9152b27..1e462273a9edd841a9d6994140b1750a02d6a438 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/CertificateAdd.java
@@ -11,26 +11,26 @@ import org.cacert.gigi.Certificate;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;
 
-public class MailCertificateAdd extends Page {
+public class CertificateAdd extends Page {
 
-    public static final String PATH = "/account/certs/email/new";
+    public static final String PATH = "/account/certs/new";
 
-    public MailCertificateAdd() {
-        super("Create Email certificate");
+    public CertificateAdd() {
+        super("Create certificate");
     }
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        new IssueCertificateForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        new CertificateIssueForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
     }
 
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        IssueCertificateForm f = Form.getForm(req, IssueCertificateForm.class);
+        CertificateIssueForm f = Form.getForm(req, CertificateIssueForm.class);
         if (f.submit(resp.getWriter(), req)) {
             Certificate c = f.getResult();
             String ser = c.getSerial();
-            resp.sendRedirect(MailCertificates.PATH + "/" + ser);
+            resp.sendRedirect(Certificates.PATH + "/" + ser);
         }
         f.output(resp.getWriter(), getLanguage(req), Collections.<String,Object>emptyMap());
 

diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
similarity index 95%
rename from src/org/cacert/gigi/pages/account/IssueCertificateForm.java
rename to src/org/cacert/gigi/pages/account/CertificateIssueForm.java
index 694652f9557953fda2774bac6b036796290e6f8e..225f24deb82766bc45ef7d9b0162d7f4e9ab7dca 100644 (file)
--- a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
+++ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.java
@@ -40,7 +40,7 @@ import sun.security.x509.AlgorithmId;
  * This class represents a form that is used for issuing certificates. This
  * class uses "sun.security" and therefore needs "-XDignore.symbol.file"
  */
-public class IssueCertificateForm extends Form {
+public class CertificateIssueForm extends Form {
 
     User u;
 
@@ -50,13 +50,13 @@ public class IssueCertificateForm extends Form {
 
     String csr;
 
-    private final static Template t = new Template(IssueCertificateForm.class.getResource("IssueCertificateForm.templ"));
+    private final static Template t = new Template(CertificateIssueForm.class.getResource("CertificateIssueForm.templ"));
 
-    private final static Template tIni = new Template(MailCertificateAdd.class.getResource("RequestCertificate.templ"));
+    private final static Template tIni = new Template(CertificateAdd.class.getResource("RequestCertificate.templ"));
 
     String spkacChallenge;
 
-    public IssueCertificateForm(HttpServletRequest hsr) {
+    public CertificateIssueForm(HttpServletRequest hsr) {
         super(hsr);
         u = Page.getUser(hsr);
         spkacChallenge = RandomToken.generateToken(16);

diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.templ b/src/org/cacert/gigi/pages/account/CertificateIssueForm.templ
similarity index 100%
rename from src/org/cacert/gigi/pages/account/IssueCertificateForm.templ
rename to src/org/cacert/gigi/pages/account/CertificateIssueForm.templ

diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/Certificates.java
similarity index 93%
rename from src/org/cacert/gigi/pages/account/MailCertificates.java
rename to src/org/cacert/gigi/pages/account/Certificates.java
index 775f527d993989b27d6653e9eab5bcc50c17cefb..33118008cfc6fc19d2a8cd06840bacc23d4844bc 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificates.java
+++ b/src/org/cacert/gigi/pages/account/Certificates.java
@@ -23,16 +23,16 @@ import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.PEM;
 
-public class MailCertificates extends Page {
+public class Certificates extends Page {
 
     CertificateTable myTable = new CertificateTable("mailcerts");
 
-    Template certDisplay = new Template(MailCertificates.class.getResource("CertificateDisplay.templ"));
+    Template certDisplay = new Template(Certificates.class.getResource("CertificateDisplay.templ"));
 
-    public static final String PATH = "/account/certs/email";
+    public static final String PATH = "/account/certs";
 
-    public MailCertificates() {
-        super("Email Certificates");
+    public Certificates() {
+        super("Certificates");
     }
 
     @Override

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 2518849f92b37ff298b98554d312325ab59715f7..661d3644b003f4352e0d00d45974b22fea29d809 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -45,6 +45,7 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
 import org.cacert.gigi.util.PEM;
@@ -303,7 +304,7 @@ public class ManagedTest {
         return headerField.substring(0, headerField.indexOf(';'));
     }
 
-    public static final String SECURE_REFERENCE = "/account/certs/email";
+    public static final String SECURE_REFERENCE = MyDetails.PATH;
 
     public boolean isLoggedin(String cookie) throws IOException {
         URL u = new URL("https://" + getServerName() + SECURE_REFERENCE);