← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1963: Clean up dhis-web-api

 

------------------------------------------------------------
revno: 1963
committer: Tran Ng Minh Luan <Luan@MinhLuan-PC>
branch nick: dhis2
timestamp: Tue 2010-10-26 20:41:40 +0700
message:
  Clean up dhis-web-api
removed:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityPlanProvider.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/DataSetProvider.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ProgramProvider.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityPlanResource.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityWrapperResource.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetResource.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormResource.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ProgramResource.java
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml


--
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
=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityPlanProvider.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityPlanProvider.java	2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityPlanProvider.java	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.web.api.provider;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-
-import com.jcraft.jzlib.JZlib;
-import com.jcraft.jzlib.ZOutputStream;
-import com.sun.jersey.spi.resource.Singleton;
-
-import org.hisp.dhis.web.api.model.ActivityPlan;;
-
-@Provider
-@Singleton
-@Produces( "application/vnd.org.dhis2.activityplan+serialized" ) 
-public class ActivityPlanProvider implements MessageBodyWriter<ActivityPlan>{
-
-	@Override
-	public long getSize(ActivityPlan arg0, Class<?> arg1, Type arg2,
-			Annotation[] arg3, MediaType arg4) {
-		return -1;
-	}
-
-	@Override
-	public boolean isWriteable(Class<?> arg0, Type arg1, Annotation[] arg2,
-			MediaType arg3) {
-		return true; 
-	}
-
-	@Override
-	public void writeTo(ActivityPlan activityPlan, Class<?> arg1, Type arg2,
-			Annotation[] arg3, MediaType arg4,
-			MultivaluedMap<String, Object> arg5, OutputStream stream)
-			throws IOException, WebApplicationException {		
-		
-		//activityPlan.serialize( stream );
-		serializeZipped(activityPlan, stream);
-	}
-	
-	public void serializeZipped( ActivityPlan activityPlan, OutputStream os ) throws IOException
-	{
-		ByteArrayOutputStream baos = serializePersistent( activityPlan );		
-		ZOutputStream gzip = new ZOutputStream( os, JZlib.Z_BEST_COMPRESSION );
-		DataOutputStream dos = new DataOutputStream( gzip );
-		
-		try
-		{	
-			byte[] res = baos.toByteArray();
-			dos.write( res );
-		}
-		finally
-		{
-			dos.flush();	
-			gzip.finish();
-		}
-	}
-	
-	public ByteArrayOutputStream serializePersistent( ActivityPlan activityPlan ) throws IOException
-	{
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		DataOutputStream out = new DataOutputStream( baos );
-		activityPlan.serialize(out);
-		out.flush();
-		return baos;
-	}
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java	2010-10-20 16:19:40 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ActivityWrapperProvider.java	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-package org.hisp.dhis.web.api.provider;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-
-import org.hisp.dhis.web.api.model.ActivityWrapper;
-
-import com.jcraft.jzlib.JZlib;
-import com.jcraft.jzlib.ZOutputStream;
-import com.sun.jersey.spi.resource.Singleton;
-
-@Provider
-@Singleton
-@Produces( "application/vnd.org.dhis2.activitywrapper+serialized" ) 
-public class ActivityWrapperProvider implements MessageBodyWriter<ActivityWrapper>
-{
-    @Override
-    public long getSize(ActivityWrapper arg0, Class<?> arg1, Type arg2,
-                    Annotation[] arg3, MediaType arg4) {
-            return -1;
-    }
-
-    @Override
-    public boolean isWriteable(Class<?> arg0, Type arg1, Annotation[] arg2,
-                    MediaType arg3) {
-            return true; 
-    }
-
-    @Override
-    public void writeTo(ActivityWrapper activityWrapper, Class<?> arg1, Type arg2,
-                    Annotation[] arg3, MediaType arg4,
-                    MultivaluedMap<String, Object> arg5, OutputStream stream)
-                    throws IOException, WebApplicationException {           
-            
-            //activityPlan.serialize( stream );
-            serializeZipped(activityWrapper, stream);
-    }
-    
-    public void serializeZipped( ActivityWrapper activityWrapper, OutputStream os ) throws IOException
-    {
-            ByteArrayOutputStream baos = serializePersistent( activityWrapper );               
-            ZOutputStream gzip = new ZOutputStream( os, JZlib.Z_BEST_COMPRESSION );
-            DataOutputStream dos = new DataOutputStream( gzip );
-            
-            try
-            {       
-                    byte[] res = baos.toByteArray();
-                    dos.write( res );
-            }
-            finally
-            {
-                    dos.flush();    
-                    gzip.finish();
-            }
-    }
-    
-    public ByteArrayOutputStream serializePersistent( ActivityWrapper activityWrapper ) throws IOException
-    {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DataOutputStream out = new DataOutputStream( baos );
-            activityWrapper.serialize(out);
-            out.flush();
-            return baos;
-    }
-
-    
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/DataSetProvider.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/DataSetProvider.java	2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/DataSetProvider.java	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.web.api.provider;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-
-import com.jcraft.jzlib.JZlib;
-import com.jcraft.jzlib.ZOutputStream;
-import com.sun.jersey.spi.resource.Singleton;
-
-import org.hisp.dhis.web.api.model.DataSet;
-
-@Provider
-@Singleton
-@Produces( "application/vnd.org.dhis2.dataset+serialized" ) 
-public class DataSetProvider implements MessageBodyWriter<DataSet>{
-
-	@Override
-	public long getSize(DataSet arg0, Class<?> arg1, Type arg2,
-			Annotation[] arg3, MediaType arg4) {
-		return -1;
-	}
-
-	@Override
-	public boolean isWriteable(Class<?> arg0, Type arg1, Annotation[] arg2,
-			MediaType arg3) {
-		return true; 
-	}
-
-	@Override
-	public void writeTo(DataSet dataSet, Class<?> arg1, Type arg2,
-			Annotation[] arg3, MediaType arg4,
-			MultivaluedMap<String, Object> arg5, OutputStream stream)
-			throws IOException, WebApplicationException {		
-		
-		//dataSet.serialize( stream );
-		serializeZipped(dataSet, stream);
-	}
-	
-	public void serializeZipped( DataSet dataSet, OutputStream os ) throws IOException
-	{
-		ByteArrayOutputStream baos = serializePersistent( dataSet );		
-		ZOutputStream gzip = new ZOutputStream( os, JZlib.Z_BEST_COMPRESSION );
-		DataOutputStream dos = new DataOutputStream( gzip );
-		
-		try
-		{	
-			byte[] res = baos.toByteArray();
-			dos.write( res );
-		}
-		finally
-		{
-			dos.flush();	
-			gzip.finish();
-		}
-	}
-	
-	public ByteArrayOutputStream serializePersistent( DataSet dataSet ) throws IOException
-	{
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		DataOutputStream out = new DataOutputStream( baos );
-		dataSet.serialize(out);
-		out.flush();
-		return baos;
-	}
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ProgramProvider.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ProgramProvider.java	2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/provider/ProgramProvider.java	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/**
- * 
- */
-package org.hisp.dhis.web.api.provider;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-
-import org.hisp.dhis.web.api.model.Program;
-
-import com.jcraft.jzlib.JZlib;
-import com.jcraft.jzlib.ZOutputStream;
-import com.sun.jersey.spi.resource.Singleton;
-
-/**
- * @author abyotag_adm
- *
- */
-@Provider
-@Singleton
-@Produces( "application/vnd.org.dhis2.program+serialized" ) 
-public class ProgramProvider implements MessageBodyWriter<Program> {
-
-	@Override
-	public long getSize(Program arg0, Class<?> arg1, Type arg2,
-			Annotation[] arg3, MediaType arg4) {		
-		return -1;
-	}
-
-	@Override
-	public boolean isWriteable(Class<?> arg0, Type arg1, Annotation[] arg2,
-			MediaType arg3) {		
-		return true;
-	}
-
-	@Override
-	public void writeTo(Program program, Class<?> arg1, Type arg2,
-			Annotation[] arg3, MediaType arg4,
-			MultivaluedMap<String, Object> arg5, OutputStream stream)
-			throws IOException, WebApplicationException {		
-		
-		serializeZipped(program, stream);
-	}
-	
-	public void serializeZipped( Program program, OutputStream os ) throws IOException
-	{
-		ByteArrayOutputStream baos = serializePersistent( program );		
-		ZOutputStream gzip = new ZOutputStream( os, JZlib.Z_BEST_COMPRESSION );
-		DataOutputStream dos = new DataOutputStream( gzip );
-		
-		try
-		{	
-			byte[] res = baos.toByteArray();
-			dos.write( res );
-		}
-		finally
-		{
-			dos.flush();	
-			gzip.finish();
-		}
-	}
-	
-	public ByteArrayOutputStream serializePersistent( Program program ) throws IOException
-	{
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		DataOutputStream out = new DataOutputStream( baos );
-		program.serialize(out);
-		out.flush();
-		return baos;
-	}
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityPlanResource.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityPlanResource.java	2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityPlanResource.java	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-package org.hisp.dhis.web.api.resources;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Produces;
-
-import org.hisp.dhis.web.api.model.ActivityPlan;
-import org.hisp.dhis.web.api.model.ActivityValue;
-import org.hisp.dhis.web.api.service.IActivityPlanService;
-import org.hisp.dhis.web.api.service.IActivityValueService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Path("/activityplan")
-public class ActivityPlanResource {
-
-	
-	// -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-	
-	@Autowired
-	private IActivityPlanService activityPlanService;
-	
-	@Autowired
-	private IActivityValueService iactivityValueService;
-
-	
-	// -------------------------------------------------------------------------
-    // Resources
-    // -------------------------------------------------------------------------		
-	
-	@GET
-    @Path( "current" )    
-    @Produces( "application/vnd.org.dhis2.activityplan+serialized" ) 
-    public ActivityPlan getCurrentActivityPlan(@HeaderParam("accept-language") String locale)
-    {
-        return activityPlanService.getCurrentActivityPlan( locale );
-    }
-	
-	@POST
-	@Path( "values" )
-	@Consumes( "application/vnd.org.dhis2.activityvaluelist+serialized" )
-	@Produces("application/xml")	
-	public String  getValues(ActivityValue activityValue) 
-	{		
-		return iactivityValueService.saveValues(activityValue);		
-	}	
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityWrapperResource.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityWrapperResource.java	2010-10-25 12:24:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ActivityWrapperResource.java	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-package org.hisp.dhis.web.api.resources;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.hisp.dhis.web.api.model.ActivityWrapper;
-import org.hisp.dhis.web.api.service.IActivityPlanService;
-import org.hisp.dhis.web.api.service.IActivityValueService;
-import org.hisp.dhis.web.api.service.IDataSetService;
-import org.hisp.dhis.web.api.service.IDataValueService;
-import org.hisp.dhis.web.api.service.IProgramService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Path("/download")
-public class ActivityWrapperResource
-{
-    @Autowired
-    private IProgramService programService;
-    
-    @Autowired
-    private IActivityPlanService activityPlanService;
-
-    
-    @GET   
-    @Produces( "application/vnd.org.dhis2.activitywrapper+serialized" )
-    public ActivityWrapper getCurrentActivityPlan(@HeaderParam("accept-language") String locale)
-    {
-        ActivityWrapper activityWrapper = new ActivityWrapper(); 
-        activityWrapper.setActivityPlan( activityPlanService.getCurrentActivityPlan( locale ) );
-        activityWrapper.setPrograms( programService.getAllProgramsForLocale( locale ) );
-        return activityWrapper;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetResource.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetResource.java	2010-10-25 12:24:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/DataSetResource.java	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-package org.hisp.dhis.web.api.resources;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Produces;
-
-import org.hisp.dhis.web.api.model.AbstractModelList;
-import org.hisp.dhis.web.api.model.DataSet;
-import org.hisp.dhis.web.api.model.DataSetValue;
-import org.hisp.dhis.web.api.service.IDataSetService;
-import org.hisp.dhis.web.api.service.IDataValueService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Path("/mobile-datasets")
-public class DataSetResource {
-
-	
-	// -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-	
-	@Autowired
-	private IDataSetService idataSetService;
-	
-	@Autowired
-	private IDataValueService idataValueService;
-
-	
-	// -------------------------------------------------------------------------
-    // Resources
-    // -------------------------------------------------------------------------
-	
-	@GET	
-	@Produces( "application/vnd.org.dhis2.abstractmodellist+serialized" ) 
-	public AbstractModelList getAllMobileDataSets(@HeaderParam("accept-language") String locale) 
-	{	
-		return null;
-//	    return idataSetService.getAllMobileDataSetsForLocale( locale );
-	}	
-		
-	@GET 
-	@Path("{datasetid}")
-	@Produces( "application/vnd.org.dhis2.dataset+serialized" )
-	public DataSet getSelectedDataSet(
-			@PathParam("datasetid")  int datasetid,
-			@HeaderParam("accept-language") String locale
-			) 
-	{		 
-		return null;
-//		return idataSetService.getDataSetForLocale( datasetid, locale );
-	}	
-	
-	@POST
-	@Path( "values" )
-	@Consumes( "application/vnd.org.dhis2.datasetvalue+serialized" )
-	@Produces("application/xml")	
-	public String  getValues(DataSetValue dataSetValue) 
-	{		
-		return idataValueService.saveValues(dataSetValue);		
-	}
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormResource.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormResource.java	2010-09-24 11:12:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/FormResource.java	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-package org.hisp.dhis.web.api.resources;
-
-import java.util.List;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.hisp.dhis.web.api.model.Form;
-import org.hisp.dhis.web.api.service.ProgramStageService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Path("/forms")
-public class FormResource {
-
-	@Autowired
-	private ProgramStageService programStageService;
-	
-	@GET	
-	@Produces(MediaType.APPLICATION_XML)	
-	public List<Form> getAllForms() {
-	    return programStageService.getAllForms();
-	}	
-		
-	@GET 
-	@Path("{formid}")
-	@Produces(MediaType.APPLICATION_XML)	
-	public Form getSelectedForm(@PathParam("formid")  int formid ) {
-		return programStageService.getForm( formid );
-	}
-	  
-
-}

=== removed file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ProgramResource.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ProgramResource.java	2010-10-20 15:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/resources/ProgramResource.java	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-package org.hisp.dhis.web.api.resources;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Produces;
-
-import org.hisp.dhis.web.api.model.AbstractModelList;
-import org.hisp.dhis.web.api.model.Program;
-import org.hisp.dhis.web.api.service.IProgramService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Path("/programs")
-public class ProgramResource {
-
-	
-	// -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-	
-	@Autowired
-	private IProgramService iprogramService;
-	
-	// -------------------------------------------------------------------------
-    // Resources
-    // -------------------------------------------------------------------------
-	
-	@GET	
-	@Produces( "application/vnd.org.dhis2.abstractmodellist+serialized" ) 
-	public AbstractModelList getAllMobileDataSets(@HeaderParam("accept-language") String locale) 
-	{	
-//	    return iprogramService.getAllProgramsForLocale( locale );
-		return null;
-	}	
-		
-	@GET 
-	@Path("{programid}")
-	@Produces( "application/vnd.org.dhis2.program+serialized" )
-	public Program getSelectedProgram(
-			@PathParam("programid")  int programid,
-			@HeaderParam("accept-language") String locale
-			) 
-	{		 
-		return iprogramService.getProgramForLocale( programid, locale );
-	}	
-}

=== 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-10-25 12:24:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml	2010-10-26 13:41:40 +0000
@@ -6,14 +6,17 @@
 
 	<!--  Providers -->
 	
-	<bean id="org.hisp.dhis.web.api.provider.ActivityPlanProvider"
-		class="org.hisp.dhis.web.api.provider.ActivityPlanProvider" scope="singleton"/>
-		
-	<bean id="org.hisp.dhis.web.api.provider.ProgramProvider"
-		class="org.hisp.dhis.web.api.provider.ProgramProvider" scope="singleton"/>
+	<!--<bean id="org.hisp.dhis.web.api.provider.ActivityPlanProvider"
+		class="org.hisp.dhis.web.api.provider.ActivityPlanProvider" scope="singleton"/>-->
+		
+	<!--<bean id="org.hisp.dhis.web.api.provider.ActivityWrapperProvider"
+		class="org.hisp.dhis.web.api.provider.ActivityWrapperProvider" scope="singleton"/>-->
+		
+	<!--<bean id="org.hisp.dhis.web.api.provider.ProgramProvider"
+		class="org.hisp.dhis.web.api.provider.ProgramProvider" scope="singleton"/>-->
 	
-	<bean id="org.hisp.dhis.web.api.provider.DataSetProvider"
-		class="org.hisp.dhis.web.api.provider.DataSetProvider" scope="singleton"/>
+	<!--<bean id="org.hisp.dhis.web.api.provider.DataSetProvider"
+		class="org.hisp.dhis.web.api.provider.DataSetProvider" scope="singleton"/>-->
 		
 	<bean id="org.hisp.dhis.web.api.provider.AbstractModelListProvider"
 		class="org.hisp.dhis.web.api.provider.AbstractModelListProvider" scope="singleton"/>
@@ -22,13 +25,11 @@
 		class="org.hisp.dhis.web.api.provider.MobileWrapperProvider" scope="singleton"/>
 		
 		
+		
 	<!--  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.provider.ActivityWrapperProvider"
-		class="org.hisp.dhis.web.api.provider.ActivityWrapperProvider" scope="singleton"/>	
-		
 	<bean id="org.hisp.dhis.web.api.consumer.ActivityValueConsumer"
 		class="org.hisp.dhis.web.api.consumer.ActivityValueConsumer" scope="singleton"/>
 		
@@ -42,20 +43,20 @@
 		class="org.hisp.dhis.web.api.resources.OrgUnitResource"
 		scope="prototype"/>
 	
-	<bean id="org.hisp.dhis.web.api.resources.FormResource"
-		class="org.hisp.dhis.web.api.resources.FormResource" scope="prototype"/>
+	<!--<bean id="org.hisp.dhis.web.api.resources.FormResource"
+		class="org.hisp.dhis.web.api.resources.FormResource" scope="prototype"/>-->
 		
-	<bean id="org.hisp.dhis.web.api.resources.DataSetResource"
-      class="org.hisp.dhis.web.api.resources.DataSetResource" scope="prototype"/>   
-      
-    <bean id="org.hisp.dhis.web.api.resources.ProgramResource"
-      class="org.hisp.dhis.web.api.resources.ProgramResource" scope="prototype"/>
-      
-    <bean id="org.hisp.dhis.web.api.resources.ActivityPlanResource"
-      class="org.hisp.dhis.web.api.resources.ActivityPlanResource" scope="prototype"/>  
+	<!--<bean id="org.hisp.dhis.web.api.resources.DataSetResource"
+      class="org.hisp.dhis.web.api.resources.DataSetResource" scope="prototype"/>-->   
+      
+    <!--<bean id="org.hisp.dhis.web.api.resources.ProgramResource"
+      class="org.hisp.dhis.web.api.resources.ProgramResource" scope="prototype"/>-->
+      
+    <!--<bean id="org.hisp.dhis.web.api.resources.ActivityPlanResource"
+      class="org.hisp.dhis.web.api.resources.ActivityPlanResource" scope="prototype"/>-->  
 	
-	<bean id="org.hisp.dhis.web.api.resources.ActivityWrapperResource"
-      class="org.hisp.dhis.web.api.resources.ActivityWrapperResource" scope="prototype"/>  
+	<!--<bean id="org.hisp.dhis.web.api.resources.ActivityWrapperResource"
+      class="org.hisp.dhis.web.api.resources.ActivityWrapperResource" scope="prototype"/>-->  
      
     <bean id="org.hisp.dhis.web.api.resources.MobileResouce"
       class="org.hisp.dhis.web.api.resources.MobileResouce" scope="prototype"/>