=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2012-04-23 13:42:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2012-04-23 14:26:57 +0000
@@ -182,7 +182,7 @@
     </action>
 
     <action name="autoSaveDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.AutoSaveDataEntryFormAction">
-      <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseSuccess.vm</result>
+      <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
     </action>
 
     <action name="validateDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction">

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js	2012-04-23 13:42:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js	2012-04-23 14:26:57 +0000
@@ -51,40 +51,6 @@
 }
 
 // -----------------------------------------------------------------------------
-// Find Selected DataElement Count in the DataEntryForm
-// -----------------------------------------------------------------------------
-
-function findDataElementCount()
-{
-  clearListById('dataElementSelector');
-  
-   jQuery.postUTF8( 'getSelectedDataElements.action',
-	{
-		dataSetId:document.getElementById( 'dataSetIdField' ).value,
-		designCode:htmlCode
-	},findDataElementCountCompleted );
-}
-
-function findDataElementCountCompleted( dataSetElement )
-{
-  var dataElements = dataSetElement.getElementsByTagName( 'dataElements' )[0];
-  var dataElementList = dataElements.getElementsByTagName( 'dataElement' );
-
-  var dataElementSelector = document.getElementById( 'dataElementSelector' );
-  
-  for ( var i = 0; i < dataElementList.length; i++ )
-  {
-    var dataElement = dataElementList[i];
-    var name = dataElement.firstChild.nodeValue;
-    var id = dataElement.getAttribute( 'id' );	
-		
-	var option = new Option( name, id );
-	    
-    dataElementSelector.add( option, null );
-  }
-}
-
-// -----------------------------------------------------------------------------
 // Auto-save DataEntryForm
 // -----------------------------------------------------------------------------
 
@@ -112,11 +78,11 @@
 		dataSetIdField: getFieldValue('dataSetIdField'),
 		dataEntryFormId: dataEntryFormId
 	},
-	function( xmlObject ) 
+	function( json ) 
 	{
 		setHeaderDelayMessage( i18n_save_success ); 
 		stat = "EDIT";
-		dataEntryFormId = xmlObject.getElementsByTagName( 'message' )[0].firstChild.nodeValue;
+		dataEntryFormId = json.message;
 		enable('delete');
 	} );
 }
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseSuccess.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseSuccess.vm	2010-08-28 12:24:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseSuccess.vm	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<message type="success">$encoder.xmlEncode( $message )</message>
-
-