package structure

jschneider · Jul 11, 2011 · b41e1f7 · b41e1f7
1 parent ca0be61
commit b41e1f7
Show file tree

Hide file tree

Showing 73 changed files with 218 additions and 217 deletions.
diff --git a/generator/src/main/java/com/cedarsoft/rest/generator/Generator.java b/generator/src/main/java/com/cedarsoft/rest/generator/Generator.java
@@ -40,12 +40,12 @@
 import com.cedarsoft.codegen.model.FieldTypeInformation;
 import com.cedarsoft.codegen.model.FieldWithInitializationInfo;
 import com.cedarsoft.id.NameSpaceSupport;
-import com.cedarsoft.jaxb.AbstractJaxbCollection;
-import com.cedarsoft.jaxb.AbstractJaxbObject;
-import com.cedarsoft.jaxb.JaxbObject;
-import com.cedarsoft.jaxb.JaxbStub;
-import com.cedarsoft.rest.JaxbMapping;
-import com.cedarsoft.rest.UriContext;
+import com.cedarsoft.rest.model.AbstractJaxbCollection;
+import com.cedarsoft.rest.model.AbstractJaxbObject;
+import com.cedarsoft.rest.model.JaxbObject;
+import com.cedarsoft.rest.model.JaxbStub;
+import com.cedarsoft.rest.server.JaxbMapping;
+import com.cedarsoft.rest.server.UriContext;
 import com.sun.codemodel.JAnnotationUse;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;

diff --git a/generator/src/main/java/com/cedarsoft/rest/generator/TestGenerator.java b/generator/src/main/java/com/cedarsoft/rest/generator/TestGenerator.java
@@ -38,12 +38,12 @@
 import com.cedarsoft.codegen.model.DomainObjectDescriptor;
 import com.cedarsoft.codegen.model.FieldTypeInformation;
 import com.cedarsoft.codegen.model.FieldWithInitializationInfo;
-import com.cedarsoft.rest.AbstractJaxbTest;
-import com.cedarsoft.rest.AbstractMappedJaxbTest;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbMapping;
-import com.cedarsoft.rest.JaxbTestUtils;
-import com.cedarsoft.rest.SimpleJaxbTest;
+import com.cedarsoft.rest.test.AbstractJaxbTest;
+import com.cedarsoft.rest.test.AbstractMappedJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.server.JaxbMapping;
+import com.cedarsoft.rest.test.JaxbTestUtils;
+import com.cedarsoft.rest.test.SimpleJaxbTest;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JClassAlreadyExistsException;

diff --git a/.../src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.BarModelJaxb.txt b/.../src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.BarModelJaxb.txt
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
-import com.cedarsoft.jaxb.AbstractJaxbCollection;
-import com.cedarsoft.jaxb.AbstractJaxbObject;
-import com.cedarsoft.jaxb.JaxbStub;
+import com.cedarsoft.rest.model.AbstractJaxbCollection;
+import com.cedarsoft.rest.model.AbstractJaxbObject;
+import com.cedarsoft.rest.model.JaxbStub;
 
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -158,9 +158,9 @@ public abstract class BarModel
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import javax.ws.rs.core.UriBuilder;
-import com.cedarsoft.jaxb.JaxbObject;
-import com.cedarsoft.rest.JaxbMapping;
-import com.cedarsoft.rest.UriContext;
+import com.cedarsoft.rest.model.JaxbObject;
+import com.cedarsoft.rest.server.JaxbMapping;
+import com.cedarsoft.rest.server.UriContext;
 import com.cedarsoft.rest.generator.test.BarModel;
 
 public class BarModelMapping

diff --git a/.../test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.BarModelJaxbTest.txt b/.../test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.BarModelJaxbTest.txt
@@ -4,9 +4,9 @@ package com.cedarsoft.rest.generator.test.jaxb;
 
 import java.util.Arrays;
 import java.util.HashSet;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbTestUtils;
-import com.cedarsoft.rest.SimpleJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.test.JaxbTestUtils;
+import com.cedarsoft.rest.test.SimpleJaxbTest;
 import org.junit.experimental.theories.DataPoint;
 
 public class BarModelJaxbTest
@@ -65,10 +65,10 @@ package com.cedarsoft.rest.generator.test.jaxb;
 
 import java.util.Arrays;
 import java.util.HashSet;
-import com.cedarsoft.rest.AbstractJaxbTest;
-import com.cedarsoft.rest.AbstractMappedJaxbTest;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbMapping;
+import com.cedarsoft.rest.test.AbstractJaxbTest;
+import com.cedarsoft.rest.test.AbstractMappedJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.server.JaxbMapping;
 import com.cedarsoft.rest.generator.test.BarModel;
 import org.junit.experimental.theories.DataPoint;
 

diff --git a/.../src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.FooModelJaxb.txt b/.../src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.FooModelJaxb.txt
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
-import com.cedarsoft.jaxb.AbstractJaxbCollection;
-import com.cedarsoft.jaxb.AbstractJaxbObject;
-import com.cedarsoft.jaxb.JaxbStub;
+import com.cedarsoft.rest.model.AbstractJaxbCollection;
+import com.cedarsoft.rest.model.AbstractJaxbObject;
+import com.cedarsoft.rest.model.JaxbStub;
 
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -137,9 +137,9 @@ public abstract class FooModel
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import javax.ws.rs.core.UriBuilder;
-import com.cedarsoft.jaxb.JaxbObject;
-import com.cedarsoft.rest.JaxbMapping;
-import com.cedarsoft.rest.UriContext;
+import com.cedarsoft.rest.model.JaxbObject;
+import com.cedarsoft.rest.server.JaxbMapping;
+import com.cedarsoft.rest.server.UriContext;
 import com.cedarsoft.rest.generator.test.FooModel;
 
 public class FooModelMapping

diff --git a/.../test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.FooModelJaxbTest.txt b/.../test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.FooModelJaxbTest.txt
@@ -3,9 +3,9 @@
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import java.util.Arrays;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbTestUtils;
-import com.cedarsoft.rest.SimpleJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.test.JaxbTestUtils;
+import com.cedarsoft.rest.test.SimpleJaxbTest;
 import org.junit.experimental.theories.DataPoint;
 
 public class FooModelJaxbTest
@@ -57,10 +57,10 @@ public class FooModelJaxbTest
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import java.util.Arrays;
-import com.cedarsoft.rest.AbstractJaxbTest;
-import com.cedarsoft.rest.AbstractMappedJaxbTest;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbMapping;
+import com.cedarsoft.rest.test.AbstractJaxbTest;
+import com.cedarsoft.rest.test.AbstractMappedJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.server.JaxbMapping;
 import com.cedarsoft.rest.generator.test.BarModel;
 import com.cedarsoft.rest.generator.test.FooModel;
 import org.junit.experimental.theories.DataPoint;

diff --git a/...tor/src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.GroupJaxb.txt b/...tor/src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.GroupJaxb.txt
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
-import com.cedarsoft.jaxb.AbstractJaxbCollection;
-import com.cedarsoft.jaxb.AbstractJaxbObject;
-import com.cedarsoft.jaxb.JaxbStub;
+import com.cedarsoft.rest.model.AbstractJaxbCollection;
+import com.cedarsoft.rest.model.AbstractJaxbObject;
+import com.cedarsoft.rest.model.JaxbStub;
 
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -117,9 +117,9 @@ public abstract class Group
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import javax.ws.rs.core.UriBuilder;
-import com.cedarsoft.jaxb.JaxbObject;
-import com.cedarsoft.rest.JaxbMapping;
-import com.cedarsoft.rest.UriContext;
+import com.cedarsoft.rest.model.JaxbObject;
+import com.cedarsoft.rest.server.JaxbMapping;
+import com.cedarsoft.rest.server.UriContext;
 import com.cedarsoft.rest.generator.test.Group;
 
 public class GroupMapping

diff --git a/...src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.GroupJaxbTest.txt b/...src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.GroupJaxbTest.txt
@@ -3,9 +3,9 @@
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import java.util.Arrays;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbTestUtils;
-import com.cedarsoft.rest.SimpleJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.test.JaxbTestUtils;
+import com.cedarsoft.rest.test.SimpleJaxbTest;
 import org.junit.experimental.theories.DataPoint;
 
 public class GroupJaxbTest
@@ -55,10 +55,10 @@ public class GroupJaxbTest
 
 package com.cedarsoft.rest.generator.test.jaxb;
 
-import com.cedarsoft.rest.AbstractJaxbTest;
-import com.cedarsoft.rest.AbstractMappedJaxbTest;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbMapping;
+import com.cedarsoft.rest.test.AbstractJaxbTest;
+import com.cedarsoft.rest.test.AbstractMappedJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.server.JaxbMapping;
 import com.cedarsoft.rest.generator.test.Group;
 import org.junit.experimental.theories.DataPoint;
 

diff --git a/...ator/src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.UserJaxb.txt b/...ator/src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.UserJaxb.txt
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
-import com.cedarsoft.jaxb.AbstractJaxbCollection;
-import com.cedarsoft.jaxb.AbstractJaxbObject;
-import com.cedarsoft.jaxb.JaxbStub;
+import com.cedarsoft.rest.model.AbstractJaxbCollection;
+import com.cedarsoft.rest.model.AbstractJaxbObject;
+import com.cedarsoft.rest.model.JaxbStub;
 
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -155,9 +155,9 @@ public abstract class User
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import javax.ws.rs.core.UriBuilder;
-import com.cedarsoft.jaxb.JaxbObject;
-import com.cedarsoft.rest.JaxbMapping;
-import com.cedarsoft.rest.UriContext;
+import com.cedarsoft.rest.model.JaxbObject;
+import com.cedarsoft.rest.server.JaxbMapping;
+import com.cedarsoft.rest.server.UriContext;
 import com.cedarsoft.rest.generator.test.User;
 
 public class UserMapping

diff --git a/.../src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.UserJaxbTest.txt b/.../src/test/resources/com/cedarsoft/rest/generator/JaxbObjectGeneratorTest.UserJaxbTest.txt
@@ -3,9 +3,9 @@
 package com.cedarsoft.rest.generator.test.jaxb;
 
 import java.util.Arrays;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbTestUtils;
-import com.cedarsoft.rest.SimpleJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.test.JaxbTestUtils;
+import com.cedarsoft.rest.test.SimpleJaxbTest;
 import org.junit.experimental.theories.DataPoint;
 
 public class UserJaxbTest
@@ -64,10 +64,10 @@ public class UserJaxbTest
 
 package com.cedarsoft.rest.generator.test.jaxb;
 
-import com.cedarsoft.rest.AbstractJaxbTest;
-import com.cedarsoft.rest.AbstractMappedJaxbTest;
-import com.cedarsoft.rest.Entry;
-import com.cedarsoft.rest.JaxbMapping;
+import com.cedarsoft.rest.test.AbstractJaxbTest;
+import com.cedarsoft.rest.test.AbstractMappedJaxbTest;
+import com.cedarsoft.rest.test.Entry;
+import com.cedarsoft.rest.server.JaxbMapping;
 import com.cedarsoft.rest.generator.test.Group;
 import com.cedarsoft.rest.generator.test.User;
 import org.junit.experimental.theories.DataPoint;

diff --git a/...om/cedarsoft/rest/DefaultGuiceConfig.java → ...rsoft/rest/jersey/DefaultGuiceConfig.java b/...om/cedarsoft/rest/DefaultGuiceConfig.java → ...rsoft/rest/jersey/DefaultGuiceConfig.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.rest;
+package com.cedarsoft.rest.jersey;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;

diff --git a/...java/com/cedarsoft/rest/JerseyModule.java → ...m/cedarsoft/rest/jersey/JerseyModule.java b/...java/com/cedarsoft/rest/JerseyModule.java → ...m/cedarsoft/rest/jersey/JerseyModule.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.rest;
+package com.cedarsoft.rest.jersey;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;

diff --git a/...com/cedarsoft/rest/JerseyStuffModule.java → ...arsoft/rest/jersey/JerseyStuffModule.java b/...com/cedarsoft/rest/JerseyStuffModule.java → ...arsoft/rest/jersey/JerseyStuffModule.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.rest;
+package com.cedarsoft.rest.jersey;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;

diff --git a/...edarsoft/jaxb/AbstractJaxbCollection.java → ...ft/rest/model/AbstractJaxbCollection.java b/...edarsoft/jaxb/AbstractJaxbCollection.java → ...ft/rest/model/AbstractJaxbCollection.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/...om/cedarsoft/jaxb/AbstractJaxbObject.java → ...arsoft/rest/model/AbstractJaxbObject.java b/...om/cedarsoft/jaxb/AbstractJaxbObject.java → ...arsoft/rest/model/AbstractJaxbObject.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 
 import javax.annotation.Nonnull;

diff --git a/...va/com/cedarsoft/jaxb/JaxbCollection.java → .../cedarsoft/rest/model/JaxbCollection.java b/...va/com/cedarsoft/jaxb/JaxbCollection.java → .../cedarsoft/rest/model/JaxbCollection.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 
 import javax.annotation.Nonnull;

diff --git a/...n/java/com/cedarsoft/jaxb/JaxbObject.java → .../com/cedarsoft/rest/model/JaxbObject.java b/...n/java/com/cedarsoft/jaxb/JaxbObject.java → .../com/cedarsoft/rest/model/JaxbObject.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 
 import javax.annotation.Nonnull;

diff --git a/...ain/java/com/cedarsoft/jaxb/JaxbStub.java → ...va/com/cedarsoft/rest/model/JaxbStub.java b/...ain/java/com/cedarsoft/jaxb/JaxbStub.java → ...va/com/cedarsoft/rest/model/JaxbStub.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 import javax.annotation.Nonnull;
 

diff --git a/...rc/main/java/com/cedarsoft/jaxb/Link.java → ...n/java/com/cedarsoft/rest/model/Link.java b/...rc/main/java/com/cedarsoft/jaxb/Link.java → ...n/java/com/cedarsoft/rest/model/Link.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 
 import javax.annotation.Nonnull;

diff --git a/...edarsoft/jaxb/AbstractJaxbObjectTest.java → ...ft/rest/model/AbstractJaxbObjectTest.java b/...edarsoft/jaxb/AbstractJaxbObjectTest.java → ...ft/rest/model/AbstractJaxbObjectTest.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 import org.junit.*;
 import org.junit.rules.*;

diff --git a/...est/java/com/cedarsoft/jaxb/LinkTest.java → ...va/com/cedarsoft/rest/model/LinkTest.java b/...est/java/com/cedarsoft/jaxb/LinkTest.java → ...va/com/cedarsoft/rest/model/LinkTest.java
@@ -29,10 +29,9 @@
  * have any questions.
  */
 
-package com.cedarsoft.jaxb;
+package com.cedarsoft.rest.model;
 
 import org.junit.*;
-import org.junit.rules.*;
 
 import java.net.URI;
 

diff --git a/...generator/maven/AbstractGenerateMojo.java → ...or/maven/plugin/AbstractGenerateMojo.java b/...generator/maven/AbstractGenerateMojo.java → ...or/maven/plugin/AbstractGenerateMojo.java
@@ -29,13 +29,11 @@
  * have any questions.
  */
 
-package com.cedarsoft.generator.maven;
+package com.cedarsoft.rest.generator.maven.plugin;
 
 import com.cedarsoft.codegen.AbstractGenerator;
 import com.cedarsoft.codegen.GeneratorConfiguration;
-import com.cedarsoft.codegen.parser.Classpath;
 import com.google.common.collect.Sets;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.codehaus.plexus.util.DirectoryScanner;

diff --git a/...cedarsoft/generator/maven/CommitMojo.java → ...st/generator/maven/plugin/CommitMojo.java b/...cedarsoft/generator/maven/CommitMojo.java → ...st/generator/maven/plugin/CommitMojo.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.generator.maven;
+package com.cedarsoft.rest.generator.maven.plugin;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;

diff --git a/...arsoft/generator/maven/GeneratorMojo.java → ...generator/maven/plugin/GeneratorMojo.java b/...arsoft/generator/maven/GeneratorMojo.java → ...generator/maven/plugin/GeneratorMojo.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.generator.maven;
+package com.cedarsoft.rest.generator.maven.plugin;
 
 import com.cedarsoft.codegen.AbstractGenerator;
 import com.cedarsoft.rest.generator.JaxbObjectGenerator;

diff --git a/.../cedarsoft/generator/maven/LogWriter.java → ...est/generator/maven/plugin/LogWriter.java b/.../cedarsoft/generator/maven/LogWriter.java → ...est/generator/maven/plugin/LogWriter.java
@@ -29,7 +29,7 @@
  * have any questions.
  */
 
-package com.cedarsoft.generator.maven;
+package com.cedarsoft.rest.generator.maven.plugin;
 
 import com.google.common.base.Splitter;
 import org.apache.maven.plugin.logging.Log;