https://github.com/rreganjr/Requel/issues/7

#8
#9
#10
#11
#12
branch 1.0.3

I had to make more modules than originally expected to get around some cyclic dependencies, but there are still some issues, new bugs created. see #16

Signed-off-by: rreganjr <rreganjr@acm.org>

_maven-base/pom.xml

@@ -18,7 +18,7 @@
 
     <name>Requel Maven Base Dependencies</name>
     <description>
-        This defines all the third party dependencies so that all the modules use the same library versions.
+        This defines all the third party dependencies so that all the moduueles use the same library versions.
         I copied the third party properties and dependencies from
         https://github.com/spring-projects/spring-boot/blob/master/spring-boot-dependencies/pom.xml
     </description>
@@ -83,32 +83,75 @@
     </pluginRepositories>
 
     <modules>
+        <module>../_test-base</module>
         <module>../exception</module>
         <module>../initializer</module>
         <module>../command</module>
         <module>../repository</module>
         <module>../nlp</module>
         <module>../requel</module>
         <module>../nlp-ui</module>
+        <module>../requel-project</module>
+        <module>../requel-user</module>
+        <module>../jaxb-utils</module>
+        <module>../date-util</module>
+        <module>../describable</module>
+        <module>../annotatable</module>
+        <module>../annotation</module>
+        <module>../requel-project-ui</module>
+        <module>../requel-ui</module>
+        <module>../requel-user-ui</module>
+        <module>../annotation-ui</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>com.rreganjr.requel</groupId>
-                <artifactId>exception</artifactId>
+                <artifactId>_test-base</artifactId>
+                <scope>test</scope>
                 <version>1.0.3</version>
             </dependency>
             <dependency>
                 <groupId>com.rreganjr.requel</groupId>
-                <artifactId>initializer</artifactId>
+                <artifactId>annotatable</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>annotation</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>annotation-ui</artifactId>
                 <version>1.0.3</version>
             </dependency>
             <dependency>
                 <groupId>com.rreganjr.requel</groupId>
                 <artifactId>command</artifactId>
                 <version>1.0.3</version>
             </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>date-util</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>describable</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>exception</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>initializer</artifactId>
+                <version>1.0.3</version>
+            </dependency>
             <dependency>
                 <groupId>com.rreganjr.requel</groupId>
                 <artifactId>nlp</artifactId>
@@ -129,6 +172,31 @@
                 <artifactId>requel</artifactId>
                 <version>1.0.3</version>
             </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>requel-project</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>requel-project-ui</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>requel-ui</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>requel-user</artifactId>
+                <version>1.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.rreganjr.requel</groupId>
+                <artifactId>requel-user-ui</artifactId>
+                <version>1.0.3</version>
+            </dependency>
 
             <!-- https://mvnrepository.com/artifact/cglib/cglib-nodep -->
             <dependency>

_test-base/_test-base.iml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+  </component>
+</module>

_test-base/pom.xml

@@ -0,0 +1,21 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>maven-base</artifactId>
+        <groupId>com.rreganjr.requel</groupId>
+        <version>1.0.3</version>
+        <relativePath>../_maven-base/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>_test-base</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+    </dependencies>
+</project>

requel/src/test/java/com/rreganjr/TestCase.java → _test-base/src/main/java/com/rreganjr/TestCase.java

@@ -9,10 +9,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
 
-import com.rreganjr.requel.user.impl.UserImpl;
 import junit.framework.AssertionFailedError;
 
 /**
@@ -101,7 +98,7 @@ public static void assertEquals(Collection<?> expected, Collection<?> actual)
 	}
 
 	public static void assertEqualsIgnoreWhitespace(String expected, String actual) {
-		assertEquals(normalize(expected), normalize(actual));
+		TestCase.assertEquals(normalize(expected), normalize(actual));
 	}
 
 	public static String normalize(String str) {

annotatable/annotatable.iml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="describable" />
+    <orderEntry type="module" module-name="requel-user" />
+    <orderEntry type="module" module-name="exception" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:3.1.0.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.1.0.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="module" module-name="date-util" />
+    <orderEntry type="module" module-name="repository" />
+    <orderEntry type="module" module-name="initializer" />
+    <orderEntry type="module" module-name="command" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fifesoft:spellchecker:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fifesoft:rsyntaxtextarea:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.2.14.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.22.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.45" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>

annotatable/pom.xml

@@ -0,0 +1,43 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>maven-base</artifactId>
+        <groupId>com.rreganjr.requel</groupId>
+        <version>1.0.3</version>
+        <relativePath>../_maven-base/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>annotatable</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.rreganjr.requel</groupId>
+            <artifactId>describable</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.rreganjr.requel</groupId>
+            <artifactId>requel-user</artifactId>
+        </dependency>
+
+        <!-- JAXB -->
+        <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

requel/src/main/java/com/rreganjr/requel/annotation/Annotation.java → annotatable/src/main/java/com/rreganjr/requel/annotation/Annotation.java

@@ -20,10 +20,11 @@
  */
 package com.rreganjr.requel.annotation;
 
+import com.rreganjr.requel.Describable;
+import com.rreganjr.requel.user.CreatedEntity;
+
 import java.util.Set;
 
-import com.rreganjr.requel.CreatedEntity;
-import com.rreganjr.requel.Describable;
 
 /**
  * An abstraction of something that can be added to an Annotatable object such
@@ -37,6 +38,7 @@ public interface Annotation extends Comparable<Annotation>, CreatedEntity, Descr
 	 * @return an object used as a context for a group of annotations.
 	 */
 	public Object getGroupingObject();
+	public void setGroupingObject(Object groupingObject);
 
 	/**
 	 * @return the simple name of the type of annotation

requel/src/main/java/com/rreganjr/requel/utils/jaxb/JAXBAnnotatablePatcher.java → annotatable/src/main/java/com/rreganjr/requel/annotation/JAXBAnnotatablePatcher.java

@@ -18,15 +18,12 @@
  * along with Requel. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.rreganjr.requel.utils.jaxb;
+package com.rreganjr.requel.annotation;
 
 import org.xml.sax.SAXException;
 
 import com.sun.xml.bind.v2.runtime.unmarshaller.Patcher;
 
-import com.rreganjr.requel.annotation.Annotatable;
-import com.rreganjr.requel.annotation.Annotation;
-
 /**
  * This is used to add an annotatable to all the annotations after import.
  *