(0013369)
|
svnbot
|
2009-02-11 19:01
|
|
Repository: localization
Revision: 271
Author: pheenan
Date: 2009-02-11 19:01:28 +0100 (Wed, 11 Feb 2009)
Fixed 6014. Added two arguments to the template merge task. Task now takes a combination of templateFolder, baseFolder, templateFile, baseFile. If the templateFolder and baseFolder are empty then only the file args will be used. If both are used then they should combine to show the path to the files. If the file args are empty then the folders will be parsed and all files contained in those folders will be merged. Updated other test cases to use the new argument pattern. Added test files used in the test cases.
---
U tools/openbravo2po/branches/openbravo2po-valuetrl/build.xml
U tools/openbravo2po/branches/openbravo2po-valuetrl/src/org/openbravo/xmlpo/objects/TaskProcess.java
U tools/openbravo2po/branches/openbravo2po-valuetrl/src/org/openbravo/xmlpo/templateMerge/TemplateMerge.java
U tools/openbravo2po/branches/openbravo2po-valuetrl/src/org/openbravo/xmlpo/templateMerge/TemplateProcessor.java
U tools/openbravo2po/branches/openbravo2po-valuetrl/src/org/openbravo/xmlpo/utils/XMLFileBuilder.java
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/baseFolder/
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/baseFolder/AD_MENU_TRL_it_IT.xml
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/baseFolder/AD_TASK_TRL_it_IT.xml
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/outputFolder/
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/outputSingleFileWithFolder/
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/templateFolder/
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/templateFolder/AD_MENU_TRL_en_US.xml
A tools/openbravo2po/branches/openbravo2po-valuetrl/tests/resources/templateMerge/folderTest/templateFolder/AD_TASK_TRL_en_US.xml
U tools/openbravo2po/branches/openbravo2po-valuetrl/tests/src/org/openbravo/xmlpo/templateMerge/TestTemplateMerge.java
U tools/openbravo2po/branches/openbravo2po-valuetrl/tests/src/org/openbravo/xmlpo/utils/TestMergeXMLFiles.java
---
https://dev.openbravo.com/websvn/localization/?rev=271&sc=1 [^]
|
|