Add a list of recently ported modules into the build

Adjust dependencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928983 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/modules/databinding-json/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/databinding-json/META-INF/MANIFEST.MF
index 6d3bffa2a7..42674a55f8 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/databinding-json/META-INF/MANIFEST.MF
@@ -21,10 +21,10 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

  org.codehaus.jackson,

  org.codehaus.jackson.map,

- org.codehaus.jackson.type,

  org.codehaus.jackson.map.introspect,

  org.codehaus.jackson.map.type,

- org.codehaus.jackson.xc,

+ org.codehaus.jackson.type,

+ org.codehaus.jackson.xc;resolution:=optional,

  org.codehaus.jettison.badgerfish,

  org.codehaus.jettison.json,

  org.codehaus.jettison.mapped,

diff --git a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
index 43dfc52975..6e9f0623f1 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
+++ b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
@@ -42,8 +42,8 @@ public class JSON2Object implements PullTransformer<Object, Object> {
     public JSON2Object() {
         super();
         mapper = new ObjectMapper();
-        AnnotationIntrospector primary = new JacksonAnnotationIntrospector();
-        AnnotationIntrospector secondary = new JaxbAnnotationIntrospector();
+        AnnotationIntrospector primary = new JaxbAnnotationIntrospector();
+        AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();
         AnnotationIntrospector pair = new AnnotationIntrospector.Pair(primary, secondary);
         mapper.getDeserializationConfig().setAnnotationIntrospector(pair);
         mapper.getSerializationConfig().setAnnotationIntrospector(pair);