=== renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetConfigurationAction.java' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetSynchronizationSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetConfigurationAction.java	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetSynchronizationSettingsAction.java	2014-07-07 16:48:48 +0000
@@ -29,9 +29,6 @@
 
 import org.hisp.dhis.configuration.Configuration;
 import org.hisp.dhis.configuration.ConfigurationService;
-import org.hisp.dhis.dataapproval.DataApprovalLevelService;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
@@ -39,9 +36,9 @@
 /**
  * @author Chau Thu Tran
  * 
- * @version $ SetConfigurationAction.java Jul 7, 2014 10:04:29 PM $
+ * @version $ GetSynchronizationSettingsAction.java Jul 7, 2014 10:04:29 PM $
  */
-public class GetConfigurationAction
+public class GetSynchronizationSettingsAction
     implements Action
 {
     // -------------------------------------------------------------------------

=== renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetConfigurationAction.java' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSynchronizationSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetConfigurationAction.java	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSynchronizationSettingsAction.java	2014-07-07 16:48:48 +0000
@@ -29,10 +29,7 @@
 
 import org.hisp.dhis.configuration.Configuration;
 import org.hisp.dhis.configuration.ConfigurationService;
-import org.hisp.dhis.dataapproval.DataApprovalLevelService;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
@@ -40,9 +37,9 @@
 /**
  * @author Chau Thu Tran
  * 
- * @version $ SetConfigurationAction.java Jul 7, 2014 10:04:29 PM $
+ * @version $ SetSynchronizationSettingsAction.java Jul 7, 2014 10:04:29 PM $
  */
-public class SetConfigurationAction
+public class SetSynchronizationSettingsAction
     implements Action
 {
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml	2014-07-07 16:48:48 +0000
@@ -117,13 +117,13 @@
   
   <!-- Configuration -->
   
-  <bean id="org.hisp.dhis.settings.action.system.GetConfigurationAction"
-    class="org.hisp.dhis.settings.action.system.GetConfigurationAction"
+  <bean id="org.hisp.dhis.settings.action.system.GetSynchronizationSettingsAction"
+    class="org.hisp.dhis.settings.action.system.GetSynchronizationSettingsAction"
     scope="prototype">
   </bean>
   
- <bean id="org.hisp.dhis.settings.action.system.SetConfigurationAction"
-    class="org.hisp.dhis.settings.action.system.SetConfigurationAction"
+ <bean id="org.hisp.dhis.settings.action.system.SetSynchronizationSettingsAction"
+    class="org.hisp.dhis.settings.action.system.SetSynchronizationSettingsAction"
     scope="prototype">
   </bean>
   

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml	2014-07-07 16:48:48 +0000
@@ -156,14 +156,14 @@
     
     <!-- Synchronization -->
 
-	<action name="synchronization" class="org.hisp.dhis.settings.action.system.GetConfigurationAction">
+	<action name="synchronization" class="org.hisp.dhis.settings.action.system.GetSynchronizationSettingsAction">
       <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-maintenance-settings/synchronization.vm</param>
+      <param name="page">/dhis-web-maintenance-settings/systemSynchronizationSettings.vm</param>
       <param name="menu">/dhis-web-maintenance-settings/settingsMenu.vm</param>
       <param name="requiredAuthorities">F_SYSTEM_SETTING</param>
     </action> 
     
-    <action name="setConfiguration" class="org.hisp.dhis.settings.action.system.SetConfigurationAction">
+    <action name="setConfiguration" class="org.hisp.dhis.settings.action.system.SetSynchronizationSettingsAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <result name="error" type="velocity-json">../dhis-web-commons/ajax/jsonResponseError.vm</result>
       <param name="onExceptionReturn">plainTextError</param>

=== renamed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/synchronization.vm' => 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSynchronizationSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/synchronization.vm	2014-07-07 14:47:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSynchronizationSettings.vm	2014-07-07 16:48:48 +0000
@@ -29,7 +29,7 @@
 
 <div class="settingLabel">$i18n.getString( "remote_server_password" )</div>
 <div class="setting">
-	<input type="password" id="remoteServerPassword" name="remoteServerPassword" value='$remoteServerPass'>
+	<input type="password" id="remoteServerPassword" name="remoteServerPassword">
 </div>
 
 <div class="setting"><input type="button" value="$i18n.getString( 'save' )" style="width:10em"/></div>