Merge branches 'PAN-54' and 'master' of https://github.com/atusa17/ptp into PAN-54

2019-03-31 14:17:08 -06:00
parent 0fc825e11b c715e98e81
commit 2a4adcbd08
4 changed files with 28 additions and 20 deletions
@@ -99,7 +99,7 @@ repositories {
 }

 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    compile group: 'org.jacoco', name: 'org.jacoco.core', version: '0.8.3'
    compile 'org.codehaus.groovy:groovy-all:2.3.11'
    compile 'org.apache.commons:commons-lang3:3.5'
    // The production code uses the SLF4J logging API at compile time
@@ -1,3 +0,0 @@
-spring.mvc.view.prefix:/WEB-INF/jsp/
-spring.mvc.view.suffix:.jsp
-server.port=8090
@@ -0,0 +1,27 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: atusa
+  Date: 2/1/19
+  Time: 8:03 PM
+  To change this template use File | Settings | File Templates.
+--%>
+
+
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>Pandamonium™ Theorem Prover</title>
+</head>
+<body>
+<div>
+  <div>
+    <h1>Theorem Prover</h1>
+    <h2>Hello! Welcome to Pandamonium™ Theorem Prover!!</h2>
+
+    Click on this <strong><a href="/theorem/">link</a></strong> to visit theorem entering page.
+  </div>
+</div>
+</body>
+</html>
@@ -1,16 +0,0 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: atusa
-  Date: 2/1/19
-  Time: 8:03 PM
-  To change this template use File | Settings | File Templates.
--%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-  <head>
-    <title>$Title$</title>
-  </head>
-  <body>
-  $END$
-  </body>
-</html>