=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultProgramService.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultProgramService.java	2010-11-15 08:35:53 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/DefaultProgramService.java	2010-11-15 15:24:26 +0000
@@ -20,7 +20,6 @@
 import org.hisp.dhis.web.api.model.Program;
 import org.hisp.dhis.web.api.model.ProgramStage;
 import org.hisp.dhis.web.api.utils.LocaleUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author abyotag_adm
@@ -29,10 +28,10 @@
 public class DefaultProgramService
     implements IProgramService
 {
-
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
+    
     private org.hisp.dhis.program.ProgramService programService;
 
     public org.hisp.dhis.program.ProgramService getProgramService()
@@ -59,6 +58,11 @@
 
     private CurrentUserService currentUserService;
 
+    public void setCurrentUserService( CurrentUserService currentUserService )
+    {
+        this.currentUserService = currentUserService;
+    }
+
     // -------------------------------------------------------------------------
     // ProgramService
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml	2010-11-15 08:35:53 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml	2010-11-15 15:24:26 +0000
@@ -12,16 +12,14 @@
 	<bean id="org.hisp.dhis.web.api.provider.MobileWrapperProvider"
 		class="org.hisp.dhis.web.api.provider.MobileWrapperProvider" scope="singleton"/>
 		
-		
-		
-	<!--  Consumers  -->	
+	<!--  Consumers  -->
+		
 	<bean id="org.hisp.dhis.web.api.consumer.DataSetValueConsumer"
 		class="org.hisp.dhis.web.api.consumer.DataSetValueConsumer" scope="singleton"/>
 		
 	<bean id="org.hisp.dhis.web.api.consumer.ActivityValueConsumer"
 		class="org.hisp.dhis.web.api.consumer.ActivityValueConsumer" scope="singleton"/>
 		
-		
 	<!-- Resources -->
 	
     <bean id="org.hisp.dhis.web.api.resources.MobileResouce"
@@ -60,8 +58,6 @@
     <bean id="org.hisp.dhis.web.api.resources.ActivityPlanResource"
       class="org.hisp.dhis.web.api.resources.ActivityPlanResource" scope="prototype"/>  
 	
-      
-      
 	<!-- Services -->
 	
 	<bean id="org.hisp.dhis.web.api.service.ActivityPlanModelService"
@@ -165,6 +161,7 @@
 	<!-- Response writers -->
 	
 	<!-- ImportDataValue beans -->
+	
 	<bean id="org.hisp.dhis.web.api.action.ImportDataValueAction"
 		class="org.hisp.dhis.web.api.action.ImportDataValueAction">