------------------------------------------------------------ revno: 550 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Tue 2009-09-01 15:30:48 +0200 message: Removed unused files. removed: local/vn/dhis-web-vn-report/src/main/resources/struts.xml local/vn/dhis-web-vn-report/src/main/webapp/META-INF/ local/vn/dhis-web-vn-report/src/main/webapp/META-INF/MANIFEST.MF local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/lib/ renamed: local/vn/dhis-web-vn-report/src/main/resources/xwork.xml => local/vn/dhis-web-vn-report/src/main/resources/struts.xml modified: local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupsAndCateCombosListAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetFilteredDataElementListAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/UploadExcelFileAction.java local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml local/vn/dhis-web-vn-report/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 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java' --- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java 2009-09-01 10:22:24 +0000 +++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java 2009-09-01 13:30:48 +0000 @@ -36,7 +36,7 @@ import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService; -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; /** * @author Bharath Kumar === modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java' --- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java 2009-09-01 10:22:24 +0000 +++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java 2009-09-01 13:30:48 +0000 @@ -28,7 +28,6 @@ */ import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -38,8 +37,7 @@ import org.hisp.dhis.vn.report.ReportExcelCategory; import org.hisp.dhis.vn.report.ReportExcelInterface; -import com.opensymphony.xwork.Action; - +import com.opensymphony.xwork2.Action; /** */ @@ -53,14 +51,15 @@ /** * */ - private static final long serialVersionUID = 1L; - private DataElementService dataElementService; + private static final long serialVersionUID = 1L; + + private DataElementService dataElementService; public void setDataElementService( DataElementService dataElementService ) { this.dataElementService = dataElementService; - } - + } + // ------------------------------------------------------------------------- // Comparator // ------------------------------------------------------------------------- @@ -103,11 +102,11 @@ // Output // ------------------------------------------------------------------------- - private List<DataElement> selectedDataElements = new ArrayList<DataElement>(); + private List<DataElement> selectedDataElements = new ArrayList<DataElement>(); - public List<DataElement> getselectedDataElements () + public List<DataElement> getselectedDataElements() { - return selectedDataElements ; + return selectedDataElements; } private List<DataElement> availableDataElements = new ArrayList<DataElement>(); @@ -129,15 +128,16 @@ if ( report != null ) { - selectedDataElements = new ArrayList<DataElement>( ((ReportExcelCategory)report).getDataElements() ); - - //Collections.sort( selectedDataElements, dataElementComparator ); - + selectedDataElements = new ArrayList<DataElement>( ((ReportExcelCategory) report).getDataElements() ); + + // Collections.sort( selectedDataElements, dataElementComparator ); + displayPropertyHandler.handle( selectedDataElements ); - System.out.println("report.name - report.id: " + report.getName() + " - " + report.getId()); + System.out.println( "report.name - report.id: " + report.getName() + " - " + report.getId() ); } - else { - return ERROR; + else + { + return ERROR; } // --------------------------------------------------------------------- @@ -146,10 +146,10 @@ availableDataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() ); - availableDataElements.removeAll( selectedDataElements ); - - //Collections.sort( availableDataElements, dataElementComparator ); - + availableDataElements.removeAll( selectedDataElements ); + + // Collections.sort( availableDataElements, dataElementComparator ); + displayPropertyHandler.handle( availableDataElements ); return SUCCESS; === modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupsAndCateCombosListAction.java' --- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupsAndCateCombosListAction.java 2009-09-01 10:22:24 +0000 +++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupsAndCateCombosListAction.java 2009-09-01 13:30:48 +0000 @@ -1,5 +1,3 @@ -// HIEU DONE // - package org.hisp.dhis.vn.dataelement.action; /* @@ -40,59 +38,55 @@ import org.hisp.dhis.dataelement.comparator.DataElementCategoryComboNameComparator; import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator; -import com.opensymphony.xwork.Action; - - +import com.opensymphony.xwork2.Action; /** */ public class GetDataElementGroupsAndCateCombosListAction implements Action { - private static final long serialVersionUID = 1L; - + private static final long serialVersionUID = 1L; + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- - - private DataElementService dataElementService; - - private DataElementCategoryComboService dataElementCategoryComboService; - + + private DataElementService dataElementService; + + private DataElementCategoryComboService dataElementCategoryComboService; + /** * */ - + public void setDataElementService( DataElementService dataElementService ) { this.dataElementService = dataElementService; } - public void setDataElementCategoryComboService ( DataElementCategoryComboService dataElementCategoryComboService ) + public void setDataElementCategoryComboService( DataElementCategoryComboService dataElementCategoryComboService ) { this.dataElementCategoryComboService = dataElementCategoryComboService; - } + } - // ------------------------------------------------------------------------- // Output // ------------------------------------------------------------------------- - - private List<DataElementGroup> dataElementGroups; - + + private List<DataElementGroup> dataElementGroups; + public List<DataElementGroup> getDataElementGroups() { return dataElementGroups; } private List<DataElementCategoryCombo> categoryCombos; - + public List<DataElementCategoryCombo> getcategoryCombos() { return categoryCombos; } - - + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -102,23 +96,26 @@ // --------------------------------------------------------------------- // get list of DataElementGroups and list of CategoryCombos // --------------------------------------------------------------------- - - if ( dataElementGroups == null ) { - - dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() ); - System.err.println("dataElementGroups.size = " + dataElementGroups.size()); - } - - Collections.sort( dataElementGroups, new DataElementGroupNameComparator() ); - - if ( categoryCombos == null ) { - - categoryCombos = new ArrayList<DataElementCategoryCombo> ( dataElementCategoryComboService.getAllDataElementCategoryCombos() ); - } - - Collections.sort( categoryCombos, new DataElementCategoryComboNameComparator() ); - - return SUCCESS; + + if ( dataElementGroups == null ) + { + + dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() ); + System.err.println( "dataElementGroups.size = " + dataElementGroups.size() ); + } + + Collections.sort( dataElementGroups, new DataElementGroupNameComparator() ); + + if ( categoryCombos == null ) + { + + categoryCombos = new ArrayList<DataElementCategoryCombo>( dataElementCategoryComboService + .getAllDataElementCategoryCombos() ); + } + + Collections.sort( categoryCombos, new DataElementCategoryComboNameComparator() ); + + return SUCCESS; } } === modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetFilteredDataElementListAction.java' --- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetFilteredDataElementListAction.java 2009-09-01 10:22:24 +0000 +++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetFilteredDataElementListAction.java 2009-09-01 13:30:48 +0000 @@ -1,5 +1,3 @@ - -// HIEU DONE // package org.hisp.dhis.vn.dataelement.action; /* @@ -30,7 +28,6 @@ */ import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -38,8 +35,7 @@ import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler; -import com.opensymphony.xwork.Action; - +import com.opensymphony.xwork2.Action; public class GetFilteredDataElementListAction implements Action @@ -55,7 +51,6 @@ this.dataElementService = dataElementService; } - // ------------------------------------------------------------------------- // Comparator // ------------------------------------------------------------------------- @@ -83,7 +78,7 @@ // ------------------------------------------------------------------------- private List<DataElement> dataElements; - + // ------------------------------------------------------------------------- // Getter & Setter // ------------------------------------------------------------------------- @@ -99,13 +94,12 @@ { return dataElementGroupId; } - - public List<DataElement> getDataElements() + + public List<DataElement> getDataElements() { return dataElements; } - // ------------------------------------------------------------------------- // Action implemantation // ------------------------------------------------------------------------- @@ -117,26 +111,32 @@ // Criteria // --------------------------------------------------------------------- - if ( dataElementGroupId != -1 ) { - - dataElements = new ArrayList<DataElement>( dataElementService.getDataElementGroup( dataElementGroupId ).getMembers() ); + if ( dataElementGroupId != -1 ) + { + + dataElements = new ArrayList<DataElement>( dataElementService.getDataElementGroup( dataElementGroupId ) + .getMembers() ); } - else { + else + { dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() ); } - if (dataElements != null) { - - for (DataElement de : dataElements) { - System.out.println("de.id = " + de.getId()); - System.out.println("de.name = " + de.getName()); - } - } - else { - return ERROR; - } - - //Collections.sort( dataElements, dataElementComparator ); + if ( dataElements != null ) + { + + for ( DataElement de : dataElements ) + { + System.out.println( "de.id = " + de.getId() ); + System.out.println( "de.name = " + de.getName() ); + } + } + else + { + return ERROR; + } + + // Collections.sort( dataElements, dataElementComparator ); displayPropertyHandler.handle( dataElements ); === modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java' --- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java 2009-09-01 10:56:13 +0000 +++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java 2009-09-01 13:30:48 +0000 @@ -6,9 +6,10 @@ import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; import org.hisp.dhis.vn.report.state.ReportLocationManager; -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; -public class DeleteExcelFileAction implements Action +public class DeleteExcelFileAction + implements Action { // ------------------------------------------- // Dependency @@ -47,13 +48,13 @@ throws Exception { OrganisationUnit organisationUnit = organisationUnitSelectionManager.getSelectedOrganisationUnit(); - + File dir = reportLocationManager.getDirectory( organisationUnit ); - - File excel = new File(dir,this.fileName); - + + File excel = new File( dir, this.fileName ); + excel.delete(); - + return SUCCESS; } === modified file 'local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/UploadExcelFileAction.java' --- local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/UploadExcelFileAction.java 2009-09-01 10:56:13 +0000 +++ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/UploadExcelFileAction.java 2009-09-01 13:30:48 +0000 @@ -9,7 +9,7 @@ import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager; import org.hisp.dhis.vn.report.state.ReportLocationManager; -import com.opensymphony.xwork.Action; +import com.opensymphony.xwork2.Action; public class UploadExcelFileAction implements Action @@ -62,9 +62,10 @@ throws Exception { OrganisationUnit organisationUnit = organisationUnitSelectionManager.getSelectedOrganisationUnit(); - - if ( organisationUnit == null ) return SUCCESS; - + + if ( organisationUnit == null ) + return SUCCESS; + File directory = reportLocationManager.getDirectory( organisationUnit ); if ( upload != null ) === renamed file 'local/vn/dhis-web-vn-report/src/main/resources/xwork.xml' => 'local/vn/dhis-web-vn-report/src/main/resources/struts.xml' --- local/vn/dhis-web-vn-report/src/main/resources/xwork.xml 2009-09-01 11:25:50 +0000 +++ local/vn/dhis-web-vn-report/src/main/resources/struts.xml 2009-09-01 13:30:48 +0000 @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" - "http://www.opensymphony.com/xwork/xwork-1.0.dtd"> -<xwork> +<!DOCTYPE struts PUBLIC +"-//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" /> <package name="dhis-web-vn-report" extends="dhis-web-commons" @@ -425,4 +426,4 @@ </package> -</xwork> +</struts> === removed file 'local/vn/dhis-web-vn-report/src/main/resources/struts.xml' --- local/vn/dhis-web-vn-report/src/main/resources/struts.xml 2009-08-21 10:34:49 +0000 +++ local/vn/dhis-web-vn-report/src/main/resources/struts.xml 1970-01-01 00:00:00 +0000 @@ -1,430 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE struts PUBLIC -"-//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" /> - - <package name="dhis-web-vn-report" extends="dhis-web-commons" - namespace="/dhis-web-vn-report"> - - <action name="getConfiguration" class="org.hisp.dhis.vn.report.configuration.action.GetReportConfigurationAction"> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/configuration.vm</param> - <param name="menu">/dhis-web-vn-report/menu.vm</param> - <param name="requiredAuthorities">F_ADD_REPORT_VN</param> - </action> - - <action name="setConfiguration" class="org.hisp.dhis.vn.report.configuration.action.SetReportConfigurationAction"> - <result name="success" type="redirect">listReportExcel.action</result> - <param name="requiredAuthorities">F_ADD_REPORT_VN</param> - </action> - - - <action name="listReportExcel" class="org.hisp.dhis.vn.report.action.ListReportAction"> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/reports.vm</param> - <param name="menu">/dhis-web-vn-report/menu.vm</param> - <param name="javascripts">javascript/reports.js,javascript/dataelement.js</param> - </action> - - <action name="updateReportExcelGroupListing" class="org.hisp.dhis.vn.report.action.UpdateReportExcelGroupListingAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseSuccess.vm</result> - </action> - - <action name="updateReportExcelGroupListing" - class="org.hisp.dhis.vn.report.action.UpdateReportExcelGroupListingAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseSuccess.vm</result> - </action> - - <action name="addReportExcelForm" - class="org.hisp.dhis.vn.report.action.AddReportExcelAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReport.vm</result> - <param name="requiredAuthorities">F_ADD_REPORT_VN</param> - </action> - - <action name="getReport" class="org.hisp.dhis.vn.report.action.GetReportAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReport.vm</result> - </action> - - <action name="openAddUnitGroupForReportListing" class="org.hisp.dhis.vn.report.action.GetReportAction"> - <result name="success" type="chain"> - openAddUnitGroupForReportListingChain</result> - </action> - - <action name="openAddUnitGroupForReportListingChain" - class="org.hisp.dhis.vn.report.action.GetOrganisationUnitGroupAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReport.vm</result> - </action> - - <action name="updateReportExcelForm" - class="org.hisp.dhis.vn.report.action.UpdateReportExcelAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReport.vm</result> - </action> - - <action name="updateReportExcelForm" - class="org.hisp.dhis.vn.report.action.UpdateReportExcelAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReport.vm</result> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - <action name="validateReport" - class="org.hisp.dhis.vn.report.action.ValidateReportAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseSuccess.vm</result> - <result name="error" type="velocity-xml"> - /dhis-web-vn-report/responseError.vm</result> - </action> - - <action name="deleteReport" - class="org.hisp.dhis.vn.report.action.DeleteReportAction"> - <result name="success" type="redirect">listReportExcel.action</result> - <param name="requiredAuthorities">F_DELETE_REPORT_VN</param> - </action> - - <action name="openDefineAssociationsForm" - class="org.hisp.dhis.vn.report.action.GetNumberOfLevelsAction"> - <result name="success" type="chain">openDefineAssociationsFormChain - </result> - <param name="requiredAuthorities">F_DELETE_REPORT_VN</param> - </action> - - <action name="openDefineAssociationsFormChain" - class="org.hisp.dhis.vn.report.action.OpenReportExcelAssociationAction"> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/reportassociation.vm</param> - <param name="menu">/dhis-web-vn-report/menu.vm</param> - <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/associations.js</param> - <interceptor-ref name="transactionStack" /> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - <action name="selectLevelChain" - class="org.hisp.dhis.vn.report.action.GetNumberOfLevelsAction"> - <result name="success" type="chain">getReportChain - </result> - <param name="requiredAuthorities">F_DELETE_REPORT_VN</param> - </action> - - <action name="getReportChain" class="org.hisp.dhis.vn.report.action.GetReportAction"> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/reportassociation.vm</param> - <param name="menu">/dhis-web-vn-report/menu.vm</param> - <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/associations.js</param> - <interceptor-ref name="transactionStack" /> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - <action name="selectLevel" class="org.hisp.dhis.vn.report.action.SelectLevelAction"> - <result name="success" type="chain">selectLevelChain - </result> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - <action name="unselectLevel" - class="org.hisp.dhis.vn.report.action.UnselectLevelAction"> - <result name="success" type="chain">selectLevelChain - </result> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - <action name="unselectAll" class="org.hisp.dhis.vn.report.action.UnselectAllAction"> - <result name="success" type="chain">selectLevelChain - </result> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - <action name="updateDefineAssociations" - class="org.hisp.dhis.vn.report.action.UpdateReportAssociationAction"> - <result name="success" type="redirect">listReportExcel.action - </result> - </action> - - <!-- Report Item --> - - <action name="listReportItem" - class="org.hisp.dhis.vn.reportitem.action.ListReportItemAction"> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/reportItems.vm</param> - <param name="menu">/dhis-web-vn-report/menu.vm</param> - <param name="javascripts">javascript/reportItem.js,javascript/dataelement.js</param> - </action> - - <action name="getReportItems" - class="org.hisp.dhis.vn.reportitem.action.ListReportItemAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReportItems.vm</result> - </action> - - <action name="getReportItem" - class="org.hisp.dhis.vn.reportitem.action.GetReportItemAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReportItem.vm</result> - </action> - - <action name="validateReportItem" - class="org.hisp.dhis.vn.reportitem.action.ValidateReportItemAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseSuccess.vm</result> - <result name="error" type="velocity-xml"> - /dhis-web-vn-report/responseError.vm</result> - </action> - - <action name="addReportItem" - class="org.hisp.dhis.vn.reportitem.action.AddReportItemAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReportItem.vm</result> - <param name="requiredAuthorities">F_ADD_REPORT_VN</param> - </action> - - <action name="updateReportItem" - class="org.hisp.dhis.vn.reportitem.action.UpdateReportItemAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReportItem.vm</result> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - <action name="deleteReportItem" - class="org.hisp.dhis.vn.reportitem.action.DeleteReportItemAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseSuccess.vm</result> - <param name="requiredAuthorities">F_DELETE_REPORT_VN</param> - </action> - - <action name="getFilteredDataElements" - class="org.hisp.dhis.vn.report.formula.action.GetFilteredDataElementsAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseOperandList.vm</result> - <interceptor-ref name="transactionStack" /> - <param name="onExceptionReturn">plainTextError</param> - </action> - - <action name="getFormulaText" - class="org.hisp.dhis.vn.report.formula.action.GetFormulaTextAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseFormulaText.vm</result> - <interceptor-ref name="transactionStack" /> - <param name="onExceptionReturn">plainTextError</param> - </action> - - <action name="validateDenum" - class="org.hisp.dhis.vn.report.formula.action.ValidateDenumAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseSuccess.vm</result> - <result name="error" type="velocity-xml"> - /dhis-web-vn-report/responseError.vm</result> - <param name="onExceptionReturn">plainTextError</param> - </action> - - <action name="getALLReportAjax" class="org.hisp.dhis.vn.report.action.ListReportAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseListReport.vm</result> - </action> - - <action name="copyReportItems" class="org.hisp.dhis.vn.reportitem.action.CopyReportItemsAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseSuccess.vm</result> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - - <!-- Export Report--> - - <action name="getOrganisation" - class="org.hisp.dhis.vn.report.export.action.GetOrganisationUnitAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseOrganisation.vm</result> - </action> - - <action name="getReportAssociation" - class="org.hisp.dhis.vn.report.export.action.SelectFormAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseReportAssociations.vm</result> - </action> - - - - <action name="getPeriod" - class="org.hisp.dhis.vn.report.export.action.GetPeriodAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responsePeriods.vm</result> - </action> - - <action name="index" - class="org.hisp.dhis.vn.report.export.action.SelectFormAction"> - <interceptor-ref name="organisationUnitTreeStack" /> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/reportparams.vm</param> - <param name="menu">/dhis-web-vn-report/menuWithTree.vm</param> - <param name="menuTreeHeight">220</param> - <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/export.js</param> - </action> - - <action name="validateGenerateReport" - class="org.hisp.dhis.vn.report.export.action.ValidateGenerateReportAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseSuccess.vm</result> - <result name="error" type="velocity-xml"> - /dhis-web-vn-report/responseError.vm</result> - </action> - - <action name="generateReport" - class="org.hisp.dhis.vn.report.export.action.GenerateReportAction"> - <result name="success" type="stream"> - <param name="contentType">application/vnd.ms-excel</param> - <param name="inputName">inputStream</param> - <param name="contentDisposition">filename="${outputXLS}"</param> - <param name="bufferSize">1024</param> - </result> - </action> - - <!-- Delete Report Temp Files --> - - <action name="cleanTempDirectory" - class="org.hisp.dhis.vn.report.support.action.CleanTempDirectoryAction"> - <result name="success" type="velocity-xml"> - /dhis-web-vn-report/responseDeleteTempDir.vm</result> - <param name="requiredAuthorities">F_CLEAN_UP_TEMP_VN</param> - </action> - - <!-- Data Set Completed --> - - <action name="selectDataSetCompletedReport" - class="org.hisp.dhis.vn.report.completed.action.SelectParamsAction"> - <interceptor-ref name="organisationUnitTreeStack" /> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/dataSetCompleteReportSelect.vm</param> - <param name="menu">/dhis-web-vn-report/menuWithTree.vm</param> - <param name="menuTreeHeight">220</param> - <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/dataSetCompleted.js</param> - </action> - - <action name="getOrganisationUnit" - class="org.hisp.dhis.vn.report.export.action.GetOrganisationUnitAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseOrganisation.vm</result> - </action> - - <action name="getDataSetAndPeriodByPeriodType" - class="org.hisp.dhis.vn.report.completed.action.GetDataSetAndPeriodByPeriodTypeAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseDataSetAndPeriodByPeriodType.vm</result> - </action> - - <action name="viewDataSetCompleted" - class="org.hisp.dhis.vn.report.completed.action.ViewDataSetCompletedAction"> - <result name="success" type="velocity">/popup.vm</result> - <param name="page">/dhis-web-vn-report/viewDataSetCompleted.vm</param> - <param name="stylesheets">style/listTable.css</param> - <param name="javascripts">javascript/dataSetCompleted.js</param> - </action> - - <action name="viewCustomDataSetReport" - class="org.hisp.dhis.vn.report.completed.action.ViewCustomDataSetReportAction"> - <result name="success" type="velocity">/popup.vm</result> - <param name="page">/dhis-web-vn-report/viewCustomDataSetReport.vm</param> - </action> - - <!-- Import Excel File --> - - <action name="getExcelFileByOrganisationUnit" - class="org.hisp.dhis.vn.imports.action.GetListExcelFileByOrganisationAction"> - <interceptor-ref name="organisationUnitTreeStack" /> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/listExcelFile.vm</param> - <param name="menu">/dhis-web-vn-report/menuWithTree.vm</param> - <param name="menuTreeHeight">220</param> - <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/imports.js</param> - </action> - - <action name="uploadExcelFile" - class="org.hisp.dhis.vn.imports.action.UploadExcelFileAction"> - <result name="success" type="redirect">getExcelFileByOrganisationUnit.action</result> - <interceptor-ref name="fileUploadStack"/> - </action> - - <action name="deleteExcelFile" - class="org.hisp.dhis.vn.imports.action.DeleteExcelFileAction"> - <result name="success" type="redirect">getExcelFileByOrganisationUnit.action</result> - </action> - - <action name="viewExcelFileDataValue" - class="org.hisp.dhis.vn.imports.action.ViewDataFromExcelFileAction"> - <result name="success" type="velocity">/main.vm</result> - <param name="page">/dhis-web-vn-report/excelFileValue.vm</param> - <param name="javascripts">javascript/imports.js</param> - </action> - - - <!-- HIEU DONE --> - <!-- DataElement --> - - <action name="getDataElementGroupsAndCateCombosList" - class="org.hisp.dhis.vn.dataelement.action.GetDataElementGroupsAndCateCombosListAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/dataelement/responseElementGroupsAndCombosList.vm</result> - <param name="javascripts">javascript/dataelement.js,javascript/report.js</param> - </action> - - <action name="getCategoryList" - class="org.hisp.dhis.vn.categorycombo.action.GetFilteredCategoryListAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/categorycombo/responseCategories.vm</result> - <result name="error" type="velocity-xml">/dhis-web-vn-report/categorycombo/responseError.vm</result> - <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/export.js,javascript/dataelement.js,javascript/report.js</param> - <interceptor-ref name="transactionStack"/> - </action> - - <action name="getDataElementList" - class="org.hisp.dhis.vn.dataelement.action.GetFilteredDataElementListAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/dataelement/responseDataElements.vm</result> - <result name="error" type="velocity-xml">/dhis-web-vn-report/dataelement/responseError.vm</result> - <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/export.js,javascript/dataelement.js,javascript/report.js</param> - <interceptor-ref name="transactionStack"/> - </action> - - <action name="validateAddDataElementAndCateCombo" - class="org.hisp.dhis.vn.dataelement.action.ValidateAddDataElementAndCateComboInCategoryReportAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/dataelement/responseSuccess.vm</result> - <result name="error" type="velocity-xml">/dhis-web-vn-report/dataelement/responseError.vm</result> - </action> - - - <action name="validateFormulaForReportCategory" - class="org.hisp.dhis.vn.report.formula.action.ValidateFormulaForReportCategoryAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseSuccess.vm</result> - <result name="error" type="velocity-xml">/dhis-web-vn-report/responseError.vm</result> - <param name="onExceptionReturn">plainTextError</param> - </action> - - - <action name="getSelectedElementsAndAvailableElements" - class="org.hisp.dhis.vn.report.action.GetReportAction"> - <result name="success" type="chain">openSelectedElementsAndAvailableElementsChain</result> - </action> - - - <action name="openSelectedElementsAndAvailableElementsChain" - class="org.hisp.dhis.vn.dataelement.action.GetDataElementGroupMembersAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseReport.vm</result> - <interceptor-ref name="transactionStack"/> - </action> - - - <action name="updateElementsAndComboReportCategory" - class="org.hisp.dhis.vn.report.action.UpdateElementMembersAndCateComboReportCategoryAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/responseSuccess.vm</result> - <param name="requiredAuthorities">F_UPDATE_REPORT_VN</param> - </action> - - - <action name="getOptionComboList" class="org.hisp.dhis.vn.categorycombo.action.GetOptionCombosAction"> - <result name="success" type="velocity-xml">/dhis-web-vn-report/categorycombo/responseOptionComboList.vm</result> - <param name="javascripts">javascript/export.js,javascript/dataelement.js,javascript/report.js</param> - </action> - - - - </package> -</struts> === removed directory 'local/vn/dhis-web-vn-report/src/main/webapp/META-INF' === removed file 'local/vn/dhis-web-vn-report/src/main/webapp/META-INF/MANIFEST.MF' --- local/vn/dhis-web-vn-report/src/main/webapp/META-INF/MANIFEST.MF 2009-07-13 00:23:50 +0000 +++ local/vn/dhis-web-vn-report/src/main/webapp/META-INF/MANIFEST.MF 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - === removed directory 'local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/lib' === modified file 'local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml' --- local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml 2009-09-01 10:22:24 +0000 +++ local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml 2009-09-01 13:30:48 +0000 @@ -38,8 +38,8 @@ </init-param> </filter> <filter> - <filter-name>WebWork</filter-name> - <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class> + <filter-name>Struts</filter-name> + <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> </filter> <filter-mapping> @@ -55,7 +55,7 @@ <url-pattern>/*</url-pattern> </filter-mapping> <filter-mapping> - <filter-name>WebWork</filter-name> + <filter-name>Struts</filter-name> <url-pattern>*.action</url-pattern> </filter-mapping>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp