dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3619: Removed some resources and replaced using the common resources instead.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 16 May 2011 05:07:15 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3619
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-05-16 12:05:21 +0700
message:
  Removed some resources and replaced using the common resources instead.
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseError.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseInput.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSuccess.vm
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/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-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2011-05-13 09:11:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2011-05-16 05:05:21 +0000
@@ -107,11 +107,11 @@
 		<action name="validateSearch"
 			class="org.hisp.dhis.patient.action.relationship.ValidateSearchAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 			<result name="input" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseInput.vm</result>
+				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 
@@ -125,11 +125,11 @@
 		<action name="saveRelationship"
 			class="org.hisp.dhis.patient.action.relationship.SaveRelationshipAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 			<result name="input" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseInput.vm</result>
+				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 
@@ -143,22 +143,22 @@
 		<action name="saveRepresentative"
 			class="org.hisp.dhis.patient.action.relationship.SaveRepresentativeAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 			<result name="input" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseInput.vm</result>
+				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 
 		<action name="removeRepresentative"
 			class="org.hisp.dhis.patient.action.relationship.RemoveRepresentativeAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 			<result name="input" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseInput.vm</result>
+				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
 		</action>
 
@@ -176,11 +176,11 @@
 		<action name="validateAddRelationshipPatient"
 			class="org.hisp.dhis.patient.action.relationship.ValidateAddRelationshipPatientAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 			<result name="input" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseInput.vm</result>
+				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
 			<result name="duplicate" type="velocity-xml">
 				/dhis-web-maintenance-patient/responseDuplicate.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
@@ -291,7 +291,7 @@
 			<param name="onExceptionReturn">plainTextError</param>
 			<param name="requiredAuthorities">F_PATIENTATTRIBUTEVALUE_ADD,F_PATIENTATTRIBUTEVALUE_UPDATE,F_PATIENTATTRIBUTEVALUE_DELETE</param>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 		</action>
 
 		<action name="savePatientAttributeDateValue"
@@ -329,7 +329,8 @@
 		
 		<action name="patientform"
 			class="org.hisp.dhis.patient.action.patient.SearchPatientFormAction">
-			<result name="success" type="velocity-json">/dhis-web-maintenance-patient/responsePrograms.vm</result>
+			<result name="success" type="velocity-json">
+				/dhis-web-maintenance-patient/responsePrograms.vm</result>
 		</action>
 
 		<action name="searchPatient"
@@ -406,11 +407,11 @@
 		<action name="validatePatient"
 			class="org.hisp.dhis.patient.action.patient.ValidatePatientAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 			<result name="input" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseInput.vm</result>
+				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
 			<result name="duplicate" type="velocity-xml">
 				/dhis-web-maintenance-patient/responseDuplicate.vm</result>
 			<param name="onExceptionReturn">plainTextError</param>
@@ -695,7 +696,7 @@
 		<action name="showAddProgramStageForm"
 			class="org.hisp.dhis.patient.action.programstage.ShowAddProgramStageFormAction">
 			<result name="input" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseInput.vm</result>
+				/dhis-web-commons/ajax/xmlResponseInput.vm</result>
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">
 				/dhis-web-maintenance-patient/addProgramStageForm.vm</param>
@@ -1201,9 +1202,9 @@
 			class="org.hisp.dhis.patient.action.patientimport.ValidateUploadExcelFileAction">
 			<interceptor-ref name="fileUploadStack" />
 			<result name="success" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-maintenance-patient/responseError.vm</result>
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 		</action>
 
 		<action name="importPatient"

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseError.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseError.vm	2009-09-21 21:12:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseError.vm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<message type="error">$encoder.xmlEncode( $message )</message>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseInput.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseInput.vm	2009-09-21 21:12:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseInput.vm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<message type="input">$encoder.xmlEncode( $message )</message>
\ No newline at end of file

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSuccess.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSuccess.vm	2009-09-21 21:12:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseSuccess.vm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<message type="success">$encoder.xmlEncode( $message )</message>
\ No newline at end of file