=== added directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/render' === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/render/RenderService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/render/RenderService.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/render/RenderService.java 2016-02-01 07:36:06 +0000 @@ -0,0 +1,61 @@ +package org.hisp.dhis.render; + +/* + * Copyright (c) 2004-2016, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * @author Morten Olav Hansen + */ +public interface RenderService +{ + void toJson( OutputStream output, Object value ) throws IOException; + + void toJson( OutputStream output, Object value, Class klass ) throws IOException; + + void toJsonP( OutputStream output, Object value, String callback ) throws IOException; + + void toJsonP( OutputStream output, Object value, Class klass, String callback ) throws IOException; + + T fromJson( InputStream input, Class klass ) throws IOException; + + T fromJson( String input, Class klass ) throws IOException; + + void toXml( OutputStream output, T value ) throws IOException; + + void toXml( OutputStream output, T value, Class klass ) throws IOException; + + T fromXml( InputStream input, Class klass ) throws IOException; + + T fromXml( String input, Class klass ) throws IOException; + + boolean isValidJson(String json) throws IOException; +} === added directory 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/render' === added file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/render/DefaultRenderService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/render/DefaultRenderService.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/render/DefaultRenderService.java 2016-02-01 07:36:06 +0000 @@ -0,0 +1,206 @@ +package org.hisp.dhis.render; + +/* + * Copyright (c) 2004-2016, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.util.JSONPObject; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; +import org.springframework.util.StringUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * Default implementation that uses Jackson to serialize/deserialize + * + * @author Morten Olav Hansen + */ +public class DefaultRenderService + implements RenderService +{ + private final ObjectMapper jsonMapper = new ObjectMapper(); + + private final XmlMapper xmlMapper = new XmlMapper(); + + public DefaultRenderService() + { + configureObjectMappers(); + } + + //-------------------------------------------------------------------------- + // RenderService + //-------------------------------------------------------------------------- + + @Override + public void toJson( OutputStream output, Object value ) + throws IOException + { + jsonMapper.writeValue( output, value ); + } + + @Override + public void toJson( OutputStream output, Object value, Class klass ) + throws IOException + { + jsonMapper.writerWithView( klass ).writeValue( output, value ); + } + + @Override + public void toJsonP( OutputStream output, Object value, String callback ) + throws IOException + { + if ( StringUtils.isEmpty( callback ) ) + { + callback = "callback"; + } + + jsonMapper.writeValue( output, new JSONPObject( callback, value ) ); + } + + @Override + public void toJsonP( OutputStream output, Object value, Class klass, String callback ) + throws IOException + { + if ( StringUtils.isEmpty( callback ) ) + { + callback = "callback"; + } + + jsonMapper.writerWithView( klass ).writeValue( output, new JSONPObject( callback, value ) ); + } + + @Override + public T fromJson( InputStream input, Class klass ) + throws IOException + { + return jsonMapper.readValue( input, klass ); + } + + @Override + public T fromJson( String input, Class klass ) + throws IOException + { + return jsonMapper.readValue( input, klass ); + } + + @Override + public void toXml( OutputStream output, T value ) + throws IOException + { + xmlMapper.writeValue( output, value ); + } + + @Override + public void toXml( OutputStream output, T value, Class klass ) + throws IOException + { + xmlMapper.writerWithView( klass ).writeValue( output, value ); + } + + @Override + public T fromXml( InputStream input, Class klass ) + throws IOException + { + return xmlMapper.readValue( input, klass ); + } + + @Override + public T fromXml( String input, Class klass ) + throws IOException + { + return xmlMapper.readValue( input, klass ); + } + + @Override + public boolean isValidJson( String json ) + throws IOException + { + try + { + jsonMapper.readValue( json, Object.class ); + } + catch ( JsonParseException | JsonMappingException e ) + { + return false; + } + + return true; + } + + //-------------------------------------------------------------------------- + // Helpers + //-------------------------------------------------------------------------- + + public ObjectMapper getJsonMapper() + { + return jsonMapper; + } + + public XmlMapper getXmlMapper() + { + return xmlMapper; + } + + private void configureObjectMappers() + { + ObjectMapper[] objectMappers = new ObjectMapper[]{ jsonMapper, xmlMapper }; + + for ( ObjectMapper objectMapper : objectMappers ) + { + // objectMapper.setDateFormat( format ); + objectMapper.setSerializationInclusion( JsonInclude.Include.NON_NULL ); + objectMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false ); + objectMapper.configure( SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false ); + objectMapper.configure( SerializationFeature.FAIL_ON_EMPTY_BEANS, false ); + objectMapper.configure( SerializationFeature.WRAP_EXCEPTIONS, true ); + + objectMapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false ); + objectMapper.configure( DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true ); + objectMapper.configure( DeserializationFeature.WRAP_EXCEPTIONS, true ); + + objectMapper.disable( MapperFeature.AUTO_DETECT_FIELDS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_CREATORS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_GETTERS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_SETTERS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_IS_GETTERS ); + } + + jsonMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES ); + xmlMapper.configure( ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true ); + } +} === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2016-01-15 20:40:52 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2016-02-01 07:36:06 +0000 @@ -37,6 +37,8 @@ + + @@ -1122,12 +1124,12 @@ - + - - - + + + === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java 2016-02-01 07:36:06 +0000 @@ -44,7 +44,7 @@ import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.MetaData; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.organisationunit.FeatureType; import org.hisp.dhis.organisationunit.OrganisationUnit; === removed directory 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render' === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/DefaultRenderService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/DefaultRenderService.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/DefaultRenderService.java 1970-01-01 00:00:00 +0000 @@ -1,203 +0,0 @@ -package org.hisp.dhis.dxf2.render; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.util.JSONPObject; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; - -import org.springframework.util.StringUtils; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * Default implementation that uses Jackson to serialize/deserialize - * - * @author Morten Olav Hansen - */ -public class DefaultRenderService - implements RenderService -{ - private final ObjectMapper jsonMapper = new ObjectMapper(); - - private final XmlMapper xmlMapper = new XmlMapper(); - - public DefaultRenderService() - { - configureObjectMappers(); - } - - //-------------------------------------------------------------------------- - // RenderService - //-------------------------------------------------------------------------- - - @Override - public void toJson( OutputStream output, Object value ) - throws IOException - { - jsonMapper.writeValue( output, value ); - } - - @Override - public void toJson( OutputStream output, Object value, Class klass ) - throws IOException - { - jsonMapper.writerWithView( klass ).writeValue( output, value ); - } - - @Override - public void toJsonP( OutputStream output, Object value, String callback ) - throws IOException - { - if ( StringUtils.isEmpty( callback ) ) - { - callback = "callback"; - } - - jsonMapper.writeValue( output, new JSONPObject( callback, value ) ); - } - - @Override - public void toJsonP( OutputStream output, Object value, Class klass, String callback ) - throws IOException - { - if ( StringUtils.isEmpty( callback ) ) - { - callback = "callback"; - } - - jsonMapper.writerWithView( klass ).writeValue( output, new JSONPObject( callback, value ) ); - } - - @Override - public T fromJson( InputStream input, Class klass ) - throws IOException - { - return jsonMapper.readValue( input, klass ); - } - - @Override - public T fromJson( String input, Class klass ) - throws IOException - { - return jsonMapper.readValue( input, klass ); - } - - @Override - public void toXml( OutputStream output, T value ) - throws IOException - { - xmlMapper.writeValue( output, value ); - } - - @Override - public void toXml( OutputStream output, T value, Class klass ) - throws IOException - { - xmlMapper.writerWithView( klass ).writeValue( output, value ); - } - - @Override - public T fromXml( InputStream input, Class klass ) - throws IOException - { - return xmlMapper.readValue( input, klass ); - } - - @Override - public T fromXml( String input, Class klass ) - throws IOException - { - return xmlMapper.readValue( input, klass ); - } - - @Override - public boolean isValidJson( String json ) - throws IOException - { - try - { - jsonMapper.readValue( json, Object.class ); - } - catch ( JsonParseException | JsonMappingException e ) - { - return false; - } - - return true; - } - - //-------------------------------------------------------------------------- - // Helpers - //-------------------------------------------------------------------------- - - public ObjectMapper getJsonMapper() - { - return jsonMapper; - } - - public XmlMapper getXmlMapper() - { - return xmlMapper; - } - - private void configureObjectMappers() - { - ObjectMapper[] objectMappers = new ObjectMapper[] { jsonMapper, xmlMapper }; - - for ( ObjectMapper objectMapper : objectMappers ) - { - // objectMapper.setDateFormat( format ); - objectMapper.setSerializationInclusion( JsonInclude.Include.NON_NULL ); - objectMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false ); - objectMapper.configure( SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false ); - objectMapper.configure( SerializationFeature.FAIL_ON_EMPTY_BEANS, false ); - objectMapper.configure( SerializationFeature.WRAP_EXCEPTIONS, true ); - - objectMapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false ); - objectMapper.configure( DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true ); - objectMapper.configure( DeserializationFeature.WRAP_EXCEPTIONS, true ); - - objectMapper.disable( MapperFeature.AUTO_DETECT_FIELDS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_CREATORS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_GETTERS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_SETTERS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_IS_GETTERS ); - } - - jsonMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES ); - xmlMapper.configure( ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true ); - } -} === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/RenderService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/RenderService.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/RenderService.java 1970-01-01 00:00:00 +0000 @@ -1,61 +0,0 @@ -package org.hisp.dhis.dxf2.render; - -/* - * Copyright (c) 2004-2016, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * @author Morten Olav Hansen - */ -public interface RenderService -{ - void toJson( OutputStream output, Object value ) throws IOException; - - void toJson( OutputStream output, Object value, Class klass ) throws IOException; - - void toJsonP( OutputStream output, Object value, String callback ) throws IOException; - - void toJsonP( OutputStream output, Object value, Class klass, String callback ) throws IOException; - - T fromJson( InputStream input, Class klass ) throws IOException; - - T fromJson( String input, Class klass ) throws IOException; - - void toXml( OutputStream output, T value ) throws IOException; - - void toXml( OutputStream output, T value, Class klass ) throws IOException; - - T fromXml( InputStream input, Class klass ) throws IOException; - - T fromXml( String input, Class klass ) throws IOException; - - boolean isValidJson(String json) throws IOException; -} === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2016-01-25 08:31:37 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2016-02-01 07:36:06 +0000 @@ -14,8 +14,6 @@ - - === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/MetadataImportServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/MetadataImportServiceTest.java 2016-01-29 02:18:42 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata2/MetadataImportServiceTest.java 2016-02-01 07:36:06 +0000 @@ -32,7 +32,7 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectManager; import org.hisp.dhis.constant.Constant; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2016-01-22 03:12:10 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2016-02-01 07:36:06 +0000 @@ -47,8 +47,8 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.ImportTypeSummary; -import org.hisp.dhis.dxf2.render.DefaultRenderService; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.DefaultRenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.fieldfilter.FieldFilterService; import org.hisp.dhis.hibernate.exception.CreateAccessDeniedException; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java 2016-01-13 15:47:42 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java 2016-02-01 07:36:06 +0000 @@ -34,8 +34,8 @@ import org.hisp.dhis.appmanager.App; import org.hisp.dhis.appmanager.AppManager; import org.hisp.dhis.appmanager.AppStatus; -import org.hisp.dhis.dxf2.render.DefaultRenderService; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.DefaultRenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.hibernate.exception.ReadAccessDeniedException; import org.hisp.dhis.i18n.I18nManager; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java 2016-02-01 07:36:06 +0000 @@ -38,7 +38,7 @@ import org.hisp.dhis.dataset.CompleteDataSetRegistrations; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.utils.InputUtils; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.i18n.I18nFormat; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java 2016-01-13 15:47:42 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java 2016-02-01 07:36:06 +0000 @@ -38,7 +38,7 @@ import org.hisp.dhis.configuration.Configuration; import org.hisp.dhis.configuration.ConfigurationService; import org.hisp.dhis.dataelement.DataElementGroup; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.external.conf.ConfigurationKey; import org.hisp.dhis.external.conf.DhisConfigurationProvider; import org.hisp.dhis.indicator.IndicatorGroup; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2016-01-11 03:14:37 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2016-02-01 07:36:06 +0000 @@ -46,7 +46,7 @@ import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java 2016-01-08 16:54:54 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java 2016-02-01 07:36:06 +0000 @@ -35,7 +35,7 @@ import org.hisp.dhis.dxf2.datavalueset.tasks.ImportDataValueTask; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.scheduling.TaskCategory; import org.hisp.dhis.scheduling.TaskId; import org.hisp.dhis.system.scheduling.Scheduler; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/I18nController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/I18nController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/I18nController.java 2016-02-01 07:36:06 +0000 @@ -29,8 +29,8 @@ */ import com.fasterxml.jackson.core.type.TypeReference; -import org.hisp.dhis.dxf2.render.DefaultRenderService; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.DefaultRenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nManager; import org.springframework.beans.factory.annotation.Autowired; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/KeyJsonValueController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/KeyJsonValueController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/KeyJsonValueController.java 2016-02-01 07:36:06 +0000 @@ -37,7 +37,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.hisp.dhis.appmanager.App; import org.hisp.dhis.appmanager.AppManager; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.keyjsonvalue.KeyJsonValue; import org.hisp.dhis.keyjsonvalue.KeyJsonValueService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java 2016-02-01 07:36:06 +0000 @@ -35,7 +35,7 @@ import org.hisp.dhis.dxf2.common.Options; import org.hisp.dhis.dxf2.metadata.ExportService; import org.hisp.dhis.dxf2.metadata.MetaData; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.schema.SchemaValidator; import org.hisp.dhis.dxf2.webmessage.WebMessage; import org.hisp.dhis.validation.ValidationViolation; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java 2016-02-01 07:36:06 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.user.User; import org.hisp.dhis.user.UserService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchedulingController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchedulingController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchedulingController.java 2016-02-01 07:36:06 +0000 @@ -29,7 +29,7 @@ */ import org.hisp.dhis.common.ListMap; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.scheduling.SchedulingManager; import org.hisp.dhis.webapi.utils.ContextUtils; import org.hisp.dhis.webapi.webdomain.SchedulingStrategy; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchemaController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchemaController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchemaController.java 2016-02-01 07:36:06 +0000 @@ -29,7 +29,7 @@ */ import com.google.common.collect.Lists; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.schema.SchemaValidator; import org.hisp.dhis.validation.ValidationViolation; import org.hisp.dhis.dxf2.webmessage.WebMessage; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java 2016-02-01 07:36:06 +0000 @@ -33,7 +33,7 @@ import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectManager; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.security.acl.AccessStringHelper; import org.hisp.dhis.security.acl.AclService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java 2016-02-01 07:36:06 +0000 @@ -29,7 +29,7 @@ */ import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.synch.AvailabilityStatus; import org.hisp.dhis.dxf2.synch.SynchronizationManager; import org.hisp.dhis.setting.SettingKey; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java 2016-02-01 07:36:06 +0000 @@ -32,7 +32,7 @@ import org.hisp.dhis.dataintegrity.DataIntegrityReport; import org.hisp.dhis.dataintegrity.FlattenedDataIntegrityReport; import org.hisp.dhis.dxf2.metadata.ImportSummary; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.node.exception.InvalidTypeException; import org.hisp.dhis.node.types.CollectionNode; import org.hisp.dhis.node.types.RootNode; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java 2016-01-07 08:13:54 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java 2016-02-01 07:36:06 +0000 @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.setting.SettingKey; import org.hisp.dhis.setting.SystemSettingManager; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java 2016-02-01 07:36:06 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.user.CurrentUserService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java 2016-02-01 07:36:06 +0000 @@ -37,7 +37,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.fieldfilter.FieldFilterService; import org.hisp.dhis.importexport.ImportStrategy; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2016-01-30 10:21:56 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2016-02-01 07:36:06 +0000 @@ -51,7 +51,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.utils.InputUtils; import org.hisp.dhis.dxf2.webmessage.WebMessage; import org.hisp.dhis.dxf2.webmessage.WebMessageException; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2016-01-20 05:57:53 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2016-02-01 07:36:06 +0000 @@ -41,7 +41,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.fieldfilter.FieldFilterService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java 2016-02-01 07:36:06 +0000 @@ -36,7 +36,7 @@ import org.hisp.dhis.common.DimensionalObjectUtils; import org.hisp.dhis.common.DisplayProperty; import org.hisp.dhis.commons.filter.FilterUtils; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.organisationunit.FeatureType; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java 2016-02-01 07:36:06 +0000 @@ -32,7 +32,7 @@ import org.hisp.dhis.attribute.AttributeValue; import org.hisp.dhis.common.ValueType; import org.hisp.dhis.commons.filter.FilterUtils; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsController.java 2016-01-08 15:20:41 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsController.java 2016-02-01 07:36:06 +0000 @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.sms.SmsSender; import org.hisp.dhis.sms.incoming.IncomingSms; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsGatewayController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsGatewayController.java 2016-01-08 15:20:41 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/sms/SmsGatewayController.java 2016-02-01 07:36:06 +0000 @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.sms.config.BulkSmsGatewayConfig; import org.hisp.dhis.sms.config.ClickatellGatewayConfig; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java 2016-02-01 07:36:06 +0000 @@ -42,7 +42,7 @@ import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.fieldfilter.FieldFilterService; -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18nService; import org.hisp.dhis.interpretation.Interpretation; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/RenderServiceMessageConverter.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/RenderServiceMessageConverter.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/RenderServiceMessageConverter.java 2016-02-01 07:36:06 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/WebMessageService.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/WebMessageService.java 2016-01-04 02:27:49 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/WebMessageService.java 2016-02-01 07:36:06 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.render.RenderService; +import org.hisp.dhis.render.RenderService; import org.hisp.dhis.dxf2.webmessage.WebMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType;