diff --git a/pandamonium-theorem-prover/.gitignore b/.gitignore similarity index 100% rename from pandamonium-theorem-prover/.gitignore rename to .gitignore diff --git a/README.md b/README.md index dc1251a..8ffdb52 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ -# Pandamonium Theorem Prover -This is the main repository for the Technical Software Project +# tsp-main diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 1885487..0000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-midnight \ No newline at end of file diff --git a/pandamonium-theorem-prover/build.gradle b/build.gradle similarity index 100% rename from pandamonium-theorem-prover/build.gradle rename to build.gradle diff --git a/pandamonium-theorem-prover/config/development.properties b/config/development.properties similarity index 100% rename from pandamonium-theorem-prover/config/development.properties rename to config/development.properties diff --git a/pandamonium-theorem-prover/config/log4j.properties b/config/log4j.properties similarity index 100% rename from pandamonium-theorem-prover/config/log4j.properties rename to config/log4j.properties diff --git a/pandamonium-theorem-prover/gradle.properties b/gradle.properties similarity index 100% rename from pandamonium-theorem-prover/gradle.properties rename to gradle.properties diff --git a/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from pandamonium-theorem-prover/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/gradle/wrapper/gradle-wrapper.properties~Stashed changes b/gradle/wrapper/gradle-wrapper.properties~Stashed changes new file mode 100644 index 0000000..0792f56 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties~Stashed changes @@ -0,0 +1,6 @@ +#Sun Feb 03 13:43:34 MST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip diff --git a/pandamonium-theorem-prover/gradlew b/gradlew similarity index 100% rename from pandamonium-theorem-prover/gradlew rename to gradlew diff --git a/pandamonium-theorem-prover/gradlew.bat b/gradlew.bat similarity index 100% rename from pandamonium-theorem-prover/gradlew.bat rename to gradlew.bat diff --git a/gradlew~Stashed changes b/gradlew~Stashed changes new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/gradlew~Stashed changes @@ -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/lib/jas-2.6.5961-bin.jar b/lib/jas-2.6.5961-bin.jar similarity index 100% rename from pandamonium-theorem-prover/lib/jas-2.6.5961-bin.jar rename to lib/jas-2.6.5961-bin.jar diff --git a/pandamonium-theorem-prover/lib/javax.ejb.jar b/lib/javax.ejb.jar similarity index 100% rename from pandamonium-theorem-prover/lib/javax.ejb.jar rename to lib/javax.ejb.jar diff --git a/pandamonium-theorem-prover/lib/javax.jms.jar b/lib/javax.jms.jar similarity index 100% rename from pandamonium-theorem-prover/lib/javax.jms.jar rename to lib/javax.jms.jar diff --git a/pandamonium-theorem-prover/lib/javax.persistence.jar b/lib/javax.persistence.jar similarity index 100% rename from pandamonium-theorem-prover/lib/javax.persistence.jar rename to lib/javax.persistence.jar diff --git a/pandamonium-theorem-prover/lib/javax.resource.jar b/lib/javax.resource.jar similarity index 100% rename from pandamonium-theorem-prover/lib/javax.resource.jar rename to lib/javax.resource.jar diff --git a/pandamonium-theorem-prover/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar similarity index 100% rename from pandamonium-theorem-prover/lib/javax.servlet.jsp.jar rename to lib/javax.servlet.jsp.jar diff --git a/pandamonium-theorem-prover/lib/javax.servlet.jsp.jstl.jar b/lib/javax.servlet.jsp.jstl.jar similarity index 100% rename from pandamonium-theorem-prover/lib/javax.servlet.jsp.jstl.jar rename to lib/javax.servlet.jsp.jstl.jar diff --git a/pandamonium-theorem-prover/lib/javax.transaction.jar b/lib/javax.transaction.jar similarity index 100% rename from pandamonium-theorem-prover/lib/javax.transaction.jar rename to lib/javax.transaction.jar diff --git a/pandamonium-theorem-prover/lombok.config b/lombok.config similarity index 100% rename from pandamonium-theorem-prover/lombok.config rename to lombok.config diff --git a/out/production/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module b/out/production/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module new file mode 100644 index 0000000..8fb6019 Binary files /dev/null and b/out/production/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module differ diff --git a/pandamonium-theorem-prover/src/test/resources/test.properties b/out/test/resources/test.properties similarity index 100% rename from pandamonium-theorem-prover/src/test/resources/test.properties rename to out/test/resources/test.properties 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 deleted file mode 100644 index e0955a4..0000000 --- a/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.main.iml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ 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 deleted file mode 100644 index e0955a4..0000000 --- a/pandamonium-theorem-prover/.idea/modules/edu.msudenver.tsp.pandamonium-theorem-prover.test.iml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pandamonium-theorem-prover/README.md b/pandamonium-theorem-prover/README.md deleted file mode 100644 index 8ffdb52..0000000 --- a/pandamonium-theorem-prover/README.md +++ /dev/null @@ -1 +0,0 @@ -# tsp-main diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/persistence/build.gradle similarity index 100% rename from pandamonium-theorem-prover/persistence/build.gradle rename to persistence/build.gradle diff --git a/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.bat b/persistence/scripts/mysql/loaddb.bat similarity index 100% rename from pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.bat rename to persistence/scripts/mysql/loaddb.bat diff --git a/pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh b/persistence/scripts/mysql/loaddb.sh similarity index 100% rename from pandamonium-theorem-prover/persistence/scripts/mysql/loaddb.sh rename to persistence/scripts/mysql/loaddb.sh diff --git a/pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql b/persistence/scripts/mysql/local_development.sql similarity index 100% rename from pandamonium-theorem-prover/persistence/scripts/mysql/local_development.sql rename to persistence/scripts/mysql/local_development.sql diff --git a/pandamonium-theorem-prover/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/AccountsIntegrationTest.java b/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/AccountsIntegrationTest.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/AccountsIntegrationTest.java rename to persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/AccountsIntegrationTest.java diff --git a/pandamonium-theorem-prover/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/DefinitionsIntegrationTest.java b/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/DefinitionsIntegrationTest.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/DefinitionsIntegrationTest.java rename to persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/DefinitionsIntegrationTest.java diff --git a/pandamonium-theorem-prover/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/PersistenceTestConfig.java b/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/PersistenceTestConfig.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/PersistenceTestConfig.java rename to persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/PersistenceTestConfig.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceApi.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceApi.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceApi.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceApi.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/AccountController.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/AccountController.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/AccountController.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/controller/AccountController.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/DefinitionController.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/DefinitionController.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/DefinitionController.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/controller/DefinitionController.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/NotationController.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/NotationController.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/NotationController.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/controller/NotationController.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/ProofController.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/ProofController.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/ProofController.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/controller/ProofController.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/TheoremController.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/TheoremController.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/TheoremController.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/controller/TheoremController.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountDto.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountDto.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountDto.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountDto.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Definition.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Definition.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Definition.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Definition.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Notation.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Notation.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Notation.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Notation.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/DefinitionRepository.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/DefinitionRepository.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/DefinitionRepository.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/repository/DefinitionRepository.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/NotationRepository.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/NotationRepository.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/NotationRepository.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/repository/NotationRepository.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/ProofRepository.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/ProofRepository.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/ProofRepository.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/repository/ProofRepository.java diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/TheoremRepository.java b/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/TheoremRepository.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/TheoremRepository.java rename to persistence/src/main/java/edu/msudenver/tsp/persistence/repository/TheoremRepository.java diff --git a/pandamonium-theorem-prover/persistence/src/main/resources/application.properties b/persistence/src/main/resources/application.properties similarity index 100% rename from pandamonium-theorem-prover/persistence/src/main/resources/application.properties rename to persistence/src/main/resources/application.properties diff --git a/pandamonium-theorem-prover/persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java b/persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java rename to persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java diff --git a/pandamonium-theorem-prover/persistence/src/test/java/edu/msudenver/tsp/persistence/controller/DefinitionControllerTest.java b/persistence/src/test/java/edu/msudenver/tsp/persistence/controller/DefinitionControllerTest.java similarity index 100% rename from pandamonium-theorem-prover/persistence/src/test/java/edu/msudenver/tsp/persistence/controller/DefinitionControllerTest.java rename to persistence/src/test/java/edu/msudenver/tsp/persistence/controller/DefinitionControllerTest.java diff --git a/pandamonium-theorem-prover/services/build.gradle b/services/build.gradle similarity index 100% rename from pandamonium-theorem-prover/services/build.gradle rename to services/build.gradle diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java b/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java similarity index 100% rename from pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java rename to services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java b/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java similarity index 100% rename from pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java rename to services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java b/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java similarity index 100% rename from pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java rename to services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java b/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java similarity index 100% rename from pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java rename to services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java diff --git a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java b/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java similarity index 100% rename from pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java rename to services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java diff --git a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java b/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java similarity index 100% rename from pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java rename to services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java diff --git a/pandamonium-theorem-prover/settings.gradle b/settings.gradle similarity index 100% rename from pandamonium-theorem-prover/settings.gradle rename to settings.gradle diff --git a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java b/src/main/java/edu/msudenver/tsp/website/Application.java similarity index 100% rename from pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java rename to src/main/java/edu/msudenver/tsp/website/Application.java diff --git a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java b/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java similarity index 100% rename from pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java rename to src/main/java/edu/msudenver/tsp/website/ProofsDriver.java diff --git a/pandamonium-theorem-prover/src/main/webapp/index.jsp b/src/main/webapp/index.jsp similarity index 100% rename from pandamonium-theorem-prover/src/main/webapp/index.jsp rename to src/main/webapp/index.jsp diff --git a/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java b/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java similarity index 100% rename from pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java rename to src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java diff --git a/src/test/resources/test.properties b/src/test/resources/test.properties new file mode 100644 index 0000000..9bc08c6 --- /dev/null +++ b/src/test/resources/test.properties @@ -0,0 +1 @@ +integration.test.base.url=http://localhost: \ No newline at end of file diff --git a/pandamonium-theorem-prover/utilities/build.gradle b/utilities/build.gradle similarity index 100% rename from pandamonium-theorem-prover/utilities/build.gradle rename to utilities/build.gradle diff --git a/pandamonium-theorem-prover/utilities/src/main/java/edu/msudenver/tsp/utilities/PersistenceUtilities.java b/utilities/src/main/java/edu/msudenver/tsp/utilities/PersistenceUtilities.java similarity index 100% rename from pandamonium-theorem-prover/utilities/src/main/java/edu/msudenver/tsp/utilities/PersistenceUtilities.java rename to utilities/src/main/java/edu/msudenver/tsp/utilities/PersistenceUtilities.java