upd: rename package name and all references to it

[gigi.git] / src / club / wpia / gigi / Gigi.java

diff --git a/src/org/cacert/gigi/Gigi.java b/src/club/wpia/gigi/Gigi.java
similarity index 84%
rename from src/org/cacert/gigi/Gigi.java
rename to src/club/wpia/gigi/Gigi.java
index c7a607940c0684709a511390fc36057593e82a23..f8f931a63f9abd45a1ebfcaf702c673827de60fb 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/club/wpia/gigi/Gigi.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package club.wpia.gigi;

 
 import java.io.IOException;
 import java.io.PrintWriter;
 
 import java.io.IOException;
 import java.io.PrintWriter;


@@ -20,64 +20,64 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 

-import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.database.DatabaseConnection.Link;
-import org.cacert.gigi.dbObjects.CACertificate;
-import org.cacert.gigi.dbObjects.CATS.CATSType;
-import org.cacert.gigi.dbObjects.CertificateProfile;
-import org.cacert.gigi.dbObjects.DomainPingConfiguration;
-import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Menu;
-import org.cacert.gigi.output.MenuCollector;
-import org.cacert.gigi.output.PageMenuItem;
-import org.cacert.gigi.output.SimpleMenuItem;
-import org.cacert.gigi.output.SimpleUntranslatedMenuItem;
-import org.cacert.gigi.output.template.Form.CSRFException;
-import org.cacert.gigi.output.template.Outputable;
-import org.cacert.gigi.output.template.Template;
-import org.cacert.gigi.pages.AboutPage;
-import org.cacert.gigi.pages.HandlesMixedRequest;
-import org.cacert.gigi.pages.LoginPage;
-import org.cacert.gigi.pages.LogoutPage;
-import org.cacert.gigi.pages.MainPage;
-import org.cacert.gigi.pages.OneFormPage;
-import org.cacert.gigi.pages.Page;
-import org.cacert.gigi.pages.PasswordResetPage;
-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.ChangePasswordPage;
-import org.cacert.gigi.pages.account.FindAgentAccess;
-import org.cacert.gigi.pages.account.History;
-import org.cacert.gigi.pages.account.MyDetails;
-import org.cacert.gigi.pages.account.UserTrainings;
-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.domain.EditDomain;
-import org.cacert.gigi.pages.account.mail.MailOverview;
-import org.cacert.gigi.pages.admin.TTPAdminPage;
-import org.cacert.gigi.pages.admin.support.FindCertPage;
-import org.cacert.gigi.pages.admin.support.FindUserByDomainPage;
-import org.cacert.gigi.pages.admin.support.FindUserByEmailPage;
-import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
-import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
-import org.cacert.gigi.pages.error.AccessDenied;
-import org.cacert.gigi.pages.error.PageNotFound;
-import org.cacert.gigi.pages.main.RegisterPage;
-import org.cacert.gigi.pages.orga.CreateOrgPage;
-import org.cacert.gigi.pages.orga.ViewOrgPage;
-import org.cacert.gigi.pages.statistics.StatisticsRoles;
-import org.cacert.gigi.pages.wot.AssurePage;
-import org.cacert.gigi.pages.wot.Points;
-import org.cacert.gigi.pages.wot.RequestTTPPage;
-import org.cacert.gigi.ping.PingerDaemon;
-import org.cacert.gigi.util.AuthorizationContext;
-import org.cacert.gigi.util.DomainAssessment;
-import org.cacert.gigi.util.PasswordHash;
-import org.cacert.gigi.util.ServerConstants;
-import org.cacert.gigi.util.TimeConditions;
+import club.wpia.gigi.database.DatabaseConnection;
+import club.wpia.gigi.database.DatabaseConnection.Link;
+import club.wpia.gigi.dbObjects.CACertificate;
+import club.wpia.gigi.dbObjects.CATS.CATSType;
+import club.wpia.gigi.dbObjects.CertificateProfile;
+import club.wpia.gigi.dbObjects.DomainPingConfiguration;
+import club.wpia.gigi.localisation.Language;
+import club.wpia.gigi.output.Menu;
+import club.wpia.gigi.output.MenuCollector;
+import club.wpia.gigi.output.PageMenuItem;
+import club.wpia.gigi.output.SimpleMenuItem;
+import club.wpia.gigi.output.SimpleUntranslatedMenuItem;
+import club.wpia.gigi.output.template.Form.CSRFException;
+import club.wpia.gigi.output.template.Outputable;
+import club.wpia.gigi.output.template.Template;
+import club.wpia.gigi.pages.AboutPage;
+import club.wpia.gigi.pages.HandlesMixedRequest;
+import club.wpia.gigi.pages.LoginPage;
+import club.wpia.gigi.pages.LogoutPage;
+import club.wpia.gigi.pages.MainPage;
+import club.wpia.gigi.pages.OneFormPage;
+import club.wpia.gigi.pages.Page;
+import club.wpia.gigi.pages.PasswordResetPage;
+import club.wpia.gigi.pages.RootCertPage;
+import club.wpia.gigi.pages.StaticPage;
+import club.wpia.gigi.pages.TestSecure;
+import club.wpia.gigi.pages.Verify;
+import club.wpia.gigi.pages.account.ChangePasswordPage;
+import club.wpia.gigi.pages.account.FindAgentAccess;
+import club.wpia.gigi.pages.account.History;
+import club.wpia.gigi.pages.account.MyDetails;
+import club.wpia.gigi.pages.account.UserTrainings;
+import club.wpia.gigi.pages.account.certs.CertificateAdd;
+import club.wpia.gigi.pages.account.certs.Certificates;
+import club.wpia.gigi.pages.account.domain.DomainOverview;
+import club.wpia.gigi.pages.account.domain.EditDomain;
+import club.wpia.gigi.pages.account.mail.MailOverview;
+import club.wpia.gigi.pages.admin.TTPAdminPage;
+import club.wpia.gigi.pages.admin.support.FindCertPage;
+import club.wpia.gigi.pages.admin.support.FindUserByDomainPage;
+import club.wpia.gigi.pages.admin.support.FindUserByEmailPage;
+import club.wpia.gigi.pages.admin.support.SupportEnterTicketPage;
+import club.wpia.gigi.pages.admin.support.SupportUserDetailsPage;
+import club.wpia.gigi.pages.error.AccessDenied;
+import club.wpia.gigi.pages.error.PageNotFound;
+import club.wpia.gigi.pages.main.RegisterPage;
+import club.wpia.gigi.pages.orga.CreateOrgPage;
+import club.wpia.gigi.pages.orga.ViewOrgPage;
+import club.wpia.gigi.pages.statistics.StatisticsRoles;
+import club.wpia.gigi.pages.wot.AssurePage;
+import club.wpia.gigi.pages.wot.Points;
+import club.wpia.gigi.pages.wot.RequestTTPPage;
+import club.wpia.gigi.ping.PingerDaemon;
+import club.wpia.gigi.util.AuthorizationContext;
+import club.wpia.gigi.util.DomainAssessment;
+import club.wpia.gigi.util.PasswordHash;
+import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.TimeConditions;

 
 public final class Gigi extends HttpServlet {
 
 
 public final class Gigi extends HttpServlet {
 


@@ -177,7 +177,7 @@ public final class Gigi extends HttpServlet {
 
             if (testing) {
                 try {
 
             if (testing) {
                 try {

-                    Class<?> manager = Class.forName("org.cacert.gigi.pages.Manager");
+                    Class<?> manager = Class.forName("club.wpia.gigi.pages.Manager");

                     Page p = (Page) manager.getMethod("getInstance").invoke(null);
                     String pa = (String) manager.getField("PATH").get(null);
                     putPage(pa + "/*", p, "Gigi test server");
                     Page p = (Page) manager.getMethod("getInstance").invoke(null);
                     String pa = (String) manager.getField("PATH").get(null);
                     putPage(pa + "/*", p, "Gigi test server");


@@ -218,19 +218,19 @@ public final class Gigi extends HttpServlet {
 
     public static final String LOGGEDIN = "loggedin";
 
 
     public static final String LOGGEDIN = "loggedin";
 

-    public static final String CERT_SERIAL = "org.cacert.gigi.serial";
+    public static final String CERT_SERIAL = "club.wpia.gigi.serial";

 
 

-    public static final String CERT_ISSUER = "org.cacert.gigi.issuer";
+    public static final String CERT_ISSUER = "club.wpia.gigi.issuer";

 
     public static final String AUTH_CONTEXT = "auth";
 
 
     public static final String AUTH_CONTEXT = "auth";
 

-    public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod";
+    public static final String LOGIN_METHOD = "club.wpia.gigi.loginMethod";

 
     private static final long serialVersionUID = -6386785421902852904L;
 
     private static Gigi instance;
 
 
     private static final long serialVersionUID = -6386785421902852904L;
 
     private static Gigi instance;
 

-    private static final Template baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));;
+    private static final Template baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));

 
     private PingerDaemon pinger;
 
 
     private PingerDaemon pinger;
 


@@ -463,7 +463,7 @@ public final class Gigi extends HttpServlet {
         csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePortSecure() + " https://" + ServerConstants.getWwwHostNamePortSecure());
         csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePortSecure() + " https://" + ServerConstants.getWwwHostNamePortSecure());

-        // csp.append(";report-url https://api.cacert.org/security/csp/report");
+        // csp.append(";report-url https://api.wpia.club/security/csp/report");

         return csp.toString();
     }
 
         return csp.toString();
     }
 


@@ -476,7 +476,7 @@ public final class Gigi extends HttpServlet {
         csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePortSecure() + " https://" + ServerConstants.getWwwHostNamePort());
         csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";style-src http://" + ServerConstants.getStaticHostNamePort());
         csp.append(";form-action https://" + ServerConstants.getSecureHostNamePortSecure() + " https://" + ServerConstants.getWwwHostNamePort());

-        // csp.append(";report-url http://api.cacert.org/security/csp/report");
+        // csp.append(";report-url http://api.wpia.club/security/csp/report");

         return csp.toString();
     }
 
         return csp.toString();
     }