=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java 2014-08-27 18:04:29 +0000
@@ -38,7 +38,6 @@
import org.hisp.dhis.period.CalendarPeriodType;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodType;
-import org.hisp.dhis.resourcetable.scheduling.ResourceTableTask;
import org.hisp.dhis.scheduling.DataMartTask;
import org.hisp.dhis.scheduling.ScheduledTasks;
import org.hisp.dhis.scheduling.TaskCategory;
@@ -75,13 +74,6 @@
this.scheduler = scheduler;
}
- private ResourceTableTask resourceTableTask;
-
- public void setResourceTableTask( ResourceTableTask resourceTableTask )
- {
- this.resourceTableTask = resourceTableTask;
- }
-
private AnalyticsTableTask analyticsTableTask;
public void setAnalyticsTableTask( AnalyticsTableTask analyticsTableTask )
@@ -160,7 +152,6 @@
{
analyticsTableTask.setTaskId( taskId );
- tasks.addTask( resourceTableTask );
tasks.addTask( analyticsTableTask );
}
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2014-07-15 16:04:42 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml 2014-08-27 18:04:29 +0000
@@ -164,7 +164,6 @@
scope="prototype">
-