[jackson-jaxrs-providers] 23/162: ...

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository jackson-jaxrs-providers.

commit 73ba417186eef640f30c83ad26ff9fdfaa43dbd7
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date:   Sat Mar 16 08:46:55 2013 -0700

    ...
---
 .../com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java    | 6 ++----
 .../jackson/jaxrs/json/{annotation => }/JsonEndpointConfig.java  | 5 ++++-
 .../{cfg/MapperConfigurator.java => JsonMapperConfigurator.java} | 9 ++++-----
 .../com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java  | 1 -
 .../jaxrs/smile/{annotation => }/SmileEndpointConfig.java        | 2 +-
 .../fasterxml/jackson/jaxrs/smile/annotation/package-info.java   | 5 -----
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java
index b0f1e5e..a65d5c8 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java
@@ -11,8 +11,6 @@ import com.fasterxml.jackson.databind.*;
 
 import com.fasterxml.jackson.jaxrs.base.ProviderBase;
 
-import com.fasterxml.jackson.jaxrs.json.annotation.JsonEndpointConfig;
-import com.fasterxml.jackson.jaxrs.json.cfg.MapperConfigurator;
 
 /**
  * Basic implementation of JAX-RS abstractions ({@link MessageBodyReader},
@@ -50,7 +48,7 @@ import com.fasterxml.jackson.jaxrs.json.cfg.MapperConfigurator;
 public class JacksonJsonProvider
     extends ProviderBase<JacksonJsonProvider,
         ObjectMapper, Annotations,
-        JsonEndpointConfig, MapperConfigurator>
+        JsonEndpointConfig, JsonMapperConfigurator>
 {
     /**
      * Default annotation sets to use, if not explicitly defined during
@@ -124,7 +122,7 @@ public class JacksonJsonProvider
      *   support
      */
     public JacksonJsonProvider(ObjectMapper mapper, Annotations[] annotationsToUse) {
-        super(new MapperConfigurator(mapper, annotationsToUse));
+        super(new JsonMapperConfigurator(mapper, annotationsToUse));
     }
 
     /**
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/annotation/JsonEndpointConfig.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java
similarity index 93%
rename from json/src/main/java/com/fasterxml/jackson/jaxrs/json/annotation/JsonEndpointConfig.java
rename to json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java
index 217dd6e..6475d96 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/annotation/JsonEndpointConfig.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonEndpointConfig.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.json.annotation;
+package com.fasterxml.jackson.jaxrs.json;
 
 import java.lang.annotation.Annotation;
 
@@ -7,6 +7,9 @@ import com.fasterxml.jackson.databind.util.JSONPObject;
 import com.fasterxml.jackson.databind.util.JSONWrappedObject;
 
 import com.fasterxml.jackson.jaxrs.base.cfg.EndpointConfigBase;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import com.fasterxml.jackson.jaxrs.json.annotation.JacksonFeatures;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP.Def;
 
 /**
  * Container class for figuring out annotation-based configuration
diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/cfg/MapperConfigurator.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java
similarity index 92%
rename from json/src/main/java/com/fasterxml/jackson/jaxrs/json/cfg/MapperConfigurator.java
rename to json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java
index e9c1621..d19ade8 100644
--- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/cfg/MapperConfigurator.java
+++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMapperConfigurator.java
@@ -1,11 +1,10 @@
-package com.fasterxml.jackson.jaxrs.json.cfg;
+package com.fasterxml.jackson.jaxrs.json;
 
 import java.util.*;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.jaxrs.base.cfg.MapperConfiguratorBase;
-import com.fasterxml.jackson.jaxrs.json.Annotations;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 /**
@@ -13,8 +12,8 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
  * {@link ObjectMapper} instance to be used for data binding, as
  * well as accessing it.
  */
-public class MapperConfigurator
-    extends MapperConfiguratorBase<MapperConfigurator, ObjectMapper, Annotations>
+public class JsonMapperConfigurator
+    extends MapperConfiguratorBase<JsonMapperConfigurator, ObjectMapper, Annotations>
 {
     /*
     /**********************************************************
@@ -22,7 +21,7 @@ public class MapperConfigurator
     /**********************************************************
      */
     
-    public MapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations)
+    public JsonMapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations)
     {
         super(mapper, defAnnotations);
     }
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
index d25b599..06e92da 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java
@@ -9,7 +9,6 @@ import javax.ws.rs.ext.*;
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.jaxrs.base.ProviderBase;
-import com.fasterxml.jackson.jaxrs.smile.annotation.SmileEndpointConfig;
 
 /**
  * Basic implementation of JAX-RS abstractions ({@link MessageBodyReader},
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/SmileEndpointConfig.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java
similarity index 95%
rename from smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/SmileEndpointConfig.java
rename to smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java
index a085d12..29c8644 100644
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/SmileEndpointConfig.java
+++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/SmileEndpointConfig.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.jaxrs.smile.annotation;
+package com.fasterxml.jackson.jaxrs.smile;
 
 import java.lang.annotation.Annotation;
 
diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/package-info.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/package-info.java
deleted file mode 100644
index 281224c..0000000
--- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/annotation/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
-* Package that contains utility classes and methods for
-* the JAX-RS Smile provider module.
-*/
-package com.fasterxml.jackson.jaxrs.smile.annotation;
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git