=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/BasicAuthenticationRequiredFilter.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/BasicAuthenticationRequiredFilter.java 2013-01-05 15:22:55 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/BasicAuthenticationRequiredFilter.java 2013-05-02 11:35:39 +0000 @@ -47,5 +47,4 @@ super.doFilter( req, res, chain ); } - } === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java 2013-04-04 18:06:19 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java 2013-05-02 11:35:39 +0000 @@ -28,7 +28,6 @@ */ import java.io.IOException; -import java.io.PrintWriter; import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; @@ -163,18 +162,7 @@ return null; } - - public static void errorResponse( HttpServletResponse response, String message ) - throws IOException - { - response.setStatus( HttpServletResponse.SC_BAD_REQUEST ); - response.setContentType( CONTENT_TYPE_TEXT ); - - PrintWriter writer = response.getWriter(); - writer.println( message ); - writer.flush(); - } - + /** * Clears the given collection if it is not modified according to the HTTP * cache validation. This method looks up the ETag sent in the request from === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java 2013-05-02 09:43:44 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/TestCaseAggregationConditionAction.java 2013-05-02 11:35:39 +0000 @@ -35,20 +35,15 @@ import org.hisp.dhis.caseaggregation.CaseAggregationConditionManager; import org.hisp.dhis.period.MonthlyPeriodType; import org.hisp.dhis.period.Period; -import org.hisp.dhis.period.PeriodType; import com.opensymphony.xwork2.Action; /** * @author Chau Thu Tran - * - * @version $Id: TestCaseAggregationConditionAction.java Oct 5, 2011 3:45:20 PM - * $ */ public class TestCaseAggregationConditionAction implements Action { - // ------------------------------------------------------------------------- // Dependency // ------------------------------------------------------------------------- @@ -115,6 +110,5 @@ List ids = caseAggregationConditionManager.executeSQL( sql ); return (ids == null) ? INPUT : SUCCESS; - } }