← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #25130

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12388: remove reference to non-existent file sendSMS.js in maint-mobile

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 12388
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-10-02 14:48:38 +0200
message:
  remove reference to non-existent file sendSMS.js in maint-mobile
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.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

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2013-09-08 08:36:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml	2013-10-02 12:48:38 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE struts PUBLIC
-"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-"http://struts.apache.org/dtds/struts-2.0.dtd";>
+  "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+  "http://struts.apache.org/dtds/struts-2.0.dtd";>
 <struts>
 
   <include file="dhis-web-commons.xml" />
@@ -14,53 +14,53 @@
       <param name="page">/dhis-web-maintenance-mobile/index.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
     </action>
-    
+
     <!-- Sent SMS -->
-    
+
     <action name="showSentPage" class="org.hisp.dhis.mobile.action.ShowSentSMSAction">
-    	<result name="success" type="velocity">/main.vm</result>
-    	<param name="page">/dhis-web-maintenance-mobile/showSentSMSPage.vm</param>
-    	<param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-maintenance-mobile/showSentSMSPage.vm</param>
+      <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
       <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-    
+
     <!-- Receiving SMS Action -->
-    
+
     <action name="showReceivingPage" class="org.hisp.dhis.mobile.action.incoming.ReceivingSMSAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/receiveSMSPage.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
     </action>
-    
+
     <action name="checkNewMessage" class="org.hisp.dhis.mobile.action.incoming.ReceivingSMSAction">
       <result name="success" type="velocity-json">/dhis-web-maintenance-mobile/jsonCheckMessage.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>
-    
+
     <action name="deleteReceiveSMS" class="org.hisp.dhis.mobile.action.incoming.DeleteReceiveSMSAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_MOBILE_DELETE_SMS</param>
     </action>
-    
+
     <action name="updateReceiveSMS" class="org.hisp.dhis.mobile.action.incoming.UpdateReceiveSMSAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>
-    
+
     <action name="deleteSentSMS" class="org.hisp.dhis.mobile.action.DeleteSentSMSAction">
       <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>
       <param name="requiredAuthorities">F_MOBILE_DELETE_SMS</param>
     </action>
-    
+
     <action name="reimport" class="org.hisp.dhis.mobile.action.incoming.ReimportSMSAction">
       <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>
     </action>
-	
+
     <!-- Patient Mobile Setting Action -->
 
     <action name="patientMobileSetting" class="org.hisp.dhis.mobile.action.ShowMobileSettingFormAction">
@@ -72,8 +72,8 @@
     <action name="editPatientMobileSetting" class="org.hisp.dhis.mobile.action.UpdateMobileSettingAction">
       <result name="success" type="redirect">patientMobileSetting.action</result>
     </action>
-	  
-	<!-- Mobile Dataset Action -->
+
+    <!-- Mobile Dataset Action -->
 
     <action name="showMobileDataSet" class="org.hisp.dhis.mobile.action.MobileDataSetListAction">
       <result name="success" type="velocity">/main.vm</result>
@@ -84,23 +84,23 @@
     <action name="updateMobileDataset" class="org.hisp.dhis.mobile.action.UpdateMobileDataSetAction">
       <result name="success" type="redirect">showMobileDataSet.action</result>
     </action>
-	  
-	<!-- SMS Service Configuration Action -->
-
-	<action name="showSMSConfigureForm" class="org.hisp.dhis.mobile.action.GetSmsConfigurationAction">
+
+    <!-- SMS Service Configuration Action -->
+
+    <action name="showSMSConfigureForm" class="org.hisp.dhis.mobile.action.GetSmsConfigurationAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/smsServiceConfiguration.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
       <param name="javascripts">javascript/gateway.js</param>
-	  <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
-	
-	<action name="showUpdateGateWayConfigForm" class="org.hisp.dhis.mobile.action.GetSmsConfigurationAction">
+
+    <action name="showUpdateGateWayConfigForm" class="org.hisp.dhis.mobile.action.GetSmsConfigurationAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/updateGateway.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
-	  <param name="javascripts">javascript/gateway.js</param>
-	  <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
+      <param name="javascripts">javascript/gateway.js</param>
+      <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
 
     <action name="reloadStartStopService" class="org.hisp.dhis.mobile.action.ReloadStartStopServiceAction">
@@ -109,7 +109,7 @@
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
-	
+
     <action name="saveSmsConfiguration" class="org.hisp.dhis.mobile.action.SaveSmsConfigurationAction">
       <result name="success" type="redirect">showSMSConfigureForm.action</result>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
@@ -119,13 +119,13 @@
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
     </action>
-	
+
     <action name="updateSMPPConfig" class="org.hisp.dhis.mobile.action.UpdateSMPPGateWayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
-  
+
     <action name="saveModemConfig" class="org.hisp.dhis.mobile.action.UpdateModemGateWayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
@@ -137,82 +137,82 @@
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
-	
+
     <action name="saveHTTPConfig" class="org.hisp.dhis.mobile.action.UpdateGenericHTTPGateWayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
-	
+
     <action name="updateDefaultGateway" class="org.hisp.dhis.mobile.action.UpdateDefaultGatewayAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
     </action>
-	
+
     <action name="removeGatewayConfig" class="org.hisp.dhis.mobile.action.RemoveGatewayConfigAction">
       <result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
       <param name="requiredAuthorities">F_MOBILE_SETTINGS</param>
-    </action>    
-      
+    </action>
+
     <!-- SMSCommmand start -->
-    
-     <action name="SMSCommands" class="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction">
+
+    <action name="SMSCommands" class="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/smscommand/sms-commands.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
-      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/sendSMS.js</param>
-      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
+      <param name="javascripts">../dhis-web-commons/oust/oust.js</param>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-    
+
     <action name="newSMSCommand" class="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/command.js</param>
-      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-    
+
     <action name="editSMSCommand" class="org.hisp.dhis.mobile.action.smscommand.SMSCommandAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
-      <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/sendSMS.js</param>
-      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
+      <param name="javascripts">../dhis-web-commons/oust/oust.js</param>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-    
+
     <action name="saveEditSMSCommandForm" class="org.hisp.dhis.mobile.action.smscommand.EditSMSCommandForm">
-          <result name="success" type="redirect">SMSCommands.action</result>
-      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
+      <result name="success" type="redirect">SMSCommands.action</result>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
 
     <action name="createSMSCommandForm" class="org.hisp.dhis.mobile.action.smscommand.CreateSMSCommandForm">
-          <result name="success" type="redirect">SMSCommands.action</result>
-      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
+      <result name="success" type="redirect">SMSCommands.action</result>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-    
+
     <action name="deleteSMSCommand" class="org.hisp.dhis.mobile.action.smscommand.DeleteSMSCommandAction">
-          <result name="success" type="redirect">SMSCommands.action</result>
-      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
+      <result name="success" type="redirect">SMSCommands.action</result>
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-    
+
     <!-- J2ME Client Update -->
-    
+
     <action name="showJ2meClientUpdatePage" class="org.hisp.dhis.mobile.action.J2meClientUpdateAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-mobile/j2meClientUpdatePage.vm</param>
       <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
       <param name="javascripts">javascript/gateway.js</param>
-      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>  
+      <param name="requiredAuthorities">F_MOBILE_SENDSMS</param>
     </action>
-    
+
     <!-- Mobile Phones Pattern 
     <action name="mobilePhonesPattern" class="org.hisp.dhis.mobile.action.MobilePhonesPatternAction">
   	  <result name="success" type="velocity">/main.vm</result>
   	  <param name="page">/dhis-web-maintenance-mobile/phonePatternPage.vm</param>
   	  <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
     </action>-->
-	
+
   </package>
 </struts>
  Thread Previous • Date Previous • • Thread Next