diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..8f4c9d6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,20 @@ +language: java +install: true + +before_install: + - chmod +x pandamonium-theorem-prover/gradlew + - cd pandamonium-theorem-prover + +stages: + - name: build + - name: unit tests + - name: integration tests + +jobs: + include: + - stage: build + script: ./gradlew build + - stage: unit tests + script: ./gradlew test + - stage: integration tests + script: ./gradlew integrationTest diff --git a/pandamonium-theorem-prover/.gitignore b/pandamonium-theorem-prover/.gitignore new file mode 100644 index 0000000..5409e00 --- /dev/null +++ b/pandamonium-theorem-prover/.gitignore @@ -0,0 +1,46 @@ +# Ignore Eclipse files +.classpath +.project +.settings/** + +# Ignore emacs temporary files +\#* +.\#* + +# vi temp files +*~ +*.swp + +# Ignore intellij files +.idea +*.iml +*.ipr +*.iws +*.ids + +# Generated files/directories +target/** +*.class +build/** +.gradle/** +exploded +*/build/ +*/out/ + +# ivy/build +build-ivycache +.ant-targets-build.xml + +# Ignore files +.svnignore +*.orig +dependency-reduced-pom.xml + +# Ignore netbeans +nb-* + +# Apple directory artifacts +.DS_Store + +.metadata +META-INF/MANIFEST.MF \ No newline at end of file diff --git a/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.main.iml b/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.main.iml new file mode 100644 index 0000000..e0955a4 --- /dev/null +++ b/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.main.iml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.test.iml b/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.test.iml new file mode 100644 index 0000000..e0955a4 --- /dev/null +++ b/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.test.iml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/pandamonium-theorem-prover/.travis.yml b/pandamonium-theorem-prover/.travis.yml new file mode 100644 index 0000000..3dcae7a --- /dev/null +++ b/pandamonium-theorem-prover/.travis.yml @@ -0,0 +1,25 @@ +language: java +install: true + +sudo: false +addons: + apt: + packages: + - oracle-java8-installer + +before_install: + - chmod +x pandamonium-theorem-prover/gradlew + +stages: + - name: build + - name: unitTest + - name: integrationTest + +jobs: + include: + - stage: build + script: ./pandamonium-theorem-prover/gradlew build + - stage: unitTest + script: ./pandamonium-theorem-prover/gradlew test + - stage: integrationTest + script: ./pandamonium-theorem-prover/gradlew integrationTest diff --git a/README.md b/pandamonium-theorem-prover/README.md similarity index 100% rename from README.md rename to pandamonium-theorem-prover/README.md diff --git a/pandamonium-theorem-prover/build.gradle b/pandamonium-theorem-prover/build.gradle new file mode 100644 index 0000000..9909528 --- /dev/null +++ b/pandamonium-theorem-prover/build.gradle @@ -0,0 +1,99 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE") + } +} + +plugins { + id 'groovy' + 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' +} +description = 'Pandamonium Theorem Prover' + +group 'edu.msudenver.tsp' +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 { + apply plugin: 'java' + apply plugin: 'jacoco' + apply plugin: 'org.unbroken-dome.test-sets' + apply plugin: 'idea' + apply plugin: 'org.springframework.boot' + apply plugin: 'io.spring.dependency-management' +} + +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.21' + compile "joda-time:joda-time:2.2" + compile("org.springframework.boot:spring-boot-starter-web") + + testCompile group: 'junit', name: 'junit', version: '4.11' + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile("org.springframework.boot:spring-boot-starter-test") + 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' +} + +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 = '4.10.2' + distributionType = Wrapper.DistributionType.ALL +} \ No newline at end of file diff --git a/pandamonium-theorem-prover/config/development.properties b/pandamonium-theorem-prover/config/development.properties new file mode 100644 index 0000000..c1f71b1 --- /dev/null +++ b/pandamonium-theorem-prover/config/development.properties @@ -0,0 +1 @@ +helloControllerBaseUrl = "http://localhost:8080" \ No newline at end of file diff --git a/pandamonium-theorem-prover/config/log4j.properties b/pandamonium-theorem-prover/config/log4j.properties new file mode 100644 index 0000000..ad6ee32 --- /dev/null +++ b/pandamonium-theorem-prover/config/log4j.properties @@ -0,0 +1,8 @@ +log4j.rootCategory=WARN, FILE + +log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.FILE.File=/var/log/tomcat/dash-board.log +log4j.appender.FILE.Append=true +log4j.appender.FILE.DatePattern='.'yyyy-MM-dd +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%t] %X{ip}/%X{username} %C{1}.%M()%L - %m%n \ No newline at end of file diff --git a/pandamonium-theorem-prover/gradle.properties b/pandamonium-theorem-prover/gradle.properties new file mode 100644 index 0000000..29e08e8 --- /dev/null +++ b/pandamonium-theorem-prover/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official \ No newline at end of file diff --git a/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.jar b/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..28861d2 Binary files /dev/null and b/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.jar differ diff --git a/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.properties b/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a12448a --- /dev/null +++ b/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Feb 01 20:07:13 MST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/pandamonium-theorem-prover/gradlew b/pandamonium-theorem-prover/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/pandamonium-theorem-prover/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +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 + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + 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 +location of your Java installation." + fi +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 +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + 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 +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/pandamonium-theorem-prover/gradlew.bat b/pandamonium-theorem-prover/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/pandamonium-theorem-prover/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pandamonium-theorem-prover/lombok.config b/pandamonium-theorem-prover/lombok.config new file mode 100644 index 0000000..0c4a2b9 --- /dev/null +++ b/pandamonium-theorem-prover/lombok.config @@ -0,0 +1,7 @@ +config.stopBubbling = true +lombok.accessors.chain = true +lombok.accessors.fluent = false +lombok.addLombokGeneratedAnnotation = true +lombok.log.fieldName = LOG +lombok.toString.includeFieldNames = true +lombok.data.flagUsage = error \ No newline at end of file diff --git a/pandamonium-theorem-prover/settings.gradle b/pandamonium-theorem-prover/settings.gradle new file mode 100644 index 0000000..eef59f5 --- /dev/null +++ b/pandamonium-theorem-prover/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'pandamonium-theorem-prover' + diff --git a/pandamonium-theorem-prover/src/main/java/hello/Application.java b/pandamonium-theorem-prover/src/main/java/hello/Application.java new file mode 100644 index 0000000..b7cb82e --- /dev/null +++ b/pandamonium-theorem-prover/src/main/java/hello/Application.java @@ -0,0 +1,33 @@ +package hello; + +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 +@SpringBootApplication +public class Application { + + public static void main(final String[] args) { + SpringApplication.run(Application.class, args); + } + + @Bean + public CommandLineRunner commandLineRunner(final ApplicationContext ctx) { + return args -> { + + LOG.info("Beans provided by Spring Boot:"); + + final String[] beanNames = ctx.getBeanDefinitionNames(); + Arrays.sort(beanNames); + for (final String beanName : beanNames) { + LOG.info(beanName); + } + }; + } +} diff --git a/pandamonium-theorem-prover/src/main/java/hello/HelloController.java b/pandamonium-theorem-prover/src/main/java/hello/HelloController.java new file mode 100644 index 0000000..66a5927 --- /dev/null +++ b/pandamonium-theorem-prover/src/main/java/hello/HelloController.java @@ -0,0 +1,13 @@ +package hello; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @RequestMapping("/") + public String index() { + return "Greetings from Spring Boot!"; + } +} diff --git a/pandamonium-theorem-prover/src/main/webapp/index.jsp b/pandamonium-theorem-prover/src/main/webapp/index.jsp new file mode 100644 index 0000000..f8d618c --- /dev/null +++ b/pandamonium-theorem-prover/src/main/webapp/index.jsp @@ -0,0 +1,16 @@ +<%-- + 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" %> + + + $Title$ + + + $END$ + + diff --git a/pandamonium-theorem-prover/src/test/java/HelloControllerTest.java b/pandamonium-theorem-prover/src/test/java/HelloControllerTest.java new file mode 100644 index 0000000..de8c699 --- /dev/null +++ b/pandamonium-theorem-prover/src/test/java/HelloControllerTest.java @@ -0,0 +1,14 @@ +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.junit.Assert.assertEquals; + +@RunWith(SpringJUnit4ClassRunner.class) +public class HelloControllerTest { + + @Test + public void test() { + assertEquals(3, 3); + } +} diff --git a/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java b/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java new file mode 100644 index 0000000..3b4f67d --- /dev/null +++ b/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java @@ -0,0 +1,36 @@ +package integrationTest; + +import hello.Application; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.net.URL; + +import static org.junit.Assert.assertEquals; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) +public class HelloControllerIntegrationTest { + @LocalServerPort private int port; + private URL base; + @Autowired private TestRestTemplate testRestTemplate; + + @Before + public void setUp() throws Exception { + this.base = new URL("http://localhost:" + port + "/"); + } + + @Test + public void testGetHello() { + final ResponseEntity response = testRestTemplate.getForEntity(base.toString(), + String.class); + assertEquals("Greetings from Spring Boot!", response.getBody()); + } +} diff --git a/pandamonium-theorem-prover/src/test/resources/test.properties b/pandamonium-theorem-prover/src/test/resources/test.properties new file mode 100644 index 0000000..9bc08c6 --- /dev/null +++ b/pandamonium-theorem-prover/src/test/resources/test.properties @@ -0,0 +1 @@ +integration.test.base.url=http://localhost: \ No newline at end of file