upd: remove directory listing information

[gigi.git] / src / org / cacert / gigi / Gigi.java

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index b6cb3d7fe5f161b24d9bbd4b05c73fd3b080581f..37d0e62a0b6cdda673ecf668f9bf806d5353b115 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -23,7 +23,7 @@ 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;
+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;
@@ -64,11 +64,11 @@ 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.wot.AssurePage;
-import org.cacert.gigi.pages.wot.MyListingPage;
 import org.cacert.gigi.pages.wot.MyPoints;
 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.ServerConstants;
 
 public final class Gigi extends HttpServlet {
@@ -140,7 +140,6 @@ public final class Gigi extends HttpServlet {
 
             putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust");
             putPage(MyPoints.PATH, new MyPoints(), "Web of Trust");
-            putPage(MyListingPage.PATH, new MyListingPage(), "Web of Trust");
             putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
 
             putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
@@ -235,6 +234,7 @@ public final class Gigi extends HttpServlet {
             }
             testing = conf.getProperty("testing") != null;
             instance = this;
+            DomainAssessment.init(conf);
             DatabaseConnection.init(conf);
             this.truststore = truststore;
             pinger = new PingerDaemon(truststore);
@@ -252,7 +252,7 @@ public final class Gigi extends HttpServlet {
         try (Link l = DatabaseConnection.newLink(false)) {
             CACertificate.getById(1);
             CertificateProfile.getById(1);
-            CATS.getID(CATS.ASSURER_CHALLENGE_NAME);
+            CATSType.ASSURER_CHALLENGE.getDisplayName();
         } catch (InterruptedException e) {
             throw new Error(e);
         }