X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=f013468e06d61d74a6bc718b833585b9ccfa678c;hp=3f3cb95496c95477021dfff51a0d6fe36b878132;hb=7d12c09641a69f141b92d9914d0915d62a436a2d;hpb=1ecbdec666838439ce8ce68115da3a6dea41223b diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 3f3cb954..f013468e 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -37,6 +37,7 @@ import org.cacert.gigi.pages.error.PageNotFound; import org.cacert.gigi.pages.main.RegisterPage; import org.cacert.gigi.pages.wot.AssurePage; import org.cacert.gigi.pages.wot.MyPoints; +import org.cacert.gigi.ping.PingerDaemon; import org.cacert.gigi.util.ServerConstants; public class Gigi extends HttpServlet { @@ -61,20 +62,23 @@ public class Gigi extends HttpServlet { private static Gigi instance; + private PingerDaemon pinger = new PingerDaemon(); + public Gigi(Properties conf) { if (instance != null) { new IllegalStateException("Multiple Gigi instances!"); } instance = this; DatabaseConnection.init(conf); + pinger.start(); } @Override public void init() throws ServletException { if ( !firstInstanceInited) { putPage("/error", new PageNotFound(), null); - putPage("/login", new LoginPage("CACert - Login"), "Join CAcert.org"); - putPage("/", new MainPage("CACert - Home"), null); + putPage("/login", new LoginPage("CAcert - Login"), "Join CAcert.org"); + putPage("/", new MainPage("CAcert - Home"), null); putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account"); putPage("/secure", new TestSecure(), null); putPage(Verify.PATH, new Verify(), null); @@ -84,7 +88,7 @@ public class Gigi extends HttpServlet { putPage(RegisterPage.PATH, new RegisterPage(), "Join CAcert.org"); putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates"); putPage(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"), "Certificates"); - putPage(DomainOverview.PATH, new DomainOverview("Domains"), "Certificates"); + putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates"); putPage(MyPoints.PATH, new MyPoints("My Points"), "CAcert Web of Trust"); putPage("/wot/rules", new StaticPage("CAcert Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "CAcert Web of Trust"); baseTemplate = new Template(Gigi.class.getResource("Gigi.templ"));