------------------------------------------------------------ revno: 20499 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Sun 2015-10-04 22:52:33 +0200 message: Moved CodecUtils from support-commons to support-system renamed: dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CodecUtils.java => dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/CodeUtilsTest.java => dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodeUtilsTest.java modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SqlViewController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SvgConversionController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodeUtilsTest.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java 2015-09-13 21:54:23 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java 2015-10-04 20:52:33 +0000 @@ -36,7 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.configuration.Configuration; import org.hisp.dhis.configuration.ConfigurationService; import org.hisp.dhis.datavalue.DataValueService; === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2015-09-17 07:34:32 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2015-10-04 20:52:33 +0000 @@ -75,7 +75,7 @@ import org.hisp.dhis.common.GridHeader; import org.hisp.dhis.common.NameableObjectUtils; import org.hisp.dhis.commons.collection.ListUtils; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.commons.util.Encoder; import org.hisp.dhis.commons.util.TextUtils; import org.hisp.dhis.system.util.DateUtils; === renamed file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CodecUtils.java' => 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java' --- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CodecUtils.java 2015-10-03 10:58:10 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java 2015-10-04 20:52:33 +0000 @@ -1,4 +1,4 @@ -package org.hisp.dhis.commons.util; +package org.hisp.dhis.system.util; import java.util.Base64; === renamed file 'dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/CodeUtilsTest.java' => 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodeUtilsTest.java' --- dhis-2/dhis-support/dhis-support-commons/src/test/java/org/hisp/dhis/commons/util/CodeUtilsTest.java 2015-10-03 10:58:10 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodeUtilsTest.java 2015-10-04 20:52:33 +0000 @@ -1,4 +1,4 @@ -package org.hisp.dhis.commons.util; +package org.hisp.dhis.system.util; /* * Copyright (c) 2004-2015, University of Oslo === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2015-09-14 17:57:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2015-10-04 20:52:33 +0000 @@ -41,7 +41,7 @@ import org.hisp.dhis.chart.ChartService; import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.common.cache.CacheStrategy; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportController.java 2015-09-14 10:33:55 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportController.java 2015-10-04 20:52:33 +0000 @@ -31,7 +31,7 @@ import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.j2ee.servlets.BaseHttpServlet; import net.sf.jasperreports.j2ee.servlets.ImageServlet; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.i18n.I18nManager; @@ -59,7 +59,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Date; -import static org.hisp.dhis.commons.util.CodecUtils.filenameEncode; +import static org.hisp.dhis.system.util.CodecUtils.filenameEncode; /** * @author Morten Olav Hansen <[email protected]> === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java 2015-08-04 12:59:15 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java 2015-10-04 20:52:33 +0000 @@ -62,7 +62,7 @@ import java.util.Set; import static org.hisp.dhis.common.DimensionalObjectUtils.getDimensions; -import static org.hisp.dhis.commons.util.CodecUtils.filenameEncode; +import static org.hisp.dhis.system.util.CodecUtils.filenameEncode; /** * @author Morten Olav Hansen <[email protected]> === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SqlViewController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SqlViewController.java 2015-07-15 16:07:15 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SqlViewController.java 2015-10-04 20:52:33 +0000 @@ -29,7 +29,7 @@ */ import org.hisp.dhis.common.Grid; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.dxf2.webmessage.WebMessageException; import org.hisp.dhis.schema.descriptors.SqlViewSchemaDescriptor; import org.hisp.dhis.sqlview.SqlView; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SvgConversionController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SvgConversionController.java 2015-09-14 17:57:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SvgConversionController.java 2015-10-04 20:52:33 +0000 @@ -34,7 +34,7 @@ import org.apache.batik.transcoder.image.ImageTranscoder; import org.apache.batik.transcoder.image.PNGTranscoder; import org.apache.fop.svg.PDFTranscoder; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.webapi.utils.ContextUtils; import org.hisp.dhis.common.cache.CacheStrategy; import org.springframework.beans.factory.annotation.Autowired; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2015-07-15 15:49:39 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2015-10-04 20:52:33 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.chart.ChartService; import org.hisp.dhis.common.DimensionService; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.dxf2.webmessage.WebMessageException; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2015-10-01 11:44:04 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2015-10-04 20:52:33 +0000 @@ -48,7 +48,7 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.common.cache.CacheStrategy; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.util.DateUtils; import org.springframework.beans.factory.annotation.Autowired; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java 2015-07-04 16:43:29 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java 2015-10-04 20:52:33 +0000 @@ -33,7 +33,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.ServletActionContext; import org.hisp.dhis.common.Grid; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.system.grid.GridUtils; import org.hisp.dhis.util.ContextUtils; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java 2015-10-04 20:52:33 +0000 @@ -36,7 +36,7 @@ import org.apache.struts2.ServletActionContext; import org.hisp.dhis.common.Grid; import org.hisp.dhis.system.grid.GridUtils; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.util.ContextUtils; import com.opensymphony.xwork2.ActionInvocation; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java 2015-10-04 20:52:33 +0000 @@ -37,7 +37,7 @@ import org.apache.struts2.ServletActionContext; import org.hisp.dhis.common.Grid; import org.hisp.dhis.system.grid.GridUtils; -import org.hisp.dhis.commons.util.CodecUtils; +import org.hisp.dhis.system.util.CodecUtils; import org.hisp.dhis.util.ContextUtils; import com.opensymphony.xwork2.ActionInvocation; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java 2015-10-04 20:52:33 +0000 @@ -29,7 +29,7 @@ */ import static org.apache.commons.lang3.StringUtils.defaultIfEmpty; -import static org.hisp.dhis.commons.util.CodecUtils.filenameEncode; +import static org.hisp.dhis.system.util.CodecUtils.filenameEncode; import java.io.OutputStream; import java.util.List; === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java 2015-10-04 20:52:33 +0000 @@ -29,7 +29,7 @@ */ import static org.apache.commons.lang3.StringUtils.defaultIfEmpty; -import static org.hisp.dhis.commons.util.CodecUtils.filenameEncode; +import static org.hisp.dhis.system.util.CodecUtils.filenameEncode; import java.io.OutputStream; import java.util.List; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java 2015-10-04 20:52:33 +0000 @@ -29,7 +29,7 @@ */ import static org.hisp.dhis.system.util.DateUtils.getMediumDate; -import static org.hisp.dhis.commons.util.CodecUtils.filenameEncode; +import static org.hisp.dhis.system.util.CodecUtils.filenameEncode; import static org.hisp.dhis.util.ContextUtils.CONTENT_TYPE_CSV; import static org.hisp.dhis.util.ContextUtils.CONTENT_TYPE_JSON; import static org.hisp.dhis.util.ContextUtils.CONTENT_TYPE_XML;
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
