Passed

DRITE · Jun 15, 2017 · 208d9c6 · 208d9c6
1 parent 169988a
commit 208d9c6
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 31 deletions.
diff --git a/mvnTry.iml b/mvnTry.iml
@@ -11,15 +11,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.23" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.20" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.3.0.M0" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.3.0.M0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.3.0.M0" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.3.0.M0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.3.20.v20170531" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.3.20.v20170531" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.3.20.v20170531" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.3.20.v20170531" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.3.0.M0" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.3.0.M0" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.3.0.M0" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.3.0.M0" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.23</version>
+            <version>2.3.20</version>
         </dependency>
 
 
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-webapp</artifactId>
-            <version>9.3.20.v20170531</version>
+            <version>9.3.0.M0</version>
         </dependency>
 
     </dependencies>

diff --git a/src/main/java/MirrorRequestsServlet/MirrorRequestsServlet.java b/src/main/java/MirrorRequestsServlet/MirrorRequestsServlet.java
@@ -20,7 +20,8 @@ public void doGet(HttpServletRequest request,
         Map<String, Object> pageVariables = createPageVariablesMap(request);
         pageVariables.put("message", "");
 
-        response.getWriter().println(PageGenerator.instance().getPage("page.html", pageVariables));
+        //response.getWriter().println(PageGenerator.instance().getPage("page.html", pageVariables));
+        response.getWriter().println(request.getParameter("key"));
 
         response.setContentType("text/html;charset=utf-8");
         response.setStatus(HttpServletResponse.SC_OK);
@@ -43,15 +44,19 @@ public void doPost(HttpServletRequest request,
         pageVariables.put("message", message == null ? "" : message);
 
         response.getWriter().println(PageGenerator.instance().getPage("page.html", pageVariables));
+        //response.getWriter().println(request.getParameter("key"));
     }
 
+
     private static Map<String, Object> createPageVariablesMap(HttpServletRequest request) {
         Map<String, Object> pageVariables = new HashMap<>();
-        pageVariables.put("method", request.getMethod());
-        pageVariables.put("URL", request.getRequestURL().toString());
-        pageVariables.put("pathInfo", request.getPathInfo());
-        pageVariables.put("sessionID", request.getSession().getId());
-        pageVariables.put("parameters", request.getParameterMap().toString());
+//        pageVariables.put("method", request.getMethod());
+//        pageVariables.put("URL", request.getRequestURL().toString());
+//        pageVariables.put("pathInfo", request.getPathInfo() != null ? request.getPathInfo() : "");
+//        pageVariables.put("sessionId", request.getSession().getId());
+//        pageVariables.put("parameters", request.getParameterMap().toString());
+        pageVariables.put("key", request.getParameter("key") != null ? request.getParameter("key") : "");
+
         return pageVariables;
     }
 }
diff --git a/src/main/java/main/Main.java b/src/main/java/main/Main.java
@@ -13,12 +13,13 @@ public static void main(String[] args) throws Exception {
         MirrorRequestsServlet mirrorRequestsServlet = new MirrorRequestsServlet();
 
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        context.addServlet(new ServletHolder(mirrorRequestsServlet), "/mirror");
+        context.addServlet(new ServletHolder(mirrorRequestsServlet), "/mirror/*");
 
         Server server = new Server(8080);
         server.setHandler(context);
 
         server.start();
+        java.util.logging.Logger.getGlobal().info("Server started");
         server.join();
     }
 }
diff --git a/src/main/java/templater/PageGenerator.java b/src/main/java/templater/PageGenerator.java
@@ -13,6 +13,34 @@
 /**
  * Created by gubarevfn on 14.06.17.
  */
+//public class PageGenerator {
+//    private static final String HTML_DIR = "templates";
+//
+//    private static PageGenerator pageGenerator;
+//    private final Configuration cfg;
+//
+//    public static PageGenerator instance() {
+//        if (pageGenerator == null)
+//            pageGenerator = new PageGenerator();
+//        return pageGenerator;
+//    }
+//
+//    public String getPage(String filename, Map<String, Object> data) {
+//        Writer stream = new StringWriter();
+//        try {
+//            Template template = cfg.getTemplate(HTML_DIR + File.separator + filename);
+//            template.process(data, stream);
+//        } catch (IOException | TemplateException e) {
+//            e.printStackTrace();
+//        }
+//        return stream.toString();
+//    }
+//
+//    private PageGenerator() {
+//        cfg = new Configuration();
+//    }
+//}
+
 public class PageGenerator {
     private static final String HTML_DIR = "templates";
 
@@ -39,4 +67,4 @@ public String getPage(String filename, Map<String, Object> data) {
     private PageGenerator() {
         cfg = new Configuration();
     }
-}
+}
diff --git a/templates/page.html b/templates/page.html
@@ -1,25 +1,12 @@
 <!DOCTYPE html>
-<html lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8"/>
     <title>L1.1</title>
 </head>
 <body>
-<form action="/page.html" method="post">
-    Login: <input type="text" name="message"/>
-    <input type="submit" value="Ok">
-</form>
-
-<p>Message: ${message}</p>
-
-<p>URL: ${URL}</p>
-
-<p>PathInfo: ${pathInfo}</p>
-
-<p>Session ID: ${sessionId}</p>
-
-<p>Parameters: ${parameters}</p>
 
+<p>Key: ${key}</p>
 
 </body>
 </html>