=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java 2013-08-30 07:56:02 +0000 @@ -1,8 +1,5 @@ package org.hisp.dhis.system.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /* * Copyright (c) 2004-2013, University of Oslo * All rights reserved. @@ -31,6 +28,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + public class Timer { private static final Log log = LogFactory.getLog( Timer.class ); === modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.java' --- dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.java 2013-08-30 07:56:02 +0000 @@ -28,11 +28,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.opensymphony.xwork2.Action; -import static com.opensymphony.xwork2.Action.SUCCESS; import org.hisp.dhis.appmanager.AppManagerService; import org.springframework.beans.factory.annotation.Autowired; +import com.opensymphony.xwork2.Action; + /** * @author Saptarshi Purkayastha */ === modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/DeleteAppAction.java' --- dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/DeleteAppAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/DeleteAppAction.java 2013-08-30 07:56:02 +0000 @@ -47,6 +47,7 @@ // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- + @Autowired private AppManagerService appManagerService; === modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/javascript/uploadApp.js' --- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/javascript/uploadApp.js 2013-06-10 15:57:47 +0000 +++ dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/javascript/uploadApp.js 2013-08-30 07:56:02 +0000 @@ -28,4 +28,6 @@ xhr.open('post', 'addApp.action', true); xhr.send(fd); }, false); -} \ No newline at end of file +} + +$( document ).ready( autoUpload ); \ No newline at end of file