upd: replace SomeCA by variable

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

diff --git a/src/club/wpia/gigi/Launcher.java b/src/club/wpia/gigi/Launcher.java
index a1cd26938edf91818e58e3ea14ff0c9c3ec09d71..b4ae8e2ae007168cdea9affa4c3fd5e4e0a538a4 100644 (file)
--- a/src/club/wpia/gigi/Launcher.java
+++ b/src/club/wpia/gigi/Launcher.java
@@ -61,6 +61,7 @@ import club.wpia.gigi.natives.SetUID;
 import club.wpia.gigi.util.CipherInfo;
 import club.wpia.gigi.util.PEM;
 import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 
 public class Launcher {
 
@@ -246,13 +247,13 @@ public class Launcher {
                             if (sniServerName instanceof SNIHostName) {
                                 SNIHostName host = (SNIHostName) sniServerName;
                                 String hostname = host.getAsciiName();
-                                if (hostname.equals(ServerConstants.getWwwHostName())) {
+                                if (hostname.equals(ServerConstants.getHostName(Host.WWW))) {
                                     e2 = sslContextFactory.newSSLEngine();
-                                } else if (hostname.equals(ServerConstants.getStaticHostName())) {
+                                } else if (hostname.equals(ServerConstants.getHostName(Host.STATIC))) {
                                     e2 = staticContextFactory.newSSLEngine();
-                                } else if (hostname.equals(ServerConstants.getSecureHostName())) {
+                                } else if (hostname.equals(ServerConstants.getHostName(Host.SECURE))) {
                                     e2 = secureContextFactory.newSSLEngine();
-                                } else if (hostname.equals(ServerConstants.getApiHostName())) {
+                                } else if (hostname.equals(ServerConstants.getHostName(Host.API))) {
                                     e2 = apiContextFactory.newSSLEngine();
                                 }
                                 break;
@@ -319,11 +320,11 @@ public class Launcher {
 
             ContextHandler ch = generateGigiServletContext(webAppServlet);
             ch.setVirtualHosts(new String[] {
-                    ServerConstants.getWwwHostName()
+                    ServerConstants.getHostName(Host.WWW)
             });
             ContextHandler chSecure = generateGigiServletContext(webAppServlet);
             chSecure.setVirtualHosts(new String[] {
-                    ServerConstants.getSecureHostName()
+                    ServerConstants.getHostName(Host.SECURE)
             });
 
             HandlerList hl = new HandlerList();
@@ -337,11 +338,11 @@ public class Launcher {
             final ResourceHandler rh = generateResourceHandler();
             rh.setResourceBase("static/www");
 
-            HandlerWrapper hw = new PolicyRedirector();
+            HandlerWrapper hw = new HandlerWrapper();
             hw.setHandler(rh);
 
             ServletContextHandler servlet = new ServletContextHandler(ServletContextHandler.SESSIONS);
-            servlet.setInitParameter(SessionManager.__SessionCookieProperty, "SomeCA-Session");
+            servlet.setInitParameter(SessionManager.__SessionCookieProperty, ServerConstants.getAppName() + "-Session");
             servlet.addServlet(webAppServlet, "/*");
             ErrorPageErrorHandler epeh = new ErrorPageErrorHandler();
             epeh.addErrorPage(404, "/error");
@@ -365,7 +366,7 @@ public class Launcher {
             ContextHandler ch = new ContextHandler();
             ch.setHandler(rh);
             ch.setVirtualHosts(new String[] {
-                    ServerConstants.getStaticHostName()
+                    ServerConstants.getHostName(Host.STATIC)
             });
 
             return ch;
@@ -388,7 +389,7 @@ public class Launcher {
             ServletContextHandler sch = new ServletContextHandler();
 
             sch.addVirtualHosts(new String[] {
-                    ServerConstants.getApiHostName()
+                    ServerConstants.getHostName(Host.API)
             });
             sch.addServlet(new ServletHolder(new GigiAPI()), "/*");
             return sch;