From fc36fa994e4734cc62c8aa2c76f6b010e203ff8f Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 3 Feb 2019 20:46:37 -0700 Subject: [PATCH] Updated the build.gradle to delegate down to the subprojects --- pandamonium-theorem-prover/build.gradle | 17 +++++++---------- .../persistence/build.gradle | 14 +------------- .../tsp/persistence/PersistenceConfig.java | 4 +--- .../persistence/manager/DefinitionManager.java | 2 -- .../tsp/persistence/manager/ManagerConfig.java | 7 ++----- .../persistence/manager/NotationManager.java | 3 +-- .../tsp/persistence/manager/ProofManager.java | 2 -- .../tsp/persistence/manager/TheoremManager.java | 2 -- .../services/build.gradle | 13 ------------- .../tsp/services/parser/ParserConfig.java | 7 ++----- .../tsp/services/parser/ParserService.java | 4 +--- .../tsp/services/scoring/ScoringConfig.java | 10 +++------- .../services/scoring/TheoremScoringService.java | 4 +--- .../tsp/services/parser/ParserServiceTest.java | 8 ++++++++ .../scoring/TheoremScoringServiceTest.java | 7 +++++++ .../tsp/website => hello}/Application.java | 2 +- .../tsp/website => hello}/HelloController.java | 2 +- .../HelloControllerIntegrationTest.java | 2 +- .../utilities/build.gradle | 14 +------------- 19 files changed, 38 insertions(+), 86 deletions(-) rename pandamonium-theorem-prover/src/main/java/{edu/msudenver/tsp/website => hello}/Application.java (96%) rename pandamonium-theorem-prover/src/main/java/{edu/msudenver/tsp/website => hello}/HelloController.java (88%) diff --git a/pandamonium-theorem-prover/build.gradle b/pandamonium-theorem-prover/build.gradle index e31dc45..01018e6 100644 --- a/pandamonium-theorem-prover/build.gradle +++ b/pandamonium-theorem-prover/build.gradle @@ -16,6 +16,9 @@ plugins { id 'org.unbroken-dome.test-sets' version '1.4.5' id 'war' } + +apply plugin: 'org.springframework.boot' + description = 'Pandamonium Theorem Prover' group 'edu.msudenver.tsp' @@ -38,7 +41,6 @@ allprojects { apply plugin: 'jacoco' apply plugin: 'org.unbroken-dome.test-sets' apply plugin: 'idea' - apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' } @@ -48,17 +50,13 @@ subprojects { } 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' @@ -78,11 +76,10 @@ subprojects { } } -//bootJar { -// baseName = 'gs-spring-boot' -// mainClassName = 'edu.msudenver.tsp.website.Application' -// version = '0.1.0' -//} +bootJar { + baseName = 'gs-spring-boot' + version = '0.1.0' +} sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/pandamonium-theorem-prover/persistence/build.gradle index db359bb..b8e0e3f 100644 --- a/pandamonium-theorem-prover/persistence/build.gradle +++ b/pandamonium-theorem-prover/persistence/build.gradle @@ -13,17 +13,5 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' -} - -test { - if (System.properties['test.profile'] != 'integrationTest') { - exclude '**/*integrationTest*' - } else { - exclude '**/*edu/*' - } -} - -testSets { - unitTest - integrationTest + compile fileTree(dir: 'lib', include: '**/*.jar') } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java index d106aa8..9ebed55 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java @@ -1,8 +1,6 @@ package edu.msudenver.tsp.persistence; -import org.springframework.context.annotation.Configuration; - -@Configuration +//@Configuration public class PersistenceConfig { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java index e12987e..64191e1 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java @@ -2,9 +2,7 @@ package edu.msudenver.tsp.persistence.manager; import edu.msudenver.tsp.persistence.dao.DefinitionDao; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -@Component @AllArgsConstructor class DefinitionManager { final private DefinitionDao definitionDao; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java index 95772e2..f33fef3 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java @@ -1,10 +1,7 @@ package edu.msudenver.tsp.persistence.manager; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan +//@Configuration +//@ComponentScan //@PropertySource("classpath:development.properties") public class ManagerConfig { diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java index a6d50c5..ecb5b4a 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java @@ -2,9 +2,8 @@ package edu.msudenver.tsp.persistence.manager; import edu.msudenver.tsp.persistence.dao.NotationDao; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -@Component + @AllArgsConstructor class NotationManager { final private NotationDao notationDao; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java index b891add..4fff042 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java @@ -1,9 +1,7 @@ package edu.msudenver.tsp.persistence.manager; import edu.msudenver.tsp.persistence.dao.ProofDao; -import org.springframework.stereotype.Component; -@Component class ProofManager { final private ProofDao proofDao; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java index 3fdad3e..a26c97c 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java @@ -2,9 +2,7 @@ package edu.msudenver.tsp.persistence.manager; import edu.msudenver.tsp.persistence.dao.TheoremDao; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -@Component @AllArgsConstructor class TheoremManager { final private TheoremDao theoremDao; diff --git a/pandamonium-theorem-prover/services/build.gradle b/pandamonium-theorem-prover/services/build.gradle index 08670b6..b8e0e3f 100644 --- a/pandamonium-theorem-prover/services/build.gradle +++ b/pandamonium-theorem-prover/services/build.gradle @@ -15,16 +15,3 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' compile fileTree(dir: 'lib', include: '**/*.jar') } - -test { - if (System.properties['test.profile'] != 'integrationTest') { - exclude '**/*integrationTest*' - } else { - exclude '**/*edu/*' - } -} - -testSets { - unitTest - integrationTest -} diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java index eb1c4f2..cd73f5e 100644 --- a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java @@ -1,10 +1,7 @@ package edu.msudenver.tsp.services.parser; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan +//@Configuration +//@ComponentScan //@PropertySource("classpath:development.properties") public class ParserConfig { diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java index 64726fb..919314a 100644 --- a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java @@ -1,8 +1,6 @@ package edu.msudenver.tsp.services.parser; -import org.springframework.stereotype.Service; - -@Service +//@Service class ParserService { } diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java index 3a4aa63..38dfd76 100644 --- a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java @@ -1,15 +1,11 @@ package edu.msudenver.tsp.services.scoring; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ComponentScan +//@Configuration +//@ComponentScan //@PropertySource("classpath:development.properties") public class ScoringConfig { - @Bean +// @Bean public TheoremScoringService theoremScoringService() { return new TheoremScoringService(); } diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java index 6dad106..50f531f 100644 --- a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java @@ -1,8 +1,6 @@ package edu.msudenver.tsp.services.scoring; -import org.springframework.stereotype.Service; - -@Service +//@Service class TheoremScoringService { } diff --git a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java index e74ff33..1ae6e5e 100644 --- a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java +++ b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java @@ -1,9 +1,17 @@ package edu.msudenver.tsp.services.parser; +import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; +import static org.junit.Assert.assertEquals; + @RunWith(MockitoJUnitRunner.class) public class ParserServiceTest { + @Test + public void test() { + assertEquals(3,3); + } + } \ No newline at end of file diff --git a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java index 886bbf2..f116fb6 100644 --- a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java +++ b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java @@ -1,9 +1,16 @@ package edu.msudenver.tsp.services.scoring; +import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; +import static org.junit.Assert.assertEquals; + @RunWith(MockitoJUnitRunner.class) public class TheoremScoringServiceTest { + @Test + public void test() { + assertEquals(3,3); + } } \ No newline at end of file diff --git a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java b/pandamonium-theorem-prover/src/main/java/hello/Application.java similarity index 96% rename from pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java rename to pandamonium-theorem-prover/src/main/java/hello/Application.java index c8f0854..b7cb82e 100644 --- a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java +++ b/pandamonium-theorem-prover/src/main/java/hello/Application.java @@ -1,4 +1,4 @@ -package edu.msudenver.tsp.website; +package hello; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; diff --git a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java b/pandamonium-theorem-prover/src/main/java/hello/HelloController.java similarity index 88% rename from pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java rename to pandamonium-theorem-prover/src/main/java/hello/HelloController.java index a9f1ad5..66a5927 100644 --- a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java +++ b/pandamonium-theorem-prover/src/main/java/hello/HelloController.java @@ -1,4 +1,4 @@ -package edu.msudenver.tsp.website; +package hello; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java index d7efc65..3e4ab1e 100644 --- a/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java +++ b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java @@ -1,6 +1,6 @@ package edu.msudenver.tsp.website.integrationTest; -import edu.msudenver.tsp.website.Application; +import hello.Application; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/pandamonium-theorem-prover/utilities/build.gradle b/pandamonium-theorem-prover/utilities/build.gradle index 36ae5e1..b8e0e3f 100644 --- a/pandamonium-theorem-prover/utilities/build.gradle +++ b/pandamonium-theorem-prover/utilities/build.gradle @@ -13,17 +13,5 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' + compile fileTree(dir: 'lib', include: '**/*.jar') } - -test { - if (System.properties['test.profile'] != 'integrationTest') { - exclude '**/*integrationTest*' - } else { - exclude '**/*edu/*' - } -} - -testSets { - unitTest - integrationTest -} \ No newline at end of file