closes #159

justinhrobbins · Nov 25, 2014 · 3b52c6d · 3b52c6d
1 parent c103c50
commit 3b52c6d
Show file tree

Hide file tree

Showing 72 changed files with 49 additions and 19 deletions.
diff --git a/FlashCards_Repository/FlashCards_Repository_Commons/pom.xml b/FlashCards_Repository/FlashCards_Repository_Commons/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.robbins.flashcards</groupId>
+		<artifactId>FlashCards_Repository</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>FlashCards_Repository_Commons</artifactId>
+	<packaging>jar</packaging>
+	<name>FlashCards_Repository_Commons</name>
+	<description>FlashCards_Repository description</description>
+	<properties>
+		<skip.coveralls>false</skip.coveralls>
+	</properties>
+	<scm>
+		<connection>scm:git:git@github.com:justinhrobbins/FlashCards_App.git</connection>
+		<url>scm:git:git@github.com:justinhrobbins/FlashCards_App.git</url>
+		<developerConnection>scm:git:git@github.com:justinhrobbins/FlashCards_App.git</developerConnection>
+	</scm>
+	<dependencies>
+		<!-- FlashCards project module dependencies -->
+		<dependency>
+			<groupId>org.robbins.flashcards</groupId>
+			<artifactId>FlashCards_Domain</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>FlashCards_Repository_Commons</finalName>
+	</build>
+</project>
diff --git a/...cards/repository/FlashCardRepository.java → ...cards/repository/FlashCardRepository.java b/...cards/repository/FlashCardRepository.java → ...cards/repository/FlashCardRepository.java
diff --git a/...s/repository/FlashCardsAppRepository.java → ...s/repository/FlashCardsAppRepository.java b/...s/repository/FlashCardsAppRepository.java → ...s/repository/FlashCardsAppRepository.java
diff --git a/.../flashcards/repository/TagRepository.java → .../flashcards/repository/TagRepository.java b/.../flashcards/repository/TagRepository.java → .../flashcards/repository/TagRepository.java
diff --git a/...flashcards/repository/UserRepository.java → ...flashcards/repository/UserRepository.java b/...flashcards/repository/UserRepository.java → ...flashcards/repository/UserRepository.java
diff --git a/FlashCards_Repository_Jpa/.gitignore → ...tory/FlashCards_Repository_Jpa/.gitignore b/FlashCards_Repository_Jpa/.gitignore → ...tory/FlashCards_Repository_Jpa/.gitignore
diff --git a/FlashCards_Repository_Jpa/pom.xml → ...ository/FlashCards_Repository_Jpa/pom.xml b/FlashCards_Repository_Jpa/pom.xml → ...ository/FlashCards_Repository_Jpa/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<groupId>org.robbins.flashcards</groupId>
-		<artifactId>FlashCards_App</artifactId>
+		<artifactId>FlashCards_Repository</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/...epository/AbstractCrudRepositoryImpl.java → ...epository/AbstractCrudRepositoryImpl.java b/...epository/AbstractCrudRepositoryImpl.java → ...epository/AbstractCrudRepositoryImpl.java
diff --git a/...cards/repository/FlashCardRepository.java → ...cards/repository/FlashCardRepository.java b/...cards/repository/FlashCardRepository.java → ...cards/repository/FlashCardRepository.java
diff --git a/...s/repository/FlashCardRepositoryImpl.java → ...s/repository/FlashCardRepositoryImpl.java b/...s/repository/FlashCardRepositoryImpl.java → ...s/repository/FlashCardRepositoryImpl.java
diff --git a/...s/repository/FlashCardsAppRepository.java → ...s/repository/FlashCardsAppRepository.java b/...s/repository/FlashCardsAppRepository.java → ...s/repository/FlashCardsAppRepository.java
diff --git a/.../flashcards/repository/TagRepository.java → .../flashcards/repository/TagRepository.java b/.../flashcards/repository/TagRepository.java → .../flashcards/repository/TagRepository.java
diff --git a/...shcards/repository/TagRepositoryImpl.java → ...shcards/repository/TagRepositoryImpl.java b/...shcards/repository/TagRepositoryImpl.java → ...shcards/repository/TagRepositoryImpl.java
diff --git a/...flashcards/repository/UserRepository.java → ...flashcards/repository/UserRepository.java b/...flashcards/repository/UserRepository.java → ...flashcards/repository/UserRepository.java
diff --git a/...hcards/repository/UserRepositoryImpl.java → ...hcards/repository/UserRepositoryImpl.java b/...hcards/repository/UserRepositoryImpl.java → ...hcards/repository/UserRepositoryImpl.java
diff --git a/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml b/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml
diff --git a/...sources/applicationContext-repository.xml → ...sources/applicationContext-repository.xml b/...sources/applicationContext-repository.xml → ...sources/applicationContext-repository.xml
diff --git a/...sitory/jpa/FlashCardRepositoryImplUT.java → ...sitory/jpa/FlashCardRepositoryImplUT.java b/...sitory/jpa/FlashCardRepositoryImplUT.java → ...sitory/jpa/FlashCardRepositoryImplUT.java
diff --git a/...s/repository/jpa/TagRepositoryImplUT.java → ...s/repository/jpa/TagRepositoryImplUT.java b/...s/repository/jpa/TagRepositoryImplUT.java → ...s/repository/jpa/TagRepositoryImplUT.java
diff --git a/.../repository/jpa/UserRepositoryImplUT.java → .../repository/jpa/UserRepositoryImplUT.java b/.../repository/jpa/UserRepositoryImplUT.java → .../repository/jpa/UserRepositoryImplUT.java
diff --git a/...pa/base/AbstractCrudRepositoryImplUT.java → ...pa/base/AbstractCrudRepositoryImplUT.java b/...pa/base/AbstractCrudRepositoryImplUT.java → ...pa/base/AbstractCrudRepositoryImplUT.java
diff --git a/FlashCards_Repository_Jpa_Commons/pom.xml → ...FlashCards_Repository_Jpa_Commons/pom.xml b/FlashCards_Repository_Jpa_Commons/pom.xml → ...FlashCards_Repository_Jpa_Commons/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<groupId>org.robbins.flashcards</groupId>
-		<artifactId>FlashCards_App</artifactId>
+		<artifactId>FlashCards_Repository</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/...s/repository/conversion/DtoConverter.java → ...s/repository/conversion/DtoConverter.java b/...s/repository/conversion/DtoConverter.java → ...s/repository/conversion/DtoConverter.java
diff --git a/...conversion/impl/AbstractDtoConverter.java → ...conversion/impl/AbstractDtoConverter.java b/...conversion/impl/AbstractDtoConverter.java → ...conversion/impl/AbstractDtoConverter.java
diff --git a/...on/impl/DefaultFlashcardDtoConverter.java → ...on/impl/DefaultFlashcardDtoConverter.java b/...on/impl/DefaultFlashcardDtoConverter.java → ...on/impl/DefaultFlashcardDtoConverter.java
diff --git a/...nversion/impl/DefaultTagDtoConverter.java → ...nversion/impl/DefaultTagDtoConverter.java b/...nversion/impl/DefaultTagDtoConverter.java → ...nversion/impl/DefaultTagDtoConverter.java
diff --git a/...version/impl/DefaultUserDtoConverter.java → ...version/impl/DefaultUserDtoConverter.java b/...version/impl/DefaultUserDtoConverter.java → ...version/impl/DefaultUserDtoConverter.java
diff --git a/...ade/PagingAndSortingRepositoryFacade.java → ...ade/PagingAndSortingRepositoryFacade.java b/...ade/PagingAndSortingRepositoryFacade.java → ...ade/PagingAndSortingRepositoryFacade.java
diff --git a/...ase/AbstractCrudRepositoryFacadeImpl.java → ...ase/AbstractCrudRepositoryFacadeImpl.java b/...ase/AbstractCrudRepositoryFacadeImpl.java → ...ase/AbstractCrudRepositoryFacadeImpl.java
diff --git a/...mpl/DefaultFlashcardRepositoryFacade.java → ...mpl/DefaultFlashcardRepositoryFacade.java b/...mpl/DefaultFlashcardRepositoryFacade.java → ...mpl/DefaultFlashcardRepositoryFacade.java
diff --git a/...cade/impl/DefaultTagRepositoryFacade.java → ...cade/impl/DefaultTagRepositoryFacade.java b/...cade/impl/DefaultTagRepositoryFacade.java → ...cade/impl/DefaultTagRepositoryFacade.java
diff --git a/...ade/impl/DefaultUserRepositoryFacade.java → ...ade/impl/DefaultUserRepositoryFacade.java b/...ade/impl/DefaultUserRepositoryFacade.java → ...ade/impl/DefaultUserRepositoryFacade.java
diff --git a/...s/flashcards/repository/util/DtoUtil.java → ...s/flashcards/repository/util/DtoUtil.java b/...s/flashcards/repository/util/DtoUtil.java → ...s/flashcards/repository/util/DtoUtil.java
diff --git a/...repository/util/FieldInitializerUtil.java → ...repository/util/FieldInitializerUtil.java b/...repository/util/FieldInitializerUtil.java → ...repository/util/FieldInitializerUtil.java
diff --git a/...ository/util/dozer/DateTimeConverter.java → ...ository/util/dozer/DateTimeConverter.java b/...ository/util/dozer/DateTimeConverter.java → ...ository/util/dozer/DateTimeConverter.java
diff --git a/...tory/util/dozer/HibernateFieldMapper.java → ...tory/util/dozer/HibernateFieldMapper.java b/...tory/util/dozer/HibernateFieldMapper.java → ...tory/util/dozer/HibernateFieldMapper.java
diff --git a/...icationContext-repository-jpa-commons.xml → ...icationContext-repository-jpa-commons.xml b/...icationContext-repository-jpa-commons.xml → ...icationContext-repository-jpa-commons.xml
diff --git a/...ons/src/main/resources/dozer-mappings.xml → ...ons/src/main/resources/dozer-mappings.xml b/...ons/src/main/resources/dozer-mappings.xml → ...ons/src/main/resources/dozer-mappings.xml
diff --git a/...ons/src/main/resources/infrastructure.xml → ...ons/src/main/resources/infrastructure.xml b/...ons/src/main/resources/infrastructure.xml → ...ons/src/main/resources/infrastructure.xml
diff --git a/...mons/src/main/resources/sql/flashcard.sql → ...mons/src/main/resources/sql/flashcard.sql b/...mons/src/main/resources/sql/flashcard.sql → ...mons/src/main/resources/sql/flashcard.sql
diff --git a/...src/main/resources/sql/flashcard_link.sql → ...src/main/resources/sql/flashcard_link.sql b/...src/main/resources/sql/flashcard_link.sql → ...src/main/resources/sql/flashcard_link.sql
diff --git a/.../src/main/resources/sql/flashcard_tag.sql → .../src/main/resources/sql/flashcard_tag.sql b/.../src/main/resources/sql/flashcard_tag.sql → .../src/main/resources/sql/flashcard_tag.sql
diff --git a/...pa_Commons/src/main/resources/sql/tag.sql → ...pa_Commons/src/main/resources/sql/tag.sql b/...pa_Commons/src/main/resources/sql/tag.sql → ...pa_Commons/src/main/resources/sql/tag.sql
diff --git a/...a_Commons/src/main/resources/sql/user.sql → ...a_Commons/src/main/resources/sql/user.sql b/...a_Commons/src/main/resources/sql/user.sql → ...a_Commons/src/main/resources/sql/user.sql
diff --git a/...rsion/DefaultFlashcardDtoConverterUT.java → ...rsion/DefaultFlashcardDtoConverterUT.java b/...rsion/DefaultFlashcardDtoConverterUT.java → ...rsion/DefaultFlashcardDtoConverterUT.java
diff --git a/.../conversion/DefaultTagDtoConverterUT.java → .../conversion/DefaultTagDtoConverterUT.java b/.../conversion/DefaultTagDtoConverterUT.java → .../conversion/DefaultTagDtoConverterUT.java
diff --git a/...conversion/DefaultUserDtoConverterUT.java → ...conversion/DefaultUserDtoConverterUT.java b/...conversion/DefaultUserDtoConverterUT.java → ...conversion/DefaultUserDtoConverterUT.java
diff --git a/...facade/impl/DefaultFlashcardFacadeUT.java → ...facade/impl/DefaultFlashcardFacadeUT.java b/...facade/impl/DefaultFlashcardFacadeUT.java → ...facade/impl/DefaultFlashcardFacadeUT.java
diff --git a/...itory/facade/impl/DefaultTagFacadeIT.java → ...itory/facade/impl/DefaultTagFacadeIT.java b/...itory/facade/impl/DefaultTagFacadeIT.java → ...itory/facade/impl/DefaultTagFacadeIT.java
diff --git a/...itory/facade/impl/DefaultTagFacadeUT.java → ...itory/facade/impl/DefaultTagFacadeUT.java b/...itory/facade/impl/DefaultTagFacadeUT.java → ...itory/facade/impl/DefaultTagFacadeUT.java
diff --git a/...tory/facade/impl/DefaultUserFacadeUT.java → ...tory/facade/impl/DefaultUserFacadeUT.java b/...tory/facade/impl/DefaultUserFacadeUT.java → ...tory/facade/impl/DefaultUserFacadeUT.java
diff --git a/...flashcards/repository/util/DtoUtilUT.java → ...flashcards/repository/util/DtoUtilUT.java b/...flashcards/repository/util/DtoUtilUT.java → ...flashcards/repository/util/DtoUtilUT.java
diff --git a/...pository/util/FieldInitializerUtilUT.java → ...pository/util/FieldInitializerUtilUT.java b/...pository/util/FieldInitializerUtilUT.java → ...pository/util/FieldInitializerUtilUT.java
diff --git a/...itory/util/dozer/DateTimeConverterUT.java → ...itory/util/dozer/DateTimeConverterUT.java b/...itory/util/dozer/DateTimeConverterUT.java → ...itory/util/dozer/DateTimeConverterUT.java
diff --git a/...ry/util/dozer/HibernateFieldMapperUT.java → ...ry/util/dozer/HibernateFieldMapperUT.java b/...ry/util/dozer/HibernateFieldMapperUT.java → ...ry/util/dozer/HibernateFieldMapperUT.java
diff --git a/FlashCards_Repository_SpringData/.gitignore → ...ashCards_Repository_SpringData/.gitignore b/FlashCards_Repository_SpringData/.gitignore → ...ashCards_Repository_SpringData/.gitignore
diff --git a/FlashCards_Repository_SpringData/pom.xml → .../FlashCards_Repository_SpringData/pom.xml b/FlashCards_Repository_SpringData/pom.xml → .../FlashCards_Repository_SpringData/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<groupId>org.robbins.flashcards</groupId>
-		<artifactId>FlashCards_App</artifactId>
+		<artifactId>FlashCards_Repository</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/...cards/repository/FlashCardRepository.java → ...cards/repository/FlashCardRepository.java b/...cards/repository/FlashCardRepository.java → ...cards/repository/FlashCardRepository.java
diff --git a/...s/repository/FlashCardsAppRepository.java → ...s/repository/FlashCardsAppRepository.java b/...s/repository/FlashCardsAppRepository.java → ...s/repository/FlashCardsAppRepository.java
diff --git a/.../flashcards/repository/TagRepository.java → .../flashcards/repository/TagRepository.java b/.../flashcards/repository/TagRepository.java → .../flashcards/repository/TagRepository.java
diff --git a/...flashcards/repository/UserRepository.java → ...flashcards/repository/UserRepository.java b/...flashcards/repository/UserRepository.java → ...flashcards/repository/UserRepository.java
diff --git a/...gData/src/main/resources/META-INF/orm.xml → ...gData/src/main/resources/META-INF/orm.xml b/...gData/src/main/resources/META-INF/orm.xml → ...gData/src/main/resources/META-INF/orm.xml
diff --git a/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml b/...c/main/resources/META-INF/persistence.xml → ...c/main/resources/META-INF/persistence.xml
diff --git a/...sources/applicationContext-repository.xml → ...sources/applicationContext-repository.xml b/...sources/applicationContext-repository.xml → ...sources/applicationContext-repository.xml
diff --git a/...ory/springdata/FlashCardRepositoryIT.java → ...ory/springdata/FlashCardRepositoryIT.java b/...ory/springdata/FlashCardRepositoryIT.java → ...ory/springdata/FlashCardRepositoryIT.java
diff --git a/...epository/springdata/TagRepositoryIT.java → ...epository/springdata/TagRepositoryIT.java b/...epository/springdata/TagRepositoryIT.java → ...epository/springdata/TagRepositoryIT.java
diff --git a/...licationContext-repository-springdata.xml → ...licationContext-repository-springdata.xml b/...licationContext-repository-springdata.xml → ...licationContext-repository-springdata.xml
diff --git a/...esources/test-flashCardsAppRepository.xml → ...esources/test-flashCardsAppRepository.xml b/...esources/test-flashCardsAppRepository.xml → ...esources/test-flashCardsAppRepository.xml
diff --git a/...rc/test/resources/test-infrastructure.xml → ...rc/test/resources/test-infrastructure.xml b/...rc/test/resources/test-infrastructure.xml → ...rc/test/resources/test-infrastructure.xml
diff --git a/FlashCards_Repository/pom.xml b/FlashCards_Repository/pom.xml
@@ -8,26 +8,21 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>FlashCards_Repository</artifactId>
-	<packaging>jar</packaging>
+	<packaging>pom</packaging>
 	<name>FlashCards_Repository</name>
 	<description>FlashCards_Repository description</description>
 	<properties>
-		<skip.coveralls>false</skip.coveralls>
+		<skip.coveralls>true</skip.coveralls>
 	</properties>
 	<scm>
 		<connection>scm:git:git@github.com:justinhrobbins/FlashCards_App.git</connection>
 		<url>scm:git:git@github.com:justinhrobbins/FlashCards_App.git</url>
 		<developerConnection>scm:git:git@github.com:justinhrobbins/FlashCards_App.git</developerConnection>
 	</scm>
-	<dependencies>
-		<!-- FlashCards project module dependencies -->
-		<dependency>
-			<groupId>org.robbins.flashcards</groupId>
-			<artifactId>FlashCards_Domain</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<finalName>FlashCards_Repository</finalName>
-	</build>
+    <modules>
+        <module>FlashCards_Repository_Commons</module>
+        <module>FlashCards_Repository_Jpa_Commons</module>
+        <module>FlashCards_Repository_Jpa</module>
+        <module>FlashCards_Repository_SpringData</module>
+    </modules>
 </project>
diff --git a/FlashCards_Service/pom.xml b/FlashCards_Service/pom.xml
@@ -21,6 +21,11 @@
 	</scm>
 	<dependencies>
 		<!-- FlashCards project module dependencies -->
+        <dependency>
+            <groupId>org.robbins.flashcards</groupId>
+            <artifactId>FlashCards_Domain</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.robbins.flashcards</groupId>
             <artifactId>FlashCards_DTO</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -147,9 +147,6 @@
         <module>FlashCards_Domain</module>
         <module>FlashCards_DTO</module>
         <module>FlashCards_Repository</module>
-        <module>FlashCards_Repository_Jpa_Commons</module>
-        <module>FlashCards_Repository_Jpa</module>
-        <module>FlashCards_Repository_SpringData</module>
         <module>FlashCards_API</module>
         <module>FlashCards_Service</module>
         <module>FlashCards_Client</module>