dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9356
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-12-18 18:12:07 +0100
message:
  downgraded to jackson 2.0.6
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java	2012-12-06 10:01:52 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java	2012-12-18 17:12:07 +0000
@@ -33,9 +33,6 @@
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
-import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-import com.fasterxml.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
 import org.hisp.dhis.common.view.BasicView;
@@ -85,9 +82,11 @@
             objectMapper.disable( MapperFeature.AUTO_DETECT_IS_GETTERS );
         }
 
-        jsonMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES );
+        jsonMapper.getJsonFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES );
+        // jsonMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES );
         xmlMapper.configure( ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true );
 
+        /*
         jsonMapper.setAnnotationIntrospector(
             new JacksonAnnotationIntrospector() );
 
@@ -95,6 +94,7 @@
             new AnnotationIntrospectorPair(
                 new JacksonXmlAnnotationIntrospector(),
                 new JacksonAnnotationIntrospector() ) );
+        */
 
         // register view classes
         viewClasses.put( "default", BasicView.class );

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2012-12-14 13:46:47 +0000
+++ dhis-2/pom.xml	2012-12-18 17:12:07 +0000
@@ -907,7 +907,7 @@
     <spring.security.version>3.1.3.RELEASE</spring.security.version>
     <hibernate.version>4.1.8.Final</hibernate.version>
     <hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
-    <jackson.version>2.1.1</jackson.version>
+    <jackson.version>2.0.6</jackson.version>
     <camel.version>2.10.2</camel.version>
     <slf4j.version>1.6.6</slf4j.version>
     <geotools.version>8.4</geotools.version>