PAN-16 finished

build.gradle

@@ -1,97 +1,23 @@
 buildscript {
+    ext {
+        springBootVersion = '1.4.3.RELEASE'
+    }
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
     }
 }
 
-plugins {
+apply plugin: 'java'
-    id 'groovy'
+apply plugin: 'eclipse'
-    id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.11'
-    id 'net.ltgt.apt' version '0.10'
-    id "org.sonarqube" version "2.6"
-    id 'org.unbroken-dome.test-sets' version '1.4.5'
-    id 'war'
-}
-
 apply plugin: 'org.springframework.boot'
 
-description = 'Pandamonium Theorem Prover'
+jar {
-
+    baseName = 'boot-gradle'
-group 'edu.msudenver.tsp'
+    version = '0.0.1-SNAPSHOT'
-version '1.0'
-
-ext['slf4j.version'] = '1.7.22'
-ext['classmate.version'] = '1.3.1'
-ext['joda-time.version'] = '2.9.7'
-
-def branch = 'git symbolic-ref --short HEAD'.execute().text.trim()
-
-sonarqube {
-    properties {
-        property "sonar.projectName", 'Pandamonium Theorem Prover'
-    }
 }
-
-allprojects {
-    sonarqube {
-        properties {
-            property "sonar.host.url", "https://sonarcloud.io"
-            property "sonar.projectKey", "atusa17_ptp"
-            property "sonar.organization", "atusa17-github"
-            property "sonar.login", "9dcc611cd79f175459248b053b25450e36e38463"
-        }
-    }
-    apply plugin: 'java'
-    apply plugin: 'jacoco'
-    apply plugin: 'org.unbroken-dome.test-sets'
-    apply plugin: 'idea'
-    apply plugin: 'io.spring.dependency-management'
-}
-
-subprojects {
-    apply plugin: 'java'
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        compile 'org.apache.commons:commons-lang3:3.5'
-        // The production code uses the SLF4J logging API at compile time
-        compile 'org.slf4j:slf4j-api:1.7.21'
-        compile "joda-time:joda-time:2.2"
-        compile('org.springframework:spring-context:5.0.9.RELEASE')
-
-        compileOnly 'org.projectlombok:lombok:1.18.4'
-
-        testCompile group: 'junit', name: 'junit', version: '4.11'
-        testCompile group: 'junit', name: 'junit', version: '4.12'
-        testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
-
-    }
-
-    test {
-        if (System.properties['test.profile'] != 'integrationTest') {
-            exclude '**/*integrationTest*'
-        } else {
-            exclude '**/*edu/*'
-        }
-    }
-
-    testSets {
-        unitTest
-        integrationTest
-    }
-}
-
-bootJar {
-    baseName = 'gs-spring-boot'
-    version =  '0.1.0'
-}
-
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
@@ -99,51 +25,9 @@ repositories {
     mavenCentral()
 }
 
+
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    compile('org.springframework.boot:spring-boot-starter-web','org.apache.tomcat.embed:tomcat-embed-jasper'
-    compile 'org.codehaus.groovy:groovy-all:2.3.11'
+            ,'javax.servlet:jstl')
-    compile 'org.apache.commons:commons-lang3:3.5'
+    testCompile('org.springframework.boot:spring-boot-starter-test')
-    // The production code uses the SLF4J logging API at compile time
-    compile 'org.slf4j:slf4j-api:1.7.22'
-    compile "joda-time:joda-time:2.2"
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.0.5.RELEASE'
-
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile "org.springframework:spring-test:5.0.9.RELEASE"
-    testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
-
-    compileOnly 'org.projectlombok:lombok:1.18.4'
-
-    apt 'org.projectlombok:lombok:1.18.4'
-}
-
-project(':persistence') {
-    dependencies {
-        compile project(':utilities')
-    }
-}
-
-test {
-    if (System.properties['test.profile'] != 'integrationTest') {
-        exclude '**/*integrationTest*'
-    } else {
-        exclude '**/*edu/*'
-    }
-}
-
-testSets {
-    unitTest
-    integrationTest
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
-wrapper {
-    gradleVersion = '5.2.1'
-    distributionType = Wrapper.DistributionType.ALL
 }

gradlew~Stashed changes

@@ -1,172 +1,149 @@
-#!/usr/bin/env sh
+buildscript {
-
+    repositories {
-##############################################################################
+        mavenCentral()
-##
+    }
-##  Gradle start up script for UN*X
+    dependencies {
-##
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE")
-##############################################################################
+    }
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
 }
 
-die ( ) {
+plugins {
-    echo
+    id 'groovy'
-    echo "$*"
+    id 'java'
-    echo
+    id 'org.jetbrains.kotlin.jvm' version '1.3.11'
-    exit 1
+    id 'net.ltgt.apt' version '0.10'
+    id "org.sonarqube" version "2.6"
+    id 'org.unbroken-dome.test-sets' version '1.4.5'
+    id 'war'
 }
 
-# OS specific support (must be 'true' or 'false').
+apply plugin: 'org.springframework.boot'
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+description = 'Pandamonium Theorem Prover'
 
-# Determine the Java command to use to start the JVM.
+group 'edu.msudenver.tsp'
-if [ -n "$JAVA_HOME" ] ; then
+version '1.0'
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 
-Please set the JAVA_HOME variable in your environment to match the
+ext['slf4j.version'] = '1.7.22'
-location of your Java installation."
+ext['classmate.version'] = '1.3.1'
-    fi
+ext['joda-time.version'] = '2.9.7'
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
-Please set the JAVA_HOME variable in your environment to match the
+def branch = 'git symbolic-ref --short HEAD'.execute().text.trim()
-location of your Java installation."
-fi
 
-# Increase the maximum file descriptors if we can.
+sonarqube {
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    properties {
-    MAX_FD_LIMIT=`ulimit -H -n`
+        property "sonar.projectName", 'Pandamonium Theorem Prover'
-    if [ $? -eq 0 ] ; then
+    }
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save ( ) {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
 }
-APP_ARGS=$(save "$@")
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+allprojects {
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+    sonarqube {
+        properties {
+            property "sonar.host.url", "https://sonarcloud.io"
+            property "sonar.projectKey", "atusa17_ptp"
+            property "sonar.organization", "atusa17-github"
+            property "sonar.login", "9dcc611cd79f175459248b053b25450e36e38463"
+        }
+    }
+    apply plugin: 'java'
+    apply plugin: 'jacoco'
+    apply plugin: 'org.unbroken-dome.test-sets'
+    apply plugin: 'idea'
+    apply plugin: 'io.spring.dependency-management'
+}
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+subprojects {
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+    apply plugin: 'java'
-  cd "$(dirname "$0")"
+    repositories {
-fi
+        mavenCentral()
+    }
 
-exec "$JAVACMD" "$@"
+    dependencies {
+        compile 'org.apache.commons:commons-lang3:3.5'
+        // The production code uses the SLF4J logging API at compile time
+        compile 'org.slf4j:slf4j-api:1.7.21'
+        compile "joda-time:joda-time:2.2"
+        compile('org.springframework:spring-context:5.0.9.RELEASE')
+
+        compileOnly 'org.projectlombok:lombok:1.18.4'
+
+        testCompile group: 'junit', name: 'junit', version: '4.11'
+        testCompile group: 'junit', name: 'junit', version: '4.12'
+        testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
+
+    }
+
+    test {
+        if (System.properties['test.profile'] != 'integrationTest') {
+            exclude '**/*integrationTest*'
+        } else {
+            exclude '**/*edu/*'
+        }
+    }
+
+    testSets {
+        unitTest
+        integrationTest
+    }
+}
+
+bootJar {
+    baseName = 'gs-spring-boot'
+    version =  '0.1.0'
+}
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    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
+    compile 'org.slf4j:slf4j-api:1.7.22'
+    compile "joda-time:joda-time:2.2"
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.0.5.RELEASE'
+
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile "org.springframework:spring-test:5.0.9.RELEASE"
+    testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')}
+
+    compileOnly 'org.projectlombok:lombok:1.18.4'
+
+    apt 'org.projectlombok:lombok:1.18.4'
+}
+
+project(':persistence') {
+    dependencies {
+        compile project(':utilities')
+    }
+}
+
+test {
+    if (System.properties['test.profile'] != 'integrationTest') {
+        exclude '**/*integrationTest*'
+    } else {
+        exclude '**/*edu/*'
+    }
+}
+
+testSets {
+    unitTest
+    integrationTest
+}
+
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
+wrapper {
+    gradleVersion = '5.2.1'
+    distributionType = Wrapper.DistributionType.ALL
+}

persistence/build.gradle

@@ -9,11 +9,7 @@ version '1.0'
 
 sourceCompatibility = 1.8
 
-sonarqube {
+
-    properties {
-        property "sonar.projectName", 'Pandamonium Persistence Tier'
-    }
-}
 
 repositories {
     mavenCentral()

services/build.gradle

@@ -7,11 +7,7 @@ version '1.0'
 
 sourceCompatibility = 1.8
 
-sonarqube {
+
-    properties {
-        property "sonar.projectName", 'Theorem Prover Services'
-    }
-}
 
 repositories {
     mavenCentral()

src/main/java/edu/msudenver/tsp/website/Application.java

@@ -1,23 +1,21 @@
 package edu.msudenver.tsp.website;
 
-import lombok.extern.slf4j.Slf4j;
+
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
 
-import java.util.Arrays;
 
-@Slf4j
+//import lombok.extern.slf4j.Slf4j;
+
 @SpringBootApplication
 public class Application {
 
     public static void main(final String[] args) {
         SpringApplication.run(Application.class, args);
     }
+}
 
-    @Bean
+    /*@Bean
     public CommandLineRunner commandLineRunner(final ApplicationContext ctx) {
         return args -> {
 
@@ -28,6 +26,9 @@ public class Application {
             for (final String beanName : beanNames) {
                 LOG.info(beanName);
             }
-        };
+        }
     }
 }
+*/
+
+

src/main/java/edu/msudenver/tsp/website/ProofsDriver.java

@@ -1,4 +1,5 @@
 package edu.msudenver.tsp.website;
 
 public class ProofsDriver {
+    //Business Logic will go here
 }

src/main/java/edu/msudenver/tsp/website/TheoremEntryController.java

@@ -0,0 +1,43 @@
+package edu.msudenver.tsp.website;
+
+import edu.msudenver.tsp.website.forms.Theorem;
+import edu.msudenver.tsp.website.service.ProofDriver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+
+@Controller
+public class TheoremEntryController {
+
+    @Autowired
+    ProofDriver proofDriver;
+
+    @RequestMapping("/welcome")
+    public ModelAndView firstPage()
+    {
+        return new ModelAndView("welcome");
+    }
+
+    @RequestMapping("/theorem")
+    public ModelAndView theoremPage()
+    {
+        return new ModelAndView("Theorem");
+    }
+
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public String saveTheorem(@Validated Theorem theorem, Model model) {
+        proofDriver.processProof(theorem.getTheoremName());
+        model.addAttribute("theromName", theorem.getTheoremName());
+        return "success";
+    }
+
+
+}
+
+

src/main/java/edu/msudenver/tsp/website/forms/Theorem.java

@@ -0,0 +1,19 @@
+package edu.msudenver.tsp.website.forms;
+
+public class Theorem {
+    private String theoremName ;
+
+
+    public String getTheoremName() {
+        return theoremName;
+    }
+
+    public void setTheoremName(String theoremName) {
+        this.theoremName = theoremName;
+    }
+
+
+
+
+
+}

src/main/java/edu/msudenver/tsp/website/service/ProofDriver.java

@@ -0,0 +1,16 @@
+package edu.msudenver.tsp.website.service;
+
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class ProofDriver {
+    List<String> theromList = new ArrayList<String>();
+    public String processProof(String theoremName){
+        //Business Logic
+        return theoremName + "Accepted";
+    }
+
+}

src/main/resources/application.properties

@@ -0,0 +1,2 @@
+spring.mvc.view.prefix:/WEB-INF/jsp/
+spring.mvc.view.suffix:.jsp

src/main/webapp/WEB-INF/jsp/Theorem.jsp

@@ -0,0 +1,15 @@
+<%@ page language="java" 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>Theroem Page</title>
+</head>
+<body>
+<form action="save" method="post">
+Enter Theroem Name <input type="text" name="theoremName"><br>
+<input type="submit" value="save">
+</form>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/success.jsp

@@ -0,0 +1,6 @@
+<html>
+<body>
+<b>Name:</b><%= request.getParameter("theoremName")%>
+
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/welcome.jsp

@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+         pageEncoding="ISO-8859-1"%>
+<!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=ISO-8859-1">
+    <title>Guru Success Page</title>
+</head>
+<body>
+<a><b>Welcome User!!!!</b></a>
+</body>
+</html>

src/main/webapp/index.jsp

@@ -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>

utilities/build.gradle

@@ -7,11 +7,7 @@ version '1.0'
 
 sourceCompatibility = 1.8
 
-sonarqube {
+
-    properties {
-        property "sonar.projectName", 'Parsing and Proofs Utilities'
-    }
-}
 
 repositories {
     mavenCentral()