dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5969
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-02-15 18:54:32 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/XsltHtmlView.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-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java	2011-12-13 14:04:12 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2Utils.java	2012-02-15 17:54:32 +0000
@@ -29,7 +29,6 @@
 
 import java.io.InputStream;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -37,7 +36,7 @@
 
 public class Jaxb2Utils
 {
-    public static Marshaller createMarshaller( Object domainModel, HttpServletRequest request )
+    public static Marshaller createMarshaller( Object domainModel )
         throws JAXBException
     {
         JAXBContext context = JAXBContext.newInstance( domainModel.getClass() );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java	2011-12-05 12:21:38 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/Jaxb2View.java	2012-02-15 17:54:32 +0000
@@ -63,7 +63,7 @@
 
         OutputStream outputStream = response.getOutputStream();
         
-        Marshaller marshaller = Jaxb2Utils.createMarshaller( domainModel, request );
+        Marshaller marshaller = Jaxb2Utils.createMarshaller( domainModel );
 
         marshaller.marshal( domainModel, outputStream );
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/XsltHtmlView.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/XsltHtmlView.java	2011-12-13 14:16:32 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/XsltHtmlView.java	2012-02-15 17:54:32 +0000
@@ -67,7 +67,7 @@
             // TODO throw exception
         }
 
-        Marshaller marshaller = Jaxb2Utils.createMarshaller( domainModel, request );
+        Marshaller marshaller = Jaxb2Utils.createMarshaller( domainModel );
 
         Source xmlSource = new JAXBSource( marshaller, domainModel );