dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13756
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-01-16 20:48:13 +0700
message:
  csd: use envelope for response, set soap 1.2 content type
modified:
  dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java


--
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-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java	2014-01-16 12:31:05 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java	2014-01-16 13:48:13 +0000
@@ -102,7 +102,8 @@
         Csd csd = createCsd( organisationUnits );
         Envelope envelope = createResponse( csd ); // unused for now
 
-        jaxbContext.createMarshaller().marshal( csd, response.getOutputStream() );
+        response.setContentType( "application/soap+xml" );
+        jaxbContext.createMarshaller().marshal( envelope, response.getOutputStream() );
     }
 
     private List<OrganisationUnit> getOrganisationUnits( Envelope envelope )