Move Template to another package for moving AST-classes out.

[gigi.git] / src / org / cacert / gigi / output / ClientCSRGenerate.java

diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/org/cacert/gigi/output/ClientCSRGenerate.java
index aeb7d9b81cf5b6f30a32830b59e9500011d1f95c..5b474a1eed98ff14ce4f3ba86178a09fb7a11946 100644 (file)
--- a/src/org/cacert/gigi/output/ClientCSRGenerate.java
+++ b/src/org/cacert/gigi/output/ClientCSRGenerate.java
@@ -1,12 +1,12 @@
 package org.cacert.gigi.output;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.ServerConstants;
 
@@ -14,22 +14,16 @@ public class ClientCSRGenerate {
        static Template normal;
        static Template IE;
        static {
-               normal = new Template(new InputStreamReader(
-                               ClientCSRGenerate.class
-                                               .getResourceAsStream("ClientCSRGenerate.templ")));
-               IE = new Template(new InputStreamReader(
-                               ClientCSRGenerate.class
-                                               .getResourceAsStream("ClientCSRGenerateIE.templ")));
+               normal = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerate.templ"));
+               IE = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerateIE.templ"));
        }
+
        public static void output(HttpServletRequest req, HttpServletResponse resp) {
                HashMap<String, Object> vars = new HashMap<String, Object>();
                vars.put("minsize", "2048");
-               vars.put("normalhost",
-                               "https://" + ServerConstants.getWwwHostNamePort());
-               vars.put("securehost",
-                               "https://" + ServerConstants.getSecureHostNamePort());
-               vars.put("statichost",
-                               "https://" + ServerConstants.getStaticHostNamePort());
+               vars.put("normalhost", "https://" + ServerConstants.getWwwHostNamePort());
+               vars.put("securehost", "https://" + ServerConstants.getSecureHostNamePort());
+               vars.put("statichost", "https://" + ServerConstants.getStaticHostNamePort());
                try {
                        normal.output(resp.getWriter(), Page.getLanguage(req), vars);
                } catch (IOException e) {