=== 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 );