dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12701
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3963: indentation fixes
------------------------------------------------------------
revno: 3963
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-06-20 12:28:07 +0300
message:
indentation fixes
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/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-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-05-28 21:53:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-06-20 09:28:07 +0000
@@ -1,471 +1,428 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
+<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- Section -->
-
- <bean id="org.hisp.dhis.dataset.action.section.GetSectionAction"
- class="org.hisp.dhis.dataset.action.section.GetSectionAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.AddSectionAction"
- class="org.hisp.dhis.dataset.action.section.AddSectionAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.GetSectionOptionsAction"
- class="org.hisp.dhis.dataset.action.section.GetSectionOptionsAction" scope="prototype">
- <property name="categoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.ValidateSectionAction"
- class="org.hisp.dhis.dataset.action.section.ValidateSectionAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.EditSectionAction"
- class="org.hisp.dhis.dataset.action.section.EditSectionAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.UpdateSectionAction"
- class="org.hisp.dhis.dataset.action.section.UpdateSectionAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.RemoveSectionAction"
- class="org.hisp.dhis.dataset.action.section.RemoveSectionAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.SectionListAction"
- class="org.hisp.dhis.dataset.action.section.SectionListAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.GreySectionAction"
- class="org.hisp.dhis.dataset.action.section.GreySectionAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- <property name="categoryService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction"
- class="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="dataElementOperandService">
- <ref bean="org.hisp.dhis.dataelement.DataElementOperandService"/>
- </property>
- <property name="categoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction"
- class="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction"
- scope="prototype">
- <property name="sectionService">
- <ref bean="org.hisp.dhis.dataset.SectionService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction"
- class="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.GetSectionAction" class="org.hisp.dhis.dataset.action.section.GetSectionAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.AddSectionAction" class="org.hisp.dhis.dataset.action.section.AddSectionAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.GetSectionOptionsAction" class="org.hisp.dhis.dataset.action.section.GetSectionOptionsAction"
+ scope="prototype">
+ <property name="categoryService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.ValidateSectionAction" class="org.hisp.dhis.dataset.action.section.ValidateSectionAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.EditSectionAction" class="org.hisp.dhis.dataset.action.section.EditSectionAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.UpdateSectionAction" class="org.hisp.dhis.dataset.action.section.UpdateSectionAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.RemoveSectionAction" class="org.hisp.dhis.dataset.action.section.RemoveSectionAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.SectionListAction" class="org.hisp.dhis.dataset.action.section.SectionListAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.GreySectionAction" class="org.hisp.dhis.dataset.action.section.GreySectionAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction" class="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ <property name="dataElementOperandService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementOperandService" />
+ </property>
+ <property name="categoryService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction" class="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction"
+ scope="prototype">
+ <property name="sectionService">
+ <ref bean="org.hisp.dhis.dataset.SectionService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction" class="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
<!-- DataSet -->
- <bean id="org.hisp.dhis.dataset.action.MobileDataSetListAction"
- class="org.hisp.dhis.dataset.action.MobileDataSetListAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.UpdateMobileDataSetAction"
- class="org.hisp.dhis.dataset.action.UpdateMobileDataSetAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
-
- <bean id="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction"
- class="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction"
- scope="prototype">
- <property name="selectionTreeManager">
- <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.GetDataSetListSortOrderAction"
- class="org.hisp.dhis.dataset.action.GetDataSetListSortOrderAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
+ <bean id="org.hisp.dhis.dataset.action.MobileDataSetListAction" class="org.hisp.dhis.dataset.action.MobileDataSetListAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.UpdateMobileDataSetAction" class="org.hisp.dhis.dataset.action.UpdateMobileDataSetAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+
+ <bean id="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction" class="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction"
+ scope="prototype">
+ <property name="selectionTreeManager">
+ <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.GetDataSetListSortOrderAction" class="org.hisp.dhis.dataset.action.GetDataSetListSortOrderAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
<!-- Validation -->
-
- <bean id="org.hisp.dhis.dataset.action.ValidateDataSetAction"
- class="org.hisp.dhis.dataset.action.ValidateDataSetAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.ValidateDataSetAction" class="org.hisp.dhis.dataset.action.ValidateDataSetAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
<!-- Overview -->
-
- <bean id="org.hisp.dhis.dataset.action.DataSetListAction"
- class="org.hisp.dhis.dataset.action.DataSetListAction" scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.PeriodTypeListAction"
- class="org.hisp.dhis.dataset.action.PeriodTypeListAction"
- scope="prototype">
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.DataElementListAction"
- class="org.hisp.dhis.dataset.action.DataElementListAction"
- scope="prototype">
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup"
- class="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup"
- scope="prototype">
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup"
- class="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup"
- scope="prototype">
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.DataElementGroupListAction"
- class="org.hisp.dhis.dataset.action.DataElementGroupListAction"
- scope="prototype">
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.IndicatorGroupListAction"
- class="org.hisp.dhis.dataset.action.IndicatorGroupListAction"
- scope="prototype">
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.SaveDataSetSortOrderAction"
- class="org.hisp.dhis.dataset.action.SaveDataSetSortOrderAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.EditDataSetFormAction"
- class="org.hisp.dhis.dataset.action.EditDataSetFormAction" scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.AddDataSetAction"
- class="org.hisp.dhis.dataset.action.AddDataSetAction" scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
- </property>
- <property name="userService">
- <ref bean="org.hisp.dhis.user.UserService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.UpdateDataSetAction"
- class="org.hisp.dhis.dataset.action.UpdateDataSetAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="periodService">
- <ref bean="org.hisp.dhis.period.PeriodService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.GetDataSetAction"
- class="org.hisp.dhis.dataset.action.GetDataSetAction" scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="selectionTreeManager">
- <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.DelDataSetAction"
- class="org.hisp.dhis.dataset.action.DelDataSetAction" scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.DataSetListAction" class="org.hisp.dhis.dataset.action.DataSetListAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.PeriodTypeListAction" class="org.hisp.dhis.dataset.action.PeriodTypeListAction"
+ scope="prototype">
+ <property name="periodService">
+ <ref bean="org.hisp.dhis.period.PeriodService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.DataElementListAction" class="org.hisp.dhis.dataset.action.DataElementListAction"
+ scope="prototype">
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup" class="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup"
+ scope="prototype">
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup" class="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup"
+ scope="prototype">
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.DataElementGroupListAction" class="org.hisp.dhis.dataset.action.DataElementGroupListAction"
+ scope="prototype">
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.IndicatorGroupListAction" class="org.hisp.dhis.dataset.action.IndicatorGroupListAction"
+ scope="prototype">
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.SaveDataSetSortOrderAction" class="org.hisp.dhis.dataset.action.SaveDataSetSortOrderAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.EditDataSetFormAction" class="org.hisp.dhis.dataset.action.EditDataSetFormAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="periodService">
+ <ref bean="org.hisp.dhis.period.PeriodService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.AddDataSetAction" class="org.hisp.dhis.dataset.action.AddDataSetAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="periodService">
+ <ref bean="org.hisp.dhis.period.PeriodService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService" />
+ </property>
+ <property name="userService">
+ <ref bean="org.hisp.dhis.user.UserService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.UpdateDataSetAction" class="org.hisp.dhis.dataset.action.UpdateDataSetAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="periodService">
+ <ref bean="org.hisp.dhis.period.PeriodService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.GetDataSetAction" class="org.hisp.dhis.dataset.action.GetDataSetAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="selectionTreeManager">
+ <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.DelDataSetAction" class="org.hisp.dhis.dataset.action.DelDataSetAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
<!-- DataEntryForm -->
-
- <bean id="org.hisp.dhis.dataset.action.dataentryform.AutoSaveDataEntryFormAction"
- class="org.hisp.dhis.dataset.action.dataentryform.AutoSaveDataEntryFormAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="dataEntryFormService">
- <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.dataentryform.ViewDataEntryFormAction"
- class="org.hisp.dhis.dataset.action.dataentryform.ViewDataEntryFormAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="userSettingService">
- <ref bean="org.hisp.dhis.user.UserSettingService"/>
- </property>
- <property name="dataEntryFormService">
- <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction"
- class="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction"
- scope="prototype">
- <property name="dataEntryFormService">
- <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction"
- class="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction"
- scope="prototype">
- <property name="dataEntryFormService">
- <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction"
- class="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="dataEntryFormService">
- <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.dataentryform.SelectDataElementAction"
- class="org.hisp.dhis.dataset.action.dataentryform.SelectDataElementAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.dataset.action.dataentryform.GetSelectedDataElementsAction"
- class="org.hisp.dhis.dataset.action.dataentryform.GetSelectedDataElementsAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.dataentryform.AutoSaveDataEntryFormAction" class="org.hisp.dhis.dataset.action.dataentryform.AutoSaveDataEntryFormAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="dataEntryFormService">
+ <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.dataentryform.ViewDataEntryFormAction" class="org.hisp.dhis.dataset.action.dataentryform.ViewDataEntryFormAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="userSettingService">
+ <ref bean="org.hisp.dhis.user.UserSettingService" />
+ </property>
+ <property name="dataEntryFormService">
+ <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction" class="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction"
+ scope="prototype">
+ <property name="dataEntryFormService">
+ <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction" class="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction"
+ scope="prototype">
+ <property name="dataEntryFormService">
+ <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction" class="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="dataEntryFormService">
+ <ref bean="org.hisp.dhis.dataentryform.DataEntryFormService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.dataentryform.SelectDataElementAction" class="org.hisp.dhis.dataset.action.dataentryform.SelectDataElementAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.dataentryform.GetSelectedDataElementsAction" class="org.hisp.dhis.dataset.action.dataentryform.GetSelectedDataElementsAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ </bean>
<!-- Compulsory data elements -->
-
- <bean
- id="org.hisp.dhis.dataset.action.compulsory.GetCompulsoryDataElementsAction"
- class="org.hisp.dhis.dataset.action.compulsory.GetCompulsoryDataElementsAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- </bean>
-
- <bean
- id="org.hisp.dhis.dataset.action.compulsory.SaveCompulsoryDataElementsAction"
- class="org.hisp.dhis.dataset.action.compulsory.SaveCompulsoryDataElementsAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="categoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.section.DataElementListFilteredByGroupForSection"
- class="org.hisp.dhis.dataset.action.section.DataElementListFilteredByGroupForSection"
- scope="prototype">
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService"/>
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="dataElementCategoryService">
- <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.editor.ShowedAssociationsEditorAction"
- class="org.hisp.dhis.dataset.action.editor.ShowedAssociationsEditorAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="selectionTreeManager">
- <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.editor.DefinedAssociationEditorAction"
- class="org.hisp.dhis.dataset.action.editor.DefinedAssociationEditorAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="organisationUnitService">
- <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.editor.DefinedMultiAssociationsEditorAction"
- class="org.hisp.dhis.dataset.action.editor.DefinedMultiAssociationsEditorAction"
- scope="prototype">
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService"/>
- </property>
- <property name="organisationUnitService">
- <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- </property>
- </bean>
-
+
+ <bean id="org.hisp.dhis.dataset.action.compulsory.GetCompulsoryDataElementsAction" class="org.hisp.dhis.dataset.action.compulsory.GetCompulsoryDataElementsAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.compulsory.SaveCompulsoryDataElementsAction" class="org.hisp.dhis.dataset.action.compulsory.SaveCompulsoryDataElementsAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ <property name="categoryService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.section.DataElementListFilteredByGroupForSection" class="org.hisp.dhis.dataset.action.section.DataElementListFilteredByGroupForSection"
+ scope="prototype">
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="dataElementCategoryService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.editor.ShowedAssociationsEditorAction" class="org.hisp.dhis.dataset.action.editor.ShowedAssociationsEditorAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="selectionTreeManager">
+ <ref bean="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.editor.DefinedAssociationEditorAction" class="org.hisp.dhis.dataset.action.editor.DefinedAssociationEditorAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="organisationUnitService">
+ <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </property>
+ </bean>
+
+ <bean id="org.hisp.dhis.dataset.action.editor.DefinedMultiAssociationsEditorAction" class="org.hisp.dhis.dataset.action.editor.DefinedMultiAssociationsEditorAction"
+ scope="prototype">
+ <property name="dataSetService">
+ <ref bean="org.hisp.dhis.dataset.DataSetService" />
+ </property>
+ <property name="organisationUnitService">
+ <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService" />
+ </property>
+ </bean>
+
</beans>
\ No newline at end of file
=== 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 2011-06-11 20:37:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2011-06-20 09:28:07 +0000
@@ -4,303 +4,267 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <include file="dhis-web-commons.xml" />
-
- <package name="dhis-web-maintenance-dataset" extends="dhis-web-commons"
- namespace="/dhis-web-maintenance-dataset">
-
- <action name="index" class="org.hisp.dhis.dataset.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/index.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- </action>
+ <include file="dhis-web-commons.xml" />
+
+ <package name="dhis-web-maintenance-dataset" extends="dhis-web-commons" namespace="/dhis-web-maintenance-dataset">
+
+ <action name="index" class="org.hisp.dhis.dataset.action.NoAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/index.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ </action>
<!-- Dataset -->
- <action name="showMobileDataSet"
- class="org.hisp.dhis.dataset.action.MobileDataSetListAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/mobileDatasetList.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- </action>
-
- <action name="updateMobileDataset"
- class="org.hisp.dhis.dataset.action.UpdateMobileDataSetAction">
- <result name="success" type="redirect">showMobileDataSet.action</result>
- </action>
-
- <action name="dataSet" class="org.hisp.dhis.dataset.action.DataSetListAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/dataSetList.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- <param name="javascripts">javascript/dataSet.js</param>
- <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
- </action>
+ <action name="showMobileDataSet" class="org.hisp.dhis.dataset.action.MobileDataSetListAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/mobileDatasetList.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ </action>
+
+ <action name="updateMobileDataset" class="org.hisp.dhis.dataset.action.UpdateMobileDataSetAction">
+ <result name="success" type="redirect">showMobileDataSet.action</result>
+ </action>
+
+ <action name="dataSet" class="org.hisp.dhis.dataset.action.DataSetListAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/dataSetList.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ <param name="javascripts">javascript/dataSet.js</param>
+ <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
+ </action>
<!-- Section -->
- <action name="section"
- class="org.hisp.dhis.dataset.action.section.SectionListAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/sectionList.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- <param name="javascripts">javascript/section.js</param>
- </action>
-
- <action name="getSectionOptions"
- class="org.hisp.dhis.dataset.action.section.GetSectionOptionsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/addSection.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- <param name="javascripts">javascript/section.js</param>
- <param name="requiredAuthorities">F_SECTION_ADD</param>
- </action>
-
- <action name="addSection"
- class="org.hisp.dhis.dataset.action.section.AddSectionAction">
- <result name="success" type="redirect">section.action</result>
- <param name="requiredAuthorities">F_SECTION_ADD</param>
- </action>
-
- <action name="validateSection"
- class="org.hisp.dhis.dataset.action.section.ValidateSectionAction">
- <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>
-
- <action name="getSection"
- class="org.hisp.dhis.dataset.action.section.GetSectionAction">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseSectionObject.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="editSection"
- class="org.hisp.dhis.dataset.action.section.EditSectionAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/editSection.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- <param name="javascripts">javascript/section.js</param>
- <param name="requiredAuthorities">F_SECTION_UPDATE</param>
- </action>
-
- <action name="updateSection"
- class="org.hisp.dhis.dataset.action.section.UpdateSectionAction">
- <result name="success" type="redirect">section.action</result>
- <param name="requiredAuthorities">F_SECTION_UPDATE</param>
- </action>
-
- <action name="removeSection"
- class="org.hisp.dhis.dataset.action.section.RemoveSectionAction">
- <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
- <param name="requiredAuthorities">F_SECTION_DELETE</param>
- </action>
-
- <action name="greySection"
- class="org.hisp.dhis.dataset.action.section.GreySectionAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/greySection.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- <param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
- <param name="requiredAuthorities">F_SECTION_UPDATE</param>
- </action>
-
- <action name="saveSectionGreyStatus"
- class="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction">
- <result name="success" type="velocity">status.vm</result>
- <result name="onExceptionReturn">plainTextError</result>
- <param name="requiredAuthorities">F_SECTION_UPDATE</param>
- </action>
-
- <action name="showSortSectionForm"
- class="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/sortSectionForm.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- <param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
- </action>
-
- <action name="saveSectionSortOrder"
- class="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction">
- <result name="success" type="redirect">section.action</result>
- </action>
+ <action name="section" class="org.hisp.dhis.dataset.action.section.SectionListAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/sectionList.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ <param name="javascripts">javascript/section.js</param>
+ </action>
+
+ <action name="getSectionOptions" class="org.hisp.dhis.dataset.action.section.GetSectionOptionsAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/addSection.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ <param name="javascripts">javascript/section.js</param>
+ <param name="requiredAuthorities">F_SECTION_ADD</param>
+ </action>
+
+ <action name="addSection" class="org.hisp.dhis.dataset.action.section.AddSectionAction">
+ <result name="success" type="redirect">section.action</result>
+ <param name="requiredAuthorities">F_SECTION_ADD</param>
+ </action>
+
+ <action name="validateSection" class="org.hisp.dhis.dataset.action.section.ValidateSectionAction">
+ <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>
+
+ <action name="getSection" class="org.hisp.dhis.dataset.action.section.GetSectionAction">
+ <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseSectionObject.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="editSection" class="org.hisp.dhis.dataset.action.section.EditSectionAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/editSection.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ <param name="javascripts">javascript/section.js</param>
+ <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+ </action>
+
+ <action name="updateSection" class="org.hisp.dhis.dataset.action.section.UpdateSectionAction">
+ <result name="success" type="redirect">section.action</result>
+ <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+ </action>
+
+ <action name="removeSection" class="org.hisp.dhis.dataset.action.section.RemoveSectionAction">
+ <result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <param name="requiredAuthorities">F_SECTION_DELETE</param>
+ </action>
+
+ <action name="greySection" class="org.hisp.dhis.dataset.action.section.GreySectionAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/greySection.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ <param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
+ <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+ </action>
+
+ <action name="saveSectionGreyStatus" class="org.hisp.dhis.dataset.action.section.SaveSectionGreyStatusAction">
+ <result name="success" type="velocity">status.vm</result>
+ <result name="onExceptionReturn">plainTextError</result>
+ <param name="requiredAuthorities">F_SECTION_UPDATE</param>
+ </action>
+
+ <action name="showSortSectionForm" class="org.hisp.dhis.dataset.action.section.GetSectionListSortOrderAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/sortSectionForm.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ <param name="javascripts">javascript/dataSet.js,javascript/section.js</param>
+ </action>
+
+ <action name="saveSectionSortOrder" class="org.hisp.dhis.dataset.action.section.SaveSectionSortOrderAction">
+ <result name="success" type="redirect">section.action</result>
+ </action>
<!-- Sort order -->
- <action name="showSortDataSetForm"
- class="org.hisp.dhis.dataset.action.GetDataSetListSortOrderAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/sortDataSetForm.vm</param>
- </action>
+ <action name="showSortDataSetForm" class="org.hisp.dhis.dataset.action.GetDataSetListSortOrderAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/sortDataSetForm.vm</param>
+ </action>
- <action name="saveDataSetSortOrder"
- class="org.hisp.dhis.dataset.action.SaveDataSetSortOrderAction">
- <result name="success" type="redirect">dataSet.action</result>
- </action>
+ <action name="saveDataSetSortOrder" class="org.hisp.dhis.dataset.action.SaveDataSetSortOrderAction">
+ <result name="success" type="redirect">dataSet.action</result>
+ </action>
<!-- Show add DataSet form -->
- <action name="addDataSetForm"
- class="org.hisp.dhis.dataset.action.PeriodTypeListAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/addDataSet.vm</param>
- <param name="javascripts">javascript/shortName.js,javascript/dataSet.js</param>
- <param name="requiredAuthorities">F_DATASET_ADD</param>
- </action>
+ <action name="addDataSetForm" class="org.hisp.dhis.dataset.action.PeriodTypeListAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/addDataSet.vm</param>
+ <param name="javascripts">javascript/shortName.js,javascript/dataSet.js</param>
+ <param name="requiredAuthorities">F_DATASET_ADD</param>
+ </action>
<!-- Show edit DataSet form -->
- <action name="editDataSetForm"
- class="org.hisp.dhis.dataset.action.EditDataSetFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/editDataSet.vm</param>
- <param name="javascripts">javascript/shortName.js,javascript/dataSet.js</param>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
+ <action name="editDataSetForm" class="org.hisp.dhis.dataset.action.EditDataSetFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/editDataSet.vm</param>
+ <param name="javascripts">javascript/shortName.js,javascript/dataSet.js</param>
+ <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+ </action>
<!-- Validation, add, update, and delete -->
- <action name="validateDataSet"
- class="org.hisp.dhis.dataset.action.ValidateDataSetAction">
- <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>
-
- <action name="addDataSet" class="org.hisp.dhis.dataset.action.AddDataSetAction">
- <result name="success" type="redirect">dataSet.action</result>
- <param name="requiredAuthorities">F_DATASET_ADD</param>
- </action>
-
- <action name="updateDataSet" class="org.hisp.dhis.dataset.action.UpdateDataSetAction">
- <result name="success" type="redirect">dataSet.action</result>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
-
- <action name="delDataSet" class="org.hisp.dhis.dataset.action.DelDataSetAction">
- <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_DATASET_DELETE</param>
- </action>
+ <action name="validateDataSet" class="org.hisp.dhis.dataset.action.ValidateDataSetAction">
+ <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>
+
+ <action name="addDataSet" class="org.hisp.dhis.dataset.action.AddDataSetAction">
+ <result name="success" type="redirect">dataSet.action</result>
+ <param name="requiredAuthorities">F_DATASET_ADD</param>
+ </action>
+
+ <action name="updateDataSet" class="org.hisp.dhis.dataset.action.UpdateDataSetAction">
+ <result name="success" type="redirect">dataSet.action</result>
+ <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+ </action>
+
+ <action name="delDataSet" class="org.hisp.dhis.dataset.action.DelDataSetAction">
+ <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_DATASET_DELETE</param>
+ </action>
<!-- Filter -->
- <action name="filterAvailableDataElementsByDataElementGroup"
- class="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseDataElementGroup.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="filterAvailableIndicatorsByIndicatorGroup"
- class="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseIndicatorGroup.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="filterDataElementsByDataElementGroupForSection"
- class="org.hisp.dhis.dataset.action.section.DataElementListFilteredByGroupForSection">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseDataElementGroup.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
+ <action name="filterAvailableDataElementsByDataElementGroup" class="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup">
+ <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseDataElementGroup.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="filterAvailableIndicatorsByIndicatorGroup" class="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup">
+ <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseIndicatorGroup.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="filterDataElementsByDataElementGroupForSection" class="org.hisp.dhis.dataset.action.section.DataElementListFilteredByGroupForSection">
+ <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseDataElementGroup.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
<!-- DataSet association -->
- <action name="defineDataSetAssociationsForm" class="org.hisp.dhis.dataset.action.GetDataSetAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/dataSetAssociations.vm</param>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
+ <action name="defineDataSetAssociationsForm" class="org.hisp.dhis.dataset.action.GetDataSetAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/dataSetAssociations.vm</param>
+ <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+ </action>
- <action name="defineDataSetAssociations"
- class="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction">
- <result name="success" type="redirect">dataSet.action</result>
- <param name="requiredAuthorities">F_DATASET_UPDATE</param>
- </action>
+ <action name="defineDataSetAssociations" class="org.hisp.dhis.dataset.action.DefineDataSetAssociationsAction">
+ <result name="success" type="redirect">dataSet.action</result>
+ <param name="requiredAuthorities">F_DATASET_UPDATE</param>
+ </action>
<!-- DataEntryForm -->
- <action name="viewDataEntryForm"
- class="org.hisp.dhis.dataset.action.dataentryform.ViewDataEntryFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/viewDataEntryForm.vm</param>
- <param name="javascripts">../dhis-web-commons/ckeditor/ckeditor.js,
- ../dhis-web-commons/ckeditor/adapters/jquery.js,
- javascript/dataEntryForm.js</param>
- </action>
-
- <action name="saveDataEntryForm"
- class="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction">
- <result name="success" type="redirect">dataSet.action</result>
- </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>
- </action>
-
- <action name="validateDataEntryForm"
- class="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseSuccess.vm</result>
- <result name="input" type="velocity-xml">/dhis-web-maintenance-dataset/responseInput.vm</result>
- <result name="mismatch" type="velocity-xml">/dhis-web-maintenance-dataset/responseMismatch.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="delDataEntryForm"
- class="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction">
- <result name="success" type="redirect">dataSet.action</result>
- <result name="input" type="velocity-xml">/dhis-web-maintenance-dataset/responseInput.vm</result>
- </action>
-
- <action name="selectDataElement"
- class="org.hisp.dhis.dataset.action.dataentryform.SelectDataElementAction">
- <result name="success" type="velocity">selectDataElement.vm</result>
- <result name="input" type="velocity-xml">/dhis-web-maintenance-dataset/responseInput.vm</result>
- </action>
-
- <action name="getSelectedDataElements"
- class="org.hisp.dhis.dataset.action.dataentryform.GetSelectedDataElementsAction">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseSelDataElementList.vm</result>
- <param name="javascripts">javascript/dataEntryForm.js,javascript/FCK/fckeditor.js</param>
- </action>
+ <action name="viewDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.ViewDataEntryFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/viewDataEntryForm.vm</param>
+ <param name="javascripts">../dhis-web-commons/ckeditor/ckeditor.js,
+ ../dhis-web-commons/ckeditor/adapters/jquery.js,
+ javascript/dataEntryForm.js</param>
+ </action>
+
+ <action name="saveDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction">
+ <result name="success" type="redirect">dataSet.action</result>
+ </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>
+ </action>
+
+ <action name="validateDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.ValidateDataEntryFormAction">
+ <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseSuccess.vm</result>
+ <result name="input" type="velocity-xml">/dhis-web-maintenance-dataset/responseInput.vm</result>
+ <result name="mismatch" type="velocity-xml">/dhis-web-maintenance-dataset/responseMismatch.vm</result>
+ <param name="onExceptionReturn">plainTextError</param>
+ </action>
+
+ <action name="delDataEntryForm" class="org.hisp.dhis.dataset.action.dataentryform.DelDataEntryFormAction">
+ <result name="success" type="redirect">dataSet.action</result>
+ <result name="input" type="velocity-xml">/dhis-web-maintenance-dataset/responseInput.vm</result>
+ </action>
+
+ <action name="selectDataElement" class="org.hisp.dhis.dataset.action.dataentryform.SelectDataElementAction">
+ <result name="success" type="velocity">selectDataElement.vm</result>
+ <result name="input" type="velocity-xml">/dhis-web-maintenance-dataset/responseInput.vm</result>
+ </action>
+
+ <action name="getSelectedDataElements" class="org.hisp.dhis.dataset.action.dataentryform.GetSelectedDataElementsAction">
+ <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseSelDataElementList.vm</result>
+ <param name="javascripts">javascript/dataEntryForm.js,javascript/FCK/fckeditor.js</param>
+ </action>
<!-- Compulsory data elements -->
- <action name="displayCompulsoryDataElementsForm"
- class="org.hisp.dhis.dataset.action.compulsory.GetCompulsoryDataElementsAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/compulsoryDataElementsForm.vm</param>
- </action>
+ <action name="displayCompulsoryDataElementsForm" class="org.hisp.dhis.dataset.action.compulsory.GetCompulsoryDataElementsAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/compulsoryDataElementsForm.vm</param>
+ </action>
- <action name="saveCompulsoryDataElements"
- class="org.hisp.dhis.dataset.action.compulsory.SaveCompulsoryDataElementsAction">
- <result name="success" type="redirect">dataSet.action</result>
- </action>
+ <action name="saveCompulsoryDataElements" class="org.hisp.dhis.dataset.action.compulsory.SaveCompulsoryDataElementsAction">
+ <result name="success" type="redirect">dataSet.action</result>
+ </action>
<!-- Dataset Editor -->
- <action name="displayEditorForm" class="org.hisp.dhis.dataset.action.NoAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-dataset/viewEditorForm.vm</param>
- <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
- <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/editor.js</param>
- </action>
-
- <action name="showedAssociationsEditor"
- class="org.hisp.dhis.dataset.action.editor.ShowedAssociationsEditorAction">
- <result name="success" type="velocity">/dhis-web-maintenance-dataset/htmlGrid.vm</result>
- </action>
-
- <action name="definedAssociationEditor"
- class="org.hisp.dhis.dataset.action.editor.DefinedAssociationEditorAction">
- <result name="success" type="velocity">/dhis-web-maintenance-dataset/loadIcon.vm</result>
- </action>
-
- <action name="definedMultiAssociationsEditor"
- class="org.hisp.dhis.dataset.action.editor.DefinedMultiAssociationsEditorAction">
- <result name="success" type="velocity">/dhis-web-maintenance-dataset/loadIcons.vm</result>
- </action>
-
- </package>
+ <action name="displayEditorForm" class="org.hisp.dhis.dataset.action.NoAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-maintenance-dataset/viewEditorForm.vm</param>
+ <param name="menu">/dhis-web-maintenance-dataset/menu.vm</param>
+ <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/editor.js</param>
+ </action>
+
+ <action name="showedAssociationsEditor" class="org.hisp.dhis.dataset.action.editor.ShowedAssociationsEditorAction">
+ <result name="success" type="velocity">/dhis-web-maintenance-dataset/htmlGrid.vm</result>
+ </action>
+
+ <action name="definedAssociationEditor" class="org.hisp.dhis.dataset.action.editor.DefinedAssociationEditorAction">
+ <result name="success" type="velocity">/dhis-web-maintenance-dataset/loadIcon.vm</result>
+ </action>
+
+ <action name="definedMultiAssociationsEditor" class="org.hisp.dhis.dataset.action.editor.DefinedMultiAssociationsEditorAction">
+ <result name="success" type="velocity">/dhis-web-maintenance-dataset/loadIcons.vm</result>
+ </action>
+
+ </package>
</struts>
