Updated the package architecture

pandamonium-theorem-prover/build.gradle

@@ -74,8 +74,8 @@ dependencies {
 }
 
 test {
-    if (System.properties['test.profile'] != 'integrationTest') {
+    if (System.properties['test.profile'] != 'edu.msudenver.tsp.website.integrationTest') {
-        exclude '**/*integrationTest*'
+        exclude '**/*edu.msudenver.tsp.website.integrationTest*'
     } else {
         exclude '**/*edu/*'
     }

pandamonium-theorem-prover/persistence/build.gradle

@@ -14,3 +14,16 @@ repositories {
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
+
+test {
+    if (System.properties['test.profile'] != 'edu.msudenver.tsp.persistence.integrationTest') {
+        exclude '**/*edu.msudenver.tsp.persistence.integrationTest*'
+    } else {
+        exclude '**/*edu/*'
+    }
+}
+
+testSets {
+    unitTest
+    integrationTest
+}

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java

@@ -1,3 +1,5 @@
+package edu.msudenver.tsp.persistence;
+
 import org.springframework.context.annotation.Configuration;
 
 @Configuration

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java

@@ -1,4 +1,4 @@
-package dao;
+package edu.msudenver.tsp.persistence.dao;
 
 class BaseDao {
 

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java

@@ -1,4 +1,4 @@
-package dao;
+package edu.msudenver.tsp.persistence.dao;
 
 public class DefinitionDao extends BaseDao {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java

@@ -1,4 +1,4 @@
-package dao;
+package edu.msudenver.tsp.persistence.dao;
 
 public class NotationDao extends BaseDao {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java

@@ -1,4 +1,4 @@
-package dao;
+package edu.msudenver.tsp.persistence.dao;
 
 public class ProofDao extends BaseDao {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java

@@ -1,4 +1,4 @@
-package dao;
+package edu.msudenver.tsp.persistence.dao;
 
 public class TheoremDao extends BaseDao {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java

@@ -1,4 +1,4 @@
-package dto;
+package edu.msudenver.tsp.persistence.dto;
 
 import lombok.Data;
 

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java

@@ -1,4 +1,4 @@
-package dto;
+package edu.msudenver.tsp.persistence.dto;
 
 public class DefinitionDto extends BaseDto {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java

@@ -1,4 +1,4 @@
-package dto;
+package edu.msudenver.tsp.persistence.dto;
 
 public class NotationDto extends BaseDto {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java

@@ -1,4 +1,4 @@
-package dto;
+package edu.msudenver.tsp.persistence.dto;
 
 public class ProofDto extends BaseDto {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java

@@ -1,4 +1,4 @@
-package dto;
+package edu.msudenver.tsp.persistence.dto;
 
 public class TheoremDto extends BaseDto {
 }

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java

@@ -1,6 +1,6 @@
-package manager;
+package edu.msudenver.tsp.persistence.manager;
 
-import dao.DefinitionDao;
+import edu.msudenver.tsp.persistence.dao.DefinitionDao;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java

@@ -1,9 +1,9 @@
-package manager;
+package edu.msudenver.tsp.persistence.manager;
 
-import dao.DefinitionDao;
+import edu.msudenver.tsp.persistence.dao.DefinitionDao;
-import dao.NotationDao;
+import edu.msudenver.tsp.persistence.dao.NotationDao;
-import dao.ProofDao;
+import edu.msudenver.tsp.persistence.dao.ProofDao;
-import dao.TheoremDao;
+import edu.msudenver.tsp.persistence.dao.TheoremDao;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java

@@ -1,6 +1,6 @@
-package manager;
+package edu.msudenver.tsp.persistence.manager;
 
-import dao.NotationDao;
+import edu.msudenver.tsp.persistence.dao.NotationDao;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java

@@ -1,6 +1,6 @@
-package manager;
+package edu.msudenver.tsp.persistence.manager;
 
-import dao.ProofDao;
+import edu.msudenver.tsp.persistence.dao.ProofDao;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 

pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java

@@ -1,6 +1,6 @@
-package manager;
+package edu.msudenver.tsp.persistence.manager;
 
-import dao.TheoremDao;
+import edu.msudenver.tsp.persistence.dao.TheoremDao;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 

pandamonium-theorem-prover/services/build.gradle

@@ -15,3 +15,16 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     compile fileTree(dir: 'lib', include: '**/*.jar')
 }
+
+test {
+    if (System.properties['test.profile'] != 'edu.msudenver.tsp.services.integrationTest') {
+        exclude '**/*edu.msudenver.tsp.services.integrationTest*'
+    } else {
+        exclude '**/*edu/*'
+    }
+}
+
+testSets {
+    unitTest
+    integrationTest
+}

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java

@@ -1,4 +1,4 @@
-package parser;
+package edu.msudenver.tsp.services.parser;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java

@@ -1,4 +1,4 @@
-package parser;
+package edu.msudenver.tsp.services.parser;
 
 import org.springframework.stereotype.Service;
 

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java

@@ -1,4 +1,4 @@
-package scoring;
+package edu.msudenver.tsp.services.scoring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;

pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java

@@ -1,4 +1,4 @@
-package scoring;
+package edu.msudenver.tsp.services.scoring;
 
 import org.springframework.stereotype.Service;
 

pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java

@@ -1,4 +1,4 @@
-package parser;
+package edu.msudenver.tsp.services.parser;
 
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;

pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java

@@ -1,4 +1,4 @@
-package scoring;
+package edu.msudenver.tsp.services.scoring;
 
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;

pandamonium-theorem-prover/src/main/java/ProofsDriver.java

@@ -1,2 +0,0 @@
-public class ProofsDriver {
-}

pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java

@@ -0,0 +1,4 @@
+package edu.msudenver.tsp.website;
+
+public class ProofsDriver {
+}

pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java

@@ -1,3 +1,5 @@
+package edu.msudenver.tsp.website;
+
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

pandamonium-theorem-prover/src/test/java/ProofsDriverTest.java

@@ -1,3 +0,0 @@
-public class ProofsDriverTest {
-
-}

pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java

@@ -1,3 +1,5 @@
+package edu.msudenver.tsp.website;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java

@@ -0,0 +1,5 @@
+package edu.msudenver.tsp.website;
+
+public class ProofsDriverTest {
+
+}

pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java

@@ -1,4 +1,4 @@
-package integrationTest;
+package edu.msudenver.tsp.website.integrationTest;
 
 import hello.Application;
 import org.junit.Before;

pandamonium-theorem-prover/utilities/build.gradle

@@ -14,3 +14,16 @@ repositories {
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
+
+test {
+    if (System.properties['test.profile'] != 'edu.msudenver.tsp.utilities.integrationTest') {
+        exclude '**/*edu.msudenver.tsp.utilities.integrationTest*'
+    } else {
+        exclude '**/*edu/*'
+    }
+}
+
+testSets {
+    unitTest
+    integrationTest
+}