From 6b6a8a91e486682edf2411ee584d673db684e4eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=87=95=E9=B9=8F?= <mail_yanpeng@163.com>
Date: Tue, 22 Jun 2021 13:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bstek/ureport/CellRenderer.class      | Bin 348 -> 0 bytes
 .../classes/com/bstek/ureport/Range.class     | Bin 882 -> 0 bytes
 ...UReportPropertyPlaceholderConfigurer.class | Bin 529 -> 0 bytes
 .../classes/com/bstek/ureport/Utils.class     | Bin 8014 -> 0 bytes
 .../com/bstek/ureport/build/BindData.class    | Bin 1374 -> 0 bytes
 .../com/bstek/ureport/build/Context.class     | Bin 14322 -> 0 bytes
 .../com/bstek/ureport/build/DataCompute.class | Bin 3554 -> 0 bytes
 .../com/bstek/ureport/build/Dataset.class     | Bin 820 -> 0 bytes
 .../bstek/ureport/build/DatasetUtils.class    | Bin 3200 -> 0 bytes
 .../ureport/build/HideRowColumnBuilder.class  | Bin 4901 -> 0 bytes
 .../bstek/ureport/build/ReportBuilder.class   | Bin 19748 -> 0 bytes
 .../com/bstek/ureport/build/Splash.class      | Bin 1642 -> 0 bytes
 .../ureport/build/aggregate/Aggregate$1.class | Bin 2288 -> 0 bytes
 .../ureport/build/aggregate/Aggregate.class   | Bin 3482 -> 0 bytes
 .../build/aggregate/AvgAggregate.class        | Bin 5899 -> 0 bytes
 .../build/aggregate/CountAggregate.class      | Bin 5199 -> 0 bytes
 .../aggregate/CustomGroupAggregate.class      | Bin 5206 -> 0 bytes
 .../build/aggregate/GroupAggregate.class      | Bin 4885 -> 0 bytes
 .../build/aggregate/MaxAggregate.class        | Bin 5988 -> 0 bytes
 .../build/aggregate/MinAggregate.class        | Bin 5988 -> 0 bytes
 .../build/aggregate/RegroupAggregate.class    | Bin 1535 -> 0 bytes
 .../build/aggregate/ReselectAggregate.class   | Bin 1539 -> 0 bytes
 .../build/aggregate/SelectAggregate.class     | Bin 4127 -> 0 bytes
 .../build/aggregate/SumAggregate.class        | Bin 5678 -> 0 bytes
 .../build/assertor/AbstractAssertor.class     | Bin 808 -> 0 bytes
 .../ureport/build/assertor/Assertor.class     | Bin 187 -> 0 bytes
 .../build/assertor/EqualsAssertor.class       | Bin 1367 -> 0 bytes
 .../assertor/EqualsGreatThenAssertor.class    | Bin 1146 -> 0 bytes
 .../assertor/EqualsLessThenAssertor.class     | Bin 1143 -> 0 bytes
 .../build/assertor/GreatThenAssertor.class    | Bin 1128 -> 0 bytes
 .../ureport/build/assertor/InAssertor.class   | Bin 1511 -> 0 bytes
 .../build/assertor/LessThenAssertor.class     | Bin 1125 -> 0 bytes
 .../ureport/build/assertor/LikeAssertor.class | Bin 777 -> 0 bytes
 .../build/assertor/NotEqualsAssertor.class    | Bin 756 -> 0 bytes
 .../build/assertor/NotInAssertor.class        | Bin 1531 -> 0 bytes
 .../ureport/build/cell/CellBuilder.class      | Bin 436 -> 0 bytes
 .../ureport/build/cell/DuplicateType.class    | Bin 1174 -> 0 bytes
 .../ureport/build/cell/ExpandBuilder.class    | Bin 370 -> 0 bytes
 .../build/cell/NoneExpandBuilder.class        | Bin 2737 -> 0 bytes
 .../cell/down/CellDownDuplicateUnit.class     | Bin 4811 -> 0 bytes
 .../cell/down/CellDownDuplicator$1.class      | Bin 910 -> 0 bytes
 .../build/cell/down/CellDownDuplicator.class  | Bin 5801 -> 0 bytes
 .../build/cell/down/DownBlankCellApply.class  | Bin 4534 -> 0 bytes
 .../build/cell/down/DownDuplicate.class       | Bin 2638 -> 0 bytes
 .../cell/down/DownDuplocatorWrapper.class     | Bin 3136 -> 0 bytes
 .../build/cell/down/DownExpandBuilder.class   | Bin 7537 -> 0 bytes
 .../cell/right/CellRightDuplicateUnit.class   | Bin 4874 -> 0 bytes
 .../cell/right/CellRightDuplicator$1.class    | Bin 915 -> 0 bytes
 .../cell/right/CellRightDuplicator.class      | Bin 5858 -> 0 bytes
 .../cell/right/RightBlankCellApply.class      | Bin 4427 -> 0 bytes
 .../build/cell/right/RightDuplicate.class     | Bin 2647 -> 0 bytes
 .../cell/right/RightDuplocatorWrapper.class   | Bin 3155 -> 0 bytes
 .../build/cell/right/RightExpandBuilder.class | Bin 7656 -> 0 bytes
 .../build/compute/ChartValueCompute.class     | Bin 1933 -> 0 bytes
 .../build/compute/DatasetValueCompute.class   | Bin 1540 -> 0 bytes
 .../compute/ExpressionValueCompute.class      | Bin 7045 -> 0 bytes
 .../build/compute/ImageValueCompute.class     | Bin 4546 -> 0 bytes
 .../build/compute/SimpleValueCompute.class    | Bin 1581 -> 0 bytes
 .../build/compute/SlashValueCompute.class     | Bin 1874 -> 0 bytes
 .../ureport/build/compute/ValueCompute.class  | Bin 445 -> 0 bytes
 .../build/compute/ZxingValueCompute.class     | Bin 7582 -> 0 bytes
 .../ureport/build/paging/BasePagination.class | Bin 8523 -> 0 bytes
 .../build/paging/FitPagePagination.class      | Bin 4687 -> 0 bytes
 .../build/paging/FixRowsPagination.class      | Bin 4019 -> 0 bytes
 .../ureport/build/paging/HeaderFooter.class   | Bin 2584 -> 0 bytes
 .../com/bstek/ureport/build/paging/Page.class | Bin 1560 -> 0 bytes
 .../ureport/build/paging/Pagination.class     | Bin 316 -> 0 bytes
 .../ureport/build/paging/PagingBuilder.class  | Bin 3350 -> 0 bytes
 .../ureport/build/paging/RepeatRows.class     | Bin 984 -> 0 bytes
 .../com/bstek/ureport/cache/CacheUtils.class  | Bin 3510 -> 0 bytes
 .../DefaultMemoryReportDefinitionCache.class  | Bin 1428 -> 0 bytes
 .../com/bstek/ureport/cache/ReportCache.class | Bin 277 -> 0 bytes
 .../ureport/cache/ReportDefinitionCache.class | Bin 350 -> 0 bytes
 .../bstek/ureport/cache/ResourceCache.class   | Bin 1100 -> 0 bytes
 .../com/bstek/ureport/chart/Chart.class       | Bin 5422 -> 0 bytes
 .../com/bstek/ureport/chart/ChartData.class   | Bin 1685 -> 0 bytes
 .../com/bstek/ureport/chart/FontStyle.class   | Bin 1060 -> 0 bytes
 .../com/bstek/ureport/chart/axes/Axes.class   | Bin 158 -> 0 bytes
 .../bstek/ureport/chart/axes/BaseAxes.class   | Bin 896 -> 0 bytes
 .../bstek/ureport/chart/axes/ScaleLabel.class | Bin 2356 -> 0 bytes
 .../bstek/ureport/chart/axes/XPosition.class  | Bin 1040 -> 0 bytes
 .../bstek/ureport/chart/axes/YPosition.class  | Bin 1040 -> 0 bytes
 .../bstek/ureport/chart/axes/impl/XAxes.class | Bin 1511 -> 0 bytes
 .../bstek/ureport/chart/axes/impl/YAxes.class | Bin 1437 -> 0 bytes
 .../ureport/chart/dataset/BaseDataset.class   | Bin 1150 -> 0 bytes
 .../ureport/chart/dataset/BubbleData.class    | Bin 926 -> 0 bytes
 .../ureport/chart/dataset/CollectType.class   | Bin 1259 -> 0 bytes
 .../bstek/ureport/chart/dataset/Dataset.class | Bin 278 -> 0 bytes
 .../ureport/chart/dataset/PointStyle.class    | Bin 1421 -> 0 bytes
 .../ureport/chart/dataset/ScatterData.class   | Bin 735 -> 0 bytes
 .../chart/dataset/impl/BubbleDataset.class    | Bin 5057 -> 0 bytes
 .../chart/dataset/impl/MixDataset.class       | Bin 3396 -> 0 bytes
 .../chart/dataset/impl/ScatterDataset.class   | Bin 5306 -> 0 bytes
 .../dataset/impl/category/AreaDataset.class   | Bin 1380 -> 0 bytes
 .../dataset/impl/category/BarDataset.class    | Bin 1604 -> 0 bytes
 .../impl/category/CategoryDataset$1.class     | Bin 1006 -> 0 bytes
 .../impl/category/CategoryDataset.class       | Bin 10268 -> 0 bytes
 .../impl/category/DoughnutDataset.class       | Bin 508 -> 0 bytes
 .../impl/category/HorizontalBarDataset.class  | Bin 1371 -> 0 bytes
 .../dataset/impl/category/LineDataset.class   | Bin 2008 -> 0 bytes
 .../dataset/impl/category/PieDataset.class    | Bin 3293 -> 0 bytes
 .../dataset/impl/category/PolarDataset.class  | Bin 3305 -> 0 bytes
 .../dataset/impl/category/RadarDataset.class  | Bin 1966 -> 0 bytes
 .../dataset/impl/category/SeriesType.class    | Bin 1152 -> 0 bytes
 .../bstek/ureport/chart/option/Easing.class   | Bin 2690 -> 0 bytes
 .../bstek/ureport/chart/option/Labels.class   | Bin 2213 -> 0 bytes
 .../bstek/ureport/chart/option/Option.class   | Bin 191 -> 0 bytes
 .../bstek/ureport/chart/option/Padding.class  | Bin 1598 -> 0 bytes
 .../bstek/ureport/chart/option/Position.class | Bin 1140 -> 0 bytes
 .../chart/option/impl/AnimationsOption.class  | Bin 1639 -> 0 bytes
 .../chart/option/impl/LayoutOption.class      | Bin 1221 -> 0 bytes
 .../chart/option/impl/LegendOption.class      | Bin 2095 -> 0 bytes
 .../chart/option/impl/TitleOption.class       | Bin 3171 -> 0 bytes
 .../chart/option/impl/TooltipOption.class     | Bin 3151 -> 0 bytes
 .../chart/plugins/DataLabelsPlugin.class      | Bin 1252 -> 0 bytes
 .../bstek/ureport/chart/plugins/Plugin.class  | Bin 224 -> 0 bytes
 .../bstek/ureport/definition/Alignment.class  | Bin 1234 -> 0 bytes
 .../com/bstek/ureport/definition/Band.class   | Bin 1118 -> 0 bytes
 .../ureport/definition/BlankCellInfo.class    | Bin 864 -> 0 bytes
 .../com/bstek/ureport/definition/Border.class | Bin 1173 -> 0 bytes
 .../ureport/definition/BorderStyle.class      | Bin 1460 -> 0 bytes
 .../ureport/definition/CellDefinition.class   | Bin 8184 -> 0 bytes
 .../bstek/ureport/definition/CellStyle.class  | Bin 4897 -> 0 bytes
 .../ureport/definition/ColumnDefinition.class | Bin 1838 -> 0 bytes
 .../definition/ConditionCellStyle.class       | Bin 3037 -> 0 bytes
 .../ureport/definition/ConditionPaging.class  | Bin 870 -> 0 bytes
 .../definition/ConditionPropertyItem.class    | Bin 4307 -> 0 bytes
 .../com/bstek/ureport/definition/Expand.class | Bin 1116 -> 0 bytes
 .../definition/HeaderFooterDefinition.class   | Bin 6337 -> 0 bytes
 .../ureport/definition/HtmlReportAlign.class  | Bin 1131 -> 0 bytes
 .../ureport/definition/LinkParameter.class    | Bin 1219 -> 0 bytes
 .../com/bstek/ureport/definition/Order.class  | Bin 1057 -> 0 bytes
 .../ureport/definition/Orientation.class      | Bin 1112 -> 0 bytes
 .../bstek/ureport/definition/PagingMode.class | Bin 1102 -> 0 bytes
 .../ureport/definition/PagingPosition.class   | Bin 1077 -> 0 bytes
 .../com/bstek/ureport/definition/Paper.class  | Bin 4435 -> 0 bytes
 .../bstek/ureport/definition/PaperSize.class  | Bin 568 -> 0 bytes
 .../ureport/definition/PaperType$1.class      | Bin 1585 -> 0 bytes
 .../bstek/ureport/definition/PaperType.class  | Bin 3333 -> 0 bytes
 .../ureport/definition/ReportDefinition.class | Bin 14930 -> 0 bytes
 .../ureport/definition/RowDefinition.class    | Bin 2301 -> 0 bytes
 .../com/bstek/ureport/definition/Scope.class  | Bin 1059 -> 0 bytes
 .../dataset/BeanDatasetDefinition.class       | Bin 2949 -> 0 bytes
 .../dataset/DatasetDefinition.class           | Bin 349 -> 0 bytes
 .../ureport/definition/dataset/Field.class    | Bin 587 -> 0 bytes
 .../definition/dataset/Parameter.class        | Bin 1128 -> 0 bytes
 .../dataset/SqlDatasetDefinition.class        | Bin 7371 -> 0 bytes
 .../datasource/BuildinDatasource.class        | Bin 243 -> 0 bytes
 .../BuildinDatasourceDefinition.class         | Bin 3339 -> 0 bytes
 .../definition/datasource/DataType$1.class    | Bin 949 -> 0 bytes
 .../definition/datasource/DataType.class      | Bin 3838 -> 0 bytes
 .../datasource/DatasourceDefinition.class     | Bin 423 -> 0 bytes
 .../datasource/DatasourceProvider.class       | Bin 248 -> 0 bytes
 .../datasource/DatasourceType.class           | Bin 1192 -> 0 bytes
 .../datasource/JdbcDatasourceDefinition.class | Bin 4547 -> 0 bytes
 .../SpringBeanDatasourceDefinition.class      | Bin 3321 -> 0 bytes
 .../definition/mapping/MappingItem.class      | Bin 770 -> 0 bytes
 .../definition/mapping/MappingType.class      | Bin 1106 -> 0 bytes
 .../ureport/definition/searchform/Align.class | Bin 1078 -> 0 bytes
 .../searchform/ButtonComponent.class          | Bin 2252 -> 0 bytes
 .../searchform/CheckboxInputComponent.class   | Bin 4101 -> 0 bytes
 .../definition/searchform/ColComponent.class  | Bin 3614 -> 0 bytes
 .../definition/searchform/Component.class     | Bin 292 -> 0 bytes
 .../searchform/ContainerComponent.class       | Bin 972 -> 0 bytes
 .../searchform/DateInputComponent.class       | Bin 3711 -> 0 bytes
 .../definition/searchform/FormPosition.class  | Bin 1124 -> 0 bytes
 .../definition/searchform/GridComponent.class | Bin 3096 -> 0 bytes
 .../searchform/InputComponent.class           | Bin 2796 -> 0 bytes
 .../definition/searchform/LabelPosition.class | Bin 1132 -> 0 bytes
 .../definition/searchform/Option.class        | Bin 761 -> 0 bytes
 .../searchform/RadioInputComponent.class      | Bin 4005 -> 0 bytes
 .../searchform/RangeDateUtils.class           | Bin 2346 -> 0 bytes
 .../definition/searchform/RenderContext.class | Bin 2512 -> 0 bytes
 .../searchform/ResetButtonComponent.class     | Bin 1427 -> 0 bytes
 .../definition/searchform/SearchForm.class    | Bin 2405 -> 0 bytes
 .../searchform/SelectInputComponent.class     | Bin 5879 -> 0 bytes
 .../searchform/SubmitButtonComponent.class    | Bin 1116 -> 0 bytes
 .../searchform/TextInputComponent.class       | Bin 2140 -> 0 bytes
 .../definition/value/AggregateType.class      | Bin 1502 -> 0 bytes
 .../ureport/definition/value/ChartValue.class | Bin 987 -> 0 bytes
 .../definition/value/DatasetValue.class       | Bin 1634 -> 0 bytes
 .../definition/value/ExpressionValue.class    | Bin 1176 -> 0 bytes
 .../ureport/definition/value/GroupItem.class  | Bin 1553 -> 0 bytes
 .../ureport/definition/value/ImageValue.class | Bin 2278 -> 0 bytes
 .../definition/value/SimpleValue.class        | Bin 804 -> 0 bytes
 .../ureport/definition/value/Slash.class      | Bin 1111 -> 0 bytes
 .../ureport/definition/value/SlashValue.class | Bin 1738 -> 0 bytes
 .../ureport/definition/value/Source.class     | Bin 1060 -> 0 bytes
 .../ureport/definition/value/Value.class      | Bin 237 -> 0 bytes
 .../ureport/definition/value/ValueType.class  | Bin 1328 -> 0 bytes
 .../definition/value/ZxingCategory.class      | Bin 1108 -> 0 bytes
 .../ureport/definition/value/ZxingValue.class | Bin 3081 -> 0 bytes
 .../com/bstek/ureport/dsl/ReportLexer.class   | Bin 7732 -> 0 bytes
 .../ureport/dsl/ReportParserBaseVisitor.class | Bin 24031 -> 0 bytes
 .../bstek/ureport/dsl/ReportParserLexer.class | Bin 9870 -> 0 bytes
 .../ReportParserParser$AbsoluteContext.class  | Bin 1776 -> 0 bytes
 .../ReportParserParser$AggregateContext.class | Bin 1623 -> 0 bytes
 .../dsl/ReportParserParser$BlockContext.class | Bin 2228 -> 0 bytes
 .../ReportParserParser$CaseExprContext.class  | Bin 2000 -> 0 bytes
 .../ReportParserParser$CasePartContext.class  | Bin 2604 -> 0 bytes
 .../dsl/ReportParserParser$CellContext.class  | Bin 1727 -> 0 bytes
 ...arser$CellCoordinateConditionContext.class | Bin 2239 -> 0 bytes
 ...rtParserParser$CellCoordinateContext.class | Bin 2041 -> 0 bytes
 ...ortParserParser$CellIndicatorContext.class | Bin 1001 -> 0 bytes
 ...rParser$CellNameExprConditionContext.class | Bin 2045 -> 0 bytes
 .../ReportParserParser$CellPairContext.class  | Bin 1802 -> 0 bytes
 ...portParserParser$CellPositionContext.class | Bin 1632 -> 0 bytes
 ...erParser$ComplexExprCompositeContext.class | Bin 2192 -> 0 bytes
 .../ReportParserParser$ConditionContext.class | Bin 985 -> 0 bytes
 ...ReportParserParser$ConditionsContext.class | Bin 2388 -> 0 bytes
 ...ReportParserParser$CoordinateContext.class | Bin 2036 -> 0 bytes
 ...tParserParser$CurrentCellDataContext.class | Bin 1782 -> 0 bytes
 ...ParserParser$CurrentCellValueContext.class | Bin 1468 -> 0 bytes
 ...rParser$CurrentValueConditionContext.class | Bin 2219 -> 0 bytes
 ...portParserParser$CurrentValueContext.class | Bin 1448 -> 0 bytes
 .../ReportParserParser$DatasetContext.class   | Bin 2474 -> 0 bytes
 ...ReportParserParser$ElseIfPartContext.class | Bin 2615 -> 0 bytes
 .../ReportParserParser$ElsePartContext.class  | Bin 1735 -> 0 bytes
 .../dsl/ReportParserParser$EntryContext.class | Bin 2177 -> 0 bytes
 .../ReportParserParser$ExprBlockContext.class | Bin 2226 -> 0 bytes
 ...ortParserParser$ExprCompositeContext.class | Bin 1000 -> 0 bytes
 ...ortParserParser$ExprConditionContext.class | Bin 2188 -> 0 bytes
 .../dsl/ReportParserParser$ExprContext.class  | Bin 2338 -> 0 bytes
 ...ReportParserParser$ExpressionContext.class | Bin 2716 -> 0 bytes
 .../ReportParserParser$FunctionContext.class  | Bin 1973 -> 0 bytes
 ...arserParser$FunctionParameterContext.class | Bin 2026 -> 0 bytes
 ...eportParserParser$IfConditionContext.class | Bin 2178 -> 0 bytes
 .../ReportParserParser$IfExprContext.class    | Bin 2451 -> 0 bytes
 .../ReportParserParser$IfPartContext.class    | Bin 2595 -> 0 bytes
 .../dsl/ReportParserParser$ItemContext.class  | Bin 965 -> 0 bytes
 .../dsl/ReportParserParser$JoinContext.class  | Bin 1660 -> 0 bytes
 ...rserParser$ParenExprCompositeContext.class | Bin 1997 -> 0 bytes
 .../ReportParserParser$ParenJoinContext.class | Bin 2461 -> 0 bytes
 ...arserParser$PropertyConditionContext.class | Bin 2183 -> 0 bytes
 .../ReportParserParser$PropertyContext.class  | Bin 2103 -> 0 bytes
 .../dsl/ReportParserParser$RangeContext.class | Bin 1859 -> 0 bytes
 ...portParserParser$RelativeCellContext.class | Bin 1632 -> 0 bytes
 .../ReportParserParser$RelativeContext.class  | Bin 1624 -> 0 bytes
 ...ReportParserParser$ReturnExprContext.class | Bin 1741 -> 0 bytes
 .../dsl/ReportParserParser$SetContext.class   | Bin 961 -> 0 bytes
 ...ReportParserParser$SimpleDataContext.class | Bin 1741 -> 0 bytes
 ...ReportParserParser$SimpleJoinContext.class | Bin 2348 -> 0 bytes
 ...eportParserParser$SimpleValueContext.class | Bin 1921 -> 0 bytes
 ...serParser$SingleCellConditionContext.class | Bin 1966 -> 0 bytes
 ...ReportParserParser$SingleCellContext.class | Bin 1594 -> 0 bytes
 ...erParser$SingleCellCoordinateContext.class | Bin 1987 -> 0 bytes
 ...serParser$SingleExprCompositeContext.class | Bin 1798 -> 0 bytes
 ...tParserParser$SingleParenJoinContext.class | Bin 1928 -> 0 bytes
 ...erParser$TernaryExprCompositeContext.class | Bin 1831 -> 0 bytes
 ...eportParserParser$TernaryExprContext.class | Bin 2779 -> 0 bytes
 .../dsl/ReportParserParser$UnitContext.class  | Bin 4089 -> 0 bytes
 ...rtParserParser$VariableAssignContext.class | Bin 1990 -> 0 bytes
 .../ReportParserParser$VariableContext.class  | Bin 1618 -> 0 bytes
 .../ReportParserParser$WholeCellContext.class | Bin 1916 -> 0 bytes
 .../ureport/dsl/ReportParserParser.class      | Bin 46934 -> 0 bytes
 .../ureport/dsl/ReportParserVisitor.class     | Bin 15675 -> 0 bytes
 .../exception/CellComputeException.class      | Bin 634 -> 0 bytes
 .../exception/CellDependencyException.class   | Bin 512 -> 0 bytes
 .../exception/CellNotExistException.class     | Bin 709 -> 0 bytes
 .../ureport/exception/ConvertException.class  | Bin 622 -> 0 bytes
 .../DatasetUndefinitionException.class        | Bin 741 -> 0 bytes
 .../exception/ExpressionParserException.class | Bin 507 -> 0 bytes
 .../IllegalCellExpandException.class          | Bin 956 -> 0 bytes
 .../exception/IndependenceException.class     | Bin 495 -> 0 bytes
 .../exception/ReportComputeException.class    | Bin 640 -> 0 bytes
 .../ureport/exception/ReportException.class   | Bin 696 -> 0 bytes
 .../exception/ReportPagingException.class     | Bin 495 -> 0 bytes
 .../exception/ReportParseException.class      | Bin 634 -> 0 bytes
 .../ureport/export/ExportConfigure.class      | Bin 352 -> 0 bytes
 .../ureport/export/ExportConfigureImpl.class  | Bin 1244 -> 0 bytes
 .../bstek/ureport/export/ExportManager.class  | Bin 1026 -> 0 bytes
 .../ureport/export/ExportManagerImpl.class    | Bin 7947 -> 0 bytes
 .../bstek/ureport/export/FullPageData.class   | Bin 1084 -> 0 bytes
 .../bstek/ureport/export/PageBuilder.class    | Bin 2935 -> 0 bytes
 .../com/bstek/ureport/export/Producer.class   | Bin 200 -> 0 bytes
 .../bstek/ureport/export/ReportRender.class   | Bin 6761 -> 0 bytes
 .../bstek/ureport/export/SinglePageData.class | Bin 1393 -> 0 bytes
 .../export/builder/down/DownCellbuilder.class | Bin 6196 -> 0 bytes
 .../builder/down/LeftParentCellCreator.class  | Bin 5598 -> 0 bytes
 .../builder/right/RightCellbuilder.class      | Bin 6209 -> 0 bytes
 .../builder/right/TopParentCellCreator.class  | Bin 5607 -> 0 bytes
 .../export/excel/high/CellStyleContext.class  | Bin 11273 -> 0 bytes
 .../export/excel/high/ExcelProducer.class     | Bin 1560 -> 0 bytes
 .../excel/high/builder/ExcelBuilder$1.class   | Bin 1716 -> 0 bytes
 .../excel/high/builder/ExcelBuilder.class     | Bin 5562 -> 0 bytes
 .../high/builder/ExcelBuilderDirect.class     | Bin 11134 -> 0 bytes
 .../high/builder/ExcelBuilderWithPaging.class | Bin 11722 -> 0 bytes
 .../export/excel/low/CellStyleContext.class   | Bin 11814 -> 0 bytes
 .../export/excel/low/Excel97Producer$1.class  | Bin 1707 -> 0 bytes
 .../export/excel/low/Excel97Producer.class    | Bin 16799 -> 0 bytes
 .../ureport/export/html/HtmlProducer.class    | Bin 15599 -> 0 bytes
 .../ureport/export/html/HtmlReport.class      | Bin 2931 -> 0 bytes
 .../ureport/export/html/SearchFormData.class  | Bin 1344 -> 0 bytes
 .../ureport/export/pdf/CellBorderEvent.class  | Bin 4001 -> 0 bytes
 .../bstek/ureport/export/pdf/CellPhrase.class | Bin 3331 -> 0 bytes
 .../export/pdf/PageHeaderFooterEvent.class    | Bin 6252 -> 0 bytes
 .../ureport/export/pdf/PdfProducer.class      | Bin 14268 -> 0 bytes
 .../ureport/export/pdf/font/FontBuilder.class | Bin 6629 -> 0 bytes
 .../export/pdf/font/FontRegister.class        | Bin 206 -> 0 bytes
 .../bstek/ureport/export/word/DxaUtils.class  | Bin 1167 -> 0 bytes
 .../word/high/HeaderFooterBuilder.class       | Bin 14474 -> 0 bytes
 .../high/HeaderFooterExpressionBuilder.class  | Bin 801 -> 0 bytes
 .../export/word/high/WordProducer.class       | Bin 24407 -> 0 bytes
 .../export/word/low/WordProducer.class        | Bin 329 -> 0 bytes
 .../bstek/ureport/expression/ErrorInfo.class  | Bin 1079 -> 0 bytes
 .../ureport/expression/ExpressionUtils.class  | Bin 8642 -> 0 bytes
 .../expression/ScriptErrorListener.class      | Bin 1526 -> 0 bytes
 .../expression/function/AvgFunction.class     | Bin 3841 -> 0 bytes
 .../expression/function/ColumnFunction.class  | Bin 1426 -> 0 bytes
 .../expression/function/CountFunction.class   | Bin 2278 -> 0 bytes
 .../function/FormatDateFunction.class         | Bin 3269 -> 0 bytes
 .../function/FormatNumberFunction.class       | Bin 3464 -> 0 bytes
 .../expression/function/Function.class        | Bin 476 -> 0 bytes
 .../expression/function/GetFunction.class     | Bin 4093 -> 0 bytes
 .../expression/function/JsonFunction.class    | Bin 3732 -> 0 bytes
 .../expression/function/ListFunction.class    | Bin 2211 -> 0 bytes
 .../expression/function/MaxFunction.class     | Bin 3392 -> 0 bytes
 .../expression/function/MinFunction.class     | Bin 3392 -> 0 bytes
 .../expression/function/OrderFunction$1.class | Bin 1288 -> 0 bytes
 .../expression/function/OrderFunction$2.class | Bin 1288 -> 0 bytes
 .../expression/function/OrderFunction.class   | Bin 5556 -> 0 bytes
 .../function/ParameterFunction.class          | Bin 2568 -> 0 bytes
 .../function/ParameterIsEmptyFunction.class   | Bin 1476 -> 0 bytes
 .../expression/function/RowFunction.class     | Bin 1393 -> 0 bytes
 .../expression/function/SumFunction.class     | Bin 3516 -> 0 bytes
 .../function/date/CalendarFunction.class      | Bin 2443 -> 0 bytes
 .../function/date/DateFunction.class          | Bin 3030 -> 0 bytes
 .../function/date/DayFunction.class           | Bin 1374 -> 0 bytes
 .../function/date/MonthFunction.class         | Bin 1386 -> 0 bytes
 .../function/date/WeekFunction.class          | Bin 1991 -> 0 bytes
 .../function/date/YearFunction.class          | Bin 1378 -> 0 bytes
 .../function/math/AbsFunction.class           | Bin 1403 -> 0 bytes
 .../function/math/CeilFunction.class          | Bin 2554 -> 0 bytes
 .../function/math/ChnFunction.class           | Bin 3814 -> 0 bytes
 .../function/math/ChnMoneyFunction.class      | Bin 3603 -> 0 bytes
 .../function/math/CosFunction.class           | Bin 1403 -> 0 bytes
 .../function/math/ExpFunction.class           | Bin 1403 -> 0 bytes
 .../function/math/FloorFunction.class         | Bin 2559 -> 0 bytes
 .../function/math/Log10Function.class         | Bin 1411 -> 0 bytes
 .../function/math/LogFunction.class           | Bin 1403 -> 0 bytes
 .../function/math/MathFunction.class          | Bin 3940 -> 0 bytes
 .../function/math/MedianFunction.class        | Bin 1978 -> 0 bytes
 .../function/math/ModeFunction.class          | Bin 2472 -> 0 bytes
 .../function/math/PowFunction.class           | Bin 2490 -> 0 bytes
 .../function/math/RandomFunction.class        | Bin 1677 -> 0 bytes
 .../function/math/RoundFunction.class         | Bin 2410 -> 0 bytes
 .../function/math/SinFunction.class           | Bin 1403 -> 0 bytes
 .../function/math/SqrtFunction.class          | Bin 1407 -> 0 bytes
 .../function/math/StdevpFunction.class        | Bin 2386 -> 0 bytes
 .../function/math/TanFunction.class           | Bin 1403 -> 0 bytes
 .../function/math/VaraFunction.class          | Bin 2271 -> 0 bytes
 .../function/page/PageAvgFunction.class       | Bin 2641 -> 0 bytes
 .../function/page/PageCountFunction.class     | Bin 2060 -> 0 bytes
 .../function/page/PageFunction.class          | Bin 401 -> 0 bytes
 .../function/page/PageMaxFunction.class       | Bin 2826 -> 0 bytes
 .../function/page/PageMinFunction.class       | Bin 2826 -> 0 bytes
 .../function/page/PageNumberFunction.class    | Bin 1454 -> 0 bytes
 .../function/page/PageRowsFunction.class      | Bin 1565 -> 0 bytes
 .../function/page/PageSumFunction.class       | Bin 2843 -> 0 bytes
 .../function/page/PageTotalFunction.class     | Bin 1273 -> 0 bytes
 .../function/string/IndexOfFunction.class     | Bin 3269 -> 0 bytes
 .../function/string/LengthFunction.class      | Bin 1355 -> 0 bytes
 .../function/string/LowerFunction.class       | Bin 1288 -> 0 bytes
 .../function/string/ReplaceFunction.class     | Bin 3153 -> 0 bytes
 .../function/string/StringFunction.class      | Bin 2497 -> 0 bytes
 .../function/string/SubstringFunction.class   | Bin 2986 -> 0 bytes
 .../function/string/TrimFunction.class        | Bin 1270 -> 0 bytes
 .../function/string/UpperFunction.class       | Bin 1288 -> 0 bytes
 .../ureport/expression/model/Condition.class  | Bin 268 -> 0 bytes
 .../ureport/expression/model/Expression.class | Bin 513 -> 0 bytes
 .../bstek/ureport/expression/model/Op$1.class | Bin 1053 -> 0 bytes
 .../bstek/ureport/expression/model/Op.class   | Bin 2576 -> 0 bytes
 .../ureport/expression/model/Operator$1.class | Bin 889 -> 0 bytes
 .../ureport/expression/model/Operator.class   | Bin 2319 -> 0 bytes
 .../ureport/expression/model/UnitType.class   | Bin 1074 -> 0 bytes
 .../model/condition/BaseCondition.class       | Bin 5155 -> 0 bytes
 .../condition/BothExpressionCondition.class   | Bin 2297 -> 0 bytes
 .../condition/CellExpressionCondition.class   | Bin 3695 -> 0 bytes
 .../model/condition/ConditionType.class       | Bin 1270 -> 0 bytes
 .../CurrentValueExpressionCondition.class     | Bin 2257 -> 0 bytes
 .../expression/model/condition/Join.class     | Bin 1608 -> 0 bytes
 .../PropertyExpressionCondition.class         | Bin 2871 -> 0 bytes
 .../data/BindDataListExpressionData.class     | Bin 1108 -> 0 bytes
 .../model/data/ExpressionData.class           | Bin 269 -> 0 bytes
 .../model/data/NoneExpressionData.class       | Bin 629 -> 0 bytes
 .../model/data/ObjectExpressionData.class     | Bin 731 -> 0 bytes
 .../model/data/ObjectListExpressionData.class | Bin 970 -> 0 bytes
 .../model/expr/BaseExpression.class           | Bin 3162 -> 0 bytes
 .../model/expr/BooleanExpression.class        | Bin 1193 -> 0 bytes
 .../model/expr/CellPositionExpression.class   | Bin 4397 -> 0 bytes
 .../expr/CurrentCellDataExpression.class      | Bin 1910 -> 0 bytes
 .../expr/CurrentCellValueExpression.class     | Bin 1201 -> 0 bytes
 .../model/expr/ExpressionBlock.class          | Bin 2512 -> 0 bytes
 .../model/expr/FunctionExpression.class       | Bin 4789 -> 0 bytes
 .../model/expr/IntegerExpression.class        | Bin 1193 -> 0 bytes
 .../model/expr/JoinExpression.class           | Bin 4675 -> 0 bytes
 .../model/expr/NullExpression.class           | Bin 1053 -> 0 bytes
 .../model/expr/NumberExpression.class         | Bin 1321 -> 0 bytes
 .../model/expr/ParenExpression.class          | Bin 914 -> 0 bytes
 .../model/expr/RelativeCellExpression.class   | Bin 2851 -> 0 bytes
 .../model/expr/StringExpression.class         | Bin 1187 -> 0 bytes
 .../model/expr/VariableAssignExpression.class | Bin 3709 -> 0 bytes
 .../model/expr/VariableExpression.class       | Bin 1344 -> 0 bytes
 .../expr/cell/CellObjectExpression.class      | Bin 1881 -> 0 bytes
 .../model/expr/cell/CellValueExpression.class | Bin 1571 -> 0 bytes
 .../expr/dataset/DatasetExpression.class      | Bin 6419 -> 0 bytes
 .../expression/model/expr/el/ElUnit$1.class   | Bin 948 -> 0 bytes
 .../expression/model/expr/el/ElUnit.class     | Bin 2611 -> 0 bytes
 .../model/expr/ifelse/ElseExpression.class    | Bin 1467 -> 0 bytes
 .../model/expr/ifelse/ElseIfExpression.class  | Bin 2160 -> 0 bytes
 .../expr/ifelse/ExpressionCondition.class     | Bin 4421 -> 0 bytes
 .../expr/ifelse/ExpressionConditionList.class | Bin 2217 -> 0 bytes
 .../model/expr/ifelse/IfExpression.class      | Bin 3959 -> 0 bytes
 .../expr/set/CellConditionExpression.class    | Bin 3191 -> 0 bytes
 .../model/expr/set/CellCoordinate.class       | Bin 1661 -> 0 bytes
 .../expr/set/CellCoordinateExpression.class   | Bin 9305 -> 0 bytes
 .../model/expr/set/CellCoordinateSet.class    | Bin 894 -> 0 bytes
 .../model/expr/set/CellExpression.class       | Bin 4957 -> 0 bytes
 .../expression/model/expr/set/CellName.class  | Bin 664 -> 0 bytes
 .../model/expr/set/CellPairExpression.class   | Bin 4748 -> 0 bytes
 .../model/expr/set/CoordinateType.class       | Bin 1172 -> 0 bytes
 .../model/expr/set/FromToExpression.class     | Bin 2875 -> 0 bytes
 .../expr/set/SimpleValueSetExpression.class   | Bin 1202 -> 0 bytes
 .../model/expr/set/WholeCellExpression.class  | Bin 3187 -> 0 bytes
 .../parse/ExpressionErrorListener.class       | Bin 1657 -> 0 bytes
 .../expression/parse/ExpressionVisitor.class  | Bin 21504 -> 0 bytes
 .../parse/builder/BaseExpressionBuilder.class | Bin 8615 -> 0 bytes
 .../builder/BooleanExpressionBuilder.class    | Bin 1435 -> 0 bytes
 .../builder/CellObjectExpressionBuilder.class | Bin 1940 -> 0 bytes
 .../CellPositionExpressionBuilder.class       | Bin 1687 -> 0 bytes
 .../CurrentCellDataExpressionBuilder.class    | Bin 1812 -> 0 bytes
 .../CurrentCellValueExpressionBuilder.class   | Bin 1352 -> 0 bytes
 .../builder/DatasetExpressionBuilder.class    | Bin 3326 -> 0 bytes
 .../parse/builder/ExpressionBuilder.class     | Bin 516 -> 0 bytes
 .../builder/FunctionExpressionBuilder.class   | Bin 3313 -> 0 bytes
 .../builder/IntegerExpressionBuilder.class    | Bin 1471 -> 0 bytes
 .../parse/builder/NullExpressionBuilder.class | Bin 1162 -> 0 bytes
 .../builder/NumberExpressionBuilder.class     | Bin 1452 -> 0 bytes
 .../RelativeCellExpressionBuilder.class       | Bin 1687 -> 0 bytes
 .../parse/builder/SetExpressionBuilder.class  | Bin 10269 -> 0 bytes
 .../builder/StringExpressionBuilder.class     | Bin 1541 -> 0 bytes
 .../builder/VariableExpressionBuilder.class   | Bin 1617 -> 0 bytes
 .../ureport/image/ChartImageProcessor.class   | Bin 628 -> 0 bytes
 .../bstek/ureport/image/ImageProcessor.class  | Bin 296 -> 0 bytes
 .../com/bstek/ureport/image/ImageType.class   | Bin 1107 -> 0 bytes
 .../ureport/image/StaticImageProcessor.class  | Bin 2929 -> 0 bytes
 .../ureport/image/ZxingImageProcessor.class   | Bin 885 -> 0 bytes
 .../bstek/ureport/image/image-not-exist.jpg   | Bin 2134 -> 0 bytes
 .../com/bstek/ureport/model/Cell.class        | Bin 28330 -> 0 bytes
 .../com/bstek/ureport/model/Column.class      | Bin 1515 -> 0 bytes
 .../com/bstek/ureport/model/Image.class       | Bin 1017 -> 0 bytes
 .../com/bstek/ureport/model/Line.class        | Bin 1163 -> 0 bytes
 .../com/bstek/ureport/model/Report.class      | Bin 9757 -> 0 bytes
 .../com/bstek/ureport/model/ReportCell.class  | Bin 663 -> 0 bytes
 .../com/bstek/ureport/model/Resource.class    | Bin 859 -> 0 bytes
 .../classes/com/bstek/ureport/model/Row.class | Bin 3114 -> 0 bytes
 .../com/bstek/ureport/parser/BuildUtils.class | Bin 855 -> 0 bytes
 .../com/bstek/ureport/parser/Parser.class     | Bin 274 -> 0 bytes
 .../bstek/ureport/parser/ReportParser.class   | Bin 7764 -> 0 bytes
 .../bstek/ureport/parser/SlashBuilder.class   | Bin 9146 -> 0 bytes
 .../ureport/parser/impl/CellParser.class      | Bin 6746 -> 0 bytes
 .../ureport/parser/impl/CellStyleParser.class | Bin 5789 -> 0 bytes
 .../ureport/parser/impl/ColumnParser.class    | Bin 1635 -> 0 bytes
 .../parser/impl/ConditionPagingParser.class   | Bin 1488 -> 0 bytes
 .../impl/ConditionParameterItemParser.class   | Bin 6938 -> 0 bytes
 .../parser/impl/DatasourceParser.class        | Bin 6233 -> 0 bytes
 .../parser/impl/HeaderFooterParser.class      | Bin 3392 -> 0 bytes
 .../parser/impl/LinkParameterParser.class     | Bin 1988 -> 0 bytes
 .../ureport/parser/impl/PaperParser.class     | Bin 4121 -> 0 bytes
 .../bstek/ureport/parser/impl/RowParser.class | Bin 1645 -> 0 bytes
 .../impl/searchform/CheckboxParser.class      | Bin 2965 -> 0 bytes
 .../impl/searchform/DatetimeInputParser.class | Bin 1881 -> 0 bytes
 .../parser/impl/searchform/FormParser.class   | Bin 324 -> 0 bytes
 .../impl/searchform/FormParserUtils.class     | Bin 2679 -> 0 bytes
 .../parser/impl/searchform/GridParser.class   | Bin 3030 -> 0 bytes
 .../impl/searchform/RadioInputParser.class    | Bin 2953 -> 0 bytes
 .../impl/searchform/ResetButtonParser.class   | Bin 1522 -> 0 bytes
 .../impl/searchform/SearchFormParser.class    | Bin 1672 -> 0 bytes
 .../impl/searchform/SelectInputParser.class   | Bin 3242 -> 0 bytes
 .../impl/searchform/SubmitButtonParser.class  | Bin 1838 -> 0 bytes
 .../impl/searchform/TextInputParser.class     | Bin 1815 -> 0 bytes
 .../parser/impl/value/ChartValueParser.class  | Bin 9935 -> 0 bytes
 .../impl/value/DatasetValueParser.class       | Bin 6189 -> 0 bytes
 .../impl/value/ExpressionValueParser.class    | Bin 936 -> 0 bytes
 .../parser/impl/value/ImageValueParser.class  | Bin 2692 -> 0 bytes
 .../parser/impl/value/SimpleValueParser.class | Bin 912 -> 0 bytes
 .../parser/impl/value/SlashValueParser.class  | Bin 2569 -> 0 bytes
 .../parser/impl/value/ValueParser.class       | Bin 487 -> 0 bytes
 .../parser/impl/value/ZxingValueParser.class  | Bin 3002 -> 0 bytes
 .../provider/image/DefaultImageProvider.class | Bin 2342 -> 0 bytes
 .../provider/image/HttpImageProvider.class    | Bin 1298 -> 0 bytes
 .../provider/image/HttpsImageProvider.class   | Bin 1325 -> 0 bytes
 .../provider/image/ImageProvider.class        | Bin 245 -> 0 bytes
 .../ureport/provider/report/ReportFile.class  | Bin 917 -> 0 bytes
 .../provider/report/ReportProvider.class      | Bin 539 -> 0 bytes
 .../classpath/ClasspathReportProvider.class   | Bin 2702 -> 0 bytes
 .../report/file/FileReportProvider$1.class    | Bin 1371 -> 0 bytes
 .../report/file/FileReportProvider.class      | Bin 5234 -> 0 bytes
 .../com/bstek/ureport/utils/ArithUtils.class  | Bin 1798 -> 0 bytes
 .../com/bstek/ureport/utils/DataUtils.class   | Bin 5629 -> 0 bytes
 .../com/bstek/ureport/utils/ElCompute.class   | Bin 5163 -> 0 bytes
 .../com/bstek/ureport/utils/ImageUtils.class  | Bin 3815 -> 0 bytes
 .../bstek/ureport/utils/ProcedureUtils.class  | Bin 7229 -> 0 bytes
 .../ureport/utils/StatementWrapper.class      | Bin 714 -> 0 bytes
 .../com/bstek/ureport/utils/UnitUtils.class   | Bin 953 -> 0 bytes
 .../target/classes/ureport-core-context.xml   | 121 ---
 .../target/classes/ureport.properties         |   4 -
 ureport2-core/target/classes/ureport2.xsd     | 866 ------------------
 .../target/maven-archiver/pom.properties      |   5 -
 .../com/bstek/ureport/test/template.html      |  10 -
 .../com/bstek/ureport/test/test.xml           |  82 --
 511 files changed, 1088 deletions(-)
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/CellRenderer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/Range.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/UReportPropertyPlaceholderConfigurer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/Utils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/BindData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/Context.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/DataCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/Dataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/DatasetUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/HideRowColumnBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/ReportBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/Splash.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/AvgAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CountAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CustomGroupAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/GroupAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MaxAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MinAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/RegroupAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/ReselectAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SelectAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SumAggregate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/AbstractAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/Assertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsGreatThenAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsLessThenAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/GreatThenAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/InAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/LessThenAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/LikeAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotEqualsAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotInAssertor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/CellBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/DuplicateType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/ExpandBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/NoneExpandBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicateUnit.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownBlankCellApply.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplicate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplocatorWrapper.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownExpandBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicateUnit.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightBlankCellApply.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplicate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplocatorWrapper.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightExpandBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/ChartValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/DatasetValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/ExpressionValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/ImageValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/SimpleValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/SlashValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/ValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/compute/ZxingValueCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/BasePagination.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/FitPagePagination.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/FixRowsPagination.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/HeaderFooter.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/Page.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/Pagination.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/PagingBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/build/paging/RepeatRows.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/cache/CacheUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/cache/DefaultMemoryReportDefinitionCache.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/cache/ReportCache.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/cache/ReportDefinitionCache.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/cache/ResourceCache.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/Chart.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/ChartData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/FontStyle.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/axes/Axes.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/axes/BaseAxes.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/axes/ScaleLabel.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/axes/XPosition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/axes/YPosition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/XAxes.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/YAxes.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BaseDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BubbleData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/CollectType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/Dataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/PointStyle.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/ScatterData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/BubbleDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/MixDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/ScatterDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/AreaDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/BarDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/DoughnutDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/HorizontalBarDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/LineDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/PieDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/PolarDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/RadarDataset.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/SeriesType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/Easing.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/Labels.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/Option.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/Padding.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/Position.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/AnimationsOption.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/LayoutOption.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/LegendOption.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/TitleOption.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/TooltipOption.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/plugins/DataLabelsPlugin.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/chart/plugins/Plugin.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Alignment.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Band.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/BlankCellInfo.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Border.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/BorderStyle.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/CellDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/CellStyle.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/ColumnDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/ConditionCellStyle.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/ConditionPaging.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/ConditionPropertyItem.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Expand.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/HeaderFooterDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/HtmlReportAlign.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/LinkParameter.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Order.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Orientation.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/PagingMode.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/PagingPosition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Paper.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/PaperSize.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/PaperType$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/PaperType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/ReportDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/RowDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/Scope.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/dataset/BeanDatasetDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/dataset/DatasetDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/dataset/Field.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/dataset/Parameter.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/dataset/SqlDatasetDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/BuildinDatasource.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/BuildinDatasourceDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DataType$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DataType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/JdbcDatasourceDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/datasource/SpringBeanDatasourceDefinition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/mapping/MappingItem.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/mapping/MappingType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Align.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ButtonComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/CheckboxInputComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ColComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Component.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ContainerComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/DateInputComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/FormPosition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/GridComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/InputComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/LabelPosition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Option.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RadioInputComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RangeDateUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RenderContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ResetButtonComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SearchForm.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SubmitButtonComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/searchform/TextInputComponent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/AggregateType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/ChartValue.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/DatasetValue.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/ExpressionValue.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/GroupItem.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/ImageValue.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/SimpleValue.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/Slash.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/SlashValue.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/Source.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/Value.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/ValueType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/ZxingCategory.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/definition/value/ZxingValue.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportLexer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserBaseVisitor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserLexer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$AbsoluteContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$AggregateContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$BlockContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CaseExprContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CasePartContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellCoordinateConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellCoordinateContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellIndicatorContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellNameExprConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellPairContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellPositionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ComplexExprCompositeContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ConditionsContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CoordinateContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentCellDataContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentCellValueContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentValueConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentValueContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$DatasetContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ElseIfPartContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ElsePartContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$EntryContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprBlockContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprCompositeContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExpressionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$FunctionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$FunctionParameterContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfExprContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfPartContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ItemContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$JoinContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ParenExprCompositeContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ParenJoinContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$PropertyConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$PropertyContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RangeContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RelativeCellContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RelativeContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ReturnExprContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SetContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleDataContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleJoinContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleValueContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellConditionContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellCoordinateContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleExprCompositeContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleParenJoinContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$TernaryExprCompositeContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$TernaryExprContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$UnitContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$VariableAssignContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$VariableContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$WholeCellContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserVisitor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/CellComputeException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/CellDependencyException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/CellNotExistException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/ConvertException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/DatasetUndefinitionException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/ExpressionParserException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/IllegalCellExpandException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/IndependenceException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/ReportComputeException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/ReportException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/ReportPagingException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/exception/ReportParseException.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/ExportConfigure.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/ExportConfigureImpl.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/ExportManager.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/ExportManagerImpl.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/FullPageData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/PageBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/Producer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/ReportRender.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/SinglePageData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/builder/down/DownCellbuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/builder/down/LeftParentCellCreator.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/builder/right/RightCellbuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/builder/right/TopParentCellCreator.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/high/CellStyleContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/high/ExcelProducer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilder$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilderDirect.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilderWithPaging.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/low/CellStyleContext.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/low/Excel97Producer$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/excel/low/Excel97Producer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/html/HtmlProducer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/html/HtmlReport.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/html/SearchFormData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/pdf/CellBorderEvent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/pdf/CellPhrase.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/pdf/PageHeaderFooterEvent.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/pdf/PdfProducer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/pdf/font/FontBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/pdf/font/FontRegister.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/word/DxaUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/word/high/HeaderFooterBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/word/high/HeaderFooterExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/word/high/WordProducer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/export/word/low/WordProducer.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/ErrorInfo.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/ExpressionUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/ScriptErrorListener.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/AvgFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/ColumnFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/CountFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/FormatDateFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/FormatNumberFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/Function.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/GetFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/JsonFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/ListFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/MaxFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/MinFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction$2.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/ParameterFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/ParameterIsEmptyFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/RowFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/SumFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/date/CalendarFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/date/DateFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/date/DayFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/date/MonthFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/date/WeekFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/date/YearFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/AbsFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/CeilFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ChnFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ChnMoneyFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/CosFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ExpFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/FloorFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/Log10Function.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/LogFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/MathFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/MedianFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ModeFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/PowFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/RandomFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/RoundFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/SinFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/SqrtFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/StdevpFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/TanFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/math/VaraFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageAvgFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageCountFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageMaxFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageMinFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageNumberFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageRowsFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageSumFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageTotalFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/IndexOfFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/LengthFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/LowerFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/ReplaceFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/StringFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/SubstringFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/TrimFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/function/string/UpperFunction.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/Condition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/Expression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/Op$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/Op.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/Operator$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/Operator.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/UnitType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/BaseCondition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/BothExpressionCondition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/CellExpressionCondition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/ConditionType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/CurrentValueExpressionCondition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/Join.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/PropertyExpressionCondition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/data/BindDataListExpressionData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ExpressionData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/data/NoneExpressionData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ObjectExpressionData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ObjectListExpressionData.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/BaseExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/BooleanExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CellPositionExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CurrentCellDataExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CurrentCellValueExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ExpressionBlock.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/FunctionExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/IntegerExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/JoinExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/NullExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/NumberExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ParenExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/RelativeCellExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/StringExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/VariableAssignExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/VariableExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/cell/CellObjectExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/cell/CellValueExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/dataset/DatasetExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/el/ElUnit$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/el/ElUnit.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ElseExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ElseIfExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ExpressionCondition.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ExpressionConditionList.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/IfExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellConditionExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinate.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinateExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinateSet.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellName.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellPairExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CoordinateType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/FromToExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/SimpleValueSetExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/WholeCellExpression.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/ExpressionErrorListener.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/ExpressionVisitor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/BaseExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/BooleanExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CellObjectExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CellPositionExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CurrentCellDataExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CurrentCellValueExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/DatasetExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/ExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/FunctionExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/IntegerExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/NullExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/NumberExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/RelativeCellExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/SetExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/StringExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/VariableExpressionBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/image/ChartImageProcessor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/image/ImageProcessor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/image/ImageType.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/image/StaticImageProcessor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/image/ZxingImageProcessor.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/image/image-not-exist.jpg
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/Cell.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/Column.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/Image.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/Line.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/Report.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/ReportCell.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/Resource.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/model/Row.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/BuildUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/Parser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/ReportParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/SlashBuilder.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/CellParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/CellStyleParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/ColumnParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/ConditionPagingParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/ConditionParameterItemParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/DatasourceParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/HeaderFooterParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/LinkParameterParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/PaperParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/RowParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/CheckboxParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/DatetimeInputParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/FormParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/FormParserUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/GridParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/RadioInputParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/ResetButtonParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SearchFormParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SelectInputParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SubmitButtonParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/TextInputParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ChartValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/DatasetValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ExpressionValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ImageValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/SimpleValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/SlashValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ZxingValueParser.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/image/DefaultImageProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/image/HttpImageProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/image/HttpsImageProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/image/ImageProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/report/ReportFile.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/report/ReportProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/report/classpath/ClasspathReportProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/report/file/FileReportProvider$1.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/provider/report/file/FileReportProvider.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/utils/ArithUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/utils/DataUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/utils/ElCompute.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/utils/ImageUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/utils/ProcedureUtils.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/utils/StatementWrapper.class
 delete mode 100644 ureport2-core/target/classes/com/bstek/ureport/utils/UnitUtils.class
 delete mode 100644 ureport2-core/target/classes/ureport-core-context.xml
 delete mode 100644 ureport2-core/target/classes/ureport.properties
 delete mode 100644 ureport2-core/target/classes/ureport2.xsd
 delete mode 100644 ureport2-core/target/maven-archiver/pom.properties
 delete mode 100644 ureport2-core/target/test-classes/com/bstek/ureport/test/template.html
 delete mode 100644 ureport2-core/target/test-classes/com/bstek/ureport/test/test.xml

diff --git a/ureport2-core/target/classes/com/bstek/ureport/CellRenderer.class b/ureport2-core/target/classes/com/bstek/ureport/CellRenderer.class
deleted file mode 100644
index 06635e42a844e6548522d9636ef72d45f7a11d01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 348
zcmbV|Jqp4=6olvb7o&|{z*-x(v5VLU+9-lK!J0fm;wCHW#=}{701qXu(ITLg-3&bD
zn|b%g^#)*uz6ak!kI;?vo{N|bVLjeNIv0nt<)bJKpR}<e*D))xugsE_3O1R%NKx8U
ziLE>Zlebs0NW|`tabyF6AErqmt;-<ff27W9p`kTtk$kXq%;Gn@7wXbPyh@dW4_}qv
p``Aoh%?YFLk@YLWpjuc%bqIup`x`(lLK7|L+s-x6amuSy_X%Q<X=MNa

diff --git a/ureport2-core/target/classes/com/bstek/ureport/Range.class b/ureport2-core/target/classes/com/bstek/ureport/Range.class
deleted file mode 100644
index 2b7b133237553eb4294a5b97535683d4bed33235..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 882
zcmZ{i&2G~`6ot<?v6EU(T1rT1`j<c>f+g?<R#X*I0VybeL}>PQIx16A8`%yEo~auo
zDkK(&HP69wAkK`fP@!~@@!UIizH{a%zy5sx0pJn(E^O?rpo*?udNtgs;cgB40&AH}
zRXCf-G*d}@JbWe~UJ5jhk~qu5IG=>GxwL=&?q9rm+<Yovvzz7|8VXcod?Mf+s95EP
zEC=@|0@b7BL<+2qR4iZ5&m)<>3!@o3>!V~!p^$Q{%VsryuQGwn(KI;^qAZsmf_W-G
zCTSkL4dYY!go=aVP=lRJ=FhcYbztf`>v3VGe!AGw1f4l-m|1t6%+slSp|k_nARnHE
zpF$6-So7ea;h~9!z{WKOn2??iW^@z0iO%Gdk8hclN`kQoPkq)eLXXkfpg1b%poTj4
zE6m@5%O9o8o@)F$Jfj1yH&`9;T=47q-ynSJ64n<pyUw*q8n8`vhqN8sWaSmpXyFzs
zO=_2<h$KDVT9EuL;{5GPRQ@sB^a<>i%spy!$?X|-x42)jNixp0yOvJMINiYQQtyzp
z#WP3CTv5<32KK4bH`I19wV*nN#lI0Ym$R-UP_XWiHMoYQv(>B)wn|@tsR7&n3hRPa
gEa)(G?0|1DMTmB3NigDNmn;8Yez5fNj*-~?3qbpLxBvhE

diff --git a/ureport2-core/target/classes/com/bstek/ureport/UReportPropertyPlaceholderConfigurer.class b/ureport2-core/target/classes/com/bstek/ureport/UReportPropertyPlaceholderConfigurer.class
deleted file mode 100644
index 16661612959069edb7cd4e2f3dc575d7b1448996..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 529
zcmbVJO;5r=5Pe(9hqVgg_s4}BaIhC+Of+6dh$KXb3I}hcEM=v1o9!0$XL-TIgFnC@
zWt@U09y}Pc$=jKincaDB-alU7032b*LKZ~}CQ2!+<x$RKogsH7LZQzYGSym-!EDF@
zXDGHs$S;#gpQ~H99}rV+OV15@t`cefMVfjfVuq8pCnrun)_m+Fibqmur+YoWJ4!}e
z>8DQMdVC~<0apzf4uwy3>XgB{k%{tnQ>1^?{?c@K?@nDCIpl3@VAIAHwi%B9Hvz+i
zRK62ON`(GUxfA{%)!6Z5sQIII;v|}j`Bt$QHvUx%LnY?A<%d%7Zm4)HgK28jk7BaQ
ztlp(I7pU|~kr^q|s`XHzon&cI0HZ_V2n&=oVNe8=>Mvk*a|WYc8qAP+CeFYTVVOFC
aUBW%e_ff<FEMn|MAC@UfUtJ+Iu=)w%KaO|+

diff --git a/ureport2-core/target/classes/com/bstek/ureport/Utils.class b/ureport2-core/target/classes/com/bstek/ureport/Utils.class
deleted file mode 100644
index 75c745042d1095ce45107a991ec357881225248c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8014
zcmcIp31C#!6+Le<Gk-Gk2@ptNkR>Q$GLtYYaUlVe1Sn{N)POB^u|Jbf7?{nO34(UB
zrK{Sibwh3KVoUc%u!%@rt6*)li`v#&t+k7`w%XmL+VtH2e`ZN0EVhR5{`>FUci+9|
zF7Ljd2mW*09RQluazD<%-b$Q~TPpEw4EQmKTjh11G`C5!KY;Jx_5kj{ozmQ;;qCwe
zxW|u1d{=t+`f(o)NORDS`|&+L7d;@&_XC)TA82^cj~eWim)kWwB+nm8^CMaEV?Ta^
zhXa^{M>IU@$5i}Onx9GYb7>xv<`)_s_u-ea<r989iC<}WO2e=HXu#7Nexu>H8h+=)
z@BL`PGosS7())uCf7I}tAB(Wphd;^l&(b{a!wd2xQ3IaQ@E76xS0Dc7M=Sm=4F~_>
z!$18vO}hW`qa82G_)7u2j8{b3e+w$FYIse<e>4nf3JTRmIvtNija)31Y)>U~=JuSz
z{Ek$nH<C?fV#(f386#nypUP~FMD6Lw@=+^V$)~$77Vn8AR~R`Xo9fF%&8$Lg#};Fo
z5$Vgt;*s`LJZ?s18&X$x#d?!Qt}kOMbd@Dq(h*H1BHh`XxivzvbSjgJ^q8As$(XQ+
z^yIgRw2j=jbs2Z4iY1I*b6qC2E!JaZD9h?2-X`rVidZZnYl<0JygfZ;cV92jJ4eC0
zL_}JqP*LA-wt~Ao)kB@ecf^wB+P*}$nOSdi$2n5nk%}7evyDtl-km{rZgY&H1<UBV
zftY2fhZf7Ouy^AI+)t0Ede^6DsccHv*3{c-#f@Zdq$?)|YZW;v5?KmZJ$h1MTvyJB
zZtXPEju17yW^S}e6&BVv9K9O|vrz`2ic`sK3}4tV#?=4n0TU@oiR~!H=|{2GVclSI
zL08%%X*;(<LphV!%4g4$I2b0Sb^QfDR%k8b21n}h^t>eFR8vY}!X`5p-Mrq&P`-9E
z9;e>X`ZBx|bXCejigG(!@hs9xN@yMJNX7Q-h-GusMnx579(p4MU)<c3>xx}K=T&Ry
z-?>!Uesjmkh0+)KiNn`x$G<||n9R?zG6ZFCN2w3lMu&6R>@sUgb)!tOXf5$$W)krn
z)O?i9>DHEp?~e3v2+toOZaJ?l0(x01PZLeKtnB}&!Ux}Y!yHy3=4s1gELGcfbP#}b
zM#fCi7-jvY6umO=7U_FLep4lw+gpkZ^nvJR9wrpQ5{aowGHM}xaDbK$<cdAK_!Qy%
zlF=I%F%Z8xEG%NG$H%bH{}+P8io!f!Y@zk3^ss@((M5}q3ozz+=%vj}Zim7t#i{7b
z?k!AFV@I-egg8WUfC%a?b36Ag!gA&IsF`*S@rqRUmeMmOzuL#->Bumt2zN0|C?vo>
z#gj9aVzI!Gn^Q*0;_M<+l3hsZ%JwKsw>e5)igd*i>9{Ert5TVSkt6FNmQ_3_bE&pi
z?+P=@L!2HJ8ha0}+8im+a;J)HF2ntjrOMgIIj4PDGv}Pi?)r1&w5{Ptxg&H@{n4JF
z!p)xtIjgA(zIR#m)T)>q_<pM}m?y!Y<1Kirjtw|lQ*K>(lvh)lu6*E3C)VmX6YF$z
zVV$Nbb>&w9o({Uwajve$sVarVue-w1kyhh%H9<|(RkfPLe5R|(szz6}YKo?&>ME$F
z>G(J<*6}Ge>KHX$VNxN0muE7@4hcdUbF>hJ^r5R6vc*hkW~n+&&DPbi>Ns7^QOC2y
zD=-vZx|*v_&{e%i)*wV7c@3-MSn?Do>4G%vJY6-aCXG*Ag{y~Uvmzi5J}aQnvYEsF
zAF)rI_EaL>moxK=XcHAF5zY4T36=y!Rhq&yYpARj)66^g)7077)YBtoHgq*#^je@6
zQrN;=-RjjXi9}15NBoqLJG4n%Y|@b@v>VB~WGYw3GjSUeL!GV`sb*<T<at+@OVx>t
z^AsjqEJnnGu1-?p6(E|Otk8HUOjs?*26;4?wuOBmxVT9X5_UxC>J+tDxVLDkRaZ;Y
zQe7>>W?h}CPE(jSdcQ*zX2fCi0xM)ncD56h!lI+Q=PW;;=OVL$g_CuwS(7s}MlMB^
zXN}&s<djgTFSl8@X(Y3eHff7sD*~x&2k$@$CZ$v#!^O$Pu~cLoYyBK6e$z-WC)vSO
zI?O6aZg9Cc6PayVOXR{ujHxV^m%p~8G#=KAthLQXcCB?SbSJIH<YCIv6Qgw4xr;E(
zo9FczQiGOURh*MTZZzYhOwAX?G~h7%QPpx)EGq@Ux)d*$S(7J03CrQz4_QtiOFKUE
zLC`?1V_B$#lo}s@M1+hT%fNQY(p;{PD{%nl<h5*I6}HxWF>6)AyxXxB_DRud#F7N7
z!swxXm3ciBjxDQzoh$Rz@66GX7gMlk60nJ3*2;quhoQEF;t-XuAcex*vCqp=tII8`
zP%+wA)Ez=pp%ACyGP~feW$&!i`R$`BJ~3jx(y<u_IYjsEOC(2=Yq4aHx&6#dV|WGO
z4N3eNX(PJX<hP7Of_LbMgr6v%Wjxsx%LaLq3v1b`M{LGxf$eJwp0tt4G9#3fFvE^m
zRQNb0jF%r<%p?ulRLs4UzUYi_oR@Hw&=1E>k$^Uf0==7G0+=)0^=m}nKu@ZVA05s%
z;(e5rzP3W9R>;)6ayd!dP>QQ^B~2AgU}dW_H?8L_Nc^%$j`p~b&9)X7Z?;o;x5?gw
z)l0u#E+u}@S!Q`&AtkjooP*i?40i@UO?AKxzf>~(>gShYhGTDL--WaI&blW5zMk(a
zgE%*yW2}nUZsc2pPaa+Hga)B*ww9j5)@uzm;ce{eHUZv_ckrze@5H$rk;T)k8Nj^<
zuCMc5p|G}@l<$J!P_Cg!vP~5!cfr306`=vRWxon*O%<QODcpB4#_@|>Vc#lrBg(lR
zi&l*zTN9fcwnYMX`bkhMz%o+yVly`$A*y#IWt)Rpj4QU3TcM3yvC3Jol`G;%IMQ6q
zy+n-@_rSXkKAI=I50whLFozw#!d(b-h8p)lR~W!J;=n$u%>La&k15&0#-bJ;_Rk=?
z9sH2liTO0_BAQY#spS^aF&Rmu*yC16=h4wo@hU1coHzFs&Q&6VET2@~brCuHiO#fe
z;{e8Ahw<S7ObDw1Ox!*6LO9fTE2`I8k4Y`=rUQ5&=stk^n)YF`!bzT>+wOR4JnkFe
ztMOh3Pg8%5*Lv|>2XD~bU&H4FnF;Ji&Bj60_B+oOt;SR1{Q{Pf+Z2TsU(n}3QZGFV
zlc_D0L3glnAA&AIH7=-0f0_$#**)~gZnVh$rAtpJUfNWC<)cBZpQ`wS?t>z3(?JA8
zD-o8;AJgIqdIm6^_|I_BEHedtx8;f3FoXT|@G)E_Gf<9Us2oQW8#%j_HdxI#IGr)D
zfl=^Q`gb?~ZJ~E&>6RDJF|Vc5-9#t)CP#0fb39D<c#`&dmX>;sHhG?uFCxbe&V9;-
zZOVh~Du5l9b<_Opel2aBLm%z;Fh8%`y=L5oZ8)EPu@pCBJ9}Poxsa<afX3D1*?+fq
zjhcq{a4mn>doSK6F~{Ef=_4*`GK7n`qJsLoh!3#m#s^7S#}S*`PG}C*&OFslQc3JB
z#Y9XRq9bY=KBVEp8a|@oqx|LPG$_Ao;%k^<4V)LI`?+3)kDeG}_a(Ue0ViHQMmOZ0
z$979KgPVBCx|0@}wU#FGsQ#t_)X_;998-r~$Q^Xkd&D7VJkHN<;Yi+cVo9;9r$5vr
zj$E+hLS`-y1rKqkBnAQMTuY5-VJGVGA%yV}EWk&x3?Jhk0zQsaxWux;YN9ZUYXx1m
zh-V?m4ts*G<grc%QxE;&5{^}n({x;lPjJOD+T)X4>&c^Qa}y+Os>||JJ4q$zR!i&#
zi0rJ_FipedMACum3PQ#kVj0MeJ#xs7I}~J-MnZNOg}R)OT|vmMBxF|+j;jgTHH2&z
zRk)5SUQftwAY`9;U65V*218aUcUC7W-%I02R&EYi4i>r_b9P}`xcc}3%yoSh6GC@k
zPG=(%G&4beD10kU=<nQ*hK-Gb2;E88y$qKSwV%UeEKfU4%%qb5pXcmNn1V0T_+KK$
zmr3yzqV!b@l@MvCGm%_Fw{UT^lEJ-;J<381ujf;GH!wK)4UK&{Xl?pWlS<sehYIhE
zl^Rj5#Etl@t&tMG;+Pjwm+&t5s6n`&{l;B5V?UZUR?izmq$A7|cK!esh&CKsSTeR&
zG~ACx%+<}+Cl25w5}#as3OfT>JcyP%4>wN%XW)3uB_IoUX1DNZpI-CmG{CnAPd^p9
z8I!Pwl(&%b+c<&8-U8f8>U})pZzD)|<bi5s9{L>NsUTIe1Jn#U+UM~Fs!e4b$OM)K
zxb-0f!EeMjX#`&pp&{;6VZRGrGW0T8R?;rJ9o(9UnxKDu-V<7F^jaPCI&H|7R4=tM
zkiH+S8!HB}tlt^$kb&?ZPVHy!w9)u2AI7ikPMV{A7bep*?e?kxtQf>fo{NWGM^P7G
zIok4gN;U!Rrs((3+3sa^bRV<D0cwAcH20JG`^5hTT=5`7@*z6Yk9hL@nDxO=h}k1~
zd>0dnFI%qGPFTbd6=`(3>sKv&uP?$k0IxSNa~&b9o5IPj;p=RridxF2Am}+}FI<Ic
z(Qgg@oH9OU?I%?ViJXd2dQy5yq4^D-i*`YFDJ?BjE5m!?aZ>$Wcv(7ys{{M6%0(Y}
zlVY=)i9bKD?SU4qUNdsOAj&lBM0tXuJc%m&iZS^V=Hb^^fv1Z^TbUPaB~$rY3id6E
N;^woT|7~u2{tKI&Ju?6R

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/BindData.class b/ureport2-core/target/classes/com/bstek/ureport/build/BindData.class
deleted file mode 100644
index 1b9c3be9c9e02633f679173204d7ca1bc625ba91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1374
zcmbW0OK;Oa6ot>^oz!VcaKpPz(j-j`#Vn8zYSjgxZirw}l)ar;!L6HAiBpLUzX>EN
zBo_PteiY)&OcLecsuG(S`}*GRoVj=W=kKrI0A8Y%LkiU_lGu|=O)m8`8fokcB(I!c
z;t3SnXU>&l2hN~xe{|2hZg|L#f#Z6CK&Iz}PTL=c0$Vz768eEHBh1R4`u%|uPDaGk
zRz4rCV~<&qI`Rj8cr38pTu*3q1QKtDJ>m*&f8c$XT)5uolj8=;=dkMp9cSdr_h~Q@
ze)h)#)pmDyVY}ndJGbfPaySZYcj5;<`;9;7z2g}uU5`*)F?}c<l-f%|UoK~2uWtuL
zo?1d*-B`QW_$WK?|EKasADO-vcJ$!QW@~)}0vpVb9n(`U&XN}A-dGDp>hb!J)z&vD
zcRHMmy55N|XPKXk<+;3j1~$<&kVeKp4jTrt$Ox2g8!4~k>dh61H(MQ4c+XS(1LBBD
zDxYGKsdfrLz);V5W(kTHxNb3W!n_#wob?mJdU}o6ca?XC>n3Ty6C|)h)-H;CE9q?9
zg~>P8DK(*(+x#Y(=iFswVa~LkT_Y~RaY%5HNTAHMLU5HrdkS9GWpj983MWc-iP#eB
z42tPUo)LYld&<E5se!NDrGmL+AYmOWxhSz^K#iGox@geFK9!rwiKXl3PRzLzQ?*sL
z%v7G@3!Y>o&ogLG59sM39&wdTvAIj%N$Uq<-}n$yt&r0IEG4QBmYj+TJZA58M;D9Z
btHlQq#oECR;k%Iz6049G5fENT<+Jh+qqzmb

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/Context.class b/ureport2-core/target/classes/com/bstek/ureport/build/Context.class
deleted file mode 100644
index 0df74867fd3d30d7dc71eb312d9c7dfdedc25ff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14322
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
Ra${n-;1gv{kZpP5{{v^3L7e~q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/DataCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/DataCompute.class
deleted file mode 100644
index 9cec580196b749dbc5b9d239d29cc48f73e170cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3554
zcmb_fYjYD-7=BK(>9*TNN-38L7Rs${(h@EOYg>yp1-XPG1d3Eqx5?5jY%V05Qcyur
zyx?6v_z(Ol>P(p08Fh5V5B>pvjgHURB$L~glo|VBPu}ys&wD@bIsNP3pML=`gl{wi
zF{9yCyr$tYUT;MJZ?xe}7#d~~YeO8SiYsks!JLYD6_$oJ%(URDT(8NGEk6kj8j>nf
z8agneBCVlQ>g~jJsUxEzt6{U;*^KKd91U9}u|*O&4c(IHmc)XF9!c~_;)aG@lGr7Q
zMGd`@=#|7x6}JT17YsXRhEs`j&M~v6jkLhp$W>#(2<05h4sl~tpfzgEB@HK+F$K<6
zbH@s#Z6xPHQ72<1=SCy3R3bE+b<AraBGRdh6PnFgc09y=X(cpWVRCew`kTkBq~(kY
z`1<;%1(a|qPD^VeR??ixC1%acd1Kb*PDdmaGwf+2V@bNWsW|giR$%vvW+x5DC<aJd
zYg}K#rfti8#?$8kOwa*4B!yOvCY(w-=Atv&Uy+cAm33%CvAHt09-J6;3Uoi-rhpnN
zXcy@55G|y$<bZ(REuuicLpE++k;%1E$&f2m$UdFaD=ROs*8}^QvI%UgF2>DtsUSl&
zVUMk-dBRG@Wfj~eSQB-O*flnsTUQlt@z4n5{_pav(wmmCm|bkjj;xhP+h%3g3Jk3n
zRH@6Obtoo%eVpNDO{ZGfp@zz2mTF+sw$WTnXUuGt#jRF2+)&|BPb77&vl7N!O|S<W
zsyk5&lA5x%k)5x0tg)tOEl6s*waCHpq?%@GK~hs}-pJHszp+o@S`am9(Nr!IGmlwv
zFtyA26lcs{IX!jk!+sTS>v%`5w{_gXyE+Ci$i~+39`34mU&jZyr{Y5$AK_zx0d~%+
z=cbNNFf0(P$C!&TGwq)DbMEjxTA~Fuxr4o8R!_*eY-X633(0IQEob%i1v#BZw(Gc$
zPvz$`9iQW#4Co8Wm9K{5EUtTB9H{r9dT`XA1RY=Eu8yzpwZOqfaF5;>INS*3-QWWI
z8v*NDc@>ztrd<W5u02<QscS@moh!vt(UNS?a^=s=UNvL9o%-s5-gkw-wtCU3D~S3z
zhU8Q$+{|uUY^?{CuT_DTx#ARL<M;J@3>a@`c=A*t&-1zw*!KiLi6GeHka-&_SWuEi
zf`&S2sGPy#JBM$H@@a5G_R%weJ$)6jg>07|3GUG=Zn>Ad`yk>2$VjKnWL#jd5?i!W
zZ@PGF8BUeFhpmE&vV4n^Dr^aC@G>P|UyhqwAD?Oh!<9ls{i}+Oug?JA#Q-Oz9D7{%
zl4?Q-KK|x(<o5t~LR<w`f8Y_s53a~Tew*FRJ$zpSdO-k(aF|ppp2aW~N$}rL;OBZW
zm`76}58vq@p$sg+FOWy`64WOAhL)+pKhZuI2ri-3hY_VqdAJPi(lXjEJ%Zk`CXc5E
z@>rWk`y;ITmD&_Y54xf9J4Whx+8if+1Uv8ogL#oohh5KxXnlYIJ%<s>(GQFgA^%Pi
zHBP@<DSd>fCgLS>g3@8~WlRO+B#}qC(+2SmLMo1_c&V7H<NTlDL@86kBviWe$1*zT
z`TC!rETfaZHk@MAjD90y4lH4l4;PoQnT)Oo8BER7WH9;yV+$Eu-8|*-3>i#UfzeII
zwkaY8^Vm+tV2RN~#*Pt%oGvAgon&<>CEhObc8~Za&!5L0$@7<Zz2x<cG)rD{9{rNX
znn+{iI!~aTA@#CJ0{piph@H$zknJ+Y6ihPD7uYJ7nSvzieS>wm&%8fiCw#|V_@15c
zJ9964<Tz8)frrfdDN;dviwI6L$CJ2?DV$;cFT=#kILjp7pv*Z$nfC{@aGo~&)U_Vd
OxajuXE7Z`0OaB3h;}p^W

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/Dataset.class b/ureport2-core/target/classes/com/bstek/ureport/build/Dataset.class
deleted file mode 100644
index 0492e50daa67a807114bc02af960b05e63ef527e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmah{%TC)s6g^|-L4w;*UWJwtQngZI5Z-hLVpGJ*qKj17j}t2lI5u*|Nc>eR6;)!v
z2lS&V&WwZFCY7+Ind|#F=iGb!>-YTwfKPbeL=`&?RPfFmyLGhd*b}IvauN%yhL`e2
z28m3^L0{)89Un0^l3EI^l(9mqBnZ`1Gt%g*aVm9@vvh4PeC(evqjs!PrB4Jtb{C=N
zDvo*sl6}rbL~DgAjn9io6z5-MlvrumP$mPJEAu^bR`i9M3UtC@HVLAsj;{iWxz2JO
zM1@L5!6~IrW21F5{HOl*`U#`^yfV{^5mz6_`rHm`z1v&tr%W)Eoa9r&-}Bm7aF$bQ
z_Ol`%#%Ibj>diDCnpJr4(D6`1-NO<Z0_|ry<(~em@Jn<V54C{X?G4c3zN`ER9KOV}
z79k<fwDvMw+8$mo{*s<6-Y)N!{}aOBzk}l++`;`$mx~t9RRRJ#=3gSrE{ob&p=Ylw
z!z*T(r)BAcwG5$yHQFA@Ol%3u^pq0T>D$02Pa`1UZE~vq4>;dwIF`0%ogGV6f>dWz
a0<W>ftodShzWBp`ic1CC1b<_x-aZ0z<)bG6

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/DatasetUtils.class b/ureport2-core/target/classes/com/bstek/ureport/build/DatasetUtils.class
deleted file mode 100644
index f8573c8602bb406154ec995ec6ff0917a75cbe7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3200
zcmd5;X;&OY6urd^X=oZrARC$mViH*boe+!>FiIwyN)pT@#JD#zl}U%0?s2A@5RLo3
zM$hpV_y^Q@B*s2R{p3;qlOAt%570mp@EkulAFAiwdiO0=?^V^GfB*C|fI)nz;{e8W
zJcV<O*pF-z&f|iH2_5ygsNrc1mvl5>yaCUs@3U%nP7TlN(C~tW7j?8?yb&+K(lDu`
z730cAP9b>>Qpe_K`m%<Cj`m2nqQTa&EfTJ3n9{K`5{ep1I(9{Zqrug&ClbmUUe?hS
z2^9@h9lep@Y4COQV_d_uhHC=4RVY+s!SZBPpk?f;HEo%`XBW-WR(V*UF>4nb%kwKz
zpuBi?WGv^F%*m=Jr%cY5-HK=C<z?HkJ==B6X{+c<b9B!7`RiploWPj$?PA`X4`P8Z
ze1z`TjVN<R1X5ky69Vasn`a;`W40sD_@zl%Id4rCiL{QnIjcBfRcs~Kz_fS8W>R}s
z^m@$ltg7@bFx@JhZDl@X-;*`?_)NJXt5xPA@KslW5jn45mKayjRDhX}jGD`=BxN7*
zGO}1qnvK>b<2s(4@rJu&%RgpUJw}{X9tAT0L2xvdV;BNE5{$*d6wq=}Kmwf!s*7V5
zXrA9%RRID637l1`hE+IkM4&Ihz{*9$0J5Hyn_@MGRiR;qEi3Tj|8PT-8Y;@{sO{uc
zJ%v5dFp?|Qx<b#oekCVQ*s2FM)G974=YG}51`gpN4c864f>#X;;Gl*Z242JK0=>(d
zcg0mSa1!jn{mUtGCMU~byQ><`ME!Go4iwlDo+m}iDVSNWVmpPSs@)}Pw(Wv5<+#^6
z=6AMZsKdY;cvB5;8F(A-sPNxqUJGZ^DXV&gJIPHn@E%SihO{(`lNHx5kIo%K2HwX9
z20m2e1IzPSO3uon%y}{PM~ZlGb>cZ$T}u5}Q3uvSEi4K76UFRbojE#Ph=uy8VkPX^
z(i}6c@5EF5Y>nQsektbd^EI+g+fIyibFD0ECdT?gu@0@i9vQ#txuwMgAh3HSV!VF@
z)-ROq*~zP{g2ctV`_UyZy4=~nyfy@kf?U`ifx)isgd_0of$*+qUT7n>5N}jk<>lBF
z-6~;=MtRO%G;xSGu~jZhC(rXY&WM_N5o1xG)9)hv1P@E~8$36H1U53$g<Yum64;a!
z0nhaMuy2?dFL8mxajlx)n6-pRY7ldcdRL%<4}h?ZdF%0!q}r0^t?2@t<y6~Hs`@34
zC7Z8=RLPnVXv&3U7iy!EFU13VKJuZZ&R>29Db?XYr1+o5GsnY3OnwEw^*y&Cz6(_z
z=D02ddoaZRMx=mYj8JOCBRE1siu?`Ie1ifbJ+r7ga|@}yJ4n~zSJV%s+ta_nXixX_
z?wiHBZv$wT0yJE@jmB1e7EOJ#FlNzw8~6M|ehSLx=Frv<$6>V5*H(J!#G_#hgOMLf
zk5Q8zF^Z#MTqDTf7~`pDO2=`6w%X9md*c*idz_k05PzXl!xI{wtgXQq-^QosRzNgU
zQT_f1(8BoEe~%P1xrGe@S}C{P!NwFWhR~(}n+a`+L0bc~6S_AB-4|dRq3tnfM}VD#
zI$}^~fL(;{k3qWw>>;!_20aj<i%@qA>Iu+GXkQHK3(!x<j3Bj(B3#h{?j867*U^XV
me0=Zcc4s(FurzFz#SIq5O)kpUEQ=pl6u*aya)z8boc#xDfv*$*

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/HideRowColumnBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/HideRowColumnBuilder.class
deleted file mode 100644
index f979c018b601a045b9b3cdd49d8ca35737d26a3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4901
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
SM<fb2Q6royRw?;LivJhbW_pnT

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/ReportBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/ReportBuilder.class
deleted file mode 100644
index c7cac51fa94d11a75598a29ee768c9aab936fd06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19748
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/Splash.class b/ureport2-core/target/classes/com/bstek/ureport/build/Splash.class
deleted file mode 100644
index e1586c3db39bfce01b90bd942e15a630fd71d7da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1642
zcmcgtTTc@~6#k}Mx|Ax&9Tgbvg>JiucR`{O@TEZ`iZLNJ+wIt0Y<KJKRwN<u%{Sjn
zeAC~c50Gf$5Aa7B&+Hc374*?*J994I`DV`KoaxVB-+lnNf|Ue%!Q&WDAO@~rLavhv
zrW8yom{BmRAf;eV!MuXB0<{AfWF<&TU;&rnSd8N`L;JF2TmA||OKNV5p>@?M3Wlzn
zWs8kkr6AnLdZA2~o}6Ro<t^Q{q+U0+`ljVE@SNdPw1Vf0ms-sgRmb(ULd_}{wasc-
z_sk`Rc+q+2TDH#+^9l^ZxgGtru9bDWq;2}-DBY8I;Sw~l>C{|9tXp#1&X6H1;YswN
zpJDJXp$sgMq?@_Qu$GsD^I!?(hIk|$d5_lou@E9S!@4Bln*5MW^6~Aukk2=pBCcZ$
zA@*g6JW!oRQV>}{D1$WOZ<vnvYQlsFiPVTk2GWm$=&N#)13pO+nCNuU9fBel0)z;S
z5?hmL5Hj3nKff=9W|Kq*c}S3Ct7BwH9V>av?0*^zYL@fbqoBA{Zh2hit0onxC%EVD
zl?4y$jtjd)R)%F>whUo=qR4AD6&CkR!S7aegO*(A;fvV?HOS|WDJv7>eAl!LQ*Px{
zi6|&al?&b5<G#ado={DzWM-<uec`wj-8O{EcP-!K1=rd2gqtbow0ou~Jga02mk3W8
z**LBxaUD03xQSbFEG4mw+YF=s?kI-tMi)FN><EK8t6i_sL5mET)QR?5nmb`?bX*hH
z<{ou%g<b=vMvVPokmYDW^HQe@y+SRj_)gfh41KAS%!KF-ju#E2SD-52fU-@@ryX$%
z<LIGhO^z6d8~rp7kfzbfXl<K61p5-W2Wf5(i~|@VIT->ljPs;1TsR75X(Ee}?ellU
zo*kkkm+omjK-<%FPkXr3wRl8RB3eg8OGLEJh?WesGZEw2h}InN6<z5AbRXbcBdzC<
z$qhlFWV$Gw0ZL{B7coV18lzam7*z|$9lEdkn7{@m@r1nFn1+EF>|hqJkir|x;VtIz
kj-uW}#RvKe_=Ie5T?65j)UQjyN8%r$YopSmy<-^r4Wxg0KL7v#

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate$1.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate$1.class
deleted file mode 100644
index f6ad01edd5f87430949fef246e75f12398a6038f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2288
zcmb7FT~ixX7=BK&$&#=@Xek&!X^A!oq+4ng1*G!PRy2TZfZ9?&PLgfdHtgbN)A7o?
z{sC{CI^zx3+*DiYc;VC=o$()eQOD<O!e_#Cn%$i9?t7m1J@4l^|NQs+9{?_5J%$86
zQo~dny|@%dH$K)e9m5P};~eJVh~To0D{)-KCvnW<Qw97ijyx80EXFCiq~miP*K}ML
zh~1afl<So(Pau^qxf^D&=3Dp7x@T>=o^O_|JGNu{w(FQn3N;}R_1EoM>byX%4Zc{n
zt7TJGDxOu5zGY7DQc7@AshSd4PQR378*qzRnN<O8)-78CJ$c))7V8^D%UhPkDmf?e
zZb?>GrDv<}CR0;x2pIE@V|lYxS*uz6G}~-;tWT*?dZjaHo6_SpSC4mV#&*hc(w7s*
zs^3Fo<^@9KQGrDMuDmbJx^Gua%39njRKCE$;bMPdaYOp+=8RpLvr6`ctSX2@h*tAG
zf=)C*Rq0gBg74W*g#fjtw73MEd9gVPNqD48>yM~hD&Dn9K2-*b1a%dBS-Q6%H-iud
zB{r?2pkrC!Z2EvPP03b{az0kDD~|M8fdctfNP`nZWj2Vs^j&ZA#g0tT(0IYEdnN0N
zt*WAXuQt!AK(lZzJEf{yW0)2!f88zXSTV4Q8wO6H-@r-q85qD925#aO#Sdpk$C`oL
z3i2hsGVnFNVFm+85dKCz>W~JCC^0AsQZ``W4#T59DguM8{nx0y-QqCt76#dP$Kl%a
zU5ZINU`HeJ0)6||??-W$eWa=mDQMJ@!0=1hAkZ5eF}rT$?V2wz)~tvim5SA_IodXQ
zIIY^fqhk51vRY><`_h@#LScEg+IUo-Kv>pFJe#a<>$1uN;8dGB%`n|D>QZgK><XMb
zXnD|@s%{5bcUxiasx!uS_j^<z+ir`7{YN6tl1(<jM_1I29lpDpj>8eyYxYClG`X31
z4DuG}1rG>>5(!n<0B2S?FPSj^19*k2Nm8>21)QGj@Dqsa$P<LJPZ55^r4U}_7$p$A
zW?tjiPae>N*YPH2MJbhn56iZpQ2a`a&b6)K9cYUq9LBZWU+73`e<Px8=l(?GA#%BA
zh>S;)nwp~7#|Zs`=nnLU=uAeEq&l{f(PTu;6o@H--w;;<YHBCY*%av9&h5ZZNHw)X
zb~TY*+q5zq__#_xzzZ~j1$1JO;aZ|!*YF0eV+aLgv5YaS;1X`|*1bu@EppcQ+{QZ3
zgH5*gckKJ`QNjb1@dMlbCscx%ZBpY9QaFt>)Sso!AyQGwr}(^0-WqxDkcv`1g|kSL
z_kg?%si=zNUc9#`KOE#^3nQdLME;B%&e4xf{0NhjhVzukL4S@u9ix23bEI`#;QO!Q
zl75$OK%drek#Ay}34E`SKsp)@Dxxbp{0!YA{O_Pg#j3R)jKG$zrhOXT4^U(HAecYI
SIA;wLn4~vAoah8+{{9E%7d<Qh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate.class
deleted file mode 100644
index d7e1c9305872f39877cd21e66c37e61ad3b8d3d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3482
zcmd5<U3U{z6x}zObV@QU5WbOOi->KLc0gMZQp-p95N(TEtO9;bk|9i)X5wVR!dLwX
z`ofF9fCuoQfUf1j7hKEVq%QZplP1&7Q0kj`$erAK&c6HXd(OF&KmYmVHvm&u$znS$
zWN{IfbX?9NjrZitl^ov32Ri0*n8(64T*Zf3eto3l<1BJm%;Fk8(XpiCQvu^jqhb4H
z*J`!wmO$T(({O@Wf%NFul7LqBYPP`kIj3PSv{x#&f6c16oXO95Rm)wnd`JH7OlrYx
zhZqxcRd2<tv;zB%+4k+G=Lcq`?YK45s@HwHZUwe^ZtbZgu&p~S@Z)HLvwg4W+pU)4
zHOv+AaZNd4)~vv4*@1Z>94~f_N(m65U)gruq}7mJ*=q#$y`VHUw`|?D%y!_o=A6?C
zB*jIi-mn5jBk<&ZNO2}1<S?l7PNOCjD$OzsqizR`vgQQTQeYt|l891c38=BN=;9Gy
zueFvew@s1CTXB8KF*5zCJTQU731AVL0-3wvuHy-YHT#xKX_-9A%2W*HnO1vBOeQ#P
z8tK4dU{&wTTTPYvIzH2JT_Cq&HJeVOE(I5u9*ratO-tcV*J{+wtCeND+D*0Slt8wF
zLKj(jy=0Ua6h$V!tU$G}-ZkS|6`P7h7Z(Gcl<2s3ea(K`T&vsZ^?S@jkUP%tnb{H>
zjKIweF>cW}g14CxxtiBaFM;op(sh$lN;uO<*2F0!*l%bIH`o`w$}$t3xg&dpz{pFz
z1a^9U&Gy$SQMMF;lTqPRmq`GM<nC1oQBpnGRRBA}0HR$gqxKOvx)msasSOBQY$EH9
zTr%I1-&QEe=(3Am+ppS}9C^zOcCU#^nd}C3BCq3yft&bT;9UHgiDkp)Eylnhd|}{A
ze5K=S0~RU*J9=dmCO<3NKovC|wt-tXW1x=PyyfD%zwnYfdO}inbSxXV1J-BZKRB<W
z6jqDCXdEDtERjYhP>h?#WQtVTp}2XkY6SXug{Tfn;L)TDBAEu;&+$a_7gM22f8d2@
zAh4U>8&8H718Pncfohj&(i1q=DXwU9jJkJv4qta}Ic{M40)A3&>BXJ&(hyzkG3!7l
zq<g%V9EnREQBPGo+kL}puoU|2Z`zj2x2ru#v9U2-ON!uy8JQH&#=TXy+0zra?71#4
zE#9Q0p|$v0ComRoV^N2drsZ3KCmWYGf<eBV%1<BI6OrflF8(q(3XYla#}JSBkizbc
z5pWE9_-up**o%FDCa@m|ICD_hz5<O^JjCA;><5k+j)w}XNX?6d;_pb`$M)hgq)%%H
zv{h&e6A!tbR(l*I6=0km1?VV}-~{I<iF{n`JH?gVv^k7dxeHN42I^@TBWkaGID*&6
zS*OQQyiVj}T+c!Lje|Pg&@oEaF>aDl1b^Zvp@s|3p%?!^rueW>Tt((7`cilXePKe)
zDUw=*<P`cbjVw+w_;*O;6iJm7$?*`cOKq6J6iJPHFq}#5x1YWyLrUWWXG1Zi)tj`E
zWckmbU;Kq#I^ODtIz`NByv=nfYMU}hQS$|I(;gIx#fbyjQ}k!>fU}{LgB*b~^gBzz
z&UfXbSC?5{2_%{2$!&zp<kLxVl)ib!b&CFyQ5vF;kEa=8DBJfWAdQBK&oNN^8QWHo
zy$|hC;aB9Yj~5@qc!B|$JfUWJj=&`z=w<nbh<dq-(QpXTWi*5tysNYt!YtXRA_~d1
dvmJ#rqz2K^<{Yig6Fr48c5uwnCdZMVe*vuj)ad{K

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/AvgAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/AvgAggregate.class
deleted file mode 100644
index 80bf42bfbff5f320e07bfb3bb37ddb1085069151..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5899
zcmdT|X>=Ra75<)VX{6Cu-V=r;IE^W`V_PW=0mexnu>&!f1hP1UC1EU$9VN1)$fGoY
zum`$OD72w%DA1OYrcm03LS={0&;@Kt_m-AI+rvN3>5u;DY0rUTaKASr*^(s#`A3iC
zH+SCLci&yUd+(ch`MqaP09cB@tLQ*NMG`4F>{gM+h#YJc8SGK<DeP6zj(tJgfE(r9
zemUGES#DNvi-KEKgply#HhH~W4tL1mfQl;Iso*XZjrg<_@fo?nXQiCa1#ve%FNb@A
zxEEhgaUbqi@kM+|4hQ@=sNw;6b05Aemw!bLUsZ5O#aT!wcu?MdO~pfaSjE|RM9TcS
zf^R7JrhspGED^I;3RJYT_6t;YC!>}?bzdxDt;-A#Sm{mXK%6smeaVO!?>Eyid7qoC
zw0Fct1eWwglEdMF5!>1o&ZMnWGHr(kGO>6xYz_^jts&F4!mIWSt;*kY2?VB}2pnuF
zv)<a9N?Ri%v1B4VOqJqcIT4PUwmD+i;U4$8W}2z1j0ksKw-t|<d+I9KolMx)Uc0Nc
zZ>PD(3}@_EJlq!>v8iIE+)SXR^oe(m8PCusZDlr%T7%M|Qg4SV+%I`4&LjQWU1r6}
zS}J4VC>u8uL*exUJFSRRS0ow3<iJiU9;X4kq|(V$G4n<{9ZL+6*&9h_666uR3`HcF
zh&mbzbbc89=rfmJI!S8JON3q)SWsqpK@<cO?j`*#u&@kkaYzJ$xp1#Dhv_@Nw8u)@
z`$)#EL0blv676KlrJP9_J9pBhd<0P@&Z&8>&xTEVM|gE?sK<)LhRrxFm{$z!eW^US
z>t_XidD}{|H_x6ejfG@eTEaG0imZ+$q7u$sa#__z+l=hG+)OzM=H%$33cjV_F$ISe
ze47PA!4U=DQSi8eCm6hqv7v-%GwTG#K7x6)e9kZz+3j~i&l(}{T+1xibrpCx2jDV7
z3t(2}>B;6;84<<c%+-rhIC+x0m{wOaB}QU5FeuN@Hb=tf|H>kDV=|MDSQp1+8>lU;
z<DIe$Y3M{)!J`_!izhXF4^JxizJ?#*sD`I-l<3v)Lp)6gYj_4f(lCf2B3Z*uWHpRp
zOv5oetKm4F6F8?dORT*SE9KPF4Nhn2P7bFswzVcdEiiwk8oKycEqjl}vQ)P@F_KBi
ze$?a?<0hj?!;f)74$o`&iBz}~KNV<jM9hk&eD*U9KgSDlcu~VRCYW>@UcxUlyo@m>
zp@v`LR|<YD4gU>OQ^RlZI{`3VHT)ib(C|mRqTx^Yvp~JGiPK_MrPJm<w?Z|Qn(RU?
zpCB4u#a|S>rr~w`RqFINDU_RZ&b4y7w-$9>fyEzULB2-|tSaR`$utr;y;R0bq6(Z@
z`nV{~*nMZmRv<LvM%RM{JZ?7>Xekw3zA+25m$H_aIo<IHshQn-Z7XfsN#ZOtWZAhR
ziQB6hT5<)#>Cw||H%PuKrn}g}(w!wZMx4{lW=XLj3|e+%N8fb2+g+~4&$#r14?3l#
zr?pJ6E08FlIXZ00_gQH~9-H(>-qOOOQ-MFETi7*oRj|+<WsY1tgYrP4<h;qW%nL6*
z>iEgv9IF^Ta+JEUe5_@&cTCBJYR&ZNQ6O2)uXBhgw_^!p<iz_NS9$O@Qz<JE73i4T
zHwEs>)il~r#GgC<m7;Bi-)|>f017mg+e)7LTYBZ;U!z|OpuVo0PYRInq5Lo{kD4zj
z8>|x76)y3|rju-59t;lB^2tZB$_{g6opY!peq`rOI5)n*Se%Om(jQ<)82}YnS&%R}
zXP4nGs#;xAiTS0d%%$}Cg+a)RoL%PfFC@jl_gT9$rYs9Zfy`royJ~iF=5Wgwlrme*
zd2*>RqeNq8Zpo}(nAd0aG;th_?TN{En<aCs?CqU%%V0E_;oD>`ml?gDqKe<+JY|5L
z=DmJU+TBwKb(et<IIE1IZs2ChQfogJ^1Zr)FY-VIXez=Sm+($r*|gzp8-;j^ga@DC
z=yN8UaSmzCWxyx-6#%5q#WHenvA2PI4O}vBaTXq<l4FJ8ZST-4$53hbT*7N8!te_t
zp!>$5>b@*|hF@1Ctw=f`3|03}ph*u*;54qyLNS7EdQkVaFYXwH-%yW;gOa1ZO%D`K
z-Xd3U(qA~aQy4*EXu_z{{l^dx&;!opF<hbtjG)|KH8gn%8X-M22F<9}t0!>gaa3(R
zj?mUoRM*vHQLBftsLP^$6b;Yo)zY%6Bk0lnltI0v3|>xN#&I-mtr*2TL#<dAYHQD8
zzPo>b&O3!<@ECLfqeibehEoL&;WkN~#;IDpdK`^<b$h#B+i?u1d+{KAN2XrWYxSxz
zoMF`Ib>q-=Z5$1Hovt0me0j-Y!GoyM>n3onu1#PGxxJFRUaudYdRVW|;>^0HEEXP;
zvhLAUy?zWI%VLqC9tepeQ#Uq-9>F|am1;MJsCSK@W;Yw0IE$|OIK2@(j<dJwY8EYH
zXcePqJBGy`Y|(>9iIz$SO>g1?(q|JbEksi*zsa;=0T!c~pll^9mk@^Ma$HWlT}Yhu
z5@}a*W*d<<i1V-q=i^4oxEo#k3bY*eV+9UkB@UDOaa@F>SjFS?YMekfkE=a+0~g~>
zT!MdKE&fSq|Hh?w2bT#C`h<eZ#UiX1ZMae_#RhR6Hj0(lB)YL#^kR#!aFy7Htzti}
z5qIKR@dU0DPh*>S5!=N}FvTkv5U(OCUWX;#z@YdSV&Wa_^weXQlP#0bse2W*J|979
z6{g+>KXaX+?OoKpnwsS1s84Q=J2aDT1?suy23ocPb<`wH`&OV9_lhX3l=AKuCMB<+
z7Y~YUw0bqFXu)yX-GdPAcm``|d$r8TT)s-`67I_+C$*N|@Ho_^xQwO1=cz#-rBp)m
zsJNVz7mXf)b>#D5fp`n+Nhw$;{(~#1fgjDZ_)1a%Tu47`z(%OF|FoQbn;7S%l;L_{
zGc|T~?<eKT=%1F+&-8RxZsF6bxbg+mO%VpFf~^X!R&b4iYZYAQ{7Cb+jXxkbiDm`c
z8ycp#ea-uGlh0Xpy(7h>T;Od4-o*t9<lWowy-PzC3{1kWATo(o1=mkv5y!wJ&fw)O
zg#HW96y_uNfqT)4DE~dM_|Nw}w^FjQdKoj|p|%d0@;==+!2-xycZ%VgE(uD-GXG*X
z{{ymYIr+auQZoNpJI8UV?(67amU^86uq@aZbc(<$y4o(Yn%Ou$HK7NKvU*fk^k6Ql
zl>>fe^<iCc652nL(2B0i<m;uVqpnHDJw>f|qaGtT12&rYLAQ(9co9GLuE$<%!ai)l
zer(50<hq$0xAN~c+=1J17so?5;N-*&l(L?2-+>q-y*-EZAZ4v}5Uxtk<nc;MVqG?+
zha5x_ucRb$D;!FqxzeE|hP~AC0SEOy>UfKTNQIj2=Ua9U_mqfqJD8NanQ|r47Q#D;
hdItSHG!P*Se`FG!PT)^>B3_#d<1Q|UbAboL{{!ykZ=wJI

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CountAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CountAggregate.class
deleted file mode 100644
index 81d6d1691f12372c2758cb48a58b544ae891f4a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5199
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
AvH$=8

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CustomGroupAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CustomGroupAggregate.class
deleted file mode 100644
index 82da69ac5a9faf01bbf088d3d80efc8dc548e043..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5206
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
Z8iF@uT*mMJH@ECoyC*sJ6vqO1`ae4*qg((0

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/GroupAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/GroupAggregate.class
deleted file mode 100644
index 313a84d27eaf3f1876566fa8cebb7ace082da41e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4885
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
HoJal#rnN|z

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MaxAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MaxAggregate.class
deleted file mode 100644
index 847c4f35a2a132c5b4e85c45b707e5b70d7b4321..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5988
zcmdT|Yjj*y75>g7nLBgm=KUy_M;{O*O_NSR<S}W%wkc3ZTWH#p^1hkeq|;7jrjwbH
z76dF0sk{WM&?-n3D2NJ(CMm(9poxNlZ$L$tYpHAbgFh^Phz8@g@12><WTuq<)0N4&
z`<}bcKKt?Qz0bX`{^y0m0M5i8b+jX@V-PVJ;yM!8E<;ks5K=nQ*rB5h*9S0+oieve
zh8u+CMh&0RaFdQIM18nfuD8hWX&H9wsKl+Z^fnQEyR5$>fY0Dg8TJJ5S=^=LZrr2e
zUfd_cZXZ6U<9@lh8xQDc#pgBb)p0VS8onU+U)1p+9@5c_eIjnZjxXWM8XlHsk7)Rc
zhDQ~=OCzyJ>O6(AmW4eE<tyWTwnBARBxbKo5BA#04OVZIGj(0@uodmGk`cMjOqQp%
zM1~ZWbcN%C!QP>iy)Bqd+KG5F73@t%qJ2SYU?6D^SSdTW#u{Fpz3EW!=bk9+Z7H$d
z9!@0fp`l1T796BX(V$EO`>d2TWT%3i?sZj;siTAlcil=m8ZGtIRd8iIma>Oa9Sgg*
zT05*@Iu(fqyCOp=s#q?YDby4{sn}sf)AUJeiB0?LesQSi?QjKqgqPwx;@6cWRvfFP
z5(`J!s1+LsuIt@uheci0tI*^=7_?Gbf-52eopv}fXhr4W4*sv^f1H7i_im+iQCi7M
zA{kE<O6*Q0Be4N4@`vNGKF1V=#UDj+I@9In;&L&ImoVM0Ft^0=yznS!+)DzXu%HBM
zVXPDa862#&2I*9v*kC79J4r_E{**+V5>xSnOF5GgRCm&)yhK+z%BiM8VDC(1!CgNq
z@Jn0Iqg~CjXNzMYY-bj+9VtatL}Gmc=MGs`*`2b&+tyeKC&8Q?J)q&M8os9CF%6G1
zdo?_v;h=^mH9W-_bw>tbR*G4tF!n!~M@x?w%>ui9PJ~$_6kcqZ<+_eM4`;AhLTDbE
zN<2N*94jHB5QCX|QJiTn%~oGv^M7T5-W^XT!}bLcDf_kgb$hXt9RrII)NsJS*YUK0
zZ{TSS-!$+oJY(QlJVUe^cn;qtWDPuz?-&@s79!WccQImM6k`Ss;ROTZcv0bu;;gWT
z!*;@{pX;4YvNArHNT=*o*=dD2Gu6+<!wTs&HmgnD#@J9gA^m5*Q+(%#<{S7P4$JV8
zf$xjLi}3>kFXI&%erVuFm|!9qn8c3_`~+i6ECa9NH4Q%%<9^0;Gw?dzPykcVz|Zju
z1HZ(t6zXR>#`0v++UeGn`NbBw$jRc}z_0Ne4Zk(;Cf*Wt-Zt<%yrJRuGV=$821o8J
zWC`OtEW<~Vo@=KCjaFgN(HG>}vcmFW?qkdxg%gWq%;cuRyyC|NnZ<@XJG=^2Gp=^M
zoX6ufK!uiK!KHh#LR&Fwk(s$(MpVu0zB*+mtyG*)s~WIVnNx_{g&JBiHNk1ixh5JQ
z-=(?!w4iurIdTj+2bzsSu?O_qsqmJrTqE0Fs;tkr^yp`s;_9=oM19MXs9-ocY{+&{
zF(Qj!`Xg&;{%I-CAL14^%1j~5cSosH)=*>@>kLnyJf3J7r!on$dlVjWd}MGAR16|H
zioIDn<m{|XjzyV>t;(Gn72>7bdjv71b}T}UOnk^el}BzXk+5TZ3hhUBQJ&W_)r~e3
z@MjKw#h{zv_od=44iy?pZN>AxL5Jo+eQhac<RRlDIUpyGDlaJ+r6Ql@FY!fkN!FA_
zfrGSc@=>g|#Tr`c92W_kD|pO|IXB+^NR*2el1H(l1ak7M%uASzmrL*$RILtCVoos}
zGbw#ezW1{tXP3F`J4hkoz4rFBC1s%?g4y76S0fdlIqLJBq{LQ7Jgo49KbWwR_6EKd
zn3;vM8c&DhWuPyf=38GT^XT%<f->FdJY`gzrn|0Rl<mw1rpv&%omxUW*V{9-L|#M7
ztUl&P?Tm|7^X*_jBHPrmI$v^To}$b7pa%>12HnnAb)XDvmk4rP!aKRLg`=W%6zVw=
z9-Pk6>r6J|4AO?nfRFP%AEZBlv&hB86>0J{a!K=|5qLu79Lqu#ZS7|H7|KIlm#7G7
zD&$ikzv-QTZhA-H4f#w>XiaFp3hAbA67x;}Bu?Pk5on=6s~IpW+7`8s!WYsHsyl?E
zzSZ>SPi~hLob=^SUZp|-6*5$)()1mIpW*X6m&b6S=??{De?4T#B@n7ItHxl2s?F+2
z%o|7L=5bVQ9z}Is%?N7Esu9$Upnen$FPYV1S>-`=nm)>)-XepSW0%p|HiAakc@lp5
ztBGXb5auX|8i#P4!ah7Cl*y?YvuXm3W>s68S<`+9$5&uKya%V>HfzkvF`N*pHESne
zn#Keg%v#fU9CPF{f)n?n(yX0CmuXDW?i#Z~xa-WiiRp(;8g)|L+!4&%C$jD_>&7rY
zRB!5&j7UA5J-y2$F@gnWH8eJO9);%4_Ko9YI_DJHuTNmE85l?NW>X)*sblz<8pUac
z(Bi?SgVe!!R5pf%Gt*|^Sz@Q$!Pa|NO8PWnr-j&BNCdTFE*9}~OdIdoiL4+owuD?~
z;C!NPHF0+tXRaac`f)aP;2hk5b8#0s__=2(KlLobUYv)=$^8^Q$;0+?9;a8}FjnFf
zbmC9A0Dr@U_&YAbyOj11T#SF?66Hac(y&IIf_17Dm#NdSUY&(*wG<oG<>*mSY*KM-
zR>QbLJ&Y^W6Szu^;c7LGYt_rRPEEp6uc24Hjz0A!Z1oQM)t?bjf5A5OE~4r^40<XN
z_bkA6$s^^(@wB6o7Mz0sH4M^*5I=DprXM<JM>Vy|%u%<@9Cz&?-!jy3&v~@+eAII{
zopvrq19gkg(q*Wn#(QY*GSuK+)kCXgkNZ_OcUwj;?^Ty#75z|2E1#z?F5<q-+e}Ui
zwVE2R5RkeUmoUGD>cSe93$JG`)^cq*49{^`N2&sio@!i5J}>5aytL{Pz631rlwm#h
z^`V)|yGi+RzWOURP-mSUIXk1(Mn?Zk%5Z(rLp@!MH<5B>Y|6>l#1wW{Ue2eR=|vua
zrU?#R!xb8?)NqxCt2JEX{7Cb6Eq_2@3e6g>Yan+wYCfEse9kh<k<v@K!29rjfO9p-
z-TUxPp;kk93O)^eQ&_0Mn!+g@{Zlx}xv8U&Y1AFtR$)p5rs?j$Q8fgn&_XrqVbg&g
zrh-RaAvv-X6O0vv7H~j?yshn0V>DBflx96`3Tcbn8sn3q=+v04LP?GBOD%3Pwf1(Y
zt}{jEEz{p7RYPaGProLKo>w)-O<k%6%c*P;2(genX?o3oR1KriaH@tg`+#s%j-z#R
z*(er;yry@i4y;E56;2ajJBa7&iT`0VVHaz}4aC@uMC47x$ju1j78<*oUw>~!61S22
zcI@QG-`%*Ae|z|q_b%MW@e$nP^s8OO`(>G|k#ELs)&$7!W{treu5@z6FAmG*04d2D
zX@&<JloQ0HBpb>cN;0I}p(HOVIQxi$Z7=0M=;V|J!M58kMOqJ~5womsz7Npkpo|dG
e90;{Ks5vo*oqwY4U+`3Af*aw=tz7BBw*LYquXw5e

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MinAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MinAggregate.class
deleted file mode 100644
index 8493b480b50ad30222d327754ea0427f459bf11b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5988
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/RegroupAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/RegroupAggregate.class
deleted file mode 100644
index 19c86018815123f5c65b89d79bb9c5c110b5c7a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1535
zcmd5+%Wl&^6g`tTN$Un$+B8t0k3fMunhru)k*HD$k4@A?gSvN;k(uJykuyd`;xqUJ
zJ^(fWvET#vD8wB*jhe&=W!FUV^_;o)%(3se{{83YF90<hnn+{E#4h$s6!5@A3J){b
z&)^Y5x*=Vuju?`~(iwx%^m>9}wIy9~67)O5e`|FdLe^Ve*K*D*U+VQ3G}JpeWT>^e
zUY~b{O1$TRF9x2kcqfofk6X6w3)@nHp9<Ueg2C}6P-j@4>@s{V#&C#>fiH$b>AAd5
zvK+1f-m{c76pFu$;;TtgJ%%ExYYNAS+l@pvJy(efRWG&9tq&FtlyrDY4i!l>^ob13
z80JOA5m}dHFzm#TU6IL<=|+MW3NfkEnkn1soNKiVYxDZ^(_Q;Gxa{1<Om3rmq&w1<
zwreTsA;XVr*pbFR-^UB-_Ov1D`Z3J57x-QAT598N&N}Z<cR7m;mNIyp#S;`WC}mMb
zC5r=88J;cfW`?K#FM2aI01U_TB@3F0;ifIrco0skK0R)(IJU84xi)VrU%EEElHK{U
zri?VjqzM`Ji;+jJ62*+jO3#}NHN%%{;F=k0&(Ae|1XJ`$)V~C1g0Mu_Wm<8HjAE+%
z9qe1UZPGOzg4<Z3`)rgz@dmBvwPBS=bnz!5O;OBMD<dRENIo~pm4oV*F@o`x@FX;s
zN!h?2#X`tei)zMvRE;&<3eU)49UEbGj?m4p-b5a^Vc-sNXeB27^VlNfE+GlrBkX>7
GxBVC7gv#3h

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/ReselectAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/ReselectAggregate.class
deleted file mode 100644
index 99091c3e8e4dc96d45657741600c002557b7f661..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1539
zcmd5+%Wl&^6g|^8aq9+J+7KwvN1#9+O-G2bAyK6gU=?-Ipza-KWTrTFWKU3$_zXUQ
z4}eWTEcgIE3US9yqoy%JWz|IT^_;o)%(3se{`LFEPXK$^wUEPxg-vW(DB-?^EFPHH
zHt~=l*Ob0g`wW?K<(R=}1wFyA)Rw+D9QL~+d}DV#LRQ*=V|&MTDD`>_8tSc#7@oDA
zpwGLJ67Tph6oVjCygQU$kK3*r3fESGABjkK!chljNP}Tvvd!?RoI)Z_2cd`}8Th<U
zx;(A{-m{e*3B_L~@zo@$kwTHwwS?!T?ItQ)fv?1=YE;@M_IsNTmGpR9Mv5dF`b36S
z3iD;f5t&0W7&cPK&dFpjokS2rDJ6AUGi3+e6RnnEc~*aMx@{i@XRTYkklU>8>yC7!
z>)VQ&$ngCNcBJ{&_whpdJ#C1FehjM<3`0k}mfE?+8SCxpHs@ht-o&Fk9;0lcl1CM_
zJa$lLc={iHW_a@Ns?PKbFdWR*T+&wz*Il8;vv6ql>4^*Fv6DU9cX>yJ(s${tY|frF
z<)tYmO~|laPHb|XC}m0(d%<L`89rYD<6Lm}>}b=6FiW3B{hI>~5$5T-Kr2p>QOs7q
zfqjj)ExP7na2<<upHC7fUZWMgHY^c|F8)ZQS&D^vZG^cIGS7`_ZKu9wj9`2rJOj;T
zQ8uteu@v*|B{gF{s>U*I#Ag(+g4H;?K<Lf5-a-+#VBj`!XeAc?i&!J%4k2^6OW3{m
GZv79`^~@^(

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SelectAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SelectAggregate.class
deleted file mode 100644
index b3ff51be16847f9b1842b97c326ccdd33a1d84df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4127
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SumAggregate.class b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SumAggregate.class
deleted file mode 100644
index 1891320b3453684a12e0a10ec45265008fc9ae03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5678
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/AbstractAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/AbstractAssertor.class
deleted file mode 100644
index 199daafde64fc4d4def62260b287b0511a83de08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 808
zcmb7CO>fgc6r8o47!vn`l$4S-X$qxE>Iw_NtyQH838_*FhoausuGMbp#*sge;FrLS
zpAb%{91xt4_)&;i#~_g+A!PYI@9f)o^TzxA$EVK#p5Q?ZRkUoZ)?r{xhqjH5jddGc
zf$E+bscc`s?DbCstf%p5D6lY4qwslt>4(Wn=|@BwgE)}UiA<DUm!OrMt5o3eAc!wL
zKh44mFHgd8oMfJ#tLW5|X&NS3oOlP^O=OTAl)$b)y(oF%55pi6*y;_2@|E-=IXd&E
z;BNmqM1_$`S-&{l%QF>u10p0eV}GcHUgHs1{!{(y@vjM%W@z@d_sKMOoXOzgNRG=n
zYsYb(1mQEKooLR^@=!N)a0535=8NXPRXNzeJqP!(De&mOP2!ZZvk3J6O;dVIuTu4f
ziur2~8P7uc*6bbr#a3$r72Xm7n^(qQ<}i#kt~_SJT-p8z@uAqRGwNbs1rDP#Ex;V+
zxw5c;MI!p}TauZ~Tkbbh+==@Y#yhm!FEEaFu3%E(d(?N#D_905?xZ-a**k@h7P(g0
zsZHh%8d%2~y4a+hx@(ur4L-N{8oEc>Uw<v(HWf69YHic1WmerGV!^1kiLUV5z}=tm
Cg}8YD

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/Assertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/Assertor.class
deleted file mode 100644
index b27a5ebc192374219d8cb27c7871744efcad5229..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 187
zcmX^0Z`VEs1_l!bPId-%b_Nbc2A0&a#2iKjbq$}a#Ii*FoW#6zegCAa)Z`LtOcBi}
zMh33n{L-T2RJY8WR7M6~$KvADqLTa~J&<lj2F>LBT>YftlGJSd(xTLY{Gt;5q|(fs
r6#Yb~I(?W1Mg{?N3)vVM7#Wy=&SPL;WMO1rW?%ua7+8TM69XFnl8!RV

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsAssertor.class
deleted file mode 100644
index ef5207b4e104dde4c6ecb2bf81ee016e13d17a4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1367
zcmb7EOHUI~6#i~I?bu<EH&~SSqx8j4<dL+*h=|efFowzk-P{>Q7?^hIbV?*)Wn$d;
z2h^3TZrHd%<HE!ZB>oY9g9{&LrUm2`Vlp}R-t+kGIo~;RzyJR76~GuKC4|r|qDMk6
z`XuyYK*XSgD~L!KLR3UdM4TZwW#kR#7K48%y38QVSgSfi-Mo?47fU%+x3gR|Nz*uQ
zY1~}qw&9+uO2Jt-iVUfF&B`fi(a|@RlC2jk+fme#VXi8?Sk!IDvX$BAC2kg{tH%so
zq;GMPAu=?-!MC_#^8A|eP~FfqCv#R4U19L4DTdaHEyta8<&Lp-SJ#XjHwn(CjuNJ+
zKXcqv&p<K+Y-4SmjI~P+*ESb;!7D*T!XqL{+%QN>R>{`%dxl$Z)5(;FT}&AgY8dK|
z@hcpO7?z=6gy3YPK&dnxyUf1O^nznpc^Nk`CL$?g91{%6f09N#Um7t@O|ZG<91_jY
z>?LxFuoERzSZ8QEi~iU#OzN-fSjS{D#Lnqi^rFUu2(`d%J!>(9tAVGo$wVJ8)OZ7P
zn9JbBSNuCEG`_kwSPU)aMXaEQ20lbT1mFWT7&RniIw`a=S_839U>`kmEy<v#Y{ymF
z%M}OIp`K0*4QM1u!R!Zt1xZ(qA0U)CKtR}y??ZHV{@wUD_}-#F;Vm8U&+soMNTh{i
zSlEN`4x&(oaOjux99UYY_>>Vy2g1TW8c%tbk*XlZT*pNUa0Al>bwNNZv4`M7oTRu*
z>CWL1vIt-YFY$_2KiqOvTqD^*9CZ>m-Be%?n$bruMn57LKoWzPqTLL=821q+lsMre
zuuPUG7{&%h;LyNtW0a7`2zwl_F@ZOj#CxRi0U3|Vr__T8TF^x3eu}N5eKQ2Y?5*nN
z&{frKAL(|EbVPNv4eqWLZC-22lzki37N#1qXpltq%YEe9>ATH-0)NOF5OH0^4exUe
VU?MtLgJ<_$=0LY}61ERre*xvSFyjCK

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsGreatThenAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsGreatThenAssertor.class
deleted file mode 100644
index 3432c0c9316d68a441ae884a5338f6edd80fef26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1146
zcmbVLTTc@~6#k~&c3@dV?xGbC1bTzDipGF3)@w`(K7c&<HeJScVcV^<Q~rxSoA|<u
zFGzgw5flHD#<Le=Q$kGK-OQXhbG~!FbJ-uizJ3F+j(a8skTY=|vnJ*+Z{h|POmHlk
zxQQi>WsVhw>;t#$>W2*Jd|{8lc;fF%hLM`vmfPJ{U8-GC_ee8V^Bv*s3FU_8L}}=z
z8!&9t9KU7P11%5ju96*JX}jKay?t8*fmGU8_Oo|g;RP?06neKQ+tozBNfG6d@EBI|
zwF7Y^Y)`Zs_N)4VboAzVP2mjzJo#3KgwEMBWR%-z(j^aV$P2?%Y}OLGX+L%wPo?9w
zghz1)BGbrbct;E8a7%Qev^eq%=8oT0j(qNhx#uomzZNpEFbI>QV4;W-N7=$E);Men
zw@|Tg8+XW|MGd*jaQ}bn#8CMsv`P(7!qI<f%P<jDs4sPf%l(C;VrYLyE4SSsP`=Pp
z*;q^ETJ%-J79HU<rA<^?emjVJ6<fU4u1Ax=-QY2G@Q`7$x1WiZuzS<z^GL9k_Ww4B
zq1fvn8Hj{gUq-}kC>poeiedR;XzzG23=)}+P;%F2m`OnW&I>Q;$KmuZg-;3uf=TNT
zoow0}?U~{iu+P!8MQb)v<}ggM6&v6ZM(9Mf$0)5K_>7!oXs?#ez{}r}NgtO^kUB;B
z1BT17^ghy_!q_g7CbLy0al=@hF;0+8eFQf?!AKvIlQaba79y5&w9XU91<YcRq$PTn
zQNju;$Va5s<G=|iqJS}sM?|ZbASp$N940YEek(+Inj`~PD8eYR18kiA#4N`QeUHKd
KT&0T?uKflnS{$PQ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsLessThenAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsLessThenAssertor.class
deleted file mode 100644
index e3737b5482c71a6d82e8241d87dab50c36cf56c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1143
zcmbVLOHUL*5dM01b{mF4<Sl~8LttMpuA)XU#>Gcsvfu&a;H`IPcN=DR)|p=Ziypmr
z;o=2}2alNepETAyjGIMb;$%`?U0si_zUuz|^UGHN>$q#84>KmNVb;WT%$b<Sf(edA
z6F0ELvCOf;kbS6HN<U&q=kj|D#uIN}G7ME!OKx|XHR<n)noE|Es^<uIPxva_Cq_dz
zRKRe*>Ud4N7HD~BcYN9Qd~Me{%H6j`5J+EpzWwZNN4P;%2ElGawknBvg9^$c;WDh`
zst4jo*sf^R?U%I!>FAB~mi%i9aOE2v;yLHfknvT$L5Do_p)3p&v0GE<hP|okPo<-p
z!lk->k!$2LxTA%0xFy<AR~$J8bI0rWj(o1d)~Ejtek}xGp&uqk-a-LIj*^8{tZ~>D
zZlY}A7H(5Mi^g$>;og6;#8CccWQExGg`<Bn%P<!4)6+P^<zCu|3hnJ^U$yEKl*@PV
z8e561MbEF>qAi?;v<XVnYX$M7Vvko^xpWP<3N~qehYaK0(@e62vzt8MM-ppk@6UJ`
z3f&2k>yRMp>4?w`M0YLrVpzU7wEJ=~^b?r2@a3+@FqH)LCeOd1SHtNcg<lF31e4?d
z?QB{Zt(n4SuusvkMKT*1XD~>*6+7S(hG<9JW0+(Zd`8JKv{s5|;H7WKq>qayNSz}6
z9)qP=dly+xVQd%3lG!Se`oLJ7GER^+K7bn^VWf{KNty})3lYjWlJkUd5wrBl=dg?=
zte}V-%E(8c*5kqnD1v|yj7C5!7$Yr35i=Oa1m!Ig<Vn&DT%iiX$o8>O_5-sVQ}jO$
L3AjoJDNO$YoueC+

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/GreatThenAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/GreatThenAssertor.class
deleted file mode 100644
index 68f04e3462f5b3eb25328becc41512bb1c910d0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1128
zcmb7DOHWfl6#k~Y?ZD+C@)kwpA<!3Gi|9g(v1&9X1s5O-chk$*4&3%O(<%Q&SMJ=f
zaf8H#OHBMv8qa+gn>NOHb93g*ne+J0cV@o-{PGpRHtyRP!n}=}Sg>&mi#C?9Y=dLP
z#%-)}tZ}R}WFM-QGLIP2x%?r6^)xt=3}aQ*l6&1|P3i+t^T{$%4Lso=3a!F@Vzf*{
zbr`m*UeI)F9V1WNu9odU8@JX~{*fy>9jQ&A-4|L4bI_2jN@CfeTJlu*4C}e-u{ag3
zFIsi?Rqa@MW@pfne?tMjd}~4|1O5ydt?CUr<e?8`VVH^Cn!+^PC#wETda5aWsyh_9
zMn0qaMtCQ?q8&BFkz=s;gRb`Ea}{<yGk|+DtnFYJHb>q;0Y#3IgAHtQxDM{1>|hIb
zDV0M*xW};d|J*Q?{~1&vy0!4kZ$25OB3Am^Ww_c;77<{AeWO*YPC>bR51X--C|U`0
z-4$)&HKa>Wnn9}*&nNbHZIn-Q=c@CBrgp+G-8;i1OE|IF!9J2$#{_?d!cgc<kX(WU
zSzkwlZX~)~u@}SI-$Q$^6vHrqX$vh60*1LHs6ToBB|Q^PFDLv`pdi>JM`-8L%4p3L
zK7)OVjvbQO$T*Kt(w*1=S1?99;vVB9!{AFwmZ7y$yaX?OLneJzJV)vR>Gv2d#oD{b
zdI4*%K$gsIiPQ(y#+-GItn~rh`Uoq1MoH3C2w09#E|Od#j4N26XT69utYRHS<WNRF
z0<|3%PCyX^OkgqsTEP@)DT<iKG-fDonIO-SX5kuD7)N%9O|l<Y;FzQTaY(>*I!NKh
EFM;G0RsaA1

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/InAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/InAssertor.class
deleted file mode 100644
index 879c50b32557681629f3390e265da5691ac80ca9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1511
zcmb7EO-~b16g{t<>8tH13RWqIieI!$VH6Y<5x+l3DjG2^)XlVxFgUh#IyGwC>DC|6
ztqa|d7&Z`Gh;B6TXBdBkF;P4-ZJ|XIW752L-+Awzd+)h-`sLTV_W%xKB8H6^lrZ85
z;b0txFyt@8K73fBN8*TYjzn=ZhA56n9G4iCI3W-jvkSI2E)Y(oZwe^qigzu6wya&S
zCMyqemV3j@IYipC#k}d<G+o<2*FnXbvC9Gj*?jSVkt=)FeWT)9rK0N@xr*)FHOz9^
za=oH!Occ)4O~zELN2Vjtm&(qXk4(cc3)9Bc+^m)NPW*|aZ!x!GZq`rXkLToa?6N1Y
zxpr6aY{$qF@uSd*$#vZRn_IZ-xvh*-o@*DT>8F~mYd%@$xO%HN);-2kU3+?l`?gkD
zo|GEWbgWBgtbd%`8>c)ofB%YE3It@sB*q%e=oN@f6)SGux@h}~x2<V5=ohY`4Vwiv
z1tP2#s^KKY$)e#DPHQ-Wvl`CfJQZ0JtCqZm3%DpCG8!)7vVi^{O>3d6wMroUPl86z
zsq|Xb6Q1RooC$%by=rbtrJDq6JfUK8#w<@-k0~_=l%t>&g2UFv`{v={G+PfVro*l$
z{xVy>d(<n|)DUQ;SZ%OcE;%;CwM=LIHr+f+bqu}G_-(N<{1ijn*(I)9crv&P?rQ%c
z#C&kw&NUK%o#>#g)gE9g5<GF9u$?QN#R|!y#Fq6>keSa=!*iLB2vsqh`GC;mz!Jg&
zqe@a)f+A2wmv5<rR6VIKAX0^@%)MFp8o0?Sj?zu?H#y)ty&qA-BauWTp}s<QQb|OH
zMx~yV4Zjx=@n+>);2N#scxC|`+G7id|Ch5)x5ykzP~exHLnqfAEUE`F>|&9-S#B@?
zr}khJdohOnoZ$l;;XYhO3fGW^jefY$;n9AIK|G_T&v6hh>Gc{zc#C1o(_X{~mT)YP
z^bR%<i8ERfDkJFVLN~(Xs$r7M8RpSL>@~5S%tewh!+d&)QSy2_d}|L`{2ned!z5d>
zkG9{m8t;C-KS1O<HbuoxbV&3`q<VfJ^uzC95>g^9(I5P1OF^#A?@)v5?v`s^LT|ce
Kj0~AW82AlF;Z(N(

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LessThenAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LessThenAssertor.class
deleted file mode 100644
index 3b218b9edd85489227447961ef3a90247f28880e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1125
zcmb7D%}*0S6#q@T?UZE^`4+9nhm?N7T0swDj74K&Qt$wB@HSn>c3|6WcBlL=dh+Il
zix(swJYwSir19;Cu_-ap&F0OUH}B*3esAXc&o5sAY~i7a9P%b^W5L87ESgxtvI&kA
z6L+!7QQ%l($UatGrJpdQi={&b<C%9P8O9r`EBE@Hrt}X)(<RGf!*hgtD0~&}6QiNq
zDqz@bI9|tY23nrjeP8xGU)#;Ta*u2g1k%@@Z#QHR9JFP(o*1^NlspwK!&<R%EKY^(
zif+q()jXDt-o9!ny`cbCzSSX;EB*`_U$xqF$U`5>!Y~`Vb%bu)JF4|uI;taFs+)^k
zBcHK-Eu52G(Tn=wC^DG)Uf*}*3l%m!GYoqpENx)~CP&Fa85NGIg>`Ij*cR@gX5l_I
zDU(Gbc)(EmZ)W}_rcPY@!qLCkWSEXP8ETf{`Y=`0zV`ODuevP?DwYPgjIBh_is!d%
z(GyNv+62Gjb%S_1vBztzTpBu8!4A#rgjgD!V3H-A*WA_KlUPf8e@4Pk9!!v2fdtu5
zM}%%Px>>OoL*ehCgBOZnguwKKFAqG1`6OsKdFds+5l+u0{8FGGm?TGOXVc1P&6Gcb
zeTt4PlG(_Z#~A5W?0{<+ryX&R36f#(B_+$yTCZG!SHB^XKC7G~b%FGIj8$XpU1Yt0
zu~#NbX17Y}BV&EuI7c@10o?cqBYj3m(o_goj!-U=Tq2AsSfDq(hyqrzh6;+Pp%j7I
ziVG*82m&TC6#=bdnzR%}<S~O;%3CAIbEFx#K@}#D&9N!=0}CAU^gj&=xJd^o-1-Fv
C3KTs6

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LikeAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LikeAssertor.class
deleted file mode 100644
index de88c389b4b4995e086350d21e68f0a06528ebd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 777
zcmb7CO>fgc5Pj>9It?yuLmNIyOA7snNntPCiVz413CYkyP!HVJ&Nkh~waaE*@dx-3
z+>yBC!X-!?ID*8FLd-U<6tzf*%Z%Ub%$qmk`SttTcL0yDRmTjjTXVyjn|0j6N`Tt|
zRs*at%sf`PGEW%XcC^pnJuiBaVLn#5d|e(VQoj*NMv+Ebq$1lFT3K8LJ#(mr3_MPY
zW1b9+9Pm=hlR_Jwlq&0SF&s*53e96Rkk2ZxOKs$-$QZWU@sT(cJQI1J?<GevHM^H1
z(OW9W<bkm&F6A@$TJ;a<ajt7bI(Q{cDs}a4QR-B_P*(rqw1S70B}5IgA?~0RVjXt_
z+zYXRO@;^mH4VeUMNJIRKPk?aL4QELD@8_YT>i^8?CdpDbd6SdpJAyTO>JNjrFBjz
zIL{1J-jnb54ldAECDBV7*{6G82<S{4^0W-HbwZpxBk$k;3ijpf`3hN^3^Wmv4JQeh
z!&O3bFIXUJi$4&VOFruSK(O-@zB}sdjNyEQ?~OWRxCGoWJm(Vv?=w7iM9D5}gC;2g
woo5XzM74?r*06-uS;N+Zv}#E7SfqC=D8e=Rawrp2>DSn7<EhoZOxQv54^Z^6bpQYW

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotEqualsAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotEqualsAssertor.class
deleted file mode 100644
index da61ae4f670229b1993fa90b70354c476fe3f9a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 756
zcmb7CxlY4C5PcilF_>^9+~KBx90&_U2SOkORe%CSLAN#w7@Rn)*L(xtzz@)*p#h14
zl1O|MV(f&5L_#!k&%Bwp`}y_u4qyZG77UD9&@pCV91|ucP2?HUTVBmm+YDNvc*dab
z1s8&0u;SIkQB-w=Jmrp0kz6Hkxqrr`7yIp?uCBe1VWZ*(Roe-bxV0lG>VZ_Y6M6oH
z&BIVg6-fIiQ2Tcg_ru+GWRtMOJ@*-w3zZvw&uyRAuIyvyM!0ITGg3UK247sNc$JQN
z219yR*Ocr(QQW;f<n{K7)=3aaR~&fp5n~-|tj41<NW;uv3ezTLGML32!}|YEVp#jL
zX_r`%+*Lm`F!Uu%weDtE>Ow}b+r2}-IiRN$3BwGd-G-cFfgazW&j6%A)i6o+kY|%-
zq>a)m*mIKZC7Diw<FLriv<lEi7Rc_$0Li%dfre?M3*{zySDG-iM)?C~Z0U{C$_rA5
zWs=$>O#KPE)}UGq@%%g?fJpDbG-1plhdGSUl6fp9nDec<ZA?PIAcm4X3doX`q7G2E
PVVNwu6Q3|lehMSs2GFsW

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotInAssertor.class b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotInAssertor.class
deleted file mode 100644
index 1e794a1f5109f93c299d8f69620d4165b833fcb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1531
zcmb7EO-~b16g{t<=_~E12vn(v3W~I}FbIl@h~FP1wVI$V)XlVxFgSK_IyGwC>DC{B
zOBb>sF>WxpAi9ynpJDtFhD7nqv_+~WhNOA#zVqHW@4j>I^vll=%K#2zB8Dv(kkI1@
zVK9zE81jc<A3iM6DRIOPN1`|yLlnm(j!TS6oDhhNStZLG7YL`)HwBb)&RtVrTh1z(
z`O1TW>0UPqHj$Q`Q#9<GhHLrj8mM^FR#{*$S9Bieg|cVf*DJ0$>$sj?s95%0-6)q$
z*K=Gw?|2iXGqn}3Rm?|*Ezq0F%@~gi-8M>7`qjdWS@cf)jihfeJ*P0^XYto@YS~uV
z6KJmPRXoeqb42`GNMe4ixBo>8mp!*panf_G(iC~B;kw3?KZxtQif!KGeX46sO>^GS
z=**MZx;w3ZBsA7HPVFs|o>9Di#h48|WX&YT>h<Unh)p^bw`g9p0@E988}Q$*VH=tS
zwgx_|zg5FYj8jO%DV)}D24^*#!+DzW+plW=8ZO|XfXHgNgv$a0n=4&|Vzpob>Hlif
zD^I_FCqChsuEFLIh+6C6j#PSsZS^DcO->u-y!n`hvs2j+N-0>h)z5EiA-1*ouwvM(
zec~S-=F_8|Q#C}OQDVK!YI)YScwIw})^^hyJF14E3mQK%)`s6?h%*btaXVK!XTe$R
zdk^t0*lyt%3BY!=GS;dG(1rw8>?-W!NOCAfu_&>X%xB2#3e@mI_7g&L7|wn~DBr(?
zu)wI2RF<F!%wd-wsf5%_Qe8yk6;x$me(h^OlXEyqn&dCv?~|5C)bL0o5lN`8(UDXV
zk)ctUNy<9!MMTW6eG913IULU}qNydei1?<+8Pb@BROX?C7x)wf{__iH=eV1X>qHED
z`PhAYb{GG+x-p9V7()-+`5?Qw7nhO3HKbvo4=ytB7(c}Tp3&Rq7{p7m-e3rCF^qSN
z-(v(zI2KrY2Tercye$cpH)OC29SBpaib*PGnMWtFH^lZZ7fHn|^XVc+>uY84qi(AB
zwOnC_NtWgSW50M+-5#DlNaO~Zqv8izC3+=NovR3~LadP>CDIao!H=;N)N20@HQ4TG
U*v?2~Hf+aF`%RRkcnJN!07Y+ECIA2c

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/CellBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/CellBuilder.class
deleted file mode 100644
index 08007744e96165eb41d923452b64345f79b1b0a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 436
zcmb`EJr2S!4256#D}{w)z(N+bA_hQAl^8fd+D0glHmJCWdvF^D4#1%hZefCoiOp90
zo}a(mAJ-dz3Hly<4?O`tDvV7Q+FAiO40r0JWI@Kt&>SfUW0%V4NO~`eTpwIcGIfcz
zvJ}+4R&H|PGSX)XM!)sEePgznBK8)zd~ToCs9*kblO;<<Dwx$}_-n%6#ua(2SH^P0
zL3#GP1g7(GiArGjP3V;|=Ftk%d!E%5T&uFJTt_<{Q%69c!T$k>mOv9N?%Uio(BaCf
Gs_qjCe2bd^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/DuplicateType.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/DuplicateType.class
deleted file mode 100644
index 4e6a1a8eda7611badb277ec2c546c69dbfde9ade..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1174
zcmb7DZBNrs6n^g3tz9W>lmUYHhM?PcspwFXk!6aQkSy|{NV52;E7w`*x}|GL{8u^>
zF&Yh@{ZYnqFAI$52X~v?lXK5=&w0*sPk;UX_7gxE&ofX^(y@Y76|*YVbmXuuHcP{#
zPC-i`9%+~oc0)s6*vA^Cg?*x;%#e8%cYV)wBF?Z{cROvX*^BtG6^Fdr2_vf+d;X#2
za^JTuk^3LJyuvWH8@M6wal7jT45^pC6C5)rHuv8%s7nVg>Th>!hP8L2rA?nWe$0Ce
zR-riJRb{(#NPT4MUcleP?IsWRou*GGs?51ZylRE|k#pi$M7CwwQRoG&N^vxTX1(J&
z{(%#EBKe?#5;$!tWd5C<A-&}VUQ}h6`A6~H;sJ>keekH`jP11oCnD_`k_8dawp@R3
zxjK}3Cy3iyqp+^hd+By34qg7*6N;GEUUOY&Vqiv$(X4?@JY^{T|1cO>z%v8)uxMZs
zrhzH3<;6A)lVRdYa>1O2#q~P@vB(#SLtX7PkGLBV)6HR>wtc79s|>*|U+sF<N^OIt
zI!C`osx~KR0Az`Yv_wW);sfO7MXQ8VkiiYifnlD!MY3Y)eXuV`oFn;(JcgUJr)6x0
z@C&##z?YGbr@E<>z9MxFMc@<H@VDv2xIp0!?#ejnL?}^l14;S-wY0KuhV*9{9xiuv
zUB!Jt9ZM3k3=I#kJRs7gM#S3x4y9qL$unrD$Vf+5q%$TRBPE@2=}e@hlU0AvrDUIm
puc7oYW;arOjN6TLA6fepOmMo8Kqt~5*~%ndV!-1e3Uro0@ek#-2-W}q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/ExpandBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/ExpandBuilder.class
deleted file mode 100644
index b159f7043c4d155e99b85812f199e746d58e56cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcma)&y-ve06ot=ilLkVer3*7#sSsY+Kn$(u6qNzg-F7T+apTH$5U<6A#J~gaP>7qT
z3kyP)j{KeL`{Vod{qYIl5~Cbl9Ay|}7-l#o^sa4X;|-xZK3fu!nJ*1tP}s^W>a{ZA
zK`O`2sPJ04r3|*=oteZZyCs|#+OLJ$M)NG{U^YHPp=#?&p^bCm_H`qxa@rUsToLkn
zUk7dGwypasda;r(vX2x!!sP!&3Bx8)I9WZ4JGC-862^b#&v>%kNXaQWycPaDuZZ|?
ld)ACev<#$^chDOf9qh3-Vc-P&to`<$BF6y}F*mOce*jxtTS@=`

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/NoneExpandBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/NoneExpandBuilder.class
deleted file mode 100644
index 4d302b9f0ce965f3120d978945a3f5f0412a4afd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2737
zcma)8TXPd-7=FHV(@oPYhf<0W=mCqQZAuUkA*}^ks1`#(T3bL6H_5haNp|CAgA`Q6
z!!Pj48AlywoZjk9nCgtfm7U?rE3f<q{sLwg^!awvLz<;{^X>b+-}9ai$)l&g{tn;>
zzKUWuPBh~rPRV0L#b^`?PDgPDW0HDPQg2CWTvBHx>g{HvaZVl+D$Yl-1t;WjA%b`0
z_o6%|C3-4~cQGBs3@%Bz%aV6R9`C8Rs^Xf8_XQe<Ov`kK1sdYL(*nw<oihZsrcKM3
zC>Jt@Go@$p<g}*kte&6N9aG+`OvSxnmIMx^vvwhwDY?eYWZ5x_w&Nx<Wiy{kW{rG4
zIbmDIncGF(%8f{-;S35idGDiq7O>;#dHt52EW2htnKn!AV1T{?{mLh$K+vmiZPd10
z<F-54yScnTBx72+)4Hn*><hs9+D57vdaL9-Y=fPdmznUq&Fj`&@_c6A$ht&q+ZY0k
zNFf;x<z*fOIs$C1i%USw`Vk0p2S96s6lf<pXS$|sU2yE8;kXOqu2En;+G}gIP+X~3
z&jv4t>O&c3Fh}ZO&#Lcgj-=Sw{}9U=v$EglbCT7n_kK_+YMFHP?9Fp}(Q7lWQ?IM|
zfYZUonKb7t-DR5ze7&)8hMt+Vb&dvL))gV(wKnh1ZLa8~U3Rj@m?_7my{`EW%I?vy
z7ac0DYtWI=kVQ_Q>v>7mU|?3ooQ4}PHOymH!%a!$QP5z))=<QUOq2!(B@HfS1$M19
z>!j<L*4&6cgBr@XB_I-#_(;QTENHlcf{MEuKE@|1KGkqfD*g=jHGGZ^4PW3(frHO-
zGkDfH8fzZ-<025>REHe$s+R&=Jn7Zd!0}sSu-zTqwH*#v$-KjCbBB%doHICcJLBWM
z_3h2E<m<GaFB9Gt4@B&#_in90IHV=R^>@e4YX7ZY1#*c>6KOqTaO7JE9<!Z-UKMHP
zlN9#%LhFhHtMRe>n<=u=t^zwY_V}P@!CVc!y++4MN~lM@p_eAO4!yKoVU8^C(x?}U
zhQ)px2=abi#%kJy`fBk0BRB0@aW~>4uI;lnCb}vs5Mwd|w*YroXMGWB=8&6!(igoS
z8*XtXp<ckRnvY=s9h)PVYp-s17DnwtvFsYM59vvRo@2HGYt5`ia<*Szf$ce4mUhO`
zi&YH*J@Ej)Y64+B(Tx}RM?hc?{}qJz<#OQJ$y<_N!Ed<l0mLufa~ID>kGYqEfaU|R
z4=?dXlh{us6b>EbH$s-$zl0DQ;0Fx!H!PtcgojX4N+PCI5U!xnBh(5a9??`mbP+#^
zlp<1LN;V6m8e@%1&;-80eMz+lPlFm$meCobq`Hh2`3<L(MND}dNu8~}_56k{mmgrO
zG`OvGdj+i?n3oE6NMLs$fC_zpL^q|vi~rvBJfy>PJDRAVEv3YiKhP0Vya>NT+du_7
zD`-zFVOIz<i_nOAAwg~|@iWt-po`}`^9?31%A~b3ZJkV7oN0RnFY{m70ldyz3ca|5
zK3qdT_ih3<4q}0b`#6jriF!!XGLGR9j^j_F|H2Ud#vAwt!+3&|EZQj%#;8}Kt7xK~
z-PC@79$ccXI4PAHzNeKw@>2Mgul)$ia#c$ysRVgcMQVWdLmrjHAvDldKfURv>|w^z
zMUJoI)vAsJeH2yHYeXF-YCob!o}z_@RUA`s{0R~&Qcdx_kJ0oP%}=nO{0IgK4KW<S
Ia3nSSA3UzyhyVZp

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicateUnit.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicateUnit.class
deleted file mode 100644
index 0e1d0e803fb7f288a8cb7ccad591d8aa389d4e88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4811
zcmb_f+j~@3760wY%$&*O1VTtC(?Ym3g=CWHv`Sk@LO_F*lq5hxiD0WvCWqv}WX^Oh
z1W>f~ey#UQ)mHI_muibP6H^q?D*Zkm{Ri~XH{bhF@wfJw!%QZVr26$`pSAa1d)<C(
zt-a6R{`2Z}0K4#d7~PntM;DSZOv+%%aN59B7(q<S#5QmyjCxEo;4D(IJQGG5P6IM{
zssUN#WXKyRgs~3iWSEuVe3*wX2z62TKP1$L!)V7Pk?|3sJ{rc;ct!+$Or{?X;}du$
zj8EcI!t!ZR_?ZTL7Ec-YoG^S|R=yy^7iIdaaD7RHf7!rS4184~G?TE?16C@f&^DBG
zX5tgMymdBS$XXdEn~%>plU6D&`@IV5Jl;`fcBC*fVPzH6pn{Qf(s}EAUSV4e5fcSF
zH5ngpStzA((wR*kC}dK0GLg3w9$fZJl4|3^9Y0Wcgfdz^84hJQ+3{>5lM!q7{137g
z9i_}*pPjbz{R)>lmX+dpu`I(<lNYP0aj+u9gM*zX6#N4Wy29EaJ8ijPKAxCJaiw{P
z!cr#^SzG3%MSp(U&b>9y1;#~@e4Gx`b0h1_j@cKfp?<QA%l2Afs5Dk=HPY6sh^4v7
zY2xhR>JW^FYdGsBLpe&-COKK!(=7XyhKjUCCu>jH>Elku)#n!`g@B!&w9YGpONI<5
zG7`EoiF1i~A#bPRTo7=%&8$_}T*D~WDQ=T-!{QiU$arxcUM#b3Svg`}@5;OVRMa?@
zPbAOMI*p@&uNnBdfp4%PS%sODC8bf<Au(>rWSyjy%MD0?vzD$_BL4I$_^fQgVsC2M
zTMbnuAXe`wu`KMRivVQ003}i`K5H@w+L|A6(%Nozic<<3b&?1}r8Fl?cbY0J8nSbe
zmxrpBYQ?<T%B8Y<`+E(1les-+Po)!ib~c6UZ)5CgSyfRcE5p$L|3-eyDP)t@L0kI5
z-PKN8QrP!P4VZWYV<sNNJ4`%;hfTzAzlk^=P>3(>_SM0x1j!On-!kz|?BY#OuCGIh
z+%&V832frqc+SLk@LdDnGx0oLVBAf7A3tDfo4AZ0n)nfZtgvf!&D9<`Srb3OPfc9G
z&rJMWL><TDCVqimns^Z}nAnG3nfNtcGVvH*HgOfdVKtfft?a#mITJ<98~B}p1rx90
znu*^_VE%yX2L7n9X{kwN3{Bh+t$z|Jf5vMj{vzi`<@{f9Q{j=NhpQu5?T<!?Nw4FW
zN~EXaM<&i#NnW9i<<RP0)?A(s=B=z;cMA6`)p)0gDXb|UkxEh+SS8&DYb2@bfp_6a
zwbx||l(oCVt;!0cdzY?sE?r`0%UStBw_W=?^i}s3BIo7cqI*<f{gjm-E<Ihm#>kta
zqoi23{!$wW*>~c$VbQ)9PqrFkI*}XEPZ;)GHY$HwPg*?wN^j-);a!uSYQb0G*;;X~
zP6f{){rss_{^i75W%pEP4csbD(=A5HHEk<BSuSaWgE0u(xpKE|AXep>zeD%?=90Mb
zEzid7yxmT(YG{yV=*xV|3QoD#`QBQ_-6@sc!R2+i=YtG`R<(6yK~f)~Qgj%Ty2Rup
z)1*eJNOIK+qmwGkq!qTW;DXCTWZITRt|Vp4QietK%eF#`M)jNC&4+Ev`=irA913JD
zy3fbcxkRd9(XEYMIq34Dc`3Fm+ey>JmU7Q2ud~6?RX*8{>bHQaxk3IGSh=~w)&)k2
z3<^7HMXFW{X`(?@^6olq<&)E1A(m59;epkBbTyQF1-9`Ited}j0r=#mB;}LKQh#}e
z>Mt)q{pEGauOICH*v)YdXV3HhD#&kVbRH_&H3wg`dk%Hc*c|-PR{tCV(Q62vjI{>3
z=3&esbXAM$;n)U)V><=j$A8BiSc9Edj}Ao8$uWvv?)JOF(TBa9QH@;eR4tU4<I|KF
zUZ*KB-LI*BQUP-A!+zIP-$}{}0c!6x)SsM3cqA5m1^%uDG}K|7WN1?nCckw>G%jF`
zLXSV<U%*<0=P)Exlj60wt|t%)2zQs9CU0|3Fct|Eu|5(kiHZdET*QZjYMDoCBtX^;
zS8l)TD!8j!!R8tYir6@Q<@P_cvLYh<QrO)+{;r6>h<jw%MC&*EFy2)}TM=7IGcx+P
zvQ-Wiu`RZM?FtLHmmbmfl1F=l(jK+<1S7#B?&~ok#!a-vBE|xC_~<k}(vzJ&`rTec
z$CcZ!34DGCd=uEnv6~@{p@jf!V&3d$(2o(K4-lk0A5IsUIhP33WkU5Lv*sn{%?;+w
zO-lGX0sbd}{THGAH~LjG_NfT=t4_R2?ZJTR!vUQFrxB)1u2M&k8hY?<3=rDOXdnkE
zp4y7{aMz%Woh3fP>?IAUgWP4(kb0CB`VdkN;SdIyG&gA9V>nEohUkq+E_ZL3dm~(F
zhw&z&296jw`UXaCp-~g}zKJ0N$4K|RL3v8vMsAwXQ@;FpGUSH8vz+i@ovx2E?GI_s
zL>u`^cKYOfM-En%+D%Wx+?%3|y6z&P0@3U6UzHq_%p_DL91jXr%FIwC6!CX;w=zwd
zd+K8mqQ5>;?`37Zp2s47`Rbeuxj9)ZgBsOp4|5#CS`4EJM+oatns|(18pV@zGf6{F
z(^RR?Cs?_CrJ&c7a~Dn!5>^?eyzrAMg`d<ofsmS=DurJtX)jW<Q+O{<64)@coWlDU
q0)b@19e#nt-Ft$20?s<r-9nRrCvPF7VHv{vx$I;9DSS{<iT?sgD>f$p

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator$1.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator$1.class
deleted file mode 100644
index 1835c035a58a86a2a1d4ce17857d93208aa130e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 910
zcmbVKT~8B16g|^!yKPydB3i^RlvP?pHX7)Q#zb41G_>%r1Rr>s?v8Znu+!`Z#J}T<
z&uU_fG5i33l=04{*ccO|CVM~5?7eet&fIU`znlZugj2yHu9s29Qkk+F8s0Q<OM~0m
z-O+B@#9b3B3|qE)79`%V&&Rf>PV7OPh>@K}VyvRX9;AWvZBIyPx6`o<Jf4XCH)Fw&
zJM1!)o_R6|gXB3wzTP-sFj~r|pL4w+6uarkKt%g|An9bjr#vnXcob+nIh=J9?v02!
z!!#p9#Z_tKiB6!KYAqsetF!QeTSXhk{FD>HcIZhJ2jNj)Btzw!uua^z@Bph8W?)&U
zqhVnU4;hwpiz9h><m@Up^@g25NPjzuRAgaYmp#&M0}X~IN#JA>I1>q+Oaezs;P^C(
z^ZQKpV+N}mh9YW79>*ePs7^We2FJon7&iasYKFBxwp|D_d6eQQm#OA=>W#zR-*-M`
zD7++vMhxr!)@G{64?-@p1)z;ETp?dG%ydI960vZ{JY*>U9J9Jids(49Wz|LfPC7#g
zv$#ZYj?i1=DFZs6!Op){J|g!)fB8=^jJ<a-b~0EbSeQbSU~vjd1kDV-he3P`sG&eR
zze4L#z$%_#i((Tm(59G2mH3JoYZI3#&ymfOT|?=Wi7V*;>ZoHOtGY@RAch+Gdt?>5
Jqf8Oi(horW;uHV?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator.class
deleted file mode 100644
index 014f44a454813fa30a40b370b91c3d01688b679a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5801
zcmb_g342u48Gi3%X6|Hi!xD(eum*^bOqPKdsV0DE5QruL37}wICX)+Hn9Ln#A%MH6
zh_(t=ThP|3wWLzps+B~f)zXDlyH~rH_K%3|`<;6;b3-QS(>^?Ta^`H`ci!*)mUCu4
z`s}^;0kq;@K`h5TrHCLcO-7omG`S%5VJL|GI3UA=rC5P`gSZd(2RVE|ng^wMNXNqg
zJQBn-91@X7gLn*&i`?NdJb@!J_hb-H;jr|+Ak7!0d0Luhq&X_hF%f%KdSBA<Tp6Cn
zmu2u3X^sbR0xtycVh{`ML%u3AUz6q~k^8#rdO3(!@T&B_A#<-u@0&VK>KNAXEe%Fz
zGHIqe646Y?%xLh&%tS)Ng07e~80pJo&ApLa+DuvLY-G^tHxrQ#uD5F_mwj8Tp`P4e
zpPAO6b#kshmrBHA(X6@kK+4q6SVT!*E}rO*h;U?`d$*|UOGJ}<MSo{<msMQ6-`o{X
z#<OuN8M(o|o8p0_mF(C<?F6$^gMXE5T%)0<t_Td5Ek#x*1=(4@ofLJD2o2M_;z`ps
ze`~Za!I_FKD;7;`kEY`?b|$^qJ#q57a_VFHt)Zl%b{#uo#8_#Xb?`F6FM?rGLY1lI
zz1e7NZ+A4Mj8ReZx{gyizOA7&?`;iMF_116m3eN{%=RK!Tu!N<dRb!4MHIPTQAA*B
z02<1Y=1_Muo|KT&P?@(!MN!&x=AXXYwiQ9@vV7-%H9eRxcV#z62{6m_wbJq3@nke%
z8!;`V=6mv~pwmWs$<H1WR>S;B0dScSH?5%GmMqU&Df>KotjDZm*4)q27Zp)uv)*BE
zp*r8bXd*`sg^TQUMW5Og*)DtAb-bbDJ379rVMZ!##mr15pY0m9TyBR*QX6E)b;fMx
z*j_WS%QfBlzaK5is~l~e$ynNqX3XAH)Cn#<Z4JqYhVC}AV~Ow7&*r*fvEYj8ar;TN
zP93(3YKn@w!c0Rjo+*S$NnJf_W?9C}7UsNlI|Y2O*UF`1=K8plxGGWaPGl?HJP_R%
zHLx1rGtiDz2ChP@fvd67z~^v{j@J#miMQxd18?K|2ChY$fp>74b;Q7k%-jvi$Ix%U
z1gm$;#H+{LA2U;`>TgkZQHM2{%4N+P$EG#R>P#|%;{7#aSxjI8YSh414Cr{*z&4yQ
z@E*?U_<?~R;(Y@j;72;n8Tc`NV&JD3Fz_>+H}G?5ej&pTrS}njY2a7*wT9-2$R<Q^
zZ+tM7FjX8gfJN{(27Zg*8TdVtjA{daz<CWY@G(9y@JBh}PtyEZ4*U!L%HnF^Z%7#U
zyO8q_X)fTO8d@iw?urFfVkdfsfhGQl@Uq+;+0-{+#+bG%{~t}YD>TfTC|HOoruf8V
z7s7GTT6D9E%zV<>Z-KcJHQNWPineg#>bNSTp>E<1*I};Oqk*ZwsP{9KY~532l3gzi
zd+XRsi1K_3U0vHd6wk)?@b0YT*|q8^RqH&ZY8ATL7;~xi5>`C7Q&_js{Zi9;Db;lq
z+}E2;$CJC;1zu#LJuaqIEV#3jnY+4J>B@81-dU{F6qfnCa%v0TG8Lpmp~_|BiAYyG
zla*Uz{0w=F_A{Bs8DPg>yOf$zQD-G`gDicEr=Zy0L;VXTTI__Lqs7nSr94(MwWUJe
zOrGAAzeVkmIg|32&Mlf;l?W+Ul+jL}>pVTBjBg!(T~6Z$+YDz<P}%NWp-YMyKQ4S}
zy|Axp3ZKPA1&T*AC1;O0OH}|TgcxG9c3m_Zoy0@r$l#96_T_8Rk>z5hU3}GZDZph1
zQByINCIKYu8&s9gZ$c4%l+H3*S$L35w;wF7oyUqDG@h!d9~pUFQdK5@f)?y-pFAy8
z0MIk>%-CB@{K`nM@AI)i{2-GrNV4)P-a5Xmv4~$1m-D-(4<5NO+4IPysXlpcs!v{(
z>XX+hKg+-@#u~QQag^hJFF!-!QE1_k)9{2FPNO6||1`Ye#?$b<r9{`VodZAHE4jTE
zrC7?Zq{}c1b*M%?uIEbFR)ibS!4Xv|K)j>a6DS_l6L2L8!a4`SIj;D))-oPKrS}EQ
z3^$CxKLVX-hEW=>^p3#_H=Ra6u$5pf+oeQgBM@v2#MVe`O^Tjn{BGTd7PeO@oUQh0
zd7LeIoGp2rE%LsgZlY3jdT}HBRq*_qDt$WE>)4=UqYjo?s?%^2Zg$LhmtrE={Wbx=
z1K$XO&8IkC%YPw5*q+b-rTlN^|H^Pf<0#68F+bce3S$_R@>xEN^0Sz>qhk6fW_+N%
z$&GGHSCaQ@D1I%iYA2(s*jvND>uBNigwmlbt+9dRE$v1Zx)q3S^e|XF$|@bcx`3{i
za$yrT+g50w5@#6?y+9L6MliF@*ASv9eh$4OsA%(t=$2U_-x<vI;8t0x9KjWZu`E}~
zbam57nQt6HsM31^Gs1MCXBYwXsW!CfA^kjpAzemuq?y|m2nA#+AftJVf%$Ev(p}IN
z3<b|&;R!4Z`9i@nsL}ZLTNLsU)8dfYvSb+b1nD_}xgp<KEZk91JBlkuu+&~&HcYi@
zV_nEsU^R)kG<E}HXCvdelTm&X{eClf?IK6r?DdeEO}GtPa0j1){d@+-u^lPS3}FX<
zxY>zA_&knq^(gMdaomO1_#!=pC?BaYoTbEve3yQV-F%b{DDR|fg7e<FkoV37+@icg
z`gvZf^5O;b5{;J#KjHZj!_|CdZX*Uibsxa3oYRSA7ZJ50KqOm<YbW;~CH~uqEvUS`
z1o}nXro#6Q@299>&u%YbxsE$^+_k{Zz~E!rjs#rfp_2FsaYK)ULlc_-NA)8Jw|QkS
zf`${AO&?dw`bm^FhUk${gS7dO@reg#g}hG4a7l$sek{vXO(L?Skl10u29h+_V)~_+
z$oDWMGbAuem*hzGKGHgbz5Gc`iqIMxYo63Zp45aB@;<sih$*4IZRjIeUP?A7Dt(F~
zR>+HJQDkf&75qx!B*ijr)p>{|Rx&BN8{GlcK>Npx?P;Q^jkcwn7DLBIT&WVK+Pop}
zd6b5{9L(YW+%^&<6Ot=-%rnW@Ushma4W{$>d+FZ$P>K7o7!R<>J;)O95bMjsSdT{-
zs)rapk1-$~r_&G9!Xwy&C&}ScilL3R33-MrhoJy@5jH&3+O60qp}u+*SYEc(DzJRi
zr7QmYimTc1e1==>a8jW(gDrLNE0_~M4{#*)u*N2>akbdiboc6c-k0Hj)T7Dtyb&}P
zth6thXK3Y7+ItMM@hpAy9DkmCURhw5wVJ#IHF*oF8U8DIo)l|8Sj4LMD<19I<6w#K
zQ);k}hpO!NsItthoII|S8}<fAxyCFX;EY_AZs8Is9d6+liwf^WqKL5PjZ1`IDk?lk
zm)R$;;ZYvS_``EqJcTIx=%AW?g~{=%(r|^n%fT)b$d#{g)>1MlrVf};{GE%Rm=X97
D^PkUZ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownBlankCellApply.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownBlankCellApply.class
deleted file mode 100644
index 8b79113309b5a2c6c44bf607ac1f2d4a3491bdce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4534
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplicate.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplicate.class
deleted file mode 100644
index eb3c7347e1e81eb18067324b65233e81d67a43aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2638
zcmai0ZBrXn6n<{9$&$^|LSLm2N^5QNV!IY;tw19ctfYiOp|-a6ZAn&G$O|qTY5g01
z@{==;AN|nI7&_>T<7a=7Uvzx#-4FsK2$OryJ@=k-o^#G~Z}Qi_zx@GV1fGF+a65+6
z_*}=dfpD<M>9}Jc8Z2hyc3uv%a=07E9OmV4Psf6RBUqH``%?NMjt6)s_r5gn2#*bX
zg(q_PRL3(N&jliGrRcmA5IKRavh7wTol;3)Fkh&at)&g$S+i=MvtIRlt6VKQB}?v)
z3FuyRbJ6|Ip;V|=eCMSvaITHfQq3(Dt;ygB?aZ=US*UK_t(BJ?PasM+v-Y~c(fq3Y
zt!>qOw`5Vlld(m2xnlc_E-<rqcf3uY03BVA9lDvNXQSe5@?hTGAn2YJ*HXiMYoF@y
zaMELR+^x8NR$wyOF}f;TuFdw|5~UspXp=0ptchE3f=b=DmrB$e%U26_>4ELJa@|mB
z{))RHaJ8fB0$XMktD6;Tio;ZGz2p{b-;ub3N(kKSj9Zp8mulmDx8iIT`?%B7#Q&TP
z^DOILsCk}K@#%iYuzS(B3v2AYN{nO{h%Y<-Y?GBk$<8<$yfkP)mjN}y$&{q^hU4b~
zmTSqJtgk%OprpXNZJq9I3Z3vitd|_0O`uo$hz7SpV5oDt>fW%-5ziq8#$Bw|yn=Jv
zRlVHPj4P7<CX$#iF@!S$y}S2e+TK`URZN`2d4c1*8@D{qekDn3;yqk6(T@QW37j!8
zh_gCgn6R;AqJW}6f2Rx0YMHR$nCO$1Ut?UyvWXRG>0(vKnu!w1Iw~frAc}7=!8>x$
zT~M+PWMjh>?vh<uw&s>rodWC8y_<@91mf~3VYfGCoL2%TlfgY~F&RreX8qYcfs5^S
z4;l!ZZQI{g^7gPf_nq>33l)#-A`700uw7&k!|OGMzR@Q1!N{qDDuU@$wk928lE8{M
z0_P8dzC*6TgDxA%HM|%ssN>07!B^r$G8f=dFRgm;B%33Jl4E-$*lB+M06IdF4U|HX
zRB9%#)J$rrnJiT^NeSK}C12oqGO@Y7gf7ZSq&TK|;(LCfX`HR}TZnY1j!^n{gde?y
zR!4+ll%ifoS2|NiEIm+%k-l6<{Ec#+;dq`7L5CW{#2DxVE)h-&7wA5P46fjP{(~zO
z2A8Rkf0jx^C`l#~Qj$z1OlTH9XaM}1b`kEC)4w8;*@hXy59n<yx<mLAM_vzPGg~-1
zswJp4`03G#D=(z{BFixp`VnzCCw^ug38vVmCAO50u0CxW$3l3>?MOy0j)(EEPkYUP
zVS)$2#ucz`0_w*w@A8MN><F&o8g6r(!42HQ$9RfStYS>1Izqq+%;PH43iI?GrZcS4
zFE`UK)6XzdWMcFt)4xVJj&T1!NDCd;HEw=H=Run+&hl`CKw}bJNTG`=<%EiA1_v4u
z1Tl?LBYWIxZ2Yp%c&e@O7{(jMS%#9miKhGO=-KVNp|sOXHK#nB3Qjc>j4HZH)HjiB
z10=pbi+o!kpJ1Y4yvABeAcL}%+E38lP>65gL_Q-m{B&*Mqy!jr?v$d<9O*evVlJSU
zzqAr~(gJp{0k#+2xP?y{NA`g9i&30x29`aLwU^9_Y~z%`{wh3Ufafjnjb;<3Xcxj~
F{{e5hQEC7H

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplocatorWrapper.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplocatorWrapper.class
deleted file mode 100644
index bd642abfb016ca1805ee20d19bee2b7d6b430ee8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3136
zcmbtWT~`xV6x}xo3`|Cluc*`_w2BZu##R(GR4Y)63egHewZ(RljAS4rahOPX=u7_v
zzrdG1*scnTcCD^H_uus0)zy7xCdoju1ntYsz2}~@&pzj#b0&ZP`}>~&#;~oT8@CmF
zsUn2i%{YTux!h53S4E>IxhExaa+z0=#QkPGz*j1lhbm<YQN*w)FCM8_!m?bxR`D1Q
zqj-XE<npb875V#As(z>7dj*DowqaQLX)~8g8XKlS``nuG!q9U@epO#^Y%9N-5I9-Z
zna*0djBVyA^7KlMmDA^}O@~^|3)X7ha7s2|W)EFY&ZP?*dTP@#*L5ls3$~-DN(9r>
zbggF!TX|iQnBiuoRLogv!ztK_8-#6@8dce*z^Sxt8jhJXw*umMqe$I=TMB5sbx=}|
z$3`Jz=3MWIfU*p#p7ya=ySy`%IAmnxed!qR0WuP#anj0L&JBUC0na%2FoR11k!iA*
zfm?YqS=vaM_M(x>xer-L8@VOJw&d9tMx3lgBG-=b8s(QD3SVN`Hi|{lCZjGRlc{|v
zVh$VwwAL^ogHWrf61e()I07dY93#EXXZM5cuFG_>;8sdY&V1%PFj&iuBqh*O$8F#-
znCToVLLfGGAg|j+FSiO(Y%hVPbRqAsqnPEsdKn2o4n84h+I8NsYC7|NA69#;ePHlV
z#W4SOYlQDzrR=0<rjyQ=JyyGkwR#l!T4vdIH2ELA+nF!7mMSgAe5(tElAShhTeAGS
z>(=k69BvveA}!G24mx*$-Lh?CTQ<Cg57DEc4?O~H)%#gvGs~*c@DV=Na6zhkfU^oR
z8caM>u&N;oOT!x0HC%?SAt!em$g?ao6p+_Y#B&9<f=vyMye#2`Kugt!=Y9)6Xt<7b
zf$^gUX5A1unq5$LP~1<gnQ0d7*;=q_Aqs>CWEYOrDjhxS=#Fnut{iib{U9*P8htC+
z0eu#A{P^1Z&Qz=ghTqLkqxrmK$WeS?oO)SG$bJlSW(X*Lc?tB^jij18a&M#Z+@WD2
z0le>NXSrR2gZsc6d0$zMuWBv06DnGsB=^j15+kBOfAA|%rXBb&_#&zoOH`kzqh71+
z51By0B-jCG_>Tl=;QtYpI(H%28W1?=?t6J=mmD~=IV$J#yl0<O&izohzlZ^@gGBfV
zVQK(Z<9iVCKM;Dnhwy7es@n!`8!1&@qp2!wjt{+t`isjU&b5cQpr;6W(Mm?$Y|#ri
zk4xys75W?EZOrq8VT|xZpKe5gOh%#me14>k<f9MmBKj+|U7XlKG(NP4mX|mi{|ya8
z`)CbencHUSob*nTNEnhxjHv>5C+M<^j(Q0`N*YxHdWC>a`6qPzDJ>!hb)BYbP7R;R
zKSYf1=BaeEi?;dUU9{7!x{Hn-v~U;kxrihWO~d=>3}FYI{-G;`zYt5l#3?_mp4P}d
zPKB{N;@e8*5tn%!D)*Ps#Q&i&Can+Se8>rMyoOsy;0`A72sf~Tn{G65k6k62r+zd|
z{Kq*)`w*=YOmYw77$>sExI9TOB{Jq#gx{b~!NeP!Q*f<=3fF1kRmM&KC87+cnPg9g
z@H1^fF4smX0aJmjMk_p`<aven0-up>$SpIOQ)$s4v-au`%mWuj(vx-WRfkvIH!1s^
v!FwQ6J|mg>CNlC8d>CypK&ques>Mx7xof6~J6)Gt!(q6Ux00K2L;2!AKa&|*

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownExpandBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownExpandBuilder.class
deleted file mode 100644
index aa7148e48f48aad513c935e49fadc20c342414fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7537
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
S2=@SuQ)`KhkCVCxcl{qXcrzma

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicateUnit.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicateUnit.class
deleted file mode 100644
index 724f14f89bfe526681e755856f022000f79f0819..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4874
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
DO(9N-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator$1.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator$1.class
deleted file mode 100644
index 1087bbf67810a9ca173fb4453ecb3f4733074404..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 915
zcmbVKU279T6g`u#P13E6wc1#}s$FeTYZt`^K@l`<AT(*gE%l*Klg*e+Gu;idyA}VA
zFFvavBGMn=j}q@JsX-7?VeiM8y?4&#%>DNL%PD||aLcITatS3Yl_<Mn;8hFP47hIG
z4da$A+_bR5u<3ZOW$X{TeC+t)vD1rUF>(?u#-Wa#ULsZB@r6>(Rx(!7=dsv-GZqY)
z!!|?liLYcJ<EISSTK#|_*9`mgbFL!;v6~$Cgx=>pMJMx}(C6xaYiaQ0aMp{tKO*K7
z(~JydFHE#ATGBLCn?(FV4u<g=d8jvz_z5S5?Z8)IB!fX$#KW*}!Le}L#vQEMn1OAh
zhPsV4++|oYEw19hz}*eK#2>b#Q2lMKLv3T-l-)CK19gT+q=B1i;7&AfQw?0Bfve3d
z?r)}Y?lai!AP~B#cod0<p)zIN>m3O{W@!B1<qT_oY&;WZ@-l@Jt`akWTdN;-{=V}u
zL;g9bG-6o)w>B%(eHn0-ZUL=D&J*et!%REywTOf_<^e<L=a`jcTFx>pE2~t^TbT?+
z%;FryIYMudr3`3&20Q&){)o&6^JPCFm)m=X+)fG$1oKm95iCq$k)V~r_s9|70v3^{
z#b2Qn$zv4{ut~9jXV{{cMTPhZDQg4gDbJA2lU+jbrG*RV{_3b>A+5Sd6(EL1^0&y!
KbVrFID#agq;^Y?q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator.class
deleted file mode 100644
index 123e8ed6c2534e2b42aa0d4b2eb24580756ac23a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5858
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
QaNSMITgTO6J~1iue_ws%rvLx|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightBlankCellApply.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightBlankCellApply.class
deleted file mode 100644
index f61c26a4fbc844c0f2b72b22e8d39ff38b4f6883..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4427
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplicate.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplicate.class
deleted file mode 100644
index eaa18d623542770710db8dcda0f3b2ecd53d14b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2647
zcmai0Yf}?v6n@^#Wy5As5X4px@lwg9xD~Zp@!D7=6;OeKTB|I{0xO$@hE1#e8~xNz
zo$2_oA9SX{v7PDkbALvEN2k;0?1m5|AQ|4vdC%oJ=REJ5{QckWe*!p%s(}x1s{@B{
zTgSM8NVv)C_|iZ;+}x4l2^l73m`dU<?#Xap$FzZcm=W=;tiDQO4)b#Mz`#R1GVnDX
z%k~=`Pjoz0h`HsW^ISpY6^uf~tCh+#?hlTFUZ|9P=ee(NY@$#pS&Qqwvuf3<&RV7F
zTZ=W<D_XfwWlSMavfXmd@jQjWHtMBH(eW%fr><F|YQ>wXl@^_<LYz@2?KOq{6VL4L
zY^&zGo<#vQJ7(PFvh6dd!u{>1mv@g6Br*2B^Q-i4l%4O1WWrr%nq4gcM8fmYcSP?E
zDo*2<-LmUnRmi1w#~_u+w>jQk*Yuo1G{@RWaon;KmTcBu^e8znQ7PEooLzNg-w;Oq
z6?a|X?5?g0jBHii<rUwWmhon7&2tO3??}1Ba*zUhgAWUwPqzuuXmqH-T7(`IhTg9m
zArFXw<0dmYXMDS`N-6}&k=*Rqvg5O3Aw?spG+CQicl>-v;%F)_B@2}r>^+fchjV+K
z6_WHj*`)ALTbpepPVi2wd5+IU5C((B!<(^Js?)*UVWDGHhoA{`rc$dGoLjE+vuArh
zPRnI5k-~KoLpZF^y>&ar?e!Iw#l$fjr{UJYjcV0?A>=jj5l)#H#8DIdIBa47M|3Qh
zu(4>OfFked&RgBuJrfoj6CaB45-#ajHnAecE}rRFHQ}M8qimuA0{Ir#70&GR7}j}L
z((%>>;61y%Y~5Xa<`h_!&aHfccOfY+5qq<K$9bV}Fcn_P7L&2`BX)ruR5;b{bf<yB
z@x5BSN#7oJY1S#Nk#W2fo3z}wg)e+LB6gAWjI7lN;9?s9JL9K!iWH9SR=&nF%gezW
zLlW(sK$B>@_IT4vC(G(o<w`L@J{-NNd<ZRgg@b2M$Q>(qj$I|)4)N;=(4h%2xYC4O
z!Ayb$GbtC$<ZLjLqEI*ytWQ#(yln1=k>EOoG{+1ze&qLEl(Ut21C`P0&@z7@^6(9!
zb;P)gbE(&n$Yks2$PCnBWJc;pz7CvcIUc7&&|#EeIvA)I!-SK@NxDxXi_`d+A8;3h
z!3ZVtXUR<=2w6!&TCkFoB9vPAqyg|B+KJ^-<~PK$Z((Zq3EhoNr-r|<?^SjK`=<sd
zGx*;XEv_ucdf^I3P5T*1nFn4n3F6mA1~vlw#K>D5&@j)#SeEOa2<As#F;ax61+Nhx
z>LikWjPgM^%g;IFa315hfJt1$1AK-eE;aKT!Y!PkZba}lGhL$HXprd=?IqLmJm(LM
z{(mv7<I^b5F3?-p5R0=^B_=8S%7qrdi3h@KK`1j+XarCMafuS?=2dD-A>*0;I=Z%+
zWCYS2Vz?Q2=nJ))5aR*2B=8t6H+;1MNlIN>f!uBj<O%`o%%bC6<2!AQui<*bc$Ec|
zEC!`-(O(dK%|&tpy%SlH@ISGEgOXj?sy^lg{=!P&9w|7DZvNytg2yeH4mL9FMkj9I
qbH<StkZ2uT=9+<}2U2^XQS2@H6y7c269#zN0^evh;U?`geDOc0yIY|E

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplocatorWrapper.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplocatorWrapper.class
deleted file mode 100644
index 9765eaf03bfb3f4960f43cdf4cd3b56edc7e33fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3155
zcmbtWTUQfT7~PWuCYcPNTvaGSRfKREYptR|t)f&kpaq0#EA0@*WFR+(iI#`H^k47`
zeCdPjDzIqR>gsd<P2XKz-DhT!Nnn<Z_2uN8?|f%}`@2s5`scSl09?Yhf>W50@r8mA
zW@0#rdt#ZDabH2RD|sL!DY48cn8(8y9^p%c%Ys7LVjSIA5*LpZEMrA1UnzKkg*cw#
zYq5MI<C*wf6{_FL_)dl{LCx!CVcN*$=JmWGp*^*sztpvyUdU*Rwq+JFNeRa)I@4J*
zw{95)id?<2ZRWI;xn)x;wrFMwx?Q#ibN|rwR4QG}YinD!v8hp^RJ3eutxPa2P1BlX
zX0o;>SS*O$opLE>rggh$C2tV8P3ZWtEeSno%g}9O-gs3bp3_UztuagiUvJk-f|%rs
z>qgEopR7?9ZUt#K$lGDQUiCycN9GqAFi=BBfHY5;1=GGEp=;QET$`McWeJgK@)xd~
z1!KOPUo)&FeJ$rCvzXR%%erNXvnPz$S(8MPjbx;n4dO5xE0$g=85TKp>+9<Q=_2fK
zBe(%ilfo0lkC%kW|BED{Wzp8to6NuGb8j%+rJ_?aEq1Z=NM~8wf|rE;0K+voVZd`N
z4F(}q7vAlX8)6x2>@*3{bg^Kwxftxhps3V9jyxr3+A-ddG3+_7CH;15A09bWI7~w7
zi0}i-l}+{Bu+!O!O~0{NwEso_D7TIGeDXoe+Zi*FI-fIRt}GVIR@#^`MJMzISMr1y
zb}G&zEuq61e9l0-Wm)>RXnz$Sp<l%y`XwCq@9*hbSyqmUk8wuDIib>vJ{jvO3_O>S
zQIUnIVgs8hK82<tCw6%hSQ{#eD5xmmg$zr^mI_;3mhn<Tt8c?K{|eu$xQ0y$R~s0h
z!A^2mJFw2!c(}G<q*=RtN8$W>ln@>k?Rfd9QX|8U2APmbGK?iQhJ*<g>pS7<^jY1B
z#<ltFslJvl_I`GnjTdEIjOM!W>c%N48Z*q{Awl+POu|5*Cw}zEUHHFLKUBnf_Y>P$
zY1`U4UY8{I!^<(|mxD8?;+2W=z}O})B1#yl{U}se*L){D5!Fj&s!s-}AJz7TO-;ol
z*#sx~Ck1HYUldk5cOlUokZ{`B5Ae)JsXMbjs^_!3XRB1tLy);Yk72GOMEDV5Y5<oL
z`;Zd9BlKh+;ax=hZ4<Z6l*+q^`qEfpbQj9c4u=HSe&PaW5y1f3$mkTi^c;Cy;QASc
zFv{C**Am7s&J%4q9!X>}0nOv{19b!+ZFCRuU!d-xWe4%Z=ssFsqc8C*nnn-M7Qza*
zG3p$1Pl8Aof=D+*1-jP4Qx{DQ(3pVt320RU8tHvP!x#A?f>759n&#l}sQgXD2ya$}
znLQkz8{0!W%_@87*g-3I5s!;B&qH+V0G%Q1pwl~ah43f3=U=183#+R&et@1ZR>r-z
zf_cPYo`AyrMMTM=n}1IS8K5(`LXMNT#c?!?Bp%~Bp5cb$O~PeY^=8%cCdxmdml*UA
zUnhytPd}~@S*2gDWPlRka~r~MF(_m5El$h0+ChbDeBxHdO)nF1x)USW6CwP>Hz9{>
zGnGJAepKUC9&t?3x=8DFG7ULpCSodHG>NFaIRtapff4jXox9cHR`*THKBpNM<hI91
pgg#0}Zh#M?&DM}=t&(bWLQ?6P+r*s?B-eBpZtk7r?l`X8{TFjeAm9K1

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightExpandBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightExpandBuilder.class
deleted file mode 100644
index 95d0352ba183577577ac2cb1a3d28ea574c4680f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7656
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ChartValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ChartValueCompute.class
deleted file mode 100644
index 06774bdce770ab746ccc73fa0d221b97a253d4b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1933
zcmb_dT~pIg5IvWsO$iZ@Pm6qtU<;)Isb4LkP(;)Yjst^(Z)p=D7#b#|jQlJ00Y;f|
zc=ks*?oDc&nus#`a&Pa=?w+%|XM4YW|MC?;7B3`RL0ZBLG9nZS5zI=M!)+1s5@JY;
z$V!OgP8;sxUMue7fry-lyod#c*n&|poJEF6GPT7Z6f8|==qMT$eZ9J0((O&PWYSGn
z(JHIvmTDXPT)PyUUE`2pzF4;QmC~W3zf-EVeqh;-QmPuJrqKOC)zOv0u4+45s#(<w
z-c6oCtbJs7l?(~6Pee?mpqpks<f|9HU{xIby^~KB_tYa*sXB(K6pcfNq6=m6WEc+d
z^+k4BxG@;ULQI=s7^HGN5e6m1LDS#zdKy+mIpXR1GAB||*PUS`#MAxcnREJ@>ZlCk
z7aOjS5jQp|XNJyT75bXHc6{)&bJ<^P7eau%<d=<#=He_8QtO7XQ&AmiGDG!$ckM4Z
z2o9yeFq=$;a1PYp72PIz5PNCEs@i3J)!>5e3urRKMI@sGogyB}Si~cSnV_-*5RE`G
z9%D(wvWx;&7`hv(T(WKTm`jskG#IkE(wxE*5vwwuVok&|8N+zaF!wvZ+8p_$R`7<5
zB;hhJ)yj_Yvb3j{2|oR&F#a)R7z~;>=7%A^qkD5rfiKYzY6kaoD@T(T>e)OHLqQ%s
z15&1D)w9<AU6~i6)yA$j=?#&uym|f~+TLip*YSv|X$+y}Z$cXqkXT*C44KQR9%GQ{
zc_3EwRzzqgdDD88P73Xe_UP0p*hl)&f-YKP?&TP|>9_0|pa;ElqM<=QS#jrc2oPz{
zPM@IV9Fg^z69_pWAxx)F5Y0u;5ZgY5n2RN1XNYenqNiy645<aL6R{8E7jdx$2o0E^
z*J+Xn-lFJ9j3Py^*OZID=3&(E`D1qt371nA1Gr9H;z(l<Llm!_Vhm%1c=gkHloF59
z+JhSyCzP9n!?W>jCg^68ZdwSF5oU^3o>hi+M!WC{ZJedQB8smfLcJnWuGRDpGA$eD

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/DatasetValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/DatasetValueCompute.class
deleted file mode 100644
index 534207b1786487f62dd0bd973b5b237c7775c460..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1540
zcmb_cOK%e~5dPe3vq=a9$}2!=2`x0Q#^rTNRS5!|q9W9i3#U!i1eeWjlz6N1KlmZQ
z0T2honIDB1?=DTM7*&zDc<k}aH{+Ra{OkAk9{?WWehxNPa#+PJ8>Jj>V=aqy+_7=j
z#)geDLwZ~KQtdFL%9Rd-)e2m}P-shE?1qD`80|Y<k2Fi|pyzlUXC(DGQCjM)95Xy>
z_kscMj+J=F!;u&UBgMO+^juE*VW<Ru>L_O{RLAi`(Ta6V20OWCcv&_;3@8<kw}j_4
z4YzTCR^Tgfq?(oXfph5aP)U!s<yaBA)gw=a6@%{-a+F1c!B8@oo(w~%;%GQxXc<iP
zjTnz*;PW_uR&Y0d`ri^fJ2s*evwO1dJBn(?5dQBHY#UOHU-LxzuI@;4N0&*xA5!?O
za>ZcpiZ_}b`bmencRcFgK6#L5ZZ8N&J@H&>eiRKYZs?xmkwwl%C66j<43B52GH2av
z)brRx!v@b|3-=fv%wnEOKZf%WV?4+2^B3I%(Nhfd(}1Q4%&<IbK4BI^rk^mLfaj<#
zRd#(AIDSx4<X1#<n!6&I>G4Xm6KXMhFtKUQLYt;;@;=k;$zd_fq@lq7rWlQ;8xIdd
zV?J`CgfxA9)C2klQzVIlw4R|8C&@@IR=<LMqRj&Gw5B8FD$deA9~<Bt3Unf--~w4`
z=hp;gku21{VBsfHyPLK8H&`D@6~p96g8tbI)*`5CY@R@oBbIP6f-m3_E|YbJ^1Onp
m1YC?zuF>sv+@MtlY>?F1TA#5vi4rHfF_o-!oa}Oha`O+?8NsXo

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ExpressionValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ExpressionValueCompute.class
deleted file mode 100644
index 11ce7cfde67a6c0195bca9200d8704f6fa50701b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7045
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
F{tdJFO_=}y

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ImageValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ImageValueCompute.class
deleted file mode 100644
index ccd75b2dc1dbe2d5ef9b4121a86d7b29ca47aac9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4546
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
QLuDN>INt#W9IDiR0EP?T8UO$Q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/SimpleValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/SimpleValueCompute.class
deleted file mode 100644
index 76b4367c070235501f5bb284b0129fbeb76685a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1581
zcmb_cT~8B16g|@}Y$+8G1pL4X6t(4}gNULQF<RqOgE1u-eA~8T9o+6V+gTz%!2hE@
zNRY%I;Eyui*)6u%ZIr}^?%g?i@3~*6^W*2Y?*P{EB#B`xn7EllOxs&Y+(vd7IV>h&
zU}+f3SQ$bd+{CJhJ0{i`1~;W6)fPiMo7-hDif&CXjFzM$w*5v$cso|bCS<(iRxNwi
z@}xeuK|{ThEr#_{)ot)fONsZ~_e9h66tDQwu5rSfz7o7F8%<m6TDC8WAyi;6+g}-8
zWg{3GREf=t!nO+$Uqk+)>nQO-6>_D0>%ii^k~S~NmLhheN|6ldh}bUXpo)NlVJ^b;
zY#L&<iJf7rH{aCR0Ub6^hqV5O?`GdL&!kg(ZYis<MfDGrW!<q9&6C0Z-}Cv$8Vp5k
zFsx>C5jEGuTP+>wI{ZK{mIv$Ip$MuzS$2J|Dqcvfo$227=k>l)xPTFciO%kxdY*Nt
z7sxQ%PgAE;GI2LWs=sIAzP1~h?SYAhDLg{K#AXVQLAqY+$J16{gf?lvK}ojd)cMQG
zzNk_?%YWnPRyV^;uX{&!42il>K>!h-W4biiY%g*2CKxUebElEA@}yHIhK+0&8n##H
zhjji?`gR!UY${w*+^W?WCL;)QZz4w)U8)uhT}7?nmSD)APi>fkzWEqZbPdMIlB(!A
zN+(X1ksVk(0{cuaF^ti3FaXoINbjl80ppmU6AcZM<fVf@lAl2~bAs635#rk`CouMw
zzGC1QgT%{@U>+k8!|Rn#<Q5O8N5}&6NFYOXEd(hRLz;F9BE%G?gR~i3#uZAJz%^W@
uUmP<OtxF1#>x85UiQxuev&0zol_#tFGQMC)=k9JR*VUHsyRG@aEAtCpH?e5|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/SlashValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/SlashValueCompute.class
deleted file mode 100644
index ca6d519448333a4de31018d83528c45f63ceecef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1874
zcmb_c+fvg|6kVrHn-U7hRg2seXt^|8DoBec6p?DhabR%pEp1~7rYX}VjQo}QKu4Kz
zeDTGPa@;4Ww3sl+j4$UTJ8Q4K&fe?f=dZ8d03`5ILI>g^WC=dRCCp)7#Da)L2>~QR
zcpxE&B@xRKBs^@z3X&~IVO7K<5o;nIGXz&PLo?SH{L$DxgODy4RECbMW~e(>DW_KU
zl$=hHu53B4==(}V<L~vLU><5!hQ(~YT#|EDQ++R674^7WG3A`4=>?hM$CjzeySh?6
z+*fo<O*@ekgINE_@H*;2P$D6^oK|%`<?+>_PnQi-{a~hI*(2pdku6ix<*ZgUiCxH3
zCc}_NZWFVu!scKY^?+V3L##TnGu(35V<!x<2SY)9#~ZAb4f%whzo`|Z(yx_@48tCI
zj>t?&DXN4E<us$PshA4Gm<QOAxlzXuzVGt1PLKagEb*7})$7^Th_7W=D;kPP!)37k
z_q6^|gJ9Az80Mle56!MN+h*IN3{o%cmaR%&-O{*``&?d(bMu7Ji7tljhLP4Q73Gw>
zNyL*d*0I4b>-M>;aD$#<(2Z}JYZz&4Qg5sLa>S2~BG>SgVZ@zvdB7aECE{5a+sKG`
z9>xn~8RoCbqqz4iBq!VF)fJ;Czsen{c{2CRbu`WQm|?&TZ(J~PZc#Pu1R}n{<Y;Pb
zl)0f))un`E{2oegsNFRyno%TJEb5NBBbf~UyY)6>o%5!6yuC4XK5)91N}+HC{H<q)
zTsFAyA49+%Fhl%izQrio>Gw`EqJO=gb}}ff-Sj5Y&S(!z)xbW{gAYBl2JPSodg(dr
z0MLiq^u}-p5km3gAA}QWUpa^Gpa%cW^cjTj2qcAb1P>y@8N{xT-(N#ZGH?#*AQGsd
zH5r_Z1iv8c!<*TUl<c<)_7fFw4<Xzqb>s9jfjB0yj2T<Rwo|Asf=Z$vcWq%S7{DM2
z3Sk~Y7$&|>L@`2V7Ko(}W3&c{tCg6?smcV^;YV`tlZ1~_#D^HgrZ7z_KU$o2-WTCB
U+PKQ*wk$NYMYw3ojE$Q84KdXLqW}N^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ValueCompute.class
deleted file mode 100644
index 1e8351bbf13da7cd7e3e76d12bafdf9db9a07ade..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 445
zcmb`EK~BRk5JkUBXrO=uw`e8AuwWO&f*@9r5GrEtB&Kq4?I;~ra5WYjfI}fBNq3YT
z8*9GD|9kxW_5JY);0h-xj#3;eq*Yiok&VLRw2+$0HJew8t!YBbv<kIxlpE)=9o;fo
zS5qE5n>Ws8#ZqrHMYfI#yXH*caBde~v!p4+|IWYubD~@8>pRUlyO9|ZesARZ%js;#
z`P#f#Z`lS<8||W@=Wcxxhd3wm5ZlV!TPOarzLO8MF1nX0oc{(kAlX74(zYIj)1Hsh
kenAiA(o{TFP#DRF0HZ`<4~gjgPGKxM#evj9vEP~e0J&p}00000

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ZxingValueCompute.class b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ZxingValueCompute.class
deleted file mode 100644
index f7438c0fd57ae3403cd0b1af630eb2415d302b7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7582
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/BasePagination.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/BasePagination.class
deleted file mode 100644
index ade32efb36e3ebd1046f07819c064bec0349bc60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8523
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
CAfdnj

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/FitPagePagination.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/FitPagePagination.class
deleted file mode 100644
index 6eb0068e64bdb367ae0027979f3c6e60c4f8cf0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4687
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
NF)A3~X@(tc@c-*^*UkU{

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/FixRowsPagination.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/FixRowsPagination.class
deleted file mode 100644
index b91a6e93248b5ebc59957fe2371dc6b334225796..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4019
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
QxQ7u};Q(*tpv&F+UrfFikpKVy

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/HeaderFooter.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/HeaderFooter.class
deleted file mode 100644
index 528e3391e30dfcd002e49dee472e31fbf556b617..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2584
zcmb7_|85gU5Xa{n`~2$y#)Sj|rG?PcaS|^4hK7bhz$D=OG))Dfs?N^E*>Lfp^BJjq
z1^(=7R8=e0s#K{wK%axYM%C}^ofB)>`vX~;*`1x6{mks_`k(*)dPhXp=~;nF^e{({
z@^qYPEFR}*ne_^bCoG<_sIypQvBqMZ#RiMbENx|}VNlw0cSD29^?m1!V|z}gZ8yR|
zblM9BnJu>yx`9ENK(zPZRoL}AVa+)Z-j4?5c+wC*xds_42IY7Cz-{@S5C3%2_jX`@
zffyomJki2>ue0L@p6I~e+;gLV=7AHmMF*C<q9ejZgGMUT+X%4a@4)YP9qwzrgQgoi
zbDAD3<+|T;ylp2CJdcg(a8Gm%nya_`1H0J`-B)%ma9{gDXg7Pp+p%9e*raVQyABX)
zzK^7kUbgLqb(#Ii%Cs*3Y<J*rs`BAFbLJ6ZDK1hT-h*)t_N^$z9L(`>6xP~M1xK+o
zJTJ!UQBhF|l(iW9M7DHgg}1e&<6*fi>2o+WMfZWMKO*1+IE!eWuDsx{bE3O4I25c6
z#zoQn_UMQ>=FpTAU5*cp6FnTmz8aq)+Xv%9!|w$xw<h?|P7D|RGB=t<pV8+y^?!eT
z`~L5rEjmSIi^gaitu{Z4pGBwH@+pm5be_cto_@mOB#SdNVbNI@=V-#9nU6SlgGxuO
zzTVt-TOnP*jVR$}6)D9#VU*&{q{e<y15s*FN)14%fg&|%qy~`GV3!*B(Bouq%8(Z@
za}eKvo~-^!Mzx&k(@3>c=u^5{&h*Kwmd^JnD`oC?8RR151euUyl*Xul<V(nX3?a`U
z<Rn(CC?s8?FEBG`ioT4uv!QvrO!W`S|As+|IG`zwlS3b84nMBYbo}umyi@F5o#|8l
z2&W*eQ<T9ry!}|@6-VIcTuI)zss$;iAk$iq89hir1(^lNTmlFmC4<arL5eDftp%CW
zgA`Ses{px{0K&b*AeXfuBPz%ZEr_iL8BsxQ1LRHu2sbl>%+nP}Zpq;uN&f=FaE~l#
zL9Qat=;NavIg2J%K^6gWF9C#a6N6mWR>V{*a$gH_Lthb71$hXNM+qQ&of+gN-GWpr
zVyP8*tOdD^f@>;bsUS}P@-zX2-xCJ;N((Zof~;ym7W5#aD#!*vHWNVjL1U1+T99KZ
zNJ9(qwI1Y{3bGB5?-D@xMP-mhZL?-okmp*Ed-`V0svs``@_hmbKj{qejTR)Qg8ZNb
bxvvKqdg!B<wF!_`0to-7FvtUWPnZ4&fP_H|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/Page.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/Page.class
deleted file mode 100644
index e878a0fad3c047dd34f15ce969221e3385a10cad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1560
zcmb7@O>fgc5Qb+R$0n&EZGiCo)wCr^)4EiJOR8KdRU9Hf6y@$DOX}jpkz-TwuRx+g
z;=m8!M<L!>CqXz4p$D&bW_R9sc4qhIukSyI=z#1zne;SA232^d@=)Vp+oZZlJA(AU
zKOYNPZJjwE9XkqL&u+QnupuaS;`WD57zI+0omf6>b^U?e8He(NjSV9|2<?I2lb-$7
zKW{V<ZFYSx8Vn)5|KG7kDnx}Fr_$-kK+sM~rcUH~J$vNz-C^H;sWu+_ekcRvHQuWk
zCWr3O4V!|>l>|T|X;<5*!x8WW6<Y34zKRAN8N72k9z4aC-*vpU6S!<ooO*cb;%J-8
z;NCcW38>QF8lOf}onDe{Sz#0Ci?`2e$%ixhGDKrQT&z?R62N;l=Ul8i?Qb5EaSo^+
zTtZ+5h8qTrxP7=`keI(y|LSyZ{3m*^a;adh2`7(l4d#%V&hsaJ6m;dW%gxVm19$mp
zShPmF7G0s7MHUa&s9@156>!0paI*$pn0jEIgDd;Gb0)i?piHIOrYCrfCLXI!8mp6_
zJS>e?@FCI6z6u*T)f&>`Z(?nYitt~D72%)3zfk)|qPBfOTCILTnJ;i<=my3jQV`PV
zv<}%a#5U+AJdfirD$y-i5SU=_i~%&d4Q~nmcx?q~<26Q#Vei0qm+rx46dM-r$=1G-
z_8AjR0T{};rIK3lhDp*`<UV{4QbjUJk?KN`hY)#$Gl@A8Jt<O85fLcR`XsmsZa%cZ
z)zrC=@j3F!Yg3l?ltNq@V^%;z^@&SRP6f#(LH1KYHqt?|Ns#9Nd9eV5FA9TfD)_D6
D+Q&n7

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/Pagination.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/Pagination.class
deleted file mode 100644
index 7fa27d186141ecf8148b8ee4bb0327d4bc2344f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmb7=I}XA?3`EEL!l!^^K!YVj7eq-F2?Q18CRs%bOBRI<hoj&C913B!1RA;-$)0)k
z<9WLSm}3y37okt+=5C`3Qx=5TILX|J(~H+ft}A_ZmFJVowdHLv@gzB@tK!-l%Za)8
zn9$pqqEueS3H!eT7C#!(+Sr`W0g8o9$4lwy?_6DFdS$E>4Fj_B#+B1I5n=L8{+VM0
mQx*uLaD-K5!Rz#(Gv6T)8uAx_T7)KA;@jdH=!lAf>b?N@nO=VY

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/PagingBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/PagingBuilder.class
deleted file mode 100644
index d09b72389e539f5660b7d35ab77fa5b4cdedef1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3350
zcmb7G*;f-+9R4mz7zl$33T>=_fD5a^rD}oF7L-aGkcvXJo0Bkxfsjd)iK5+CyV-r;
z+lTtv+H<g}=k)Zc4}I@H(7&QD)qeL*LI@-W`f}&q-~BD$Z@u&9&0l{5Z~))?(TZ_D
z9>R%Av|z%IlQ>m{Nla;YxC-Ss?I-z+WO&4nNAXw{9>)_^I158AVGR*Uo|a@&F6T5v
z{iwx^9~)rF-K^Zr$t5P2c@1$t0vNA^jf93L{n&<aX)-A(DGiPv+cB;ot>L^tb;5{R
zal^6f_^6Q(*ch5M&KtqBW5t3b^a)f>SWz;hlcs=Kc-tR}*z>_~$}#7HyieFkCpc}M
zv*MQ27aW(Wqoek;*;j-yoVH@qL1jMbvMLmP1GHJ*FLewEc-q=01-wJlA+cF;b1Xd{
zHj^ifaEz4NkR35%lSa~#=Pc3d%vdRbJ?pX=9h5N4B#rtNB7!z4y|1l^_&j06f+v)t
zeeKI)5wcQ_gzd&aVEbCa0=|TiFp~m1im(>MkX#a6K2HLjMPy2aQ(00jZCVYuzA%0l
z6S){3TESZ^(<?2SDs`v-ci`5qyMg7FNIT}y1;$$@YB(K_$Wj|JV=*SJb#2?Mriy99
zF=WQL4O{W)BRmSUl#J<MmWNsJMrcT&u?VkQ8xjclw1^#d%mrF#F2d>tZpdXJcfDD{
zp9Aa8!V*T=Jw59XTLxE(R8KfYWR4B5dPu_s4GS7Ba{e$#{gGI<9sLt_IvFvCE!BL?
z0Q-B;ZJ<4JZs=%3yM{|Tp2E{Qc3`K5XLLM^=QKR8;|07Z(7t+RtgNK$K+^FNdUW*T
zZXGY<6{6DdDlQY6j@R%y@#%O2Z|ZmpR|K}L)|+=y$J=;E$Gdn>qIjPjx|-WXk&C2`
z4{$}thxkax$GEKH6MU-UGqmgY9A603<mcouBQ?X&Y4}pdSNNI<D5YFAaWpt=sp?hn
zQ$tV3H~3b^ck2^gIALE%<%I>h*05KQD1l81dd!GNgU7?OW`t$hR7yj(N(DCL{dIe%
zHcuFF%%tJioMw%y^(-HnET*VQ-__*X)z)65If~4_meopEa<PJy;@pG78M(Ih9J8$d
zyff+<^iZ3?t~R%mmW3)e_Lr07NU_}*b5K)qDQK-lL9Fcm07XiTv|4J&W6QoX71mO~
z>kIC4iJ(W?jFB2sBZzP48IG>FI&8`D7dlX_Fv;oVPQ#wklT?kkBA~n}>k^-2S{o6l
zYa7Y36xxyLpEP1=GHNN)agEg#3o{3G6`3W6TW?k5&o!sO=B$kRQBh%$KMKslu$`PY
zn7f*3Tgpx)jl_`qYVfTs=2c-fq?X-l)LX7@=)*b7N$?%wR9mZ*b3#mwhi{m`;UZqI
zv)pKQA;}qlX8t|4@=udxCx<P+yLc+YZg{!pEauulN|0Z{udm}e#7~N)lWVymHlvGs
z-DN;G_V83mksd0N!dLk9^4r?6h_cW%csdv1&A?ZN-%&o=)scZ#hOv%cP|^J(**uV{
z>*3?t#<d-FRMSAJG$c)RxazPM`*`x95&QYC%%b7{>zz1Aa}9)c2#2ZbE^<g{E~S?g
z*TX(S<io%lLKKH6qmk1l#L5uy`A54ls1g|K&OjF&+f&?B3nJdo>+KA97qPL|7x4XY
z>+gUsgH3`nz5ME}zXCo_1~t;L+TQYjH&DKa&5PLL?&=m%FC}jacxmDGtG9lTk@PBe
z52Bj;Af4%9D)urJ`xwdngm?h=(4`RFnWRH!>5z$D%%Kl)-pX(c(AjRT1HAW<vxyS-
zlC~4WxDSIWSoTt|W-){#blXooM=4RJLR8PMt7Dit+`IcpJ4XFm;kk(#4I>&J(D2~D
z=++S8{vT$#0;5Ysa!OeO_TE6?^mT0g86GD48t%A(Z9F$*(CERGA~oH>c9NQ1k_-a}
XF4tP6qD56>10CpLwwMIol;QY)AzGkF

diff --git a/ureport2-core/target/classes/com/bstek/ureport/build/paging/RepeatRows.class b/ureport2-core/target/classes/com/bstek/ureport/build/paging/RepeatRows.class
deleted file mode 100644
index be26de7dd110d64e4c995560c62108a9ce5f9bc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 984
zcmah{U279T6g`v8hnub@O*MYEDFsPVaS(h<>5EW&SQJ{x`)o2zr*5)gGh6XrDOdy_
z`~m(b@$7D-c2f-lGjq<|Ip^Lx^YhpD9{^sVQ%41lT$J%Rou1V2w1#bg=9yMw9Utqt
zR`xjhxFF@9s|zI)YeMOpg&hdECuTBJHi@->EF2&Bqi8CFh1DM<1Ljd|<un@WP*QGi
z$lJ}+D6-c*st0Cf?4iJ3w;(qt;@(i8{F;IS4d2Z4+hiK(_`M23GA%zEsc@)blj0>=
zwr7TQ?B9@BkeF~R=W1eR6M0oMlWbpC`ZWKerivM^E4Wa=y708Vt%<frD@|&3dj&1#
z`ErF^XOPRkS$XIBNtDDRePq%`Hm;iSB7J@j8`$wsMa@GUHG$shEB~XJeDLf8g^E3X
z7o6*n6>z$}A$IxmD*TQm4k|<7R)$<+n*4<w?l<6(zs-n*tHZU?{|3?DzeK73{1VO=
zQV#BLZc!N6=DY(J9df&9km=;t(8MMY1(vqyE;TIiCeY@ZpSiTn&(f6g<hID&#XaIQ
t6-kuFRQg}xeCDQ<B~Z=Cz0B0h1D2+_NSoaK8%0V*k!SxEd5~E?{0(04-FpB4

diff --git a/ureport2-core/target/classes/com/bstek/ureport/cache/CacheUtils.class b/ureport2-core/target/classes/com/bstek/ureport/cache/CacheUtils.class
deleted file mode 100644
index ac0e4dddac7c77b96cf075f75919236353011fa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3510
zcmbVPTUQfT6#fng3`s^V;o_}T6fYpi*lKG9L@{`w4PXJWYFj!90}O;rnoLyeMSJ}Z
z?H};f>VqroT3vnep+BSlqHEd9cg_q+2!pNiaAszoy}$kKefHib{QmdPzXCXg@1xj_
zxd?XQx?DbpLB|aZH)E*BEe#*a?~mlp$1${FUM`<#Fk?s|Ep--Ru&@}z5|-s+OZ^oM
zt5TfNuoguJ<{FXJ;AqHc_*5X4w{lM2O_=FrOW<%a?W`H8f@`fBMQ_JQ%PnKNqBbPZ
z;q8rCi+0v_Z71v78~<TnV?d;)#Ff$M+4-^2+0pq`Yh56oTrqE(M#ju888dF)&Mr}_
zVOaVZ5eW74&IyDQ&H~vsC+(~?SzJq5`B^iSp(LJk(q?AP%-izY7lz$syC86ATW*T{
zHP_A*=t^I*+{Ch(cgIZE6gb_pl}~RFk~A^Oh7u^ffihv{Bv}<#k!}nMsGuo@@dZYu
zBJbQxem%Dlz@^Qm!&@2s4?-jKxMRjO)2sBZGNU0c&{}YvyjA9{sK))6%Uos7Lu)dM
z$c(*|HC@(*z<7<?tMZcQ5oUcVwPK}Rfg^z_uT+Jn$8f@nwmkHh3Sq<gXn=K9!hB;D
zk&{~4TyJIMHq!AbzEZIQi2&%JT39Hzh2J(65VG!24Yd`0EC4;=Tweq(qiU&bO@W}U
zd=U&e7A$u(m&@2`Q+2nKb*;NRnv*?AC%<GAa<VTM^X8g$$H}i6X>Z@yYBD4#)vJh^
zYBK=x#LFV`+|y1bBhXpZ770pNJe)+#u<oTmwKW_6Y@pt7KyDS!O`}eB&E;3JubjE!
zF*Guyp`gL#ycURFyqmUik}gF>fyUu<#-DJ}8K;;}TbER6H!E8;ng(P8=s19bI`*SW
z$6maq<22r3TW^{yI&R~Rz=42CzIjIJ7{ri{*RfB>2+rv^k5Pf{0K3{7K*L=f>$s=m
zGknglbbNs?8Jmv#c%b7ee68afJP<hkVz8PV>G&4k2@Gy$M0K;6aVM-bC%<0XKq^x_
z`*}50=NCA==LHUKhgC@|Tc&olu+U$w%t!B-aw1j%c~_S}d*y5@HOf|~h{s(kZ*m9=
z^aMFgS!T9iT##$IXgG~IplT-N#$?+%>;wjakhkwzUdzN+KBpFEc@Z&@)zc}FF$;yE
z-m1RvZnTEmW~OMd<#zQ{Z&m_lH#OSjcsn;~ZRCME+Ok=gR0D_i{Y^G}R(-T@=&K(G
z<zd~pU>D?d&x<r%u<wy9t;X3YyZCELU=Kow%5LFLtf;JZ^<)e28R0%VifcE&3_b;)
z^~at<{KS_!9OBxbgk3nycimIK5gg@L1U=}bL>m7{?GT?mk5QL=jL<Xe=h|07xDLOe
zexm;wn);8G&>%mxN8%B6!wP>7J%D&&qD6_f6URumk3I&J&o1KbL^Gv*^g$2kSLCJj
zalY|*DV5ATErVJoC~1Uvjw2f0AkQ~(l2XaDNHmGkQRcZr@+7my5M<CEsW_jYS(t`V
z{xogJ+lox5XG}?-(rvAwKw$0}+$&RPmlWQjq>dO7IkNneO;9599arg+G{}PK@{$u$
z$!StaJ;M|Yq6NcMhY-gZl?Lf21kplh&NCl+&X2OS0?niFBdkU~N96NFzEBlitB(w{
z(&Je|R{7wh^nIN2=|>+ULgG;pS3y>4=3*7ys1F*EW7bDV_$*@*f&60L33z1}RhhoR
z?2lJ*i<P;>$T>kEfiYa9E)Q480;wknw=b@ju%iwoGzm=fm(VOQdAx)cfgjM#msY_t
z)Ca@6!zIL}u;Jl9f9wuFLFgf?A>LN8mS*jO_1*FdI&M5g=MzL8qMcG=`ao@zRcdDd
zF>;td6DC>CQ>>t?Jo#xJ&I~V_Ye-^_>vjIuasvh2Qqi3v?_So<CHASTJlAhA`F0ss
z7-bU{nTdB9VUjKI9^XQ$@MT4Md&%<N1oz~b?M3}x=+H2!Vd^=$G+g}?+H-VM(t`J?
m5GL?6J7uOk1olxP{~F>upP)_##eW^-w~}{ro#j^@uKf$)0BV~6

diff --git a/ureport2-core/target/classes/com/bstek/ureport/cache/DefaultMemoryReportDefinitionCache.class b/ureport2-core/target/classes/com/bstek/ureport/cache/DefaultMemoryReportDefinitionCache.class
deleted file mode 100644
index 02f228d499970f6de58f402663a211b6d3ef7458..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1428
zcmb7ETTc@~6#iznveGUWK@b%M<l1ss@gCdoV2LrYXhID{-=@n@7TVorJ4@uJ_%Afk
z5HvA9`=g9!rkfVqjY>8<mow*l-?`2F{Pp!afCqS-Mh3GM=F%`Q+mAHnGg!c)g(Wp-
z)sR!evV|23s}|N6`a{tOLb=5o3`3<ue$1UndNqdxc{(k7RiDc!6b##co)%i$8uzPC
zS%#ip&6nJu?o^sm964m6V4Xd&@A;ne0^ixzlFhatzd;0j1$Df^U@m2M7*fSxkEn)9
zo-bZS^@<4J@Jfv&Bc;IQwH+RMY99+z^1y2{6cTt{?j8t-$aqwfTcRF>C*Ax-r9v)@
zR)y?7V<;~5#+OYX`dfe$&%W34UMKc^t{BF&kG;&B3CtHHR;e5gyYkK8To8s~pe(t2
zM7<DaJY5c=&=t>hREz&k@0yC+#ubb(EOeU74SY8WL*YxO*j~Qi%>!bxF@Qk}j*Yum
zXIQ;ZPuaMK`!?N$bsG=yh~a6k`Tw>CrLa@A*Of!z%0zcsc-?i>-9-uP1g)=_NzF#7
zIA7uxbUu5o-(nF%hB76&=Qm%96Y7{Gvv+ifLTd11x+P{KBJ?K-YQ5kIe3+p(BLfDT
zenZuP<{^4p3=G4hHPw;EQIc%vJusX*1<QSd@%9wv7o<LE?W;7ZM+mry6ecl7D}_n=
z7{@i5876Q&#(GAYN_Q~#8L8znTr%(jeIH3;Kq2*M%PEaA-qMUw$ObovgV8sMTQS~y
z^35c>`54bK@SzQU*}$%rubiRZ#IADK)HEaHDlki7&yjNrG%jk&=@wX<az3Uc0^G(F
QIW(;?*aY#<(9*!2-*_{7ApigX

diff --git a/ureport2-core/target/classes/com/bstek/ureport/cache/ReportCache.class b/ureport2-core/target/classes/com/bstek/ureport/cache/ReportCache.class
deleted file mode 100644
index cd8c8693bc862c02b2a97b7e2bfa6cbcbdc20ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 277
zcmZvXy$ZrW5QJy_i$(?CK~U3pjh&@nB?t-@c9+W%qcM@o>BCw006vs>Ne~0t?844`
z?9B6Ze*l=F@1X0TN9crX*8Y)|A&e%gqr6EG%On(AqoX98dzDk^n-jX3Ni~14@gMA$
z@^*xF5M|PjIUv+0-k#uY)2mjzjAAAXHhf97Sx9x@X&!_yROwmxnc<VT>OvJNmqo>D
i!Efp^Q;R^T*`h$bVSk|k*xf{{*bdrOvEA*g!F>ZRBS~fe

diff --git a/ureport2-core/target/classes/com/bstek/ureport/cache/ReportDefinitionCache.class b/ureport2-core/target/classes/com/bstek/ureport/cache/ReportDefinitionCache.class
deleted file mode 100644
index c2e61e32f61e56dd09fb1a1bb6ba696d1ace746e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 350
zcmb7Ay$XU*7(JhvmMuZF^aMH7UD_O#CLu^@*W1mmnTB0^xP~5}hl<ppKwFwVI3MTt
z`MN&<tS~Y$G+_}Yu~1ua$qVI)gUqCoc}8&OeiGh7mWEl(0#(Q?c5I*LXBJ(RII*&5
zC~W`Xu(pUpnDUSxMf*YUeyIN`Ztn<Ike3A)YnckdtZn1g-pjfLVbM+AMC*iZNQCjX
e{3c2SR|bKgRm%aIPUt}gs@sQAAq2C=F?a*wwQZsR

diff --git a/ureport2-core/target/classes/com/bstek/ureport/cache/ResourceCache.class b/ureport2-core/target/classes/com/bstek/ureport/cache/ResourceCache.class
deleted file mode 100644
index 9d63b5b2a2870d3670b013037013243b5c1610b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1100
zcma)4+iuf95It+BapE|n4K&cwLYvYyNue$fB&0-rsf3USAQ99G-qyxSoQoYfn@W5N
zf5GLUDoA_)ABC8;oyHMC;$?PccJ`bzXZP3d?>_<5QP-iPoJAHpIo!jp40|%{%TUo!
z)uExRp{C)0K^^iDL!s5<=iHnKcVNEcqXt8^?RGpaCV|87Wd5`nr33DD%(e(zuhU3W
zURyoK7L8-VNH<;26~{zUsh%>VPW%sqR%p4N^J+4*oZv0D22?4we47tWdEm-CE~Z4+
z9W(5=Y=3B4W8w5o5;O7xVcOj8I_4W^>`wyQIgy!EJer7zoNiSTivFolic<T|N2ws3
zKRFT|`BrcKD4vZW-xl2NlT)$SY{$9c-dn(3P2gXFWSaIMHb`%Wqdap%JLV=kl*$Yg
zuxua)L&JRo4{&I}#F2rAcx2!)ju=*EFZi5~yQGa__rJVjSe{Kkbud4J3!!qh?+NaD
z;}_De)#QxvK-Ks3;(;^t&*@3$Oqez-GC`$RV|cm%@9*w~E~;cbw&}a;^!*t{GKtna
zWeTn#MSJp&;tEwvS{bcNwF|H>VM~!>IxMc?I_>3UYQPPw(wapHH>n~o_n{IbQ2q*~
zb_rF%C*-4jO2L`j9b95b#hFA_A(4wD0N5bZO+va$LbpPeQiOzCSfg{o#5!&h&j#&P
zuo4k(;!aFlr)DWikI2#rK2xTI1d;S|Lb@J<W{7S&_fAL$<bFVVcY(||C{iQ+Zi*4a
KI%QiS?Dijn;q-t2

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/Chart.class b/ureport2-core/target/classes/com/bstek/ureport/chart/Chart.class
deleted file mode 100644
index cdf60c3d9190fc0eb56e1e48d728f2838795c1d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5422
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/ChartData.class b/ureport2-core/target/classes/com/bstek/ureport/chart/ChartData.class
deleted file mode 100644
index 78c8bcfc68379a5f8d3363a5d3dfe523f24033e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1685
zcmZ{k%Wu;_5XQev^Ty>-+VZBfywbGPKnn#5<q?D^3LsG^7cLujmAFmp%5gyaPaHs^
zfH-jEz~6)r-#8()5_6f|9gk<e`R&-h{(S!dU<nV3*ay3SA}$wk1y^OaC}ydMYq(zI
zZdr~u#N5o`Rt_r)DR)z0th%M&YP+euy1gC-u2<)i^j6#V6pA(7HrJOP>QE~jd(rVi
zw`Dfmwp(kO`<~~AI&^)ntx&G|LEU!zP1Deww!NjDZ6>gFH^$gccv`D_eqfk9^UmE2
z8wzSoA=@x+y%BPA+x6UVRbjC-EU4=EExXnZ&9>bM%#I&~c8j%|cEvQCE3+FET;W;a
zK-KlkvremKf|r^ir9I!#%?%y6a_%|PVZ){Bvk7^fhGzDPSZP~WI4q)YIw3eFLLpZ-
zq4cRRUYZ^5L1DCQ!Ur*+6A7J4FNXrddw6T&vFXj|4o25QqJ64&qDFX+3VD`&-32;Q
znkCXa%k&)S(wZbJFywKMbAeC)?KAYRaRiF%ekX9uBUga!@AtkSgJEF;w=L|)XbyKQ
ztYXT7g;5I!#B<leJ>0i2BknOAwlI#v3e&^)HNaKj;NI9huWcEJGeG@Rdvf^YJ<eUs
z&vc7QXNChE?KF&C5&J51o4jL-J@z|NSWaS|aI*t)S1`>FXCJ?{3{uiRcPW7qtwaGf
z#C?|Qp~y!VLq4(@@D+HTz$EPvzV(JVN4Soaze1Jgc9AO2f5FHu(x0N7N97sPwC8Bg
zqks#nb`i(uIn#X;$8mxui4%1y+MUEHX66WEs#nS8D$g?I&q#gbCIv|@@`2eXq16rO
zB~&ahO^?W2WpqlSMPg=8S~2p@6Vat8!(=zAFDWZC!yLT1zL57kNv;_R$^1lKmX9>)
zZ^%~X=$QM0oH#O~awJlDoH~Ka$nj5SVUZ)ZME^B5xg4uI)2lm95N8QR5gLdrW&Os%
z9O)_2yGSc7#d+jE&=KcxE0ITuoCbNE*hPMj#~t!mjp@q9cyxz^zt2P=g+U?r5{1kq
i3n>f=sZhwn{|M<$row#xV&X*7gA?*7QOKo;+rnQk{wUr6

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/FontStyle.class b/ureport2-core/target/classes/com/bstek/ureport/chart/FontStyle.class
deleted file mode 100644
index 02c773857b1bb554374e307c5c450550986b26fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcma)4?@!ZE6g_Y2)~=Lo)HxmE4`9MJkU1Uk!xjP|kdQ3$p}J%-et0W&6uZ`R9f|*y
zjzo+`!)N~}<9&|>Ml^A4@^0?E=bd}*z3<oWZ$AOlQBOg^s*V!MDsn0+I?`AZ$GV1$
zPRVtFc%orW*bNP)uvHaL8Ipbw_PNKf+_HmywL6HM_tjzOd<ep*Y9Dht_X9t&qK}@_
zAh;WG&$StpZr~j;sKxe9>-C<+P<%5T!72BK&VXU1RG#jJvKt&Z44IbeJ1>X*t`olE
zU5_HFq&j@Z@S@Z@;itUnalco!qR{nwjq+4-%vNA?ugybOaE^%;pZAI1{F{^p&~$w_
z+G5E6qvk=mO_Pa^UFt7oxjmmpG)jheNhGwU?Ts&QPEhap!+vuLv0F5L-3o@G?d-dv
z|Mb;jHbnOZZi(&Z4Ak(9Ve!A~G*G~E0}t@fKn7U@bK)?OCF<*O3V93(+Y5ZEnJbki
zq#t%q96KUio0G%X_4r`Wn1Eev<R)ulyGGA2O>bD)E(iqxSrQ>F=>W3xqA7tu3b&C5
z!yWRL$cj%Nfqg;j0`X7eG2EpyDRX(k7cf7@*AbIZ-Bc=Hk+^^&@Ua{CdlWG)QCPrz
znWxbZN>r>NPCuYl))vl@{4CRx<*u)*cqF7_QDT;$VOa_mG;gU9@$Gzv(lOQeIkYpR
zq@yd+nURi>kj`xK2jSu)dQ2T<gc+-o7-7~r0}}!+`_)MyNaHF^CpIox#AAxZu<{4x
C{pXti

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/Axes.class b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/Axes.class
deleted file mode 100644
index 6acbd9fdaffd2cd5c05a8d7ade67c5adbafd3b61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmYL@I}XAy6a@E$U=u0|E<gtjZs@3JC=e1wPT*Ki`4DX6IEb@RZ~zX4uq&F;7NgOA
zzOOfc9SR94F(ZiJPJ^?A<$81O^h2v&+gg>ux3=CB=A|3G;bYq~p*TEw*d~jxGVZ3T
qA@Eg=p6|{FWf~o+qoa~YSp0*Rs$&xbfsn-q0Of=U^0Y9G%piW;5hsNJ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/BaseAxes.class b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/BaseAxes.class
deleted file mode 100644
index fd3e9d9b4cf577954946e64b848018d19ad0bdd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 896
zcmb7?OH0E*6ot>Ev9W3E+xn<g>jSG5vvF4`s2~VM!Akd&IB2vslBD8~a-m=mT=)b0
zQR2O!+N!l6fjgO#d**yIlehPmR{+~sGBJR;1a#!M%o|uRuxKDJFz9=s3|+4wAPxo0
zz>#%Tk+!M}tXCZG+OmUCU0F?E-FSXzITw<uyi<Wy{c0@<#CP0=8<quPh4q?%zVDqW
zf#HhVP)E&cTluHbu9GrW@yJ$_zRUBrsD~GBAh6ayZ%+nlmx3uRd9K2fFK~(^^kmSj
z>4ih)NK<2nQ=nM*&!*C}WVd^>(4Vl=TjFrD>NR~w9k{&l^e6t-rM#6XB#}zNz+egq
zm;$SPkNVRqFv4!DE*t08v3;qWP$1ve$|t7h>DC88w*-wIN~PaI<6s(DCm5<}nprdo
zRyUp@9;3D)s_{t7V3^*ym2D#!rID@_<5a(!pP=2-M-3hGY)|t9Cfnw6#70pY*%q`;
zv`IRUqrmxSg-kS$x8oU&_ruf~O!WYXJ^TP!><KcBnO`8q7Ggg^mI-9#4-h_32APc#
FvmgC3t0Mpa

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/ScaleLabel.class b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/ScaleLabel.class
deleted file mode 100644
index 87e8ff545af67c3eb4b4da2d690e85e96c871f10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2356
zcma)7ZBrXn6n<_9$tKwnTuWOD+BOIc36feZR)S~&X{oWOsbKMS6SlB5WSL}ftd76I
zKjMt9q%-Y|KfoX5_?+Dh<Ym+8mwWcS-SeF1oSXdn-_w5pyoLQFCb5>l1U}HPF7md9
zJ0dsaxSPO-D9P7HaokHHi8T$IB0tvfiO5eilttdx@R^1!4ci(%7sCS$J0ic(@TG>Y
z;`lm_ZxrIYcJr`iK2}gW3aOe|v1(<vVb}K*jM5|Xd$Uk8>w5*?R#Zqlbn5P^Q*#;$
zntYe-A1!8Y1g^6CxJG@dRCNvtm8NTbS2$`|hfc#SRQFAu>yjfuyezh4*KK!MVJJJh
zr4U_pcA1+l*>&sQ(Lu#(+&3$7n^AJAW^K!C*rEr<sJm}B6=nxkGJmj|g)$SZlC&lD
zT<31nsVkh#&W1G?X;u`*`#dX0c5T;cNcVPgtxXs)ld@#fa!*Xr?2hy?vS+zo$u^TC
z4C*qBW&4U0B~xdn5EKxsGp|EU1zw+W)+gzyAjG#tvm2e)1jCqSw=Xh|cDW#JCi?<e
zQZ89`jv7^K-IiIUPZ^(={n0Ult2$o6s|wI@370wOsfC3F9anH!M+Q@Ie5=F6w2s#>
zt#H0~?E?O}Wk2btpvsDwU~e;vV%eo@PKSkg*3Wb-ab_{25XsCboXN<tdc1nZl&1@8
z{uK|~Azt$gk$d?F6faOeD_k8!V9%B*jGn^ZtUR)+uELc;$tRD2yIFS{2WE{Q=Ha1L
zXG^b#ElJ<roG#}ix9>S_&2`%QILS46PGnbMzlY-Bc#d&`zgoaBA~I%vMP$sL<cK}V
zDSMIwrqrQiD|lw9nT+RdU@G?nDmQeDNY3CH%^AbTh~-B0W5jcRLOVv{5ATv$o);10
zc>z(3BS9@q5MzWfK?pf|qy(=-9&?l=6Z3vKmBtVY0?(cy`QQmsrM#iHaArFn=*9@O
z+~0__kTyp7-NH*<e#7@iDU6px{AYcCY><D<_s3f}7kdAB-=ApVf-%nTc75X_mF+y$
z-w8hgp<#y2gB)v|LYi->z?L`pj2!a(3%$RQ<rY~MO3wLh2b5^|i_zCeiozSX?vq1{
z=$xex@GC$3GBM9M*TL-Y3A1nVf6E`_GNXmrSZ;ztJe^h2vlh4@*E)d2f*Tm`t&J4E
z(VkKlkmzZ@K9K97Ko;<JACNrvs29i$0$CUUMD|vI+zbU0>jiQ%6v#W_Kw`Z>iUhJW
z0Ej#s0kVi9PkAPtqlx#9W;qnd65b7xyG9f51#*i(Rt5l(mn%S)@m>g!L@y(2p+Mfp
dtv(<eO~-rocjPvK+!+8wemVrmino=k{{zxNx{Ck+

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/XPosition.class b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/XPosition.class
deleted file mode 100644
index 30e6fff9c1fcaca09dac916f38d19359003c16cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1040
zcmb7C?@!ZE6g_Y4)~%EcrcRkC{y=OuT_wRUZXp<giDnU#=_2vdTdkwm^^x|C_-E-z
z#Aq~p_Kz~&R~8u252H=q%YFCUd+t5={{Hj*7l1W9DnQ4wiF;TvFmK?#2@AG5oIGYt
zaykl8%cG?3x`77_niTsCcH0vJx0gu&qdScKeGyC7+vRlfPk!RQeI=4W1|n)Q<a$C%
zF<>y3yHDG1wmJ;Xy9<OL@NnoS40Zb=Vfv<c?=zIzLFB(24tjq4n)gC_G17e79~fG8
zdygM*H{?;@?Z`NY`b}s0!pd#o@vzI|KqVe$*CRe4lJdWqNr+Yu1#+FC@*m>oPM1NK
zy8(4t=mh<UOVX9(wv{8_^1^ZOlZn(@(Qwe3w&Hb~h1n6q*z=zSN{Qm>lp0D03v+4-
z<}Ex#gJEU50b8iRwQwDa7G_bjP(qPXp9!mKWXO7<h=}vD?M&3a-P`j$Np(G*RAe*c
zNz$BvozCWb*5<}4ZKXx4tZghPa)55)2j;4(8S>~Tpo~i(X0q<ktv+)E_7$09XrIYq
zxI$+x^;HO8!PPN-4Vm=SEbFyz$R0yi_{=%{HF~j5P*^}U^^+QeQjDw6=m(5ieenpn
zFR6Qy?kwEE4OKdBrkEw<aSKc1LS9fK>TCRfzEd`|BjgWJNDWg@jhXCEa%m%4o*jLJ
cna&}YVmoQhq;f!QRjIkmnBg|bp_;k-7toOEM*si-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/YPosition.class b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/YPosition.class
deleted file mode 100644
index 291dfa26ab0cde0f4f8c47aaa08cb39e0e7cb109..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1040
zcmb7C?`zXg6g{s=n>NeZt!j03I-PSStu_wk7hA?;Oi+Ros)e#ouQ6-iOcP1c;h&`)
zI8l^+_Ky<p%gWZFA8G>cao;`no^yZv`u*)EfK5CuK*gGl`&ieosNsPQ1ExHzJmz(B
zS`tyqqa^RThKCHQ?;RuzrsIY~yB8<kdwUdlAHpcH-2tbQfAnIz`#Ow8BEq1_kc~ut
zKq1;%=b7_%x6NSf&mNsS;{M2s8S3W$gsD5>JCC8{h`@U_8uq;C4e$B%qNVxv4j5Xd
zbI6al?em~-x06T&{iZd$u(A`n-0$#6$i$QEYQTp?QvN$LL#`zPk!&$k{z3f0>QHZ!
zfuKqYZP5>SLTzPGOzFtCTz?Y$bSm|3FdDXIRlG%`(A(iCa=qt5cA|Jbq=xK+fd#n)
ziv}K{!LUBtd<|4!8@P#O1M?^vD4|HHFB&T~(hj(O7!c=G)0)!1*E{swgmgWb?#PbM
z<G48mJD<(vtj+BW+Dd~~S=nBa<N)2o4=hw=G2~HEKp9s+%w(<7EkAt>_63<!D4)n;
zxJG9#^;HO8!SxA#6Pff?FRQh$$eu!#_{=5z4SF%oP*_4W^;0(pB^fuM&<|*}`tk{K
zpHufV-9@;DTT(i1r<fJwaR)0CAup*A`8B>n?Ups=1o>kWQbSi$V=nuHT*{c1r>l-J
c*FFZ5Y-h#kBnMPhm5R$u817O#WHI;t0CUjlF8}}l

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/XAxes.class b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/XAxes.class
deleted file mode 100644
index ad8e5e02a04817b2cce7f829af670d69353465ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1511
zcma)6YflqF6g@*9yImI0@)AXb1*F|AtPezO0i`Gk7GtbI{5UNeSZTXWcWX$9|4EIO
zL=!*y!C&DY(RgROP_(9yCNp#Iocow_&-TafFW&&n;i-atq+*!CYz%Rj60R!<BPHX8
z*l)_XC1XyZtJ}h!mvKkzcV*lY&a{k-f(0x}Sdws`A+}$2T-&pq3PU1SbjoJI^{hR!
zUbCuB%`=O;oL0VXx#rgM0GVNkF4z^@TVe<$lA8?S6=&OG=*!s^>sh^Auxc-Pp+uf|
z&METJCa>AT4xC|c*LE3_oy*zfYRTMMrplt8=d8P;$ALsL_lCdaW{FpJ%)D2#D?4=G
z<rWx5+HSISyR>c92%xyshn3?6t8{AR{4taQd-5JH?rrd@-#pPR;Q@oXV|iOG=5*@n
z%-pH&U$MrSX%|c@d8b}0TC28TSMlkY6?~`|!mxy86<G|b7{DOI@V`U_bTF_36)Sj1
z<JUa9xaVr=1BPC$Y*$`59v5oR(kdQdRlpuIK*bYWp}2P{*04_4l-43tOA{w5E(^qT
zM;cl)Wti%S%yQQfvp+3kYgP=`I%YhUFR7{Ec%D<H1Fu%C$~MDHqD?!QcA>T8)J^k0
zqRRgW))+<;Yn?)5&uPk)G)2)T8#hjqPYayEIDN+b^j|=t7h|SVn9ekPS}%~5CO=IK
zs(uKje?-@3gg%hng%Mg6+JTD{bBR_lSRYH)C|OJlG05{1A^HL3uL!?BL?ma#qYX%}
zjJWJ?fjb@}OK(7FpgXS8xq+T0tXFJw)3=fOjw{9y{v5ee4V-U-8Wj1S3Woefb!rvV
zjEt-3!x%kq9P`kyhzXMTBvvs6j%n;7;Xh=o*=+C-85YHj(NnT8C{m+mPf)&YuwUR3
zCM60d#ZZDKYbNc2iHQCQA<;#XuBh)cPEZv&rYeDC5WGZaL2Fbu{zLXGA~5|7LrqkW
Of$;tSMPc2qX#4@ocwjXE

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/YAxes.class b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/YAxes.class
deleted file mode 100644
index 0120cd3afadf9a7478c9d51bc62c1261b5bd687d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1437
zcma)6ZBNrs6n^eD)>6ug6+w{KqOz@nq9W=BC__mw!x(2U`*=4RsBG=Bc1A<|PnzgR
zH1VS!{1yHYjpug5A~S<5x%ZrVpL5SS&w08ZzrTC~u#7DQ8Vm_(1rZoB7R0_N!<4b4
z;1X^L|F(=fVqcbVR~)X$xToMg9`urvk&u<J%Fz3+=6beoyADGlUv{fz$@8s4vr)Hd
zZrwM_2b@;^*7D5a^ENWe5MQ+&+h1phCX%}hu}yc+Vi?TZj`gfjEm`%Kyi}nRE$^0j
zWtZ1&;kOTC{(<c=B)g}xtF?+*+@Q=NpYJ~PM2*9VWd1dO!_5kJ_RWG{x1D{uk9Z}9
zv5uQu!>;UEbpj|J)nVm%$*P>2x$qZCf&B%amk)P%EhwHim$1g5?puB_WG+QjU6?!7
z`zO}8FzteArQkN|Woye8>?#30i-HdoS1`gbdX}3u0}Sj)#X26+#C6{;A9{M`h+#ml
z+Rh8t=RyE_M#Up+2w08*DmF1maqm?;#uLJ(^^ilI1hl4N0+T8(W0+ySYy06W8E$k%
z=D25xnV<J!I3p4VuhlGPk6|Ivp@3|sTtZRw(G*X*52U=!Fp=2q79#s@OLU|RiauS2
zah?c5a2B)l5o+`?lXL}vWW~s)8PYmRo=H0m0X?Z>u#aR!aFy10a5#=Jvegy<<G4m1
zRgOtoMet8V=?7H5B2qj?G;e6JCVE~OT0Gd=$C^Z5stLJ?UQHppiM|$06&v03@1(zD
z$~eIf&~dtn!49ZFksl~wG$=9!h3qNFn8qMxsHa)1K*t*9ki&Is;U+i|I6yLJWTsVY
zyAc@{#ZFTzIT#c@OReklULV*ma0zn~JwY;}N6u392}7ca(^RGZOVvDOZw0RtIzln=
il<^ruA<^QWQ%s=;OTh~xEmXTkF$gg=F{5OVG4%%lP)i8_

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BaseDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BaseDataset.class
deleted file mode 100644
index cd92ac2e499a32761513b821349fc94dc6d37538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmb7@TTc@~7>3`Wr8|@YbpTQEP|tvi-I?yvR`G}@v`XR{lE$lT+0-Joq%6jt;gvUD
z82^D@nV9Gg@DF)ojPJCVs4+2K>@)Lz-#6c3cK6HokDmefsAX{&MF*aQmM{_}311?R
zSdu79R3xer7bGr9EK6LHxGZr+;;O_oiR%(85;r7nO5BpTEpf-es)M@@?g?a;+nsiD
zSs*nxzb=qo>2AaV6Sa0Hez5zj5%(TNjV)SKt=o*Y)}vnA>OEsRdD7kySgbX>&x(zm
zBz{`l?Zw;OUQ%p6iO7v8iFV?oc%8g4*k2SFZN<sMR%4~R)$IvP&#lhaHlycJaVzSy
zieb`gcUp`ZZg)1~7Xo6HU9POv)*glelaK!vIu<5T^XdI)yWf|C1%YhX-R(8wTW#BX
z{+IgaZK)iN;u!6JmKDgEAaD!Ss$0+{LmBwoEg839O2JRB@fcEBqAYWxtMn2-y*l9G
zC7)yJpyX=LxJ)T9LSg!X9^+{WYbeuW^D&7{k+tQuDZ3SqLYEmrgKwj()r!8ORB?U!
z44W9$e%aNUWpvf5YQ@?IMaO%M)|}=HfyY|xf^J(i*i(ji`j271S>rPgPYwc0%<B0A
zmDLr`t+0f3W$k$;)P}7%R(Q6l5$#vFGg=Fr`;QOex7V=N*o>Qrz}bH#*!!B&$1%&F
zL*NMilp(HsuVjI$$W?G1Uibj<zVALxX8Oh%oZvn;2*634qDtd5&d^fe{wr0A>zn+6
zPZ+AFR4S~eRXVH>tKqPoQJJvrC?~8-CBu3?qee(aWl5<<$q|(!vucbSRpVq%O^{<M
zPmZg7<b+aWUQLqw)D)@IG&!mElT&JjoK^?O{puh&qYj1lXWh?lA<6A!ch<aPiz(Q#
z6dMK(;w5k374P6Rt#-u1V2r&HIS|fbjzhl01m>~8J3GfH3GofD9k}!?QV-$$56g+&
Ax&QzG

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BubbleData.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BubbleData.class
deleted file mode 100644
index 40e3ad809ba195ae6bedcf89376475a42a2a37d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 926
zcma))Uu)A)7{;HIq{&w6I;We{{c{txHpl`ZdZFw>gI7gCrMSzJ?675P8%a~qPbGpy
z@WKz^hZ3LnG&m_4cyZo;Ip=wPImxfzKYjvug!@hS*jz*dTN1V<>;$+MU{^tX;)=OG
za}^5yvuu==M=UyV9C!N)-i!RiD71Uo$h?{i6H~m?$$*oUUY_bfUl*D5)zB-?va!O0
zUYZZ1WL%nyXi}IDc~M5`nPxoEr5>9ydOk^bDrWbT9;c>!ui$pNMDh5Tjn|pk^U?8a
zD2d&hS;y3Tn@@_=yvzireW`eOu0QG)u3@i*01GWFN@!w1A^d+Xg=Nu+26}WFy-v<e
zT3W<Dc6oz7@79GQ`m7wWu$eB*0Tk_9jMv!>xies14ZlN$2U9p<cM3OLZ%pBRwa1ni
z*C-2Yz{4ixwy=b4+`<mpoQ9lI0L!?+ER`55TZy%6D=}|yx`LaPbwo7T)d;`A`NG1X
zEJ!cIJu5Ag+)zm?TCP@yk0>j`zGc1yZBhl;=a~bmux5MzFPvY&DZWx2h&vAw)`Hxw
y2XW^?4ha%n0U~$9KO5_{Al^L4!&;C#^&tOzy4j69CdiX3K;+X1$X(u?gN;95fp8)K

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/CollectType.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/CollectType.class
deleted file mode 100644
index 14d772d87ebca5cc64178556f0aca54fb2fd5297..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1259
zcmb7DZBNrs6n^g3tz9WF28?$_MBSKBQ1ES&mk>-$7WhykS^RW2>L_+CSzDs<hxj+N
zBw{ogKKrAL=Ux^W(JyP0^Ypp*+;gAv(qF&7{RFUz%?uPQ>sY}96*DRx>KMVQFl!n{
zb=q7L9*;DP34E+!T;LN869S)Vm=yR-!<4|XiV8zIuwA<mGAvdbe#@)}q5am3+V+Xx
z4$a09Cws_49@wF|?YqKt|NV(wW=J*s$fI+~AZn52r%kdg{!UoOV^HT0wyLjoEQY1m
zJ%&!7ayPOAhUG%B*R#sDe`qrdRvpjYjaqfPz0d0|t*A2S-W!IkLiL!Ra?|Br)3n02
z<2B309wp|geuKLQyzPkSohuZNx9Fzazu~FQ6~}YJb%y+ZZhu)kU{Jy%hjPwXPSfKd
zwSX#F5F1*h;dTyhbcNpWqE@9R+3VCc-SVS$!+zn2nq<3Lx+H31U|LMpjDhDMt)(7D
z!oVCh4BSJ(z$o$t#)KIcW<r=rVWyC07`Upw$U%&f>w6?;q)_b2Z?Aq#(?*ilx+}Kr
z@*pU8x&3Y6^{C~|6`Ju8`f=3F2_Xm|Bux@YmPAq}k;F+PeL!|nRDn(^$lwNUf?<}}
z9HDsh80-rY7f600#&C;lTJGh^e-5`h{;NpHRXwLHd`0R4ittZd^Pi^`<I)Rva98eA
z1<7lczE_Z>moiu=O`jwES#Eb<cXeDvQAo#v^eI8ZeUv&vK2jp$`S2Y|EvF{Wp`9Tk
ziLOY}Cy9}gq+gPOv?PO)WK~IqB*|%#3}@3nC|)wAiLEIy`m9<iM!!`{#~8F~YK$SP
fro|Yx&cKB9%S!2#8>kPvBsbBKyND%POThdC3YZoM

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/Dataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/Dataset.class
deleted file mode 100644
index ade562a67551b16e9e92bf9aeaf8ddf4d210a8ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmZvXJ#NB45QX2EAA^%fDYygBunnC{5JhAug>!+mJu-&HYuRHIu13KDI22-?L`nhG
zlb$}!eD8WYUjQue;$!S1AiO1QVY0Or{n6Nx5YM929#ql@?^RoKWouDCj9S@J_*=p!
zz`<s0)QXJ>=h03dwKBTQRV;N;<{`n)S-wsc6DG5#KoHxuPI*%p$Gmnr4a=gtM3_Db
qrCaT^vR_R7;e_}9*PqFbQyCHno?8rfeL@d?z~ul#*Ep@N$LJ2S;!pzs

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/PointStyle.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/PointStyle.class
deleted file mode 100644
index f7576f353c2d869dcb7f17dc8515bf471634186e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1421
zcmb7EZBNrs6n?sOYgYyv1BSf6iW_ee1>ZL35JAyJ3{{fFPhD4`I9k(nME{kJL<~m5
zXMcb{$9T@&A|v|2b;)`5-22>no^$SPfBZW84qz3<2xQ#Va1U7pa|&`AhH;-mUd4z;
zlX+G=P%*|>P%+N9u401mp^8by4HZ+2k5o)EZmO7J+)^>i_*lUc31QRr%&H|}v1qzS
znR3my-e&5a_0IMDjCo*CtQfvgv;52p*LHl}|4_BE5<;fu)@l+|fxE6RL9Q6J0|L)7
ziFGmTx^<^wRU{})#;Tfcc(l&<Y{S{-%*yQEdhyk!E@A0)XC}hOMzwB{i%crr;Zk|S
ztx)b*(RQro^`o-oy)??gjo5SNjf6s~cxW6OnJW3r=;YVg&!#&wm?*lYQQb4BR@%Ik
zL3WHIN}c$7cRG%o?bv=^Lh>KUx6^ynKmWj{iX*zc?-)Lvl!Rc4C)Au-Z7t5XZN2H#
zk8+*3&eQ2?x?A^5Ys==2#4ZkgnHv(tRlb&UQEcO>g!%u!H&HC$Srpf?62%BcqZs2b
z&S8SXB!?*u(;Q|v%wkkR&&5G-J$(JDu0!7XQ|Y!^cglx!>B#?Dd-pb~My-}@ll?i%
z%e!U^EA(0n(>tgYhS(oKNEQW>OMzrmAbAx?b_J4Sfn-`B`3B;{+$-8qMg-T8f`l}&
zX+nOq2BgmjoFn*=7`2jOSj;6!zktP-eiZ>RswL$4F9@AOW_{q2eu+k+O%;}r5%bh&
zQgOx=1nCDT^9!S=2!9gO?ddL-E4abdaZ_kkp<<0bN=@TGsStk7zCtb~l;A1U6GQ~j
zWI?(FiG~E}7NjRENKBBpB1o?w3006jLHgrO-GE@pmT*w8EAggsC?5GnnS%|w|0TJB
zF1-|Lpj$768;I#8rGZ|(q&Co}m*O-uKtN-I1T;9LpFrZun~m0}HNYU=BT4_7)!xEw
I8VlggZ}>$v)&Kwi

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/ScatterData.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/ScatterData.class
deleted file mode 100644
index 8c49090fac17de71d5596cd22530752355d4fa40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 735
zcmb7?O;6iE5Qg84KSF}rK!B9;(H0OQNkx6(2IA6)Q`8=)qH^3gtHdG1$k`zHRS1cw
z5(j=je-z@~jn$$m94c#PXJ&Wac|7*-r-w%X2l!Bght&dHyf<bokM%q@1jIF0gX>1X
zKZ=L3J{It*jYh2{;C@XyN}$w?hw9t-qOH;&vOQp?+)N@lXvs7-ah7y-FCGc(H>2bt
zY>%`$567vxOi~?2JxSY<T8@+sPa~<dN*fFh*`%xVPXVV|BZkX!25xoQpGRlYB)8&e
zGEO6P5*vbr7b0K!@=69MU^9S^e1JLR1wQ`=2K9_aIFQ3`_`Tg%k+wuFY;jl~Cz#_y
zZR=5<y9dFRMcR2rXK?JjQvDZ1eQ$zXy*7b!XA1(_GKGLO+I5y~;4L=shM7++1WJrc
z+>K}22<w?f4*dlzW^F=Zm@}__kK8St9E`YclOL^MFujlo@>^jkD?X-}Y35tLzi36O
y0Ndo>u?iI%`+t!93`t;lCW!Md$nH##mDwOKW;6w<5~TJDh?xj~R#fb(zk3GJzh!6u

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/BubbleDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/BubbleDataset.class
deleted file mode 100644
index 14df1e738d6eb7dd9bdf05ffa73e3ed2b0ce9f8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5057
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
axC5yu1@b6?9GwP;{78^M?z2<+{{I2J`MXm9

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/MixDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/MixDataset.class
deleted file mode 100644
index 9eafa35afeba67dbc24e3d63c27db4d22ce73865..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3396
zcmbtXTXPd-7=FH-HcdlX0xbj-!#R|u5k!OpIhBKj^dPB}gQ%NiO&8K^NH&;)ctn4I
zGhR63z$F*n=!}*@X4GrP3;%-G{s6}r27SKWO|xxNMSIaN-?#g|&-=d5d-%3LKl%O#
z0Q>N12yx^TOore=t_#oMHMyKuFcm@oxgajc--|(9>c(Zf-i<4GLoRPBcq<4sgb4Bq
z3L&gUK8T_e(&X~Cd{dH-OA4lg&_h^{t3h0oaOEIof~Y7k6jT*l7wFEbwG*nT)-|&(
z(3`!g-cVBwQ!l5odfm(jbmjC?MKv2WO(47I^`UIRm`Ua9rgkkwfvQn6Q-x`jYte>G
z=`+=Gs-T)$$*9eyj?df5942(QtXH(Q@zE8cXWM8NeBh8?(apmG-o&o+0={9R$QXL0
z*jQsGuhk~ie3?(8S)-tq&#N_Eo}Gt2b6O`Md!8=BQN8KJ!LU~48+y4Y&u8jJMIe{x
z0Ak6chK-7;HO)*1ff;&RP7Q12a%PuJOj)gzQaQ7xS4y<vDbl@k2gRpMfIug!|D^2Z
zS3oJ)z6)&b;Kai4NPdBV2yE&g>I#%m)$;<eCGj4YjA}K8?bj<sttlWz1OjC>ua!wd
zbcupYL(WtS*GAQ<l~MMUf*N~=J)?j+N=Y*(XRFNr+C)c!BNS*CthCaSbGOIXl7}m7
ziU>P#f!Q^QMSYQx)!e_ZXc>r8xZ{h(SLBa0)k7j&xhE6jD-PO)XZ30iqjo)`jfs`U
z;ew+H8AvE+G-?IylrFozr`@wda_EJTz%GF`?E!eKR#Ru?6bxevwuZ3-TLsox?_I6v
zlqM_kRv0E49BW&g=~v&9zO3Lz81JCT;tOLIH^aDvcLfgo-@!>cgJImpdjbdl8-|My
z_SqGpypIpU_z)k3@i9&c>|KhdH49qR)Qw8&oHgBtjhSl0)K0b@3v45eacgSCE1Fh}
z8x<|?gdbPUcv(~H=8)v}4qMLd*K`=4NPFToM>DS<fz(pV9R^W5VZ5l?X&BF6)e5G-
z&VK`OCNvwlo#PQxtEr|zA6$s`jOBb$t5vO16i7O?=t_Hsq1+x)k+uO@KLSC0-cJ95
z-f7wAyi%ss`WP<*>%O|gky)`03#XGEETy|lgM8Q*%;ZWhn30YH&{x-QvQc<@a@Kk|
z1O)mL3q;%A$PwWT<GxO0vHOCiVH1nZ{LqPm7Y9FmJhHdA-^Q;Z54Q7<Z8m@2359z$
zCf5N<jKa$uuyNo4#K0qXE<S+wJNVjL|2G!UZmtmugNA%G)I&3aJcVs_Br(JjD-X|e
zCA233KaD~3K0<(~%2+ZQoI}@CG8&RU-u=FTZ{d50Zr-~7nExTd0$*TI?p6u>gh)Ej
z=evtgGTLLQ#R9tr`+Rfgm8biE{Yq_$E~mYE8SSW}os6!LJCXL=UaS?ki}iBveTY7f
zv_FUbwEsSaY(w(`{+7V%IjoZcs~%zf#c1pSHvE`$VvTMjc+Agb4$nwC$>_7z5077y
zCod$Qd45QO=?P*d`AndnX^D}$G~XT}yQj$MBpIC|r%mkPklKqo{M7vnFXD6T$Cr2s
z_izAT;UN7@;}>M`8(zlmI3j#FD!OsZ%F#JmNMi#L_VSapY3*L%j=6F2CU^UY%2MEN
zKXE+>iXgEM($^UNpnisVzlZBML<@c#rssp`dV*~VttmMA7@HLw`xCv75o#TeTgL$f
z!|^U+pTJ4GHfWX8O7alhB<b*2bOfwNr(I>`oiD3XI87;8u_;H@%G+Y)vo2-7qii?A
zD^wf783$y7zaD}G26nU9Wrf=rk^egY<BV^@Lh84rS}c(>ySdI%%C3C*WIM5KD_QPF
vJG$y$>}qaVSH}o4-q}^F8Qrc<(bWsfxN7&k+tnQ`w3e$A+`Y;$JUI6^9yD7-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/ScatterDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/ScatterDataset.class
deleted file mode 100644
index 1b53bee43343f575b5bc229b49beefab06b52345..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5306
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
Ra@ROO<e4HsZgY0r_g_qe>bL*^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/AreaDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/AreaDataset.class
deleted file mode 100644
index 2e02977e73cd4dc945f3b193174b643bf80904d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1380
zcmbtTTTc@~6#j-@c3T#K1;l#6vM829Suc2@MT}yMF%2&ej2a)N+p(-pcQ@Oukr@Az
zzLZ20e}MnTSL2!P1{!JN?P2H4xu5Twv)_Jv{t93X_wty;l8$m76Ij-;l1EzU6(v`d
z(bjQQ$2Fy2*KtF~nvR<~ZfUr!;SNJ~!}Z)~lOa`F+G9v>`AxwvUUxmQ-EB8SxXT-o
zEN0zzxZLBRtMtT}j`rOSL#^)kZM)Hl#2dRCiog#e+u7%IHhIK5BC_3fAZ>?7qUDDN
z_We-shq0%|FxKe0vZ?eZ9p7WvDGe#tkFmFWFB0#fVg1@Px3sr}l(nV$YyOtol6x(C
zCkkD!MO`!}&SjYYZF!=>p+XFELqZ1{F=T?!4~PMCSj*7_eGF@)(_ko^h<l*Gi;yPF
zO5PBXifJto?H&X~`gCb1mi&(24IS~wRSz>Uz~-s~ZotG8!>IMjmC~w4VOJPfN0njr
zS6-6l4D7vu8a52v#Uew_ibt_1hpiacR7S%};B>6&3$nkY?*lO<X;T>1|9J!cI#;b`
zvOR?UXnAPOVxq<W?$3!g8op6k9t6T`GE_=`l5zadIeOoE^45Cf$193?`dKIGrv_4>
zg~Ak_)1=uX8Ocof5bP6OMleHXwr?!pG~JCj0JAtl8f_WQ(y5Za({Hbl^v#j&^72Zh
zhg3EF1?gvp$W$|hjG660ds^;6uVxFG#9`*hSWq4_Pe%`<D(Kj4D0f=9#|GWzsW^<{
zKT^wh%thqrex5L0pfTrY^ow*WVuA2JfCWxB7nk}l9>=35FlcC;qfCX}r<^&en1ZDI
zB1r=dRVWg?89b*t3&_w{r%J^>HJ7oNP*5SMYNX8Z<FR7)N(1brj@Y}>AHMVxIM7l>

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/BarDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/BarDataset.class
deleted file mode 100644
index 89ebeec3b862e77da1204aa955170ef40c2f9f9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1604
zcmbtUYfsZq7=F&yZDowh3X1c>rQWu|s25Zm7nK<kbn*p)A?k;2YeunKm##Aq<A2gG
zkZ9r$@Mri#jL%schO!STS$5vO_vbn9+kXG~<r{znl#)oJki;nF6EKp9qM+iIl((hv
zj*7b~7NmYp#eEeIR4l4^sG^v_QUc2Y@nySd`>O)cY;IdXDY-REV5Dp}t&L8jVtHF;
z#i2zjyH(TKHa%PFp;7U7?Y2O%Ty+~prR`hqjE-luT+cVEyC%<?>6>lKH|$2sF{-9-
z)m`tvSTnt+fn!NvsM4{Wn$(}S-KM~1wokQgj8Sr%zP0Z!^$BPYwqukm$63mi_ssXE
z;h4?3vFUquv(7GwYLF{1(<l4)^1OvA3kgj22|dwBU@+ttAlLdej<hQRnNyxMN!s#=
zEbf>U%i%2!`0h)4KPa_z)=OCLdkZnUS+n*9#JWJN<+&}kP1G%a>!8IEk7xTPB{$uU
zSGAtmat%g$vzwRKoPvh26js0un)vhHLz3+GA%#bHoWc|2NmLIg>qUCzQdpD5lpfw?
zTQ9z*{Vo3=rP(Joy{K1APv??S2rT~Zx(TfOTWTp>*>GJ2M!TyLs==(Rv(D<&a`a!}
zxY=r1&6+?V`!^ZA4IAKu%i)r#z8ky~nBn&!&5sD6fUh^kc#cyuC<SFKe+2QF4-uT>
z8Sff1IM3%)5P%6>pvLvaMV>PG2aCli_wuuI;t-LIuZZp(K`AO3MT;FG{wjZnL@}08
zLWic(n2{cBfX5+{GN|Vsq*{>P)Jd;46htxn6T1Znb*Oy4%<~F~O%l}<f74hc)i=;l
z!__YO)c|3Lo>*~-S(5S|GbdS1MWve=Wt|;n>tr>B7tEhVjFH!HJ>=U7`KGnuqC(CY
zg``O@)`K<7k1ueOfmsYAcLGBC7()6OLOO&1w!XovDD#GxIZY`mNkS4r4*3v5fl`8x
YY9qa-!L$n9X2G<g$J3f+a0GL|0AiGV2LJ#7

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset$1.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset$1.class
deleted file mode 100644
index 9554e805279b7c545f546f928abb03889ae4da03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1006
zcmbu7T~8B16o%iSAKR8iDpo=Ks<J{WmIVcF{E8_hA-2V&4PJ2LbUJAlwmZ#!RQWsJ
zc&#SJ7{d?nFZf@KXO<?7#>5blo%hT$J7?z2ne+YU*HZwS*verM*Rq(#^(@V9XuN6Q
zmWHC1+gk2uS<+$|xNBgAVcTlGaYE5=@S!Et!0H5{JhmcV4wWBTqR&aYJmi54t*UZe
zDZ=*2P%=y%?lEK@3)k_S@F_#0R6bxxR#lgN&ek1IHlsmD`fc8EX=Sdi1a}X(?`R$`
z&a^@<j_K-{$u2{#r6OO*T}LMssyviE<)7@FIaoX5BTlE+JmIRq@p=sz_EpzF$w1k}
zJ*=9T!37idQ8BRwn_*F>*e>^ac2l(?(cg8X+pYP&@=dJkZ5vu1XnCk*6BUMMR0=yT
zg*`5X9hbr$m%?@iL)R8#clIAPtqlfq&-0{Tb$JlTfFVDzvEMnOA~HPruR9o4|CRsS
zbEQYzjkJ^XQu(lcj?_mC=|JjtXQ-Sr(NKQZ@wgjz2enIrk9rI#p(2k?OAPp1t&T?;
zM1y>h+SjCZX88sEjCzI)W|60Ok?02!Gy~)pu+wk3Pni0szr<%Gll$+Hd=X=sFf~Dg
zFg?Kxp)tWMVP=9k!u;9p4@e`60_Ksz0+z5$afSM1i{dt(V~1i5FVUjd#%l<Q3Cxkb
vbZqh+F4267MuA2V<|_l2(fErr^%~_~iTBUbZ9o!NNtbEl=(K5y$Y*{5w-NOZ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset.class
deleted file mode 100644
index b5c611ce587b5f89c734e949317a3a366864bd9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10268
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/DoughnutDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/DoughnutDataset.class
deleted file mode 100644
index 7ad01cff50077e6058687a56aca9483e3c540c9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 508
zcmbtQO-}+b6r9Hbi-@8tiHSFFV4}TvAo1%U@w71}5bkAZmg=%4rE9{!(vyh?e}F&A
z_zFagH)9VonfGR1U;F;?`Uc<>tvbrssbM!n6k?B1J=eK*mxQ3*84}9ZW~>O!Sm)}t
zn2wYk$Wg|XC^m`AhSF-U*Tu4%=sDpkPRvw{=1x6`!m63EP9zh_IF?S%l@oe8%S0lb
zN{wBJo+;8vUbx<>dqxOT<pzrx-_vS$;(PfhMJDr9^qtjt%7%L16gE*e+V9f(HQ>Yt
z8mOR3sEyad2^as`iqQRA{!Xj)gK&s|zuBJ>$nV7%vJ%Y1Tse9HJulleM&AbZvBB6_
j8BoV2D`LIH=)=d%-WNorC#Dj<qX$2t!B=#9>1uug=cRh!

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/HorizontalBarDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/HorizontalBarDataset.class
deleted file mode 100644
index 660215c0afc0da81745453ff3b5c9edf52243f62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1371
zcmbtTZBNrs6n-x2wla#0iegom43se#^#v6-!UrJ6=)xBWhNvHIyPHw$+NJA^X#7w5
zWh9#T1N<5O5aYRP<EHcjhAca`=k-3%Ip_ZP_4PY|HEiUN$6^i>C}pvfLkf#3%JN*6
z#uXJ66{}J=Roqo^PsM!|53*Rx;vqw3!||MOlOa`FI$%(?{f1zes5_q6?Y1lt>~qT{
zi(dC_?jG>Kk$P-Y!Xu}{uv54FmT7fD@z(4HqU{HvX&-Tt4Ic822u-Kec1@dyqUi@G
z<}*KVKKNe9-7OyML?JbXajWaN4XHox_#VSvDWPsZ#@wcC@jk321hj~NYi<kItu57$
z`8#g9+-sV9Vc>X8x+QBzxeRj&*?*U(e%MrqVKyOj=pu%(m}!JuPr7)dV=)+KJX?~q
z2nbom<(6=%pV_7e_fOi?^{G-Khuogu4Q%n$k&`i!+PNy3YnX(t;SnA)O#j=8_+AF~
zQNuc(XsBX=VYC>bC|1d{qM;^@S}~^ADOO*R{SEy;(ZG&|2g$H?@ikyr|Gy%G4Pwam
zrx!0&GzoFh9Xd0w<gLo^c3XH2hDzx?8H1sZ(yZ(8+||&J))aH}a`W`OLC==SDU!TQ
znn@?4GhIFf`$8Whm?D|!8x35cZ!HSIRZNq{a191Ynfwz9MFPj=<rUV$$nH0!4o{&}
z6+_X}J!D>%d&pMPh7vn;m5he;=%XZh$jP9AdyLeI^lHOieLRYy@XvHxgs=#ezHgG8
zAv&{!sX)J5*d(g2QA7jtee|0V!Wcba#dX~1Gdia18LFnjqWl6iW)g=~VUAc8@PcX-
ikfz9aEW~^(bjoI>^h*OEQL7e*T9x|Ks@r|IcYXuoX;@PL

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/LineDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/LineDataset.class
deleted file mode 100644
index 6a62fed583c2b2eee0ae76584d106656d6f4095b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2008
zcmbtV-*4Mg7(KVK6DLi(&6Jfu+ihm7sh7^I47$2o$CfhIk(D2fiU9H8BwlB5<0x@Z
zC$y)%^A7(6AVDS#iFf#;(9X?ula5+KY?1Q$`rhxy`ObH4^7lVa{{(Oa^#W$Gmc8-U
zkMi?V9;e~vuwH<UH3Qe=^SU$}(%dNU_<aL6<@1(-s)0=d9~ii8;6np<3~U*=o5M#r
z)C4BOpzYWFb}xw90%B7jdo5@O@rFRAytFHzRil<KaH2-P?f!nl@7BFW$Q`p5HN9}x
z>jv^Y+0^0(K~G@4){OR@Mlbfib^2Yu6Ln*!`M{%Xd9l~?V<*_}gih0o{k^FB(2>bE
z)ycZRRHGk+E%|=8CsFN`Q_>B6oNCmL{ew8I-ac`MPSp>?^`+W3-gll8dhI=DC+-IA
zJyyvzRjk0d|4dIBnoK0Hkm7ozkbvIlMjbL>rj?vbx>s#Y^cn)CV}7?}^M02Iv!U1U
zLnh0|(Y@e6Mb%%HjIC5Q^q}4H52%1GGPCE$^@knKc&41{JWU5VvXO2m6)I<%gMDsW
zD{o2(6?US2x9Q&wq-;(ene`<(mLguq8%4Z^lECc0=ai7a+*UX)Xt_n)!?rXZ7x4*J
ziue?t5&ZW>>|lk2S&BN#<z_{oXeG?|EcYvJea-J9fjKK?o0dDwZB?ExK^<1C`#~65
z?tL%p5xOQJ2&}!Zwgs;Lzu0PWL6W;cNqC)(-);#kmyZc2Mdo8I&2bdRBF4u?9I1=J
z0W}V9AIGUQ=fAAxj#W;<O2Ox)u7;Y&IsSOf^2bkLLP~?HEZ0;D?Hu1+WVix~_7ezu
z1{1$S`<3q#n5Ql92}Ws*Sdd=I7iVymZ@lraR34G1PmX(!|A79*6J*WY0EYb=v;p!1
z6t?Y)mE{2@T`f6x^^$HD>GQcgz?7RU>4$;S+$?2j%o8+>l}_X1lk%8Z4fE8|W7AY_
z^#6r06#NUwb3IQ276|wZmS`^%^eSQR;!X5%9*^+Wu(dl1e$pBn;raPtyN~H{ff;8J
zVi9E$b{0+MDzoJ!d<h#D`FF938Y<kA^e*F)q6I(DCrb?WVRx?(W<rZOqZ)8Ek|SH1
zl%$N&PqPwOVV)HhSwjwBLuDJGv_~lI1SM<1!P|_T$J7w7Mw=Pp)rsmdRuXK>d<y2w
zn6HkDO88*-c-ooKwBO-hs8WqXI;5X2Tltv_#kUH+awJ$E1;2~;lHd)Zk)37j#T2ov
alFO^Z45yh@%2kO?uB3n^=G9@vtIq(dB+AqP

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/PieDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/PieDataset.class
deleted file mode 100644
index a0f77a6349271b4713a3096ac53f781fc0a935db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3293
zcmcIm+jA3D82_DSlijw#(nt%j6-rP{FClp0mX;P;1PY~GQmNdmn{-XLO_P{xk%D*e
zE{gEviw}-7&iJB^Gi9od<M`l%zA?j$FMaW!P-hVRo!!k1A|pCJ?Add^?>pb+_g!{>
zyz$ky03N~R2CTza144LA#nA?MFs5N#z8{ywV;YWYI3dp`HJsA$gocSmwBpG|=twjo
ziAlK_8lI9uDGgJSZK{~oFeA5Vsb^M0M!vHea`OGO6wYfXXs|TQsW`3T83A9PnK7+?
z0Z+K|sDLt*oiqfRM$C*cIyajz@?&};O-f)So7B@s^}H$1E>W?j%z{8{B$=I!CJL4@
z6P?Q&xoqBwCZ}|+le(oB3@d8R=F-umZW*a;em;80G<G?RUV&waIWs*e&-)75j6ghG
zLz^uV9m-}b<BZi?LtvI}r=vqgI^EkjGOeH1qiH>pipH(HnMu)#nsn|8tgUgoT0K!n
zQjx&w8ln}31RCA=9M1!_4A&JB0>N82gED9%PtSa5Jz=DYVi^b`#`C7Ib8F5r)6oNZ
zuJ;xtwL@(z;><fTlQtS9B{Wzt@}@xpmHr+~OdCmy?s#V9EpINL%~3>{e1-*DtFu3!
zD^|dsYV~~;KDsI^1V+q)RYRh`x1WZmD+K9z4Y@lJxQ!`kY+2mWlQT497c$#W#Tgaz
zY$1XAxS7i677JP6;!QdDKfS7e&Mn)TmAt|()<L?T%4g>?lSA2bHqQ)&hlgv*dy|fU
zw_vd&S=$BktfAs8dm?36V@##Mig3-V4e{(;K56VW<p5|ZckKpQQhwZr`~5hFX9ZT?
z+;MJsvv|(=@f@D_;{_Zhv>~V1LosrC{CH6k{UNuD3Zd8u(ogYu&X1SyvWi#yIFDDE
z96w&e>wdg}H%nSVv5?gLmOx#Iy57b+%xhJ#v&2J*YM??fKSpuEkA2ur1Z>li_AcI|
z*%N+T#QT0+!Ugs~D4$A%sl7AAw#b>pVC%n~a{}A%?COv^E8RKCNXn57TSi{DWYU+H
zad*0{isV!gNp{7!nw(K({MRA-4~x~O=W<47QXt|sQsq>>wdTrGv7WU#;tod5$`(WM
z%^34>gH_yItXO-nktCbC43RCPnI)iFtHg@{@{T&C7e@I_vA=)E*&P}CP~8xv;aC-g
zOTAqb9!4RszB2Y2w@T{y3FfS=FQrRh-A(i7Zzev?97!eINzf9mJqUbhBa^bGu$Dgq
z>-Z-Ecp+pHb6w9<ly4!aT~{E!;HC}_aP`^5c7(b2I|ArL7f%A+=;10a{{n@Qz;su4
zk61w6=-2QZy8<Pq1eJhy0lx9B1*kD^P;nUnjl`hj1nRjgpg{_i*^N9#B-dZb4J>n{
zDE>LEIUa_faleLZ2bvjPkO8h?i2V%iB*UAehtm6g$3xe9`iclP*bz-L_>I)2A%O?+
z5Py`KaSRXhXHB7|{n$jBm;24wLMg^8zTsI~U2?-2^=wwU7jc)sBAWO|<PCZkv0UH-
zEXrLoNxl~4Lo`I}aK|GKD3Kx>0mc<13U>!ql;iCV`WDerhwsoDQ%j;NDbUrT1l2{X
z61ajO&y^UK1n-f8L3IIbWtBZYpsgezf$u5vA`ZIe74gZRL&V;OSh0&>5X%{C7enqw
zBa_}u=r$6(EnNEv*+~Lq60l2z>@&jkC87EWTX7ZJa1Am1j9xnhd!bS;P0lv%y74J_
zy>?obN@-a_AGxv;m$03BWm>M;$?(wjRoWY1Dt3_HN}i)_C$&lWJ`D2a5ch3RZeW#)
zT|&j9*Rfi~?(4X$V$W}^;=L58!!RFy2HXn%m06b+JW<SOB+yQ5#@jY4ElT@G=qKh2
zxHsk{GOLx3%b6^ua1EuMg6=3|YJ>TG#IEA;BBmZ2(=Ig7+yJB7fhO$4D*E0*-^19&
za@>srq{Zp#aXMNo-wxtFVi#k8Tn7odT*7XGw+3wNCis~fu(2C=v6H9-;Q0dqiOO}f
pt2p>O+eF|H4!a;k_?F0f0&C0t<xGH4+X-g^cuEuC2!-nq{|n|oH8lVL

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/PolarDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/PolarDataset.class
deleted file mode 100644
index 3ea5de342aadf2fd5c12c3d990c0a835cb26dee2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3305
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/RadarDataset.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/RadarDataset.class
deleted file mode 100644
index a462e2050ba342ccf4345e8d3cb0dd25826a6af9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1966
zcmbtUU31$+6g_KOA9mEVG3keCDUAcfah$4w1d8LNv^J#_6QBtx4a0+Mi&UUk9$8`N
zFg)<cQ=j2CFayj`cPKOb0Dct1S*_wYjbR3`$1CmKbFa?1_sD<z`Q&#1%ea@rIn=T^
zi#7e)uiwef_j0#x;93qkY9`*0*Xwe*VWKXt4Y|CTBkZP$x8(JfiMLJMHt~*$riph=
zY#4aY!21H3Pd(ok5IX`BzSniP+-~0sx{Ndg^qSZ8qIH3EX?~m7deCtNPBw|#*xzfp
z;g-|#8Ob+;w&QO*p(poAFcaPP`U16PJJ_>Z{mA{?-Vfbg5Jq<UzQeWSL{8t0Y;UjU
z+ifRucZ2YOeaGoIVM86Q3Y=)|dwxgmZ}%mw&C-~9F~+V3-N^kiS{(z}BXQrZyS~3V
z-~7z^!m)j)yK8Soq1WBzQ;fFC6_^>5eY8CL&}Jcli({Z84-(LNVbEg>^5Y&kk;qrF
zQvH@d;TZ0Q6z_&)sQXUK^;yi=b)&5ZJ$8M%G**l5^>4;A<<K})gDqD3Ole0>agqh(
z1c#F*j<cR5?npROYDjo)GuRK?E=%x{Q=`+lEE{RzIb5_*z_S+4<AT81r`wxoAd{l>
zTCr;31Kg3zCcRWCj<`;pZCUsbOBS|qmp1&$!beyV$QD%xid6<H0#-3;V82-Xn4wSj
z`<guurGEsf|J`*0YyU2}o_IHLEr;dwdTzHPuvj`a(lG`+obm;Z=vc<+apRwk%_vZg
z7C6;9cx^aVWij{vzB$K;jgdm9W~IMkvtow-J?HpGmg1KViSK9<UJVFo9InrES4Wz6
zz*PA$L^<;asq!?^kD&b=r(EJXNeEaZ!!lVqZH7BbC83B}?gU=Ii>jbFO`O5l!{4Ca
zdkiCQ4v;PXg46)H{DivK2CxP=u~A;AEDkVP%_P{WR?zY%iMd-I;8ayFXa_~67%b>q
z@_8=Im7v4pXXJ549#4-R=T9pb@jsDL3YWOPL=m9&S?($nvqBMT+|?<fMH$}^@h#?J
znYWabL?%V?Y%Z4m5GBmB;w*fWvA`Bp(B^M}@>j5fMO=o)noZb@>CCx;CDkIH@r5CW
zbpFgCEeSzP=%BmlVRv7~D@m%Iq-wIGKQKXQQps0FMxzarm&r%XdY$MLbM*3g&iQb_
zxj4E^zAJHsGYU0St;Y_MoL|LjLn0~O0g{OJ<5NVgjwNyxuMdf&V^8Vjxg$<fL~10m
Q_BTYNg(Z<{{KVD208<C9!vFvP

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/SeriesType.class b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/SeriesType.class
deleted file mode 100644
index a3bd28c017e1f5a5861d7496863aa495b48a66b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1152
zcmbtTU2hUW6g>kAyKJ}6qN2rW{iw=PWo=RuBiPh5HK`%(1C^xlY1oc*>#|Fhp^<;3
zG_gjb>9aq|cxOw5MxV+|GLt*^%suzqJM-)Jx1Rvk@H7Jr%O)P+p^kYSk4#u7sl_%h
zYm(Deh_Zp4+E;WuW-z)@*cFi+FubU{VaI9pr1;?UBhd{b>9~iS)&nkiPe{k>bbZI=
zQnbTp;50<!iQe9zE2<2d6dxsnzTA9Of4kLSsJ@#fT>6;%ebHlhS+b`Jq-}-=f+1J;
z0<qKYv_!PWTRxrWF~jbAhMiLVh#zyu=Rw<P$jA%YRePG`^Yzf>ev?O@q8jmO0q+oP
z{$DPJbj=Gqxz14dPb%AXQ<eA7qiSRtUOV8Dy2FqxDTh&W{n6$6MCh%c->F?*!#Z`;
zY=r&D6|X&2t=zcT6;&(?bLxrBTX=#B!}H6&918_F7H(qE!Yr~Da>z1d$Nf-37*ehu
z29(Ctl06}Ew{;|3NvS@YEZe5fd%fxe>~BjiMy+nF(l4;+>m)Z86gfaU@dI;3C67EB
zGRWf!h?%T=w5wqb!M-4IhU6!*7_QNpj(r8f7jS)qUqd23HS=2eD^h3B6h3hQe}hh}
za}*X(jQvy%LMg^oBxwSAd1dhw>Cdryl5Tum$1RmQZpWA<7`TI_Q6g_hh#Hme(Dw6s
x@)X7iGO=N5u`!eSL9XPGUf8}i#7yG^OtGDdGbtUAtRjg^j2P}xIh2_De*lIm7McJ6

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/Easing.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/Easing.class
deleted file mode 100644
index aa131d6f1c7584a43f6078829e778f4d7f120c3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2690
zcma)+*;5o(6o-Ee19KS$xD1<sxDx@R6Qaf#a3!OnBdD$Dxc3Yrv<^LF7GhS-ZuWiO
z6Cd-CT&rR#sib_)AC<~Er`s8*<N>WZAK$&F@7(_N?f(0p-~R%z4YwN*!ZQ&(i|4|a
z4deL;4&Vltn+gXbG<lOdUQifkzNm1R`I5pB=F196<|_(EnXf8LFke%cWZqIZ#(Z7j
zIP(pK6U;XiZ01`ECz)?6oMOJCFvWaV;WYC-g)_|e6;jL(6wWd~R5-`{NZ~y5V}%RM
zPZTaPKUKKI{7m68^K%7<`GrE7`K3aJ`IW*n^J|4H^BaXL%x}Z^&O&|8^|DUE!p3AK
zKNn9IOWAAjav?jPFO=e$S%+$VzU1b;c)}^V-pq)FNY*K4$GziaXWBv|%VfFaTa!Ok
zahV<W#>#0oV<8&!2HIR{4hDj5TB=a0b_ZJR4hAaSuD7IHbaA%~1e><$ZmXO2t-5L7
zgVx0L`Fyq2w`!~JLF<@Xpxe72g>Ti?C7#GR#S(`hJEWj01G*ANWhhvFzmvIEUEa6q
z^1e&9<KF&!*~`!!$~3Kh-&-n+-yaEYnA(>-m9Q-goLlyzuU~L-<!sTy(7@pGuL_Oj
zr)f_uNeX|WJeSTEPCDrvjf7>n$txB{29j5u1t*?!yqUOND)31gT=uqN$$ZAiO*sXZ
z*9{gAdCnaDM(n=})2SbIJ-4*mLg)Yd?)c!8g-~hMrTc8K-5Jj*(F<Xrc7P|;Xog-H
zxp?QIr4wFxZgiO&-pwzOoi7(M*#j=;(3p^SYYRsZ#SDL>W~2BXKUnBr)>|3H9Da<V
zfMOH}aVUy$E{C}s;gaNXl*<H{NiN5@9OrU^i_PUEms4D(xSZy4hD(aeSuW?eoab_Z
z%SA4ixLoGqa7lB?aGB<k<#Gjw=*(B2G3RBWE|bgi3)wy}xG2lX^wn&pL?LZo{B*|X
z%_)v7YO5TRrK^tY9j33_0s8c>+1t%&07MEzNSO#J79k}gq;Q0kkB}k~Qc6M!N=R7=
zDJ~%;CZy1Wl$(&E6H<CY3Q$NH3Mob*B`KsZg_Ng|A{A1qLJC$$*$OFMAtfxNkcE^p
zpnLcbQ34?}z{OQqxJI^)$p0b+)~~3!huWXXEaa%x%Umb*&%q1&x1mNxBeBrXZ>YP6
z5ck(C>Ce+h)bGMPo{)JuhSbHsIE-5Q4}^y{t-Oo+Uu1gm&s8rEqr_WBS$Y<r@FW)e
zjnv$x8{y$we;|~Kg=_CZ-9dv$BqY)(60H+y5^1g%X%W$3kyeqI5@{1@*M47zSZC1K
zCALEQo!w$Rx<Rh%6<etzVtrz(bfeg6u{Am>wpMJNZW3EBwm~<G^@}~ATf{bs4QMSk
zC^n>9#WsmOsAFQA#kS}+vAEbnx?OBo>|xy@wpDDK?iAZD_K5Bh+adO-ULm$q>@nRf
zHX=5vd&G8$?bf|wd&Kr?dYbeI_KEG+ePUx`kLy)p3BCGHdRn!HzM-j*L8G0jGib6?
z^#(0=Ds0edr<6gPozgVaL7=fN0u6Q(8Vq^~bXfZcjRva;QG>OFCWG~aW`ll0i@`>M
zHW(zd8f+rO3^o(m4B~`#gJD94!B#@2!FEEI!4AR-gPnwKgAqcH!7f6t!5+d&gMEZP
lgE7J?gM@tt7N2APwTaL{2fD1E&`E#!XZJdu;=_uk{{?8}VB!D(

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/Labels.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/Labels.class
deleted file mode 100644
index 82c7cac0ea0d8fcac063db47741f0a73a9b4692d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2213
zcma)7+j84f6kYOFb_6k^ZPKP!r)eEIt)Qi$*u|wu8%QxtA*G?*W@K9=Dvsr`6^6_3
z4LmTz3%|evWpFw}XZivB3je^cwj^KT$V?}bv(G;J?6cQiYb*Kt-@l#%cmrQ%aU7Kl
zW^q%NcQUwz71^z-xGnaMENf}Jn?(i{74L~%S8-SD`zoqpKTvT`#fEI}tN2jGM=CZ|
zJV@i?G#)BYYwovOPQ%+#psdsV%58a@&iA&0jKB51YjQtdt-HHst?Suen|mF*?RGq~
zzGHD+llyY19A>P#O}C>!uRgZEvCO8`+BP@6j?>!ag>>6$G`Lley5Y1Ouc9DcSR{(X
zs@q_h>8jJR@9pi@?9KzLCWZB?Teq4It&Sspc$n~ZoUVe46G6Fc&v9F3)vDReF6*W|
z_iop1DL7JCjKUS`))X8+6j|AGnhm?d2d1`dZ)HFfF_WsP?&w*fur7_rMV}I%Lb)>Z
zw0<n$bb(l2gjKEoNRW1+@B&!^rC%--r2kCl9xWVdw=7v%g1p~XDa+DBXVcy5)a^A#
zbeRgcy(}VY$YWl^3Cw9YiMcekG<<^78cyLfrJY}1Ue<61XEmI|oPwG0!3b&Q0REui
z5kBQ0^@p+~2cI#rq~UWI{h=heC1My1XelrEzEBX$FNNoRo25Kc<@ZMg3zN7$Ff0mk
zLwFmt$9COQaBfoSVE8#=Ew{64HMz0cZM)S_a4Cx6L!=L9>?9}Xf5NKg2H(-x%K^yp
z<W#ag%fBQ*5-|~pyO`+YTT0|x%HvxqM5{p&O}U<@SL1z!_Pp^Fijgby5HoUG4{_rU
zBzj01da8%Ck<0d=KJi~!;CccnuCqw6c9vd_FVC><DgInwL~8I&TttCZ!6J;X-am-5
zBJk@oWF9?5wp!Gu_MvSRLtlT1p7AGQ`*>NO=6)Z!1MydaczjY^58}yvys96G$Uhpy
z(=__Ak+?oXXRF9^zY|^z(q<ki*E3wtVwzN&JlP<1E?fJFH-2HW((bXKrLbKUKck2x
zHcT~fIc(hYeF`Pb{Wd6(;xWk2khSE1H50Fe$rTn5)>6hC1sdv*^-q_m{-qHhsqh8f
z_h&+YydDW8J`Ti;1ac)BNPHZ~6#}_B0f-Ex0J+Nle!=LCGLjsU9x!q(638_yhsi@m
zik#AMAlC`xtqDNns}LY>4rX!`NO~MdITFZqJ|A>(07!ZqNQFRdP5>gGr2r{KN~4ZT
fb1M=^Ia->LZ#9^a+XQlF0ucGTAV6;TQ~CCPxx$p$

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/Option.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/Option.class
deleted file mode 100644
index df7964468c69804dbedc9c5a801a3c39e37f69a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmYL@F%H5o5Cr!^zz_;3_yQ6%xS^w`Ku9UV2OMJshhRsJgT&V;cmR(=IHaJt(e2)9
z@BMkc0Bn&kj2R|`S>EdEoYr1jb7-s~ELQ7dDei(-!W2C7PMcy!V1@FhN394+W?LuK
zURPn6_R&q3AS|W5@x1Zs%3G&u>pYhi5vKhW@cx)E{}-frsiYqf2vK+qh+@J3F%UTH
K7@Se3gM9%QATaO%

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/Padding.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/Padding.class
deleted file mode 100644
index 7bc1cb21e761f7f7c2f99dd47a933265a87a76ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1598
zcma)+T~E_c9LAqBwzZoT=6I7g6;a&AOA!GP5EYaJvxpIb@v__MD2{dMI&X|$zzY*^
z{1jejqL66f2k?XVF^tb?i_@)3ygC23w&(Xe=WIWIef<t#0b5D*Vot&JBqEqoF)!l{
z6$=TZu_%ir6*pyER&h%<S5&OZxTfN^jO!}yD7dTOo<Ou>K6eGgwm{6W$_LE5T)QR^
zFW9bYA2C_8s+POXekQxm7dGvZDbSO*s^+7{QNeWfj6#K-blxr+m3_mpWF0i4?txVo
z$mEOmkzS~~<_o>ym^IsR_2PlS)vmdgUDY2OrIJ-GuW~!rept7w0)3fm{?K@7=oO<{
z)^}aUpGWEifuXj^M#HL<Ooty(%BGw5L=l*>l=^8M&1_2rDj#^_OI0}w(m1<&o^bZO
zB*D%`U_ye;(>%FrH=LrmWl7aqKt3x`H4I@`V6YWCfTPW?G;Cm#UQ63oH1wfgcJ6aD
zt>FR2X@GYOoDHC#cJnZp56WEekA&rUS&G*JlmF+dK&r{KQ#dq>Jm<JktC`i3z)Ysi
z&eeABn+}iC$F?_`W7W0&)516}TQ4tdl$Vi8nMI^3FH(^gDTOf!9x8^pj<C`h1!F9C
z0`bXvY?N!<YYt$Hx#mBB3%JNi;1W0UU;c?MZUemkhRCxMbmgbg(PPA(P6c&3&MNmA
z$}!Y*g84C$|IE+$bFI_-tUvGWH1F}}Db7znoj&L7!15!>B9Lk>L*+Wkbqqb!p;O5Y
zb=Xw$hSPVL@RSbtY67Jy-f}iUtpZnYHPGBNjJiJj*}^w$GSsk1Tnk=a=LXWScy8ni
zl&0PCF9gUUhTLBu@c={~hdfgWk_iRTT0y2mL9*c>S}TZ7khu;Z@={5VTqsC)E698(
x$W%B;cPq#uL6$mz$XhKzrb9tetsu*xAT!}0saB9xf~<7_kv}U5GV5Ii{WmVk{X75w

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/Position.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/Position.class
deleted file mode 100644
index 40072facb004e03b03f8478b389c8016bf750ba7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1140
zcmb7CZBNrs6n^g3tzGHZC}RjtQ3TlrQl~>rh6F<}F<Hc<xMcBDSIbuH+NJCGT{;pm
z8V#TQQO0vGQ%3XyyG_pNx##UU&pkhXef<HTif1WED63e<hKzX`4^(8a$%Ua{MkS}g
zBOWT4<+`FE$Mquxb6h``QDu-k=O|(*)$O2bwEB_r!5D;2F9;*U?pP#)UgQS8@h0fI
z{HMl{2;Fvva^g|YV@S4wC<?j^@=D`H{q4TVP<}T-wd9HA4V*s1MzJ(Wp0pRdcNj8t
z*LPkIx-BO>v|1kB$fDrE5ySIh{n$FO4A1i0h8cyf->ywEs9q0j%WGJn%PWt{OTN{m
zF8aTviHmL5ccUGK{C_&XDm94isN>SCDbsEHRzyq_jYaNIwry{eTpKIB?+?1$*Jg8v
zUPm>9L1;TKUCu@N&$DfEA~fXrp3H05!V`wIYd*P#0-kEPi)9Tn&^63*k>g?xI>YoO
z$s8^%i0uVFb<Y(`W1}3jjvYH9gj?g}?0HtdKR)r_ce+}&wp*c{&C=p0b{9AdfHWZy
zn!pH6c!2C8pOYdbq;LZZU|1w;nKVD@5bQHz=ZJqKi{U28r10e_zJOb!_$p%JR@J5Q
z7bMOh@%Y%4_}g@&T|{9CcZ8pKqA1?6f;fGETwX7nA^AzT$J<?|%ecp(V@1TQLcx8k
zj)3%N5PlB7L2Bx9{0zz|Qo>LrVN3}_O9&$^jOnB>GV*syiVtbyn$i$cW-~EF+H59=
c$e5>K9Mc5_DuD*kRweRcBOGfe(p?Ot-+0jdcmMzZ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/AnimationsOption.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/AnimationsOption.class
deleted file mode 100644
index a4a4ed3410dc75189628090f619f3fdddcf00fea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1639
zcma)6YfsZq7=F&K-BuVBxg$yu*@aP*i8>JFs*uISKrqHn-PS;HTbHggF~(oxS3jtc
zk!a!%@R#^2jPGf8V?#%lozwSvp65Al`|Hp5p8%5B4`K*P01}o0xP!a=Y1xlt5MC$(
z?(uy^z<s_y5b%)iDFLf|UlZ_1z`B6PemwDG!;eh{Azw9BOE*dkY>&aGsTI9+%rKwM
z8AT;qv9vcz)zr#{X(_oAl~$w7)0G`Nag|Ee^pb9^Gq@wsBL>fwk=Gc)X}zR9uNJeK
zd8lR!<dM=wPAwd%rq1oU(_@|J6^4~wr|HFVLD?wjMH_1+V`HGh!`Z4{$UEkKg|oO8
ziKb80x2jT5OUKHAWfC1qbXBqp<6V(WUapyx;6K)^!*^u@8ltD|rYgjWbO}}3eV)i3
zry8I{M+Sx{9eY*90@SQg7mHl6j2{?0Fsf!w+ts<A!<}+0a@r!sF(G0YBYtd&*v6QM
zQH(K+c8XG`&d?{T4PoWfdl5U>CBkxJFys_>J*D|r5b+E%1VeVFL{7;(MDj41{vSw@
zW+#SZ4>>NqQig#R&P?`H%UKL_Jvuqp-#f3Nxk&J}Ox1c(rFo_SR?B6rlxIjpy5?iG
zdze}yGeu+2RnZCymf?(FM`wrDe>!7^-s&OHEW<@Vx=VWZUHlqp_miKlnAS<McF50Y
zABvrW#RlEK&)|xEh5HPiFLu!st^IJ*It~w&g{bU0S)x;hY1|--;U*pGwERffF7mzp
z0q?7G_|kF7UxV;6Ubm$HS+Q?$)ew|I^jw2@A>QZ2JvH=8;kLLmV5d>~XKL>Phc*Ep
zt<w+)Mwmb-1S10(N0_x?jyO>2Fa;b?Y?gpB+-d?&*f!vn23w7N<OJs1xVoEM=Wv^%
zTt1~<>g9Ysk;6gd6vx_%z0KlzMC!%sl+A_m#U@GhmfS(xo1ic5VjBlvy#wXjH_ACg
m5xWG4r<29fr9k3X=mHYIaPJO~Wdf4?2M|6|97w{ZzW5hhSXxd1

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/LayoutOption.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/LayoutOption.class
deleted file mode 100644
index 0e019d2f72d3e6b49d5fc6b7b56242fd5c69a957..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1221
zcma)6+iuf95IviV?HZS~rlbTYB`GOR($u9~BwEx5ka$2AMQT;Vqn%i(i{rH%2dP5+
zCy*eOK;i@VD8#I7B~kN`K6rO#JhOAonYI7^`}GIFGrUl-hz%K!ROGOspf2`J1&<e?
z!BEjaQ$$({wiL8wY|AiZ>@dio-R*iokHN4yyl*;#*!^q{BRAwxY<5m<T6q|IJTO0`
znfnaVD=+Zk1BSfOIAJKf;a!)ZWO;%6e%N>1=-76Ais%;a*#3zfdBV?vh4|DPFzn82
z=k-J1wCr;}j1Ln4)VSmfJ-?f}?*=?zSTP#bnf=8!eLLuxM{z`4C^0v17%DSwUW;-!
zq6E3;#>eL&fmF%Ls4+C@xNFOx4yGzw*Va!+rXKNO)N$W>LZ;<umfM1jhGpmst5=z2
z_^H0;C(6|JzG`@aT@lG9S=-Z4!jg=q8eNQvhUcg-unQVnTEnn2hvJO%3`-Lzht8SX
zi5cp1PD#f^ZS630gDykcm>J0a?DQrx+MLs1JT)oi>1|MAo?Zb|>E17b;U+yfp$B~?
zMY2g(T5pkO(#}M*c?tHNj2u>Im6Biux5?Jh1eCE#9>X0}Xcfg5$WuP>@;7pyE|Ird
zdSQg($5!U+5_!!ZkVjC+8et)MtE<UI?l&q<8<q(dum%MW2<JN5ct~@rCIHH5lMH}D
zlfH|41cBlH7)m?wfxLcWa%jq;KE)zGX0b+%u1Y{iuNE6q#l>;)I-yI84+xu(Kx(#r
dLY@dH{xiT9v1(6okg^kmz+xJLLp9N$_8)fT4D$d0

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/LegendOption.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/LegendOption.class
deleted file mode 100644
index 5d20982429204022d8fbe7e85bb1da93dfb4ffb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2095
zcma)7QF9Yz6g^*(W;f|V(}-0pYP%|=Nnx>qLW)HxqGF(EYb*6>lkSv-ZFVQwIx>ti
z{vaRJkuak(Jo?~|@RvA_=k9K@B?*R?{q}zMo_o)|_iXalzrQ~PZ~@;IF^75qFJrZU
zEBH{})-+r#VhVK~AIbT#j%#wR>$ooGCpvD(`KgZ2B>r<9H;ecJ4IQ_1+}5z6;f{tc
z6|_CK8+i6Z1+}Z72Y%NLUB9ic)M)t!R<j#A53IwE6ZoCbYTdK>^aF{o?j)hB3VF|N
zI$l@d%p_1F3KYl{x9x^&3faoiwnA>*-*XgZ8gARUeR$AxI$L(r<4w8Yw`_0Q?zmzn
zm$~qs%W5l=s<{V&XEmICr@glkk!InU=Ar8)=FP5jdZMz_xNm=FTb|wCw>HC$+umnj
zrrT6FIpVn{aHqq7W1FGfdT`4QB39f8r@8NhTMq;BF1X$6{mHUL&bHWf!ogLpvMX&*
zGrm7Zg&K*x_|T`BFU2lbUKlEc3oIP(f}5UPcCfYri}rEVi6s-56fAD~hn<#l!<D7Z
z9^J_~nZ1EG@TP%RaZ<xq1~xHo;5E!EyfVC*Wd6)(deLUh`Xd8d_*!lfF`IR{VO6zk
zU<aoa470Cnvu=v>8#?)N3a@h*rWeW5tZTSyU{?U@2a$DDK;is^t&HeQp_KC8Xx?{P
zp~5>8vcwYQM>HWWU3xb31JbmEfC^VQTNzR7>Zr6+0iU7>M-Zu75B>OK7|I;?^S_xV
zwc3|ZKJ?`q#3FyA=D=+ui;Sp%zkC@HKy-3RJPY(wBz!K=TBl#}oUJ~As^%UeQ~ed$
z$H@J{%M23&$C(UFl4F_zH*L}~Vi4ZK+qAe7oK6z{9hC-t`~y>WpCI3;m9-x9omyg-
z3$&`gA=5*#Jk9qWjA#7EVt=lO<K>yuPe|!cEDqAl#$lx%%4txo{1T0w8gu?kUfGDh
z37zi?d@f>!>@Bk1An$Fm4siyLP>Fh)W548`^rYi^`YP;diMKk`KL|BcY1an5o~0$j
z%a%__xp-Xp=xX`Mn6iU0Ekhs+jI|Qzl#Jr1A+U7>JT(BHi$DTiV=3X9ug-H}>86U&
z?F#>}-aFD!KFPrNND{*NJl-8cBsbi}#j!+Im_F_zB~p7vGBJ@$By#yVL`0K9<N_{^
jAyOJ9vO1Q?`}klSk<#!))=1>)bBM@CAw(`kJGlHGMB%>s

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/TitleOption.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/TitleOption.class
deleted file mode 100644
index 73356b2e5c720c45b5908c304fa3859cb361e6bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3171
zcma)7YjYD-7=BKZCYyAjB^D4Ux70$K0uhvgEf%>ITMI3=wt}GMvXq518<Q<ks-nNZ
zKjMs+v1LYQ`~iOPr})7czc}Ogyk|E}+-xWxa?ZZj^PKm6-jm<|{pB|RZ{nLIj$$E!
z53rcP5iH5_p@G}7-$~#j+?B6;vV0uJCrKo+VBk~P^9Bl{FN#nyV99>pz_KVG7_bdI
z6xAaGW!YB@R17!<ss=tYP%}`E!;ND#j>ih|l3lNs^J@y~j)GBj>b7e;6@}rMqO+1K
z)LrXQZnb7rotm2~KFD)*s^XEG^IgXocHgPE^Y&AVS*8>cB3^OIPE8>-^DzH7pDX7p
z%ei^CW>=Q!uN~&ywK4++JDxKsNyUi~@oK(QVz5HgwVt>Nu?u#^b|(}fnc+ohuQ(+p
z>z%PH*3H$Gf>m3{7bJaZ#wq5@i}{)@vagJ~5A3?a>5fPHSF~5E<=lepmaSQRX9DRh
ztlH(0Cr;O;Q2m+Vuse3u3kv(%ESDwRs>zj>Eq7t9N{k7+eznmBUWa{1)-88S70uj{
zEB4U8QFDb6p8E0)>S4ZS?1{`vhc*t@z0eINK(<&CHg(a=lsKA1C`!Nertjm6yEARY
z7;la8`7rc?i?uSMk=+kF*7;7&C^;@EWo(d1>bxcBhG=rdsb0`u$$4kBR<tH<;Zk1<
z6;27QP2});9G{zbf@3CzWI2uu={Pt#I%;AV**MlrJjDqUBeI+n>)zl<_@p2c(yp*A
zJ+^LQ9bXV_+Mmz#n2ABWCh9LaWlZ%I&T;b6G7jmnw24#5Ds-h!un+0R7;D2ip0Q!+
z`~HkdrgeO+utTeKcj(uUbv?D*llF&BONt(fM|W$43b}3A7n~iIuX*j+!b7XbDIVG;
zi8p5o$G7ooay#NWRfVIS{I|Hk9u=H&i4RG>TD2<tI2p#zHp({VcYtI00<+;d-g_6w
z>|K5QMWF*6r;eHVzj1^=g*4*m5>D_BrAxS{chXPqq@Lc%I=z#4dM8V`?_xZu%k?y+
zBI6bJq3m<0>`&<0KqT9@a|6+As(S-5s^S|kvVF-7B!1Ls&T!q2m|mk8Ko1Tw=^^aJ
zVXjB;1}&zSl>c^TDJhKNoOhsFLWD;G|NM&N?dRy38A+L&*s(O?%c-4|vOlAD6Md;&
z{N6<BfA&{Adq20-?hyMP&mP&t-cb9io;|vWeWCgHd-fQ&(D(zM-RP8mz_TYL|3Q8?
z@TU$@SQ?@D1Fzo&DdQ;?5A34B9`>?}IX)q??3Tml<6Cy?d%hfhu#124@%WqGQrbOU
z`TWuv_zUOp7K^Je)+jQ)MFt|N!_C8DT6LzSKas8ejN<~WLWrCn+ATf!jtUQ{7ksuQ
zxO*%3ZA|#V6ZDqm#<B-C(A%U-Qftqnn@F2?i1``luemIkFXEjLAd%oL#zTQz!sRv~
zBP4VX$OM60>;OcDNq}6z)es=jU_~y40=b6CHXy7>GzjD>fn4hVM5bAQT;J+yYinY`
zid+u`@-C*@fUqL5AdqPSd9MQyc}@h#G(FlmVg!NQ2n8~O8(~0<Adoo%xzz!Pyk`RB
zW@u{?!Pd-&0+|hOP0QQnk#&(kmO22D2UUQ~g|?<YSdrVIKyHP%raxGby99Et0}y%9
L1<3n)PUrsvxfN&e

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/TooltipOption.class b/ureport2-core/target/classes/com/bstek/ureport/chart/option/impl/TooltipOption.class
deleted file mode 100644
index 7828ecda64e127d76ff8a46a5d4ccd2ad3343a1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3151
zcma)7TT>iW5dO~IW>|(StO=1o5;6o>7Q!ZCj6x&^43T6FQ4kD?#=Q(MFzl?m14=A^
zgMY*-FD0ZZR`~;b@u&D;l`mFVcF!61GR(xhoSxH{bH3C4b<gkrzW5Emn|PMQARcz$
zB0l2f;|?rig}**gvC49dmrq&!h`-i(d92_`5*i+=_>AS}DxR|ZLPddPQALSmS%txJ
zL&c_wEfuDUZ52BzEET&7Dhg}`RRP7Q6pEHn77*(KU5@Ek#)4gOmd$4d=@tb}HFeH`
zMarRk$==Ns>yELL+p8H>yXNFdTLoI(Kz5pG4V$+uyC#s%Zx{9pIjd0F%q=@Lv$9EE
zTG1{aH1F$bY~@vry>~|9rdctaS%GL~Y*ipOZ<h&BDsNVd2Yb6kqqf42;k)co!CEcU
zOx}CSn6qWp1*Ssb+f~Q3D>-wwYUNgJ+j7k6lB*)1sp6h#mF4zc-L43n&Wr`UC{iy9
z^qsKGakx>Vlax)vSvjZ@$_}%B=Q#WHAj*HTZa589EVIs!>}LP=vXC<srkk97hFE5i
zLwedmWGaUV?yJ<Tr|nc3JCb>Y&=VJXHETQ2)1AqjNYD(&rwI658zWK#r(MJOXlNup
z&V*mp;^kf1>gB1D%l2NaWGt92Y1(Q&$!yhd1(O<d3~9KGVFh1ms9{vY2u6v1LmL|#
z8ZsEukj1cuI-ACMnZTI9SwG=D5)kcmNAjz#Pk*Dq!5-CK_gYb(X3aiz--L#*aGffx
zH+zu!QaXH1G;h&!CiH2YLk|QZ`b3-AeJ`0Q#d@(N!TL0@rK#}_Y1K6&#kT_LF>Zlt
zVQdO*BYH?PBTL0?qvQw-|Iab9<peH;`89?P6{KieG|3VbyS7`f=%Y}r8Wqx93F6xc
z3O0LmfLiY*X3Bz`U;+cwaWC;~yI4MXCfpyFXv7bK9t#B#rXBq$BFsEj66st?gmWcv
z&XvSCR}$$+_E0>rmew5Y_9<SFyqbLuk&PW9lI_+G5zYP#+QhTz#32+{rIM=S5J^|n
z`ICF%Ra$kZwDuu}bLc=nQW!ul&eM8<Y!~UyL0lsbP2PhyFhx5-f4J)sgIGh9Pyqk@
z3hmKzbmhm>r;d<X8~66<ZrWvkLF5QM=`?*G;k7pVX=#rh;Y^^tSK8x8IGcVwAihu9
z6%v8=bJDJco!>9*$*}VWq`lLBe)>FV*2d{MKhpCf;B-!+lh(_W)L}~H2o-4*OEg1l
zO5}GmMt-0H@(0b2KdFd+lQ*ZfSEkQPt%|?!7H&{-1>QbRGI{eJh^8+zFH5+psh0Xg
z8})ey(`03i<h;;0*Wi0nNTf3OMoVzK5j=yNUhph=b8!>dej-<sHc3}IgE)CM-;nT5
zAb*$MjQL&61^|irf!qoNatrST0g3v7%oC9JLx6C9F_7Ds3jh-Lr}J(gka;>@rn8xm
zaq2KXkoyEA9|D9MoPpeFRJFA<iXX^QAdm&z4FaP0fh-e{l@K62VHn5<fu&LXrCAFE
zvKU+%)eqz`0eKPvghw0$xffWPq(3811A*KRE=|%8q(nf<AwYP>GLU>=X*&HtHUoit
a7+ji`VJo|4hk#fiKzPVAkOyv`F8v27Dr64;

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/plugins/DataLabelsPlugin.class b/ureport2-core/target/classes/com/bstek/ureport/chart/plugins/DataLabelsPlugin.class
deleted file mode 100644
index 3ddcb313b8e3b5a92ccaf1d3947dd123e00ce81b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1252
zcmb7DZBNrs6n^eD)-tBx<W*k8E5aBX1w>Q?J}5CpCz4<=^6hrJj$&z-w$q^T4;epb
zqL66f5Aa7B&u#0r4C2d&o^$T$dCq;#bJ`z2zkUa>jP(rqFsq}WVJ?HD3X95@y3vby
z6&X4flwZ`bq~p4dWgRy(tZ2BY;TD5dwfwp*ju_Y;Lwe0}tYCv7nV;QdNZoU*lA*V3
zIdZFUXiD#?Fm1}@%5Fv2yTY^7IZmd6eamN9Dp%Y?!}J6B(r9?H?s|by*%xH%cB5uF
zzOg9+Q5L4O{p~PwhiKGfuq6(ub$@=gd>~#4!xm1>*a<w#sZl{Xa3A`v!!Vsc{rXHq
zDmbc#RL|&^@J)u1Q;qI6EW0W_x~|*uH-8I5T97muUk1%oD!-@n$?UiduOjbTN|S-k
zvF6pqS@dIop{GhSm+Ww8hM`VM@x=_oTop!jeDy7lx5HPnxD7HnTvQP;WW_AjFvg(s
z7p@afG4bKP^+xj5#pNPxjlY&wZJ*w7)3vLdAnzC!{&zVHeJ!?6%mY~oXbFGo5-pb2
zChB$RR2fSDw6@j)#z^5m>_-pW=+nRz`qKNraDkqL(uaPGE{aKZvV(Lo$TO8KoPd3z
zAb}yW=`cBfVT!X+0Y-3%P7I?MBdfqA@(P^HB|egChmN#ClTGM2CSvG&`t6d0+5U#)
z^An^V7vmt;b&Pc3Gqhvqxo(P&ks<r6nCppLHge}8cfQ?GX^RJkPW{KpP9TrVH0dN(
zNRf4LY~m^&VJhS}8S#iY5+kaeB$hfJP&KEi7*$Wjyjyw^#Sa}r&$JEQ)g1a7rep91
lHA@gCT^RiWt)+G*%ob=hb76<UsH#aR9j;DkJrmxT{{@5$0$~6E

diff --git a/ureport2-core/target/classes/com/bstek/ureport/chart/plugins/Plugin.class b/ureport2-core/target/classes/com/bstek/ureport/chart/plugins/Plugin.class
deleted file mode 100644
index 0ac97047fe9ee083ec603c043c3bbd525a6328d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 224
zcmZvWu?~VT5QhIl1ck-HXE3<f#m(Kp7&YMuO4C#jT2hJ+=imeQP{yKzgD!W;moInU
z<9WLSSR;)wjgb%{XLg;@ghjTm_?5GoYsGSBORYA`UqpzNbO+u@!aVycB)RFWklV8M
zPI{_)RqEAn+dmPeVMXWUh4ogp#yTd>+|TxHb?jpkX5W@$QAyz<0wM72KoAl}2m!yx
Lh&=I81IOeAF7G=v

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Alignment.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Alignment.class
deleted file mode 100644
index f4ff5eb09acd9089ee401e807cd73cb26de414c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1234
zcmb7DZBNrs6n?sOZC8rGcz;tw#EmHx1z*@i2*Jc;fe%%Z#ZO&VMzL#2*YU+4;@{Ac
zh|y^H?2j^@b6H?SKg>2cPoI0wJ@>iKJ^l6j+fM+i*vvx4Lmex4q+(XZV;v({<*=q<
zRHw-`&Um6>objoK3C3p{CK;b=m||SlFwIy}QI;V4?m;XeUva{wS!>1ad$S$6$6*wk
zb@#vvyx0o^bIbP{LDLQ5l7vj;H4bTs;t+Qu3F$aICffAsb>F3rS{TP+Q-Zp%zg2m=
zV@W8y>%F{kV*72kC83!ApJnoPSf|YgDqi63wwpCKdSlmEjw<Ty9Y`qWD@XQ;ZTfc5
zFs(T9f<~#(yRcj(bZmd$jyx{hsV)b0lQzlyU73t1vwa&9#{RMK>%u;nA0K*j(yT@9
z+A;Y~X6AW9D?5H?@p@P3ouJ(;_o{e<?n<}9cI3FPJa*#7<t;9=4+dtqi)IbH0Et}e
ztpN<o<E4Rn$Qu~Nn1OK)6C5TvOmUdT7;SfDHtVLwar`hK9V7Wd*O~TeN3O$twbt#@
zwr{surLMHg`?_AWw7Ej9JVO76x;e>$07B9vkYouYWdcc@K+*>cPO$;BQbraxaSIaW
zh|Lr7qbHEQAa#!PCt?zAQ&hy<DCN)NPA7jADKV<&<fX63oI~dP)V2Ht8Zj=ia2JbW
zo*bmCIr?5fnqE4=QgP-C%4ad%z1`Jv6$O@#C6QBvhWjXXgnXof@blq2<Z4b$pFulC
zRuEklq)!kdBS^m>Hxxkz1Q}EX84@I?2{JsW{GfX2gu1jUC+M@PnFRe-RY@>lRn-JT
gR#i(dY@I@4=@(AvbT*LGUAmK0NA3eG(^v}TA4K>KQUCw|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Band.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Band.class
deleted file mode 100644
index 8684c70beb52616345cff99541aa3e9d023b310d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1118
zcma)4ZBG+H5Pr73-d&G_!cjmFUx0!wC?{IPq=cXZ6O%?h9FjDC+P2qncrWC7CGlTr
zNyKP0eD+5fXO~7wG_iZh%+1U*GtbQK&tG4E04U>m77A7ktl^=C84ZsNjALC0TgQY!
zL0cdm>zEXJLq}fdCpxBteyX9&U>>`?>Bg~p>hgqPsoIDFyWUCM_jZ?@QJmOKx8;Ri
z;zgnTl84O-CAFd`xlYO?UgEn9TBjQXJpMp`g`*eMxBCu5;oVRb)idsQ-44S_u{2zU
zvKKX}XRhjn?wf8<cjH4|mn>wdgBHV9v3kPKxb5?>Z97Tqh3!gdC^}X(YH<IE$DXL!
zFRX+-ppMqxMH$p>v7#M@>3{TmT{>b=l4FnN%Q{{=<O%JTAzc&!eY@fJlQ#!S?}y!B
zdkC^SbRUKjb>oKn$`kWv#U-ta!A(qycQIpP6VDhH{(H41=CNgB0gEOkV40W{A}_=g
zEQYb`bqab6nT8*Q)H7c!4NyO*pSX>Lcx?_YW6$TEPGtc0=SFT;t?X{l>l~*ip4puh
zGyu}XL~0@<HSqz)=fs4BRFK6j%z|N#tVPn|7(KAhNL?cRkt~MWBvl!kCj30^^zmh+
zq}Q;N)i20gLJ|1X4g6j5m{%y=!+ja2JrPQD+(4Q>KwDj#zkvElh6meSr)yXe)KQR_
zW$0MJa-Ya44I<9rHz+krOJ6`gM^+k!B8?Ggm>Fq|N@GlwMo#-qN$DQFu$t1th*Qh-
iFzVFQ9&*k(nBa7^0)t3{)>fwFrTRP`ph&(HO1}XRck`71

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/BlankCellInfo.class b/ureport2-core/target/classes/com/bstek/ureport/definition/BlankCellInfo.class
deleted file mode 100644
index 5505fe52ea1e4ce808f0bc056a1b12099cfe3ad2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 864
zcma)(!EVz)5QhIvoTLdUEyWaQ8``uKQmeuTxPd?-6_QazkpemNwn;Z-Th|-e4hNou
zhv0%lgwz8Mz<Y4z5fJ}wA^}wn96Yl-p85aJ<L|#Nz5#fIRt;q|t0-aHh8-L3R<K*a
zy$bFNEN3d!GVZA~(<XTv9SDe*0*h^vWVuZ8o{Yz;^wE2E@Izhv6eyeFFjG0ZA^|TO
z$%M6$OjTlQN4z}IiO!!26kB^ewzSQ$5?Jc!M7<iH_f`5v_G4C7I%Ys$Nq637MK6D+
zGlBiiz?_HuELUgYI8`H)=Ham#T46$l&tsXKwN)HP$<REeWh;t~tXcI$<%csq+LN%t
zO4mUy=<M|jldlL`>zZ*oP%pHj`A74?seCW%Si$u=7IC$XB^#D;O(6JxGA`HZgrq$Q
z5BsNTz!mwfq)pg$d)FWA*Q3e5QU-D1VGRqY@?7KpE8q$rBDgatTqX!}i9IA_^m%*8
zENnIS3h~*s-C(S79B5GX4pw=pPn&QPw|KJxw;8QK%ubKlw*tZX1chK@f@08^!26@O
zN?Tx)om+%#5@?$UJ5D>8&d;=|<iIVIZx`rDe7i*y>A8mWnRCcIMgM}rC$<-0(d|Bf
i-MQEsbBBwUhxg_VH@J)GH~;PIT^`<_JG|-mwtfR!28v<;

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Border.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Border.class
deleted file mode 100644
index 31d8ae775301b242b6583f19f726d753fdde9faf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1173
zcmb7?&2G~`5Xb-PI3G<?+J>}z6bkf%I&KqRI05Q`Af%uO4uNoXl5M&r^&)!%f*bF{
z0VFCUgm?g6fT!RU5HoflBDhjGcy@O@GymVr?zf+xzXG@guZSF+1!PfU<FeVyV?U32
z9u0xzNQTNEb!8YS9XxH_7Z48x7MnVVj31b;KN`zy>-(1<w@Ys=f$S?aFh>;BqJ3YF
zbSO}1ANwzTZ{!C<uVX?L4DZm-$h;m&0k_@PCtfcy^0_w-<qI7eZy*m<pbQCm_jEXr
zVTWTWDR-Cs2Lc(V))laudO#(X+A5Hb#wR@)KJj~8w9?jng7yiW&J(9?j#MPDGmju?
z6^7D0OPV1yYNrtWaoA3a^*N-O^jLLjX<c&8Bx2S1H{f@XxIck?D)JxG;Np|ax-)+w
zixxY29QNe{#nUP!LvHXbm2n=`G8S>Jj3q3Wv4V=g)*MvyR;JhdxOXi3MxYwIl=eFD
zGg5E(K5&B`Sq=hu*tm=W7HD6j=V+lsA8E&Xl8;v+pfyi1ghqCiP9Cj-)~x#p;zJy^
zMwW{L7jc1XISHWCB{~TbS||H=@<&+j=%<Bg@<wX%6<nPpA5gSKIXQRz6xLL_7<;+1
z&A7r^5;c)$H13P3H*hTlB=dd-WIGk)It?%BVhXZ%ip(s?E`c~_fbd`$WD{E{AoeVX
bn+mdxoiq@87NkxfjWa;_W*OvW-1_b>y+hPw

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/BorderStyle.class b/ureport2-core/target/classes/com/bstek/ureport/definition/BorderStyle.class
deleted file mode 100644
index 24911e521d0f7419ae08f01e546c5f09e89a9466..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1460
zcmb7DZBNrs6n^g3tzGG06b1}Yr=n~_m?$W^iM)u3$&e3K5;T73wgQE&#jYdqr|>Uu
zBw#ceKKrAL=XMo}@&Vf9-kf{Rea>^9bMCL--+ls^#&QAz9>|!&LlGGfk7V>=nlCdF
z9?N)wSsw9JrsWx5X1T8<p`RNw+*g(`!1w1821U#<#F~y}))@+wn$sv&o1U>#Y`Mm+
z<9fxqv0>V#XF7Iq(Q)gBt9hR-qr?!e>&-2LZgth2R@E{B3~_XAq4I87V;KK%CAdA^
zY8g$2iCq3l7lkFKZZPyzOxt+VYE%vPtxj|pL?3Z=gJCXL+1B^;qNUrLMa^?fd$W|k
z3OTjn)O2f2cTEl*;0w0ipfu|L*d$Jwi$>B8T#)*8evLu!woIxvp_!Yu?vdII(HwUq
zJtrhI*_x-<c2@M=Ag$y%oe~)ObNP#sOXZpsq%Vj3%XX_#zI@el)MHt5T5ipFWpX`J
zAzG7MPX$AK0y7F;V4fj&+2K)e0}Bf7V3bdhKRhB96)fSUf<dIY|E7Wh#ufB)a{y_E
z?z0y1N@!|pmSYpI^D3-Xw~d-d+-JhdFIjrCSqh19ItAxZ>0avW<gd<g<5Nqws9WhU
zW{@fWetwD`Qy;xfVLrnN1GE!of2VqY)G(KdBH~D37}vlsLe_2C`6su*ju1IP^nfge
z>$JvwUz*}cj39m*5&u+Hg~C_FP9X63$hr6|ohY3s+@cKJPfF9uGfp8&KOh#yM~)Hy
z;=9A?vUJk9F5)hyj(dL07!k>x5?Kj|s0CF#g0v5@jl=<Qk~yKMPpI2ZG(`6@NK(mJ
z@^p~ZfLPv-Wl3U7y$)(TgC@u$bnPRqiU);bDE~rdArnxNstZGRNS{JWxR0>_`XjZ8
ze+%CstgFfBF}e@Y;~Oc#H+p?Tjrm3*{)6J8ZS-jCLL0r>dW<M(hhSW`PM2g70@Uj<
Pk}48NHGxSwi=g-i+nhFU

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/CellDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/CellDefinition.class
deleted file mode 100644
index f7f5407d0bcb9b11f4710d67f23cf7a088d2b2e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8184
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/CellStyle.class b/ureport2-core/target/classes/com/bstek/ureport/definition/CellStyle.class
deleted file mode 100644
index f9a7c4b42f05f19576ef4d89d5bff646bb4c1f22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4897
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/ColumnDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/ColumnDefinition.class
deleted file mode 100644
index 313cf89fadd8326c848dd2c1a78a3957aac23726..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1838
zcmb7ESx*yD7(KV!&|##=CW2yd!7jjPK~#!Gf-#a*eSl!#ZQ717(1o;9iT}w5O%M`I
zjL-fk<GC{fEkjv+xy!eld%o{GGk^a6_yu4VODeiCtKf->0Oq2I;;B46lc(o$nOC`F
z6)ed8g@T-dMFFi?D>p0Ecg;${tP6-0f$+XnvbP07+g8b>X;UDwU{x(UClE{|*XdcV
zNlz?qRZTZ@%_x*<>C4xOMtR++Tk`H1L-w}S5YY3*T1783Y;#v{*3G?I-PTLyM+t1z
zs`|3S<JE~FD-f-k`>t6algRHFpA5ZeTV*|OHSBD%173x^${rK}6t_4&-s{h1DRc_N
zFGm?VUDW5j<H9mN(1pvea<ZsZYpZJ5?0~?Uzo;u9T%qjPmT9|vJ02^?#=*uKetRgf
zBInt~gb(h}yBOmgBUa;$qX1@80}4IvJ(Sp#Sy9e&&#0SgHD^5kH(kj`FmcdpLD{Ho
z>F*0WW|5PnZ^P|vySdG>?7S>B)~RC`sY;GOU9C0iMf0^KB|GSLswKQ>sWT0I=oc6}
zTU5KmWYkLyG4yCiU_!$+dFsV=4fk+gVCro81>7`DVVY8Pblz6Dz(C8?s$8JoFQ063
z9pn7EyTK0|L4N)u#J@v8Qgn85<F3-r`nV48rgInE!>J>PZ%)`C*N9^r!4S`y8-N=a
z<}HMq7$K-k-sLkv?)^Uz*hn8C_;xaNfY2erlV52LLPGU8A#pMr=lgdZ$he#4K@tF?
zxW#9pWOo~5gulZ~_hIRa(>G2_fcZkUm+NWv2Z(%e0$S`RI<OabfC(=-N4NlUBB{~u
zh_q^#e@-BUFwzdfkQ;SEHsUl^w(Vg@A|XGK>5fFGnNCDPej*tXnK_4uoUA00B;B(e
zQT#;aIuc1^vJ(--Ph_4%vgZ(y(vn0dVjq@DMMTnv=qmZyEVf~(C*4&k$zh1zC1O4D
fux7kTMN{eDh#o@qL$wPv>OloO#XLsF5ys3vGR<XB

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/ConditionCellStyle.class b/ureport2-core/target/classes/com/bstek/ureport/definition/ConditionCellStyle.class
deleted file mode 100644
index 38919e9bd9ffb0d973635e74970d321f251eb0ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3037
zcma)--E!Mh5XV=EKVn&S5<?T(@=;1i9JfRbq|nk3+9ZU!n0`44EyD$}t+)b33bNcG
zyaIPT2Ezp~beQQyAD}bbaLo-b!tmcC8OtX}9xk%$v)VoT+ud_cp8xao84<0~=Q>T(
z%>vcwR)Na&35y1cPg&e%afiiS7WY`(XVGM_%VIB2`+53IqnVx^IF`F_2R+C4_UhXj
zX}2^gZTVg=w7hWNa{G4n&&|L8c>4WcKWa2};Co@y`Ob!4T_c^BJJzA&9&1!-d}Teh
zOxN<dW-|;NuX{}+qt$Kut{*hp{t<!}8g2j3Z1qC>YqKBNM}82R9s9uXoDlg<;f1L3
zfgjk(xY8hRywCJ7act2o*XerkqWCzuDztpJGx*|!_|%S9<-XUk1K08F*pORilnsq0
ztIPWuWw!hdsHYq7xZOW&*}<;Wa$%`7{5INVp?O%x#!UFg>1nh&zDBgRBdXo9UAGw?
zyEY1*?%LtzNT(L7%j5SE#2ng_Lzk-mCz9)%McN&y)w9@7w#^8?X!3EVaB|=_VyeVm
z(SeBlDzV>)u>{W>iFuXalw6nb9Y=3C&@voG3<f+lhhsJHJ+b8Y`pBU1eZ;_(?@7bw
z%4J&-euFZ_slcf(!f$BHRO{SIE{TnU+wdahr??MXY0~Xf^`sYXr#Jn6(6)CRK5g?S
z&&&$%ZO|LEkf#R*J)|=Ron~>C#mg*SVeu-9*I1lm@j8q1EKbp!LG$#IM&{Tnc`~&|
zi{m2(=USulV;$oYl4&CVWMw>RL<XIq8JZ>BF{~!&1^j_k{06SjC{$?FDm2O!8WjtT
zqJ>7?LZft{QN7S;0Q5X^pns5WV)X;^XwciW-$|?eN)u0LGE$jHWh0e~R6bHukt#$=
zk5us&k!2CGMmppiWstFm*;Fu^)0oUT3}y*)S;4Q%sC^wnS%Rk#F;JD3vC<HKA?7oo
znJ-)WjV6D_j|t)gIbmE#1ZV#XzDRGy!5i?NVDH)mlr_ZDg|$jqq~r8+kypF}@6N5}
z#4AdWj0|#731X^2GBU^|fUKr~@T?i+k`g2<gRCh*R@ER`8RQB;uBL$SVPlZDl^{78
zWL*jJjv6E<gIov5jT8_*?F_P}1j)-F+e(njYLL7PauXo+6cD~{4DzlLWJ(5UC_&y+
zgG|XFcL8!Q1%&TAgIrO96l9QHCCF7ZNI?d90FZ|%ApGDk$oonVT?Y9=335#hqRSv(
z0>nxI;TMlV)|DVd8Kk2G`9KYlc;=#a<Pkue6cB!L8DxV#gyaV|`Jfp;!H|5=TqVeL
z+=VE3_@JGALWbOtBY=F90>b}G7-W;S6d)zJBcT#xn?5=Lf|s=<gM15+;}j77XT~5q
IqV$jd1z(-$RR910

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/ConditionPaging.class b/ureport2-core/target/classes/com/bstek/ureport/definition/ConditionPaging.class
deleted file mode 100644
index a24554c13f40771c469cd9b44c299c5eb93faf22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 870
zcmb7>O;5r=5Qg7{LV;F6MEt<-m{?G$2X7iKBqk(8Ni^IG)LMj=l;W@Qpozr9gFnC@
zWt?3wYC#gS$?VST%sbEQzJI*F0XV^S0ukimkg(3phKx-aTMV(D+qZq&br_DSO}DEz
z`o4Lm4?MHydcNK=Z)`{0>ovo&9ji7@KV^_Qwqr7|3PbdaXO$SjTE0#<Ww%8)$topW
z47v@|yEYmfilnP<)9BO<&*uI(DEYT`pP@Lrec5$d0%XKN{T0jfzi=3IEk9def?w(X
ztUuQNRnEth34o6%#->-0NpR##T7@ShuH1pwG|z25dnPbJv2ENNDiTmsL?Nq)A<l3(
z^A7?N3@I+6cMQkUFB@&M>0^g}H$q<?qD8XeM9Q>BKtxc;s^sakGafCxfIW${IkHg^
z%wnF->L>w8q{w4fK$`6D;%9^&1I3$Dix-g@7ncMZwJID85&CYOpg4#>f?c7I6@GNw
so}=-3IQ0^;Q$WHG0g%0^Aj?>p0Lcvz4ub3xi1r5ve^3sxDmt!x0t-E+@c;k-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/ConditionPropertyItem.class b/ureport2-core/target/classes/com/bstek/ureport/definition/ConditionPropertyItem.class
deleted file mode 100644
index 1cd691e1a8855f9024c317bdb4620649026860c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4307
zcmbW3-&5RF6vt1Ng=Loj1zNOV)z)9IRnk)YNxMQ<uv;mm{8+5oYS;}+Ae&$|TjW7!
ze9##mbjAmr@j?FrA9Ti!Gd}nS_(wT@Pm;}syEhE@a_-M_?&qF!?n(an_piT+XomK4
zbcR03(je(9wpdhHR9P4-wpr9z?65Fd?6TNnVX>%Z$j*?XP}<h(hC;(jyZR$tvvj+r
zt$D6#*Jc&URvf!(dZuG5G__Q5>e^PrGxoHmYwSC&rx~B^yGEmdb*=7H4NEJw_Cxvn
zYSZ@2x=}V8=9Xp5+qUEBY^$MAe#vobS_L{gdb6SJ>Xp3)jOf80L%WSpsb)K_0YkZn
z0-9$6&ZcKt+LGDum~zdm*}4ZPh316i>!+hGusPQ`xMi5N9Zw;pq)>0gu{O=Bw}Y;2
z9F%pdiGwnhY42^g7KpgFuDdnE+cfQ}bD+=wPp#-KJnI=Qs0$~+sv6s-?K>M6i>c50
zP!+?n*1SUtM_-lPDW)97px9EurF!=D8e%FBqfB|l-_PD}2U#Iaa&&t=OoD|dE1;g{
zWt@MV?^aN#YhtpD*&;%(&>${qEH~?0hP$pKM>q|gif)y4*W__Hnf7)}IB`aDxD?%W
z_6^rNEO|y91Q`To+0XH_6O*zm&oo*a&P{Z#Gp-5~ky{nI0z0RC3@XluS-3iJIs**R
zABTWDhFiCZzlEC}lmFud^v7Xw(n#o*_Cd@udNfpr`>k*l#qFm?VDo((w&=O_ag3r-
z4r}~I{P&l`QZyI|SB}2Nk#Nh=*`aW6{GraB$bYe{>wKz1;bC#J^Cxl1F;=4_Y&~g(
zu1S+HW+O_scpdQbux(^UmWRjNXr*HNm7^j_S&lCZoMdqu(=wFfOfU$)Z8m~lXfAlH
ztL+kwf`cN?_l`}bCrYgxD@N6wbF4ke!gNpslODXxPf^*-!dOdP`r41tX0+Uz({wAw
zqRCZpEQ;kythP<@7h9z~T~=wFo>J)oiy<0TX@t(I^aMSr($hSAhQ+fiF7n)S^t?(h
z(S%BqJof^<sL*t0L6Z{3&c~;({m*cBYuBiFus?{u6QX`fF$sDph9QN{q2Ggc)Sm+z
z`se-r81{hQ@8b%73v9myx!(fbZ^0kwU4kC2;?Ls_ev4amoP|qbZ5;D(739kp%|ll~
zJDC5Ilzi$jrC4<R?i+apa)7!ZFHjne%EIUrMrxo!8ePE%X;0IkISnnF>(2i{>EF;v
z5gXzA61^Ey?v9kN;a4tTDPVVscjqrZrgR%2=g;1tZYuZ|MuT0U1-8x}=7V3Q*Fsxy
zkZuuVUJCL$y&(hX7C{yOvX}r8gjm5<-vT5%I1bVyf|Mj6K`zV!<vQI6jjW)JJk!HK
zUA|uf&)fmfasp70Uj=9cLF>V57=!KLl(*5FlLjv%qTZ9BDo7t`@G_#$Hh@@8K;#tX
z;N6sh^ok(&r65H)NUsR;03Z(&K=_R@$U9PytO%k@K^Ej7SrNnl$aVq<KXL|Hlx9&*
z1TiHbL44nZkz4XC%86N22aufr6jYmd7G0!EupOLILhm-c2Pr0epNRUY1XZCWx)UlN
zDFJ<=&zeAdlz_+ukbSmHcO@XI2y!R|S)qF}5LE>E93WpLfCQCSp;c)X^@|{1N<r4-
zS=29rd<BrN6F|7!vq#oxL*kLtuc!&}>imrqq)eL~9vR11LIn91Am1f`@HdS?-j{-O
zi6GxgLGH^zVqdDD82$i|9}__Mqsky3(1(y>vJQx$`AG`$5j_Z%k0k4W=#ifR@=F2;
Nf2A4Zp&x^f{{vf>PE7y+

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Expand.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Expand.class
deleted file mode 100644
index bb804afafc1d456fb16e6409df6b858a61b9e85f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1116
zcma)5ZEw<06n-ugT1q!r$L5Cfb#H~aRg{?+$g*W(VuD*@m4p~Sl+v-z(k`V;<F8Vd
zIHS?*vp>psZXp?{AGl5K$+_pb=XuV#r@wxG`w5_g$0-QVWaLp0F(+a}#x(BpZBs%<
zrr;(=Y)MeL)g{bw`#?ld#6yO}OQ(GtGOX4tzoR$1q5V$p1@@^QgnG+9ay%z=d{3`_
zI5oXinL&8!zxT)-_@2!muGIHxud4>b+M5XzB+pE@XLlJiEkEfUVc%~N+qIhG*$2H&
z(+*ylO_%dW$qtVgo@lib^UTy;(`)NS7&u<LoS#sVTJtT_t($?vvkp@Wp4lM=_20A%
z$qMhw4#WI^SfA(X)SvL!p&C<$)Ar1e8p;sYctEOH?(p)9k<?YM*Qrb-cc(nK=J>i{
zlVaET$W_zR$cEnwEc=<mJCh!~*cNY!f-E16IR%eUVpyKwr4{6`t>8B9D9B(&fy%d8
z%rHz}^_i<?$VLZ$>7mK8+-OF!T7IO^!{&)?g`{?Sv~~Ng+3gMs8-KxZvhr?`hIbk?
z3lMe}xio+*sf#QL1Tr~ZFZ~??QkcheLNAbak1StuAM6WamxzBNk71GaWE5K<d=58;
z_!45#sjLcxuSi@%;P}`Weu++$0SY&9D~eOk2*nwTh|>p%g^i^PBtJ*tQM#+^BJOhO
zB$87sL&6H}1L1F}5We=lLujaC`~uQBQjsGIk&})bB@sDO$sdG^_i6YVLLX_Pk?3Q}
bI0xeb2KCBB0;*)4bjF6Ht5~D67}oy)()apf

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/HeaderFooterDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/HeaderFooterDefinition.class
deleted file mode 100644
index 0af14a130a612a5673e3fed93127c767a47649e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6337
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
LwSogSg+BgYnb~d-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/HtmlReportAlign.class b/ureport2-core/target/classes/com/bstek/ureport/definition/HtmlReportAlign.class
deleted file mode 100644
index 869acd8a764d2681b7e6f6ee96f23e66fd1de290..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1131
zcmb7D?{Csj6g>|LEnNq!BFdb<=5)Z2isC280xmN%Auh2>LX00uS6F9hO)2}klqJq+
zH2dryWxVf=IHrD~B=6?ld)~e0o_G2A>+25yb<|Uku&JVml8l^;vWhge_)$@iQ7KvB
zh=&SRxUDMCxiw@wVvsy%5HVCcb}%yf<H&h$OhV^F5Jtv<GjM%3as%Jki$>ln5p8?!
z&~Gp#ZO4zCkRcJe!$YbdZ*<$8H@hZ-@pj>2$Cfv7#tgM$Y2nM#PH^BbWIC?zyqt{s
zPWamDdlZpH)%^j(vtsASI<^eY@`r{Qg|0trlolnacLLk;x>o4&^0OY2Z;hyx{%?Jf
zsLAEqX2}1i{fknU#E%YLnmT2YrdC9{GsKHLp)_r8cDXfIde@(fnv3z?rngefU=rHS
zbC;`<`|B;MTp0~l_~zs^)bN<0vdA)MDBy{PTez(ugRF)Xe(1<Dq%TzG)M;64FYq~u
zVrg!y{r-_-M@01LyihxyH6AzSV1FL&a@9twM%$dGzk<{%a0UQbA|WjC0J5umK8`>N
zSCI$9HS*TU@=u+DeMamI@sH#&T&FWBa(TiRusXxn5ff2Wm&#v|ID^FTu}k<H6w%I6
zSi?<`Cus=9JJt}VA0U^v)=rW9B+~QkF0RYC!>Qx0z^p^TJwce4c}Iirul)^DPnYAT
zP)?8%jw%UfNjO?UILpcJgo{sU(R$JpOJ*-I#j<$<#tEFys}e&H$4ycvHfy?p`xJ}e
F!EZ1=1aSZW

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/LinkParameter.class b/ureport2-core/target/classes/com/bstek/ureport/definition/LinkParameter.class
deleted file mode 100644
index 9718ed4355df0a2fe29a858b2eb2285dda08b254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1219
zcmb7?+iuf95QhIvoVX1sEg>yu=!ue~5lazwpmI?_fT9*DkgMJ}=@Q%~c4a#i;sJOF
zo&uyI5EncE4~6)5<KQ-RE_&hFgJ=HvW_JGk{q-BbBh(AX<L)$aSkva7HWeFH8#Np2
z0&}4XT&LGkLFoG4yI0Qy#A|_>E#C_x$BSA{Z=iBN{Vz{9KEK=*uso-)1WJv4=g5&g
z$Lq>w6u4gZu|V!fI}6O3_4&ucK!sXWKsGvlU$(<Y9mqkT4*ejK>i>V)_xDs!CIQsS
zKXE-b+7!rEsx7A7q6?K9uBWyK{k96;I_;hT@jJwKSOm}Ur4@Z}LxFlq);;xJ3zJGx
z>)?$Ou%1W-Olfyjv~8*@SE_0C+2P1xzH;`z#+;&r=@_?kj<==JZBn7Y26LRZDW#F-
zNuh_8bLwc&Len1v9reN;_V8pU?(3H=qJ+yu%-~`Xv)atzl0fY&@T7invXTkeY458}
zBv3Y2t}mNr=-f~G&9KCg%!B=hh3lBYH1`D#Zw43m5y9+9VOD~0wdq4b+A>d)tKgce
z{ebvp+~#SuC@8r=TO2yz3a;`baE<rl!N<sa<<AU~;KkJ78@L$<Z_+!%n0#&hJ2FY?
zg1KE`WvfPEVdxd7*J!#fO?@jBBs&hWmI`t^9V9yrQYA=j0*G#`2DyVp+SBbkhBXdS
dPX$@RavXfBBi1;GB*=paAo^uB$clM`)qm3_>;(V-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Order.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Order.class
deleted file mode 100644
index cb5f4b0910b028fd94c14810eea3d53368fb6e91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1057
zcma)4U2hUm5Iq+b7Pi|$5m9RWLMk7vT~Rb9kfu#j6B8m2C<!q>EXx+RF1uz~`n!}S
z)@U?+_D30KZi%JQM0S%qnLB4@&YZbFe|`M{ppJSH3Q8KvsHn)QsA^cjCLdb~q%;a{
zG2%f2t8BLu$gnk3JQPp{_Sh0Awk&^S^v9w7-k1dT2R{gnfqm$BPU!fa(GCW7&=824
z3|2hfvjx;*cdzyOpd+yHX0i16vFT3iu|TO@SujP}_XpG~)p9)h<z&>igI8wX<?gap
z`%vInxpib7n}%z8L!%Q0jyG&n79*5t`IhN+&A{QJv&xERj;KNA@2UdvCQGs-ko!l|
z7nLrF6TWk3!eqx8dS*ykl4@lRB$}2xOMW_6`oNovnv1aAA^o+EKM5@Rxx)%*ax2?B
zyN)Zo`K*o_9tjlwzf2u@Jl1gww{@hD*0IV*25Etn3pJUXK+JOG!n5Vd9PxJl$hJZv
z^<-X(eb*e18*{Kf3%Ojiv0I}zxIzzD+08QpfGm-amUsZ^HJ*wQNa8AT5V%HOfh>R8
z6yh@?XNZ0zPvAP8aT&`IK998-zK)2z)iO%;3u0$b7$3QWzd<+pIST8zDdQv!p}1oW
zQThS3y19Oe_$L{jZ+DTd;to^CU5P0mfqRlLmw8Kr@VEC3N-v{EPmwr5QaYL<oh9k$
vG3hMFzY{JxrKi+WrdaCqVpA-4P9T`T`Mer21aT~pI+0n^A~xtQg8RP#9D?Rl

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Orientation.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Orientation.class
deleted file mode 100644
index 0f0595edb94c5aa057ba1dc5789f032ab4ad4967..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1112
zcmb7@?{CsT7{|Xy3oTs*M07Bx&N-DIj*6MDAY^8liH1lbO0xLsC>`D`?NZ8K_*W@Q
zoY83Z+CR$pTp<~#FUB>wyXT%?pXa&juixK(0@%TmBvjlt@Bj}rWHl5Gm?+7qtRrQR
zvMensIx=#7q+we_l|euDgD~JCWGJ_6e`xhaq4U8S2aZ%&edkbkA{4%7wFBXJA(#6)
zL(=75e`NDxhe6xwK5M<*?=V!}EfXVg!riemV%RR0mU2}0{66JPw}j`s8V`F;@P_wX
zNfJeDA2KwHts{QIEy5gFoiGsIpk7)AF5B{L?sj<~WawFZ)#F1-ll?a~L!u!&)nvHw
zpVTi(T?RFLFR0pNM+`h3Qi~asqEzS&+nqVTo(sM2jfaiPGdJr~U*TIFhp=7oQKHjj
z86AHd*v@kydz6{G$g1p-iL3I(WKCFj%uu}SD=@K&nu&GXGLb^sL<VVw)J5ARKSM4$
z_zQ|5Zo9rmIJshJuH<&_$gx90emdX8J(rJ0v+5QvbTL_dw?=Q<1j7|5y9G%F&`MxH
zW=+;fKZ}Yat|3QO*Gbx>RSshU_64zXD4$58TckM=>GEX1iu}xe2eIhX$g1V9h@V51
z_OS)~0-Z<-ii$PdjP%qdvXU8VQ0N1+a%KGtiO-RGKHY`8hT9SycOsh&=(vlG8OTd2
zM2_lrs0Ue1IfH(RWF#1BB&@`LkV=`*i#t#!Sm~UC$!yc&48j2l1emAYG{YwD(OC>z
Fe*lFv1*HH0

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/PagingMode.class b/ureport2-core/target/classes/com/bstek/ureport/definition/PagingMode.class
deleted file mode 100644
index 9d323f557bf98ecc2c7eff21fcbed8bf2f43ee6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1102
zcmb7D?{CsT7=8{4g{}ftbYo7Pb2?y?ikY9lWoDU)2A!r#viRxf3f?U3Qpz;`Rmu`)
zG@5<(k21bjNC5T2xF&b^{(j!)z5e?B?I(au+)qQnZ4Gy@rovEB)S#mzw{i*@jf`dK
zv7SOso*OFes;DriZ4n;vj>AxD*nZb+^+M;J*$<o}KM2hOr!71Y3g0td@Q(00&-??Y
z7Dass{P#V&tu`MuUhi5A<u@}VNFH;y?@;_ku{2AZvO@qEvJK%m&->k$6TIRrmo#dW
zaIekqu-G`{$J}(e*D<XyAk?*4dNUfn&D|ysgv>ljuXwymRg8aAGbHPhqb-Ij|Ec_>
z)MQY?w}N_2TcYFfkjQ0-7o{Opx7|_j%Zb#xUcXyEH=A3vVW{v;%OTXR_$ZOnm^91p
z2e$KANQScG305RQIxfnGV(2h&k74bc)7LSNs*WXG(~&_|M-Ewr%$RZso*^G8{({7i
zuwCCHF!^F>qTjvNp<{;x_`xKDJ1+0_M!iiBbGle<yGk!w2g3!#w+j*#KqmnMa*MJ}
z`b89^aS3_yx=hjvopNadurG+6A^wRZ8X@h;$hJWK^H>=9Zz2|HHA5+XMdA#K^p8#X
z7f2&fP*yDBYGfyx$V*nNB2FKmme-d~k^CH)C(Dh)Ra}?QaU=3sMhZ8vJOc8R8j-8=
z9m>9;#!rztK{^sNB@*TmKgbjx&~w{Y2AH!>z+|;ya~i<`3IuS0Zo>*IxJ9}cR{sEx
Ci~olJ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/PagingPosition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/PagingPosition.class
deleted file mode 100644
index 300cb6eaec67b75851cb516d389ac76a58eab131..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1077
zcmb7C?@!ZE6g_Y4)~=KdicXm*{y<$fSs}qsTM$Ap(KJ9ZT|)fyR^Dc@Yfabjcj-vP
zXf%BGk22m@7TKa-_L}tNzI)z1=bm?e{r>h7z!o<0P_bs<F`j5x)bP}RiHiK$I_3>Z
z+7eOKQIva4!!w3lM|7iDFs!>?)OR|AM0{|DvG^FpiE|>le&{ED6go$|=ZC$cXpn{t
zhAi(UB4*Im+Pm)C{T4(0-Hau2XFM2+0mDYcp7pM}7oCvmqU(p^VA$`7_zmv_bfTq2
z54#Mz759{%aVOwm&uJww>2KIGO0?X_<3XFpzN|i`P($7)ChOnw<Y!Ylw#`ub5Bn>-
z&7daled;;i@_Qjq$Z7_qA`^Pk3&xjUOqAXahyCVEvbX7Zj8-&^J@L|)o-9qjUR~N^
zVnGhcqKS3X8EP}UzKIeX6L+v;Vjcw(MHCnc*Jew}G$CFPg~WcNVo$Vl*f|wmLJFTx
z8nhSi!Jsh#`}<zgRU12-G`c3uyRx$^$pPAlA6O{Mjwqud4+~2mW{MutE|)O^`-03R
zlur~f+@yal&6NmW!mTlW3z_uPu+-{TWG|sgd}a!Nn@-Ft6qZp=^W+AhB;zI&`T(t3
zTe(2)bDEx{yS}dBu9S{@DP|Qq?qhW<<TW)SSN%KGV@p#mpr0e328NmjbJ-u1QbsgO
f$La`kt#dHRcGa9gazJgBskzLU;Q`qpn|bsH=_UF_

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Paper.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Paper.class
deleted file mode 100644
index 436536b08d92a069aa85b1ff2704271cecf6d42a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4435
zcma);-*XdH6vxlD32DN%X=_2W_@jWBra(YY&>}xtC@u6C{e>1qH|aLnlI+IKh87UP
z@j+*NfEgduVMcv+d{D=XGd?&z`$su`&&{UUT<<ncr|0aRJ@?+v`El>f-~asaClQ^Z
zPZKmiR-B%p4Hmaq6j_wwWRt^BWfmW?a9LDXcr2<c?y%TovBlypi+e2Y$LQl2J&4gK
z8ueC8*D{JLrdzQbdwJ@TM%q=4y2l;6;u*HLVic=p^v9>)ef#*YCtDgNisrgEW4L+C
zhUb(<yIm_^*tWzyr`-6eXC2RTN{!ce*(jUt(%rJDQEEEplrq_hXWq_KU9;@CUS`c)
zw`|J;MP|O?If@0#2G+{YIBOU;+-_XM6$4}I*4BcvS<xuEX{~t$jdm4GW(Bk3TBhw8
zyqHGmohO}Z`eN2(!7CLP1o6e9mB;X7I}e|1^=GhbeyU{T5l;W~hH=Np6b(C{S@c|l
ziO=0Rr&ul7mu(|kG}n;iRRGs*<4)BEzFvQ8Bz7MoP1&C5-Z6l-?wXZ?C>tU^%PBpl
zQD<s+MWe{L$YOHZvd!6QDT{LOA`If>&;$lr0q?#s;uS1p@6gWiiCQss-t?vey@3_c
z9o>~yYa}(rAU$wi2=+}6{8|h;JeC5zgztgZB)*QdbXO7%trnhPyOB`kRNLn9+Y`a)
zm@P1N<bU@o2iJv#Z`3=k3-kDoaabq){)@xhc;-|DT1=xO?LY(GK;_H@EE*kc0~>H2
zWn3=Yd|;1_v|GRF%w-puYHT~EZ`UpjU$J-si%&H6X##U?za*{7c<V+$M`0`A!1AOI
zk<@CVsp?<+eZr|}F>u?|4UN6SZPRM$hmW*pH9FodC(;NcrXMp)R*g=y$&NH&J4IuS
z6Jr1%iZg>Vx9zhh^<Njx&!8Wf`luN6dDUMNi%!+enG+VD774L6jxmQ$uhB`J25G-e
zFR*x##Y?n5Mh|s*L}{IdS!CFJoW%(iFVm1tukh1h7OzrDrvr3Qr$hXDl#b~%LPs<@
z(Egf0M>G>Mm)$UPI3Wjw$#OD_;&!v{)sML&J5DDhAIBx%bu@$<bAUA3Lw)o-?WJe&
zybm{Y2R(;>L@u5YywHeWXrw@BL@G3*6B+>ujo^hw{6ZrILL*y3BYdHe3!#xfp^-zO
zkw)ktu%G~tr||XwJR0=L^zWpldsl1JA!KK|cd|wiA*1PEX;+P6>1d6*(p@!*r#owu
z_(e?mI^<!BL++ypf=wX2UM#eiYm3?(<VxZ1D2n<9y!85VbehiKO`|vIEgvNV%_!0I
zZ`AP<9y*98-zAJAfx*%3!J~B6AAAnp9qgSRL<mi^gs^5PicaF?_tw4q8F+TC1~2@!
z5~NcGIjICWrv~YiK~4kYOb7_)i$TsSK_W89s1oFY8YCivoCnB-5D@N12DzvNiOL}3
zN{}%%NK^*70+7iN5Z(|BGESEuxm|-jvioNkf<1Cg338bx{K3s08L8238Dth9b0HwS
zBN^n1G9$X2k?Ts3Np(ha8Dt3{%ON0q1Te^y5~N!OxuFEPss`znK~@2BGX#XsAO^Wc
z(~xp$dgRjFQi9CTtUtJ=G(9p%79hD05I$WPWRB()AW0cyT?ulX7E~Zf8N>p}MhFO>
z)(o<!EKRRmnxYb9NnM&=8N>ldIRu2S3kF%H6-c=>eKJTz337wp@dr0cgOjyS2H6D2
zRtN~+Lk#k+G9z6w$bBWqsyZWGGRQ-KJPHBfi;zKXDna5h$Y)BB_tYS98RT<-d=Ub|
zH!*{}Pq!fD(!}Iu{Za|?0e$EXZk7fIT1*Cc43H-wApDboK@7?&K>B5nuaqD;T2q1a
x%OGC^<eLx>{>{Q5rm{2%xin9eAnWSV1b(5^e+GOHkRL)o_{R~0<i({@_!p)l|DgZ?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/PaperSize.class b/ureport2-core/target/classes/com/bstek/ureport/definition/PaperSize.class
deleted file mode 100644
index 6db1858032b88f4589285e9c6b329d57eb342dd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcma)3%SyvQ6g`tPO<QAA>)X~xL8Q&XY}_es1hG(5s8n1g>DWwdlai(iev=!)BDnAa
z{3!8G8eB*hGH@T~=A3gg^Y#7l3E&8o0yM1Vk-?e_>pC`cY%*w1q8s}RtjUn|x#;;Z
z6(=GP@hMH~&1R#+kU0yxoWX2~fL~6AE{|>;cR)zF6?)E~<3vLCDVT|UF=nW@yl`l{
z<Cs6#lZcPPD7L%&UP_BFu&<pFkJ{pyA2Z~7JieVRqShO<N}hm=belpuoJ1Z!7t*l!
zOFQg4kB)&nwhUyU8^}RtIQX9@LrK!@ffMxXE4R-*`falAphmZ&(UmE5NH(cRnX(Gn
z3k8Y`)ZNisrEFU7U{+-c#i~xBz9s~NVwr@1D#dN0?VyNVEE2Leqfu{CM*@irODbuk
tkU<Gcsf|rp&NS-{$_o_=q<A&~Yl)yS`ydshH<?RT|C0CTl9v;Ul^-s@UL^nk

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/PaperType$1.class b/ureport2-core/target/classes/com/bstek/ureport/definition/PaperType$1.class
deleted file mode 100644
index 9af59b5df839e0394dcfb411c527c78c218d75bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1585
zcmb`HS#J|p7>3_tJMn^(m?VTW6dK4hOIaLer!0*p3r({Yhoo)T#^ZquOlGXHP1U<f
z?GHeLAAm$9F1RU+P*ov>1Xo;DYJUI{{Q;HQ>#E;tAx<v1$VDa3^UgDKzBy;koa0yj
z{`w5S2<#LF@JSN;a5yPvN2o{RI7Z15gG7!PB8G_(Vw4yo#)%2yIPocQf;dT>B2E*Z
z5tBroFo~%+rsJ4Z$Qgxi-KxF0Xq62+*fNThs&n0_g-$sLt47JW;`(mY4SZw8Dm&ro
zcV$N*vN5NSIB9#lcUmFZKd`0{n+i&Dvt_~cou%4VQCeF?Pp-5s1h(a^S)ogRd$Fld
zwe0KCYu)9|6;g$u7TV6N%cACY{T;hz-LT}jGrsKw71zJI=u|g@QXFT}_#AU-?8kvL
zzQBAM3s_X>V*9LT`B$?`L7`@E&bp3QnhC=oOk;`7mWdVOOX4h1AXbTU#2T?qd_{as
zd_!yy=ZOo%MdA{1nXrf=<`w#7GPCu`%)Xt>te(v5yO%R^3h6oDcfu*ps#KhcLPn2&
zxp>X7s|vk4dzeDw4a=+XA&2`1HWqePbwWO9eo#id^Y-x|EV;hr)jz$gg-BjrBa$B?
zhKUhklo%t%i3#Gkl;m^LTg0q`btdaf)|sp`S!c4&WSz-6lXYfpFw-qN=0n**D$~jD
z&NC$N5xON00+IWO${CdN3)HixsYi%B<S+UJvDorG#OCYTDB7SkF50LyAsW}36isMN
ziDtI7-bLTmJWb!$zKNdH_09B@_7?gs?HPJn`)+!Z_Evhc_BMKp_I7$k`yTpk?H%-1
z?R)8M+B@m(+CQN0(cVSxsQUwSAc=PDMFTp~gI>u#3}IAq40%jT&d5e9NUq8Tu_a3=
zqas<w_xM5bN8H3M$=kStyOKZQXFQU8jOTbE`4Ye3cga8S8gC^3#9#PZ@*f2iMT3f|
zjB1l?SKX>d(olnHSaL*7swv57wW11=tLn0{r7ns?vS=E)NMr%^2qSVBa+GmoJ&upD
h_#Q0r+W!q1OK-jZKJ-h*<Zl@=UqDJmw@(t8#D9q4I&%O3

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/PaperType.class b/ureport2-core/target/classes/com/bstek/ureport/definition/PaperType.class
deleted file mode 100644
index f68ace06c98e993ddfa76725f1f751741ee4af31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3333
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
P;Q`_p^`vWp?pOW)^w;_n

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/ReportDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/ReportDefinition.class
deleted file mode 100644
index 5a97c51823d4badb977cb521a847076d33befa5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14930
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/RowDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/RowDefinition.class
deleted file mode 100644
index b02590c85388919b4ee32ff8e0b25a0284537bb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2301
zcmah~ZF3V<7(F-LB;9q9w1pxTv=zZL2`os9VoH#-BBh}yDZzp=vuW0JG2P8<Hg@oX
zzre5l3qR<Lq%$((@R=Xwc<ye}B-^x|PWIk??(=e<=bXEJ``<tR0$9Lv4O1v4v8*A6
z6%`ZsO78B;-Pdw=FNswR<0y{fzFgPjNlES=$j7?$d8pC$O%mVA^-&V#BsP+GERbqh
zo^3WNme;af=ke-_fVeMkV%c?CzUlZCv(dKVt>03=&aRaT0;=ckuD5rpmPf}`fyB0D
z*SCEErD{4gfeWQAcgLu<eCsEp?O9FN^NpJIqwUx}^BYAv<r%dk4NNzdp06-=*{xXu
zCrh?tg~>O}YJ--^lDkE4CL!{@YgGJgyCsl2y3!+ecV)k>Ea_Ogv<VpL(hKuv(`fs4
z!zkG;KR-Vr(+&|e3<fY%Vb3g>ipCK>PXx{%6F)uN#mi=|6C;vw>BvL{LQ%_h-7$Sm
zR$x8a$Z_Gv^{Lk_pB?w;B{w8kZw(oh^r~b`rR%*e^C~@h`y}m>V}Xn5QRNOwA<5`4
z;!=7<`_X`)I3?CJJ!``a*gR5j>}Nm*vLV5!)7{ZEOs8%<tiG_er~;lfLP7@31D55W
ztW@HtNe>_$E?UTkIc(P`2bazMMdl!zTG?%TTh?7W(E3o+6{%4jvzQZ@IoRR8Jf%xT
z$9bI7aRUoFKEQ`MZsH4pGl9&5Udp~_JN07QZq$N{>*;uc?{v(_uqW8m@f6Q=e2*V=
zT*IdVnS&({>rY1>OS~QZYT-ZyPW4Uw(e=!cX$VY3<(!vXC(LHkl6ty4NLknqFK)lW
zP>Y=HISTcN<8j{&BZ!AejpmV8EfoHm^)jNDUhxX%_%WU0*Yy-mL&5u)#u*5_$Io^Q
zXZhoJgFV>^R&v8tqYruI^CP|)Tm{#7W)I@8!0iH`iNH96kGa=F2VBG@zA5+wX(pG!
zzhjJlz~XDfHnV#edyvcg4W)y)ToWB6bFVSJxd(Mp>);*Q^bSsR@NNeubAK{$46@iX
z;(X3QWzq>+&a&)vmXpP2!vfvnEQNVw2uMW^S^i?UOs^24JiEd(gO(Vsaz`=oIou~f
z{1G_x`<x%qryzudZg7F=VvI>-W?n(>Pf7l30|CTYR)U=lz4pN-0t)1S7e@k7qCl>V
z1j36o3WyQ~vPd8|4gn%HAc1^_&%3$$%#$ifMl2vBWd7zzAiUQHfMj1G5e0IKKnjNd
zks_2pcxxlMG^vkl2dP?gEX9Fb+WvGk+@c~y>JD=iy1A~i3(1L^$-cov2b0lMgOXOe
PsbXEl+{Tx|81DQJL`m&n

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/Scope.class b/ureport2-core/target/classes/com/bstek/ureport/definition/Scope.class
deleted file mode 100644
index 68a728bc98d854d25afc24549b09bf849825666e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1059
zcma)4ZEMp|6n<`-Hfff%U98p4`Bppovbk8TBD9Q+F+nKqL$pxD4{4Uw%rqHkGXIu#
z;6zdO*&ijIdskeCf=%Ea&N<IL=Q+>0KYxAw0icCe1`?_&YN*R7$Y`j@VvQf`3UVqX
z*E!;Wf+cP@6zJR<G9EHWw&QsWm98C(jKMf^-Wze~90g%y>^ldp??!Im8>Sr`Ic<hy
z7<^zz+kqF4d<MDF+wQ*JH5pdl%vT_NY<aOWW~kQcb6$~lf_;Y}*L8j8Wjq=<;VWz4
zQA8HC_6``H)w+k)v1NFcKQzoJbp2twJ|7{y8`zfDvqF~_omQ57YeWt7zpK*l9WKfy
zL-8L?U(|afY4pye2{WcU^sR{0B;9H}p>%9-dim*0>0Lh_b>?BaNgGhjAP#Nkxyuz$
z#a=e}>>94{-4`@8@ra@P|8;68;jxBWxUC_FyoM!y=*Tl<FVy7Z7*e(u_|&jatIrVM
z8yq@zM5La~O0nZv<8gZi_GclNtG2hA^a``|gr%(#X8@2T62cM>AivC~;s|7L6-6*y
zBd<)Bf9eG6GZJS=ek70KI-O~eD-ynh<te^}govuT)cAtb86=KRT*BX=h<1*`3T}!#
zNkb^!v56%8fZSMHIYs)DNYA#rxGv)kr;fV<Q-*?jf-o=hmImS9_BTj<T~3}tIYCA^
zswA8R;b<x0ET+E`E;*s6)R!h$F#D+q7R?hdPT+iAl^B9JR!N=2v}pya6ieX#Z`1VW
ANB{r;

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/BeanDatasetDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/BeanDatasetDefinition.class
deleted file mode 100644
index 3cb935d7f211995c962c3741fb100d2808ac6ba4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2949
zcmbVOZBrXn6n-vwSrS8OLqVX{g0{+AyNWHf35^seZ85w^+Gs4kY?1{QLXt@~9qstZ
zFaDi&rj{8yzI^s4_#gc22WK3gdv{4T$ufg}$nMQK=brQ2=RD^ozyI^oF95E?ilP^3
z`B;l!0P7kyG;C`4B#I!mG-RapVHA&$)$pl?&!UJSr{QxAkE7_vw)B4?A75(tO2gLz
zXX|FoGD=yqR<|nUM-P?-#Hv8wQl(tCjk29JN)0pg=l9S5DE~eEgFvus9GU|0^uF=L
z&`U;nSI^irtGt^O2p^jEUZp4yDwK?;Pife(%u=z=Do%LAwn}>1s@n{XWUSq?VK-{b
zmg;cNrwf%sJzuxY1DyfYO3l`b=8jdiY=YE_hHcbMTVIjclPOtwUiwl3fr-g1K`vE_
zOxvHf%I13GFmKi#8u^lfT`BOe29M0|t}$ruS;TnCqKl?cUUmR1Hz5&1EZ?w7Mb{&c
zo#<xBW7){>n*}@RIro}TO-}lpTcy?AysRS*1x7uYYUWOfsq{6)z2u^1)*B_ey+>|6
zQd1)R%tA5-Jz4I4Q!uNNTqZc9_^mW*1#?|BJ5b5*3q-3%jbCjlMN+H!uNo?m3k;>(
zsQtEjOz&k+sO<f`r>qN0w(y20j2XRAuE6~F^<`|MaKIg^o7B3%cmIR?Q`S38ha$VC
zt)xkw;uDjebGg!A=rW#Cdo967sQ=>{1MYEK(<Nu%PN(%h){r@Rd6Fe(l+PbyZXfwx
z;&3AdeOQ-CG$wI$q%qi8Ns1i7@*<%1cpc3s*{xV|SVw(F?V1!`3~%A>7!2fNcmo%x
z$JTX3ICXjDv@DK(c&W8%Hir8sw8c4UjA0ZPG!$bnvBPO-ZIbO1xYT_&wauu+wkt5u
zs^1(gf!XfO=JDw1Tk57;svK4uw%Oby^X<j(CN9NrQJyu?ox|sH^d(PV?o^w*F1V%^
zB((!=T2Op*fERrF|JXCLPMkXqN=02)*Kmuob{}swtNf&LKvmrGmT~V7ZyDF*t>c;m
zu6Xyh-74*~Gwh9PHX=Eh#W;UEdm(ThA<ASBLtMYk-{u|+^F!gNH6^LuY?peocZ?fT
z>v2T6rhNIlOpDI9;5#&R1o2#jT;VgUj2H0^*D)sm?_z@A1ST=XV%#j^jMHe_o_UF$
zsTT-@e?~ADh=(${pnQbl;mk{DiQq_ZhOXXRV45BVM(DdrS2PhC3H^rG65&^f<)mXI
ze1yJdiQp^r=SG4@IQy%rzJX1g;lB)tZIo3(G-Je*B$`Fy*~B!qFr)Bpk)koYN6QR%
zBuUd%Tq9wN%%GEsFe9V%zfUi*yXTUtSrR76*v1Fk(W6$^aRUL&aXmzfljEjBu+6_j
zAJTV=J~rhq`Bx~x%Ca3v=9$NBhbIroFL3Ue3TTl$>qD}WB*i2jVZlwZ$+v_Qo|^s<
z=VYq_ijJtV&hdaZRVE2jHqdF8Tsi%hM{rsxE#u5RMoSOwaJ7gfKHK&10`X3$2_L8e
z%ed=qPBC2*V!Wj$2jXo)Oq~ExN>vJR#TQ7V6Ud@3kbC|>BAq~12;|-gK;#TbAoqQN
f1UiAN`T}|24<yhDWSu}ZP5>f@SOQs9P5Ss>3>L1#

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/DatasetDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/DatasetDefinition.class
deleted file mode 100644
index b3ef1ee999847e9f53c7e4191e5c58af8851822a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcma)&O-{ow5QU#hscHEYLYx6Mc!Ss!Ar@6v5iD{7CmEtCu8ooj3y#Ku18^wBB&e|H
zhK1$P^EYqi`Sa`j1Hd(oEe<RWEshLqP4eK^WN>zInXUY*cfrTn<<fAh=LS;+mQ0~)
z4Nf;mCmdYHt@J?7b@b9T>T$mX+-7B3yP_3(c8a{DMqEWt99cL;S9$R*i5n)&@6>LV
zr>-e!$wB?j7eDWd-;S$(MT47vxo&kEocu+6ELK#C1|K9&E~kcl;5T0cniv?2^z7)D
Xjm8FJ>;igEU{&4gRZO*-4b}cPZB}D3

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/Field.class b/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/Field.class
deleted file mode 100644
index 23e54fe180deef75398324f45e56cc69405486d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 587
zcma)&&rZTX5XQePrIlJm5%6DPqF$gH_u@^%#e@^V1BUyyU2(CrrYt^}CK?kDK7bEp
zoVEmwT)gbg%zpFDZ|C#t{R6-`b{v@4s-T3rjfRaTgBgp7WT^GV;!*HO#3Me?sftGz
z4A!NJmF_S!TFcMvAvIqmAvITfDwh4(#Fy!f@T1%=2}Cp$smk(s(bRWp%5d5Xk_q>x
zTHf<nDj$+m^HAPqqf`>}P-rogns=3qLV~bIQulMldaJ#RK>|`20%wrS(m-}qhT!A|
zXW6%0*w}VahQ;9he>lU&&r+`au?#drsns6hkTz)2Mj4FEm7)^GHdg4YP}ZfoLAT?*
zfq5sdFrFzh;Ly2FT40y@_ei^sRmz%$8ZOo-qrTjgk=r_|b5Bk;qqnm60^^B-!p_Qz
n2f2+~2<A3~zX0lxIs>x)z&LsJh{hfN0<jh#)&gWRpIG|_g2rrF

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/Parameter.class b/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/Parameter.class
deleted file mode 100644
index 8bcadf88119bf46d87413bc1e08c67c5a8e5a184..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1128
zcmbW0OHUgy5Xb-Cge;^Bp}bp4%cHajP>d=#wc=95DWa7?xjTs)7B;(R<3-|IfdoS8
zfe*lkLd-a6A=^cLTxRU?Jbp8_Z|{EG0NBKG5e2*%!T{!3EU;K~vE<^dKt5D$EihI+
zQm0A=Ds0Jp6Z>K76P=l}6FU1?ZA5KZ?-+e7lUScbv5`&v-4A`^N1<#gqdHL%H?-WL
z<pIS|tVbRy2~14|3FRn!X7_D@T)9%C%wM7=SxZ$v)O$(0uHyq$4=hL2P(e+_KJR<R
zygBqc0vmt9p^f~eVrt3gm?+$qHhZ?giE<^YMYr?QVY2-DIiqq4?nz*iQvAmxxI{O>
zR{7uK8KFc7JALCUQO<r#ao=9SuFq2(`89)ezE%$&hCR3#^e}{?hi4cRSpRb`kEbax
z`tU@)){k_<V1Zszf!<gS4riy8!v(CS8l+v&Q@}9E5!y-8g7m=3HN=H=E0HW%;|xY=
z?R6dS9AmT-7{>(3{@_bE=c(Yi%-~5(^@6vF%;8cit5<LyN*Aqlp1+07FxB<ym1i{W
zi>aqElL3-TgDho&yuiyWkX#z%9f7=m0)z+4AhVeh$)`aonINySCz4NttP#kECqVdS
K8D!4h!Rvc4?a@O3

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/SqlDatasetDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/dataset/SqlDatasetDefinition.class
deleted file mode 100644
index c18ca8e7835813c65e7e51cbd826745ae427a7dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7371
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
Pjk?X%sCSWzD!lu@ity!4

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/BuildinDatasource.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/BuildinDatasource.class
deleted file mode 100644
index d1f1515175adc6c623a566ebee883f0eaa5e8ac6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmZXPF%E)26h!AEf?`Z8j9x(-x3MvHYOG8wIKcudS%h7M#lu;601stcOq9avCo?ZE
z^PjK#1HcjkAAKJI!BxBvgz;>C$oP%3oU4?Drj#mO6NafUTdkCcjns-T{bJQMXKi80
zAk=jki@nUPZL+Clo=COhhF70_(Z~s_SQjj+j5xEp6c=3@mWY#7veC2ThqFHcVbtzB
cMwwmY5eSZb2XI_M2QFZ57oJTBev_m322R^Ur~m)}

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/BuildinDatasourceDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/BuildinDatasourceDefinition.class
deleted file mode 100644
index 0924bbd9cf305581055a7e2056b7f4c065834b3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3339
zcmbtWTW=Fb7(L_Ip4eU*NFd-+TIe+wf=fcU*l7xc00|~soI*)y%f?=k1;=abH8&yk
zx#AbJe}Gq7(V`To@YILCRqC&))Y3DvYkTduV5zdSp800x%$f6DW`6(YmtO%K!2LM3
zA{)a1&L*&ca}wv{2qUXH7ZSLLocb(Ed?s-zjyNu>k<Syjf+dMBB(BEMhc6YtS228z
zYZ9i!vP51WTr$@zf&T0b^R}5Pnx&Og&aK#`m5e}d!F0{4<yHkYd*e0NE~c_})#Yd`
zXRnk@w^rfu`L^MyY~EQ*EmvLZW{MNaPQ^_Xtm}5kc5SDW@^MoqJp2=lk<2uKqf=_$
zv_Q|$@Fg;waSGg`FKd^qh1%M(RarEbi<+~OH;b3dimm#-G3>6|<U8910jE~UTdCtU
zyI8PGnu@jr*a&P|R>M9|;vO9GPFlTHOwBl@l9g8n$^?#o)+}d+1ASkuI9K>E0+}w@
zS#B!VSkl5NR3MQ(9UwH<x~LQ~QmAsFz~K&a3k}U*;SB*nowqlSoV$>ny_>hn`p|Su
zo)QRbYfcDgA`mZ|6-Jk9RY<rmpo!9mtBVXIfx&Ex8}F6tuAFRLG39lGAsVopTfRYG
z==hlktW)ZD3dUBcRMc(Cxn}+*ndv~1C`ed3d9LehS&>*3_@*28cS*E8NV=mbS1fly
zr|i}tA0eoSfMmjY6SnzegX1cp5`<_*bblQtnA_P6#!l?IiXo+Kf}EN=4*0y98!A?3
z+pYg&M}?<^T4XQ@q<NUvmm{wlXqLLE){=TWr+X)DRdIH|qFC%x1=PS>*kxb`k_;dN
zHf{(E=*p@Od#qA1@2QY9a1%uan1MBv3^*vWw7i}pYl1Ihvmgi@>1tu8Vq)MHDh8@>
zB~}d7u#3s8>8kn`Om>0sjk{R&Qjof+OZ<$pR<5~Lqe3V(ZW|cHc8NO%?&6-n%tn~@
zF!DU{3aNP=HE$~~@dc*31#Y@HDB>GUFDVD{Mr<19Siwx!snmU`6KZj_;@t5rBG1E0
zvS#^XL1_Z8s<7Nu?fZ-&UTSl^TI~krU`wvm_hRVDRkONa-6a>USt3A5cUtq_uX_T9
zE@^&v2%HM0ld88~QEVm2i)y24t)-Ehn}q_yB3MlPO%<s~zUWkWtR2DeMg(M3CUz0n
zosy3NXeu^um~L*cP8b>N;iG3O$R8p87>ayRg;avl_NH#{gk+m}%kSH?r1&rR9~pTH
z@q?c74!==t+=Jb08{PzhzssJ$dw8FqTrB=X58q$F!;vQl{f0jEw~iix?-3D?pCNqZ
zDIyD=HOkTyPKMVZ1-`?mYV``dKr9_eMqVJEjwYjfM}I~lEyt2_9YzS3AHDozbRC-n
z9$`2geulm)$?#KbexB~FoBPr+ZH_5(viJGeV?Gs^a1D99!80zg*nnw&2lv@`*i!v4
z)Dh>=&+ms+>?7(m%-N%u#$L=~jPJ>PxJ+%9FixyVqD{c!+tk5+VvG}Sl86&{K-;%C
zq-DB_7}xgW17b#r5F_po)t;vM!x%w?2yyPQm-|2PTQM?t=nJb_W87DH<01F{m?G~&
zi904K^Ej=8w0L6^jj;n9o1}FPu>tWn`XvrZ9Qq6UPfHv=BXQ&<w~9%mB{C9I9Oh)Q
zIs(B7iI)Tlw~cy%@(GDd<5PZH!{iCJJSIX&Yv_f^RL3wmievubY0g&6qa&j~VM{Z}
z;@WzY${f=O-ua>pJ)$~-ReT=D4Cl5J3AGcM?Lfpk%?X0c;-n99p8pL(Aw{T1AIBp!
zM?&-eLC8xb<qR(?qD-!x#P)VM#nx%M!qZH-QgCMYNA$NdT?jA@H!^FUvqL!ZFT0&#
AQUCw|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DataType$1.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DataType$1.class
deleted file mode 100644
index 878ec28bf98b5ed578bc463fcb3b7be4b7a71b46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 949
zcmbVL&2G~`5dJoC;v{vbDTS8u7l>&S3Uym3mm(x+6DcA|ksOsnFKp~3aqD^`+bQCS
zI0F(w2=xJY1>OZQYg+ljrAXdy=G&dWomv0<{rwcc6FjcqI+n_q!HqI$Hx<35<F+Dq
z6x0;lRd7#1U5BM(nPJ;<-usC=?(vD`%42I7C*sJOMq(nP#PY;DKlBq{hL*<@9?NOu
z3Tv0t!H0=p$Q^VTO3&OtSv_aSH=6ql+K%+-aJK7*qCY(zifF)x0qx9nrOShT9{Gx&
zZC0IxyGN8i<y136#Yq#jedSa=Pq%i+PdJ5bg>E2YKOFT$GM1i>6$1@44ODT-zyqur
zc!);~OUm93csR2A(wVyBwl4y&6-6>Ku%^sx1?vhn6l`LZVUxOGr(Lkmx?pEru(K}M
z=Ve(N3`QpmMYI#}I2JL3nPuJ^9tt;MSifjkhT;hirYhW4qj}K1sQ)&D{!+?7@Q^O`
zU+yyU{E!FfSZU6Mb|5)jMel@(7>S4~bdreXKojr!F`a1C6Jgfq6&my^nYpM&qBN8+
z3zOt!V!x0l4G`bJPJdLsAop2)`LEEly^qjdrL;)2kWrmzF{34-dPd7cOBt;YHUC<F
zLJ?)mV*v#$qK;*fD>UgXl27phyChq94Tt0aZ{d>6V~)xzrbX6qh4dV)d0I6XZ**Km
e?;p@td*pj9wO^oYfJVO>aGzF%qRo(mS^5L+2jAiV

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DataType.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DataType.class
deleted file mode 100644
index f4ca0623eaf0efac16270d171bd77a30a71ebf9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3838
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
M5K*#+E9&(B0!b*{GXMYp

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceDefinition.class
deleted file mode 100644
index 36cdf680222470f60dc12d7eac21c5eef925b74a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 423
zcmb7=J#NB45QX3HXCOdOl!hCSCflS6C>2U&C55@bVis$OStEOl#MM&d030gHcuC?S
zMMSkTZ{L1zc21w~9{?V39bgz>L<kbYFM4MPx6`|Ds}EYG+9fLD+`42&xDvxcvn~u5
zgqt5z$u?D?Em$nQ$R<v6nF}TSW0;3=wo|Ku&6^U-KFe9H&Bi**HgjryW~=Xv#qZ7R
zNzm1J%i~_aj{^Q5l$CjG&MaS6Zw1qjeD`cqAx(Ug7wWY8>g$C0<q<W5Fs>K)y4sqU
iI|M>QRt_{<geF>moNaVO4@7OCD}4`rsb$$-8GHd*pMG!v

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceProvider.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceProvider.class
deleted file mode 100644
index e2848a1ae815af36e1ad840bf02d81d0c18818f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 248
zcmZXPJr2S!3`Rfm(?Ssv15&R53t5<81Ti5%;sj|Ms+5vIn)YxE9DqY1(n`R<Wa;y>
z{rr609{}bU_~`ox2*Xs^l~zi`R%%5EC(~`lE6$2r&VG$0!FS}2Uj$+NVREigcC<#S
z)B(X!mnIe)nL8$2bIXe+I2c{YM3`B<m#~QSg++xGXI2_<)yA?!oTQSq0874O?0*Ac
h)VMWw_fh7gJp!TSegaw@LK_{x)h;}jIO#e^?+r*8Mb!WR

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceType.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/DatasourceType.class
deleted file mode 100644
index 180a7917782b7aae642fbe2f6ecc69e3d6e5b1d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1192
zcmbtT-)|B@5dIbp?zmooQbeisSFILk?TMn%K$<qSCK_TNs3gSra2!`WJnqPG*Tnxy
zX=05=(`WxE<Ls8S5PhO|$<EHqw=>_&?Ee1q{TF}=DhWtfQ&B)sMpi~iMH1_L*-(&D
z$+^K14-_nLxv3z-r7q(kgVgJ^O@?Q6)9dT)VPJjKL*E*BexP@(L)*0j+jI4f5g0=+
z^i4~DalSqHG_a}+@!`O?-7bUN4sEAnyR=(v?$qDzH5i`1yF}n4!wIb+L$y%6L>Ot;
z>sSn_y6swT!hYNG4~(`$7FopKKV+yE>OJGg&>h3=>WzSxQ!UO;JX7~f!)Y46%@d8Y
zNv_eSq?vy+Q44Fl(OV3;{}6dqY|@y54>olo(XhL&5zvGfq6O|yYNj(j{CXnvo*VXS
zvsSQ0Q&k&c+%Ik3sm1A`Z}MhoSmc*2tD%fX3{PjfKN|9Qtl=hZX-FZhVSz6hq#2SI
zBjMFB#7xI?iA}apoTzla-LuSq7(bcp-L7K{ht&z#`BbN)R=3Oa6q59gr0qOs0FWdS
zLJ|)ky~Hc!2qbU?IWSx$ZG|NN)DhTML{1U?Od7*ATI0f(BYYl9V|)b>VO29y=^J9F
zkT^avg}+V~?F@xw+z@_h4WW3(GNSYYa%p|}1o1DzJ(=#}xQyGJI_?O}3KZNGgn5|v
zR0#ieen4tv<md^MV<d#4N<x_viWU>feEcWjq9eL{Eop?gMk_YLeB&656F93^C59l5
RYt)^{IO!_xku8Gze*s3-9b^Ci

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/JdbcDatasourceDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/JdbcDatasourceDefinition.class
deleted file mode 100644
index 61cdab46291eddc53a782cc7d3f32f59f8420704..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4547
zcmbtXTX!4P8QsT`G?qNU!H(T1X$hAQ;wXs<gg|6BK%7exWE0|CaGI8krHMU>EIFf5
zZY}phOYemMrCi!R@tStghLp8{Cs?a*{R{mWU8_y^cV?s+jmMz1`k<LJ-#Ont`@5c_
zfBg6Fp90v4KjrXERI}IsdjMxKpW|r3fRjTSRgs(<z<Jc<v1p)fppnA>mSpC_09-T;
zcm`TItieS=xs=0YT#?aLdHhfwKg!`*JZIqfEMCBiB6-Qc%LaaI;1z{b-CDF2hRWxx
zi&n8_)#r;dp6k@-#}zVF*SToB3aeUfO`*Tlv|WFB|B}^gUTU~iN~@M<HEpk{u*L^z
zc}}fZcA6d`vNO(n-SS#4_c$Dzo+wuui^aL7XP+-}!BWHZidFlpQ+GV4Q7;C##eF{h
zzRt|}9^p12>-Lb_ma!8wW3o}@7K3G{Zcn!s=WO?wHCNMyH7Zu^gylN&9SBq2f<wN0
zdmzwgxfQ#3xH?zSJoIOTio)u-mQ$++Bni4}i*IK0LajL2sMqa^STi26eac!IAB%hk
zuF6p(fKeFlftu|VXF4ifocgLHa#sR`=Gyisy_l{xsi^Qs!rE%b;a?F71w|)+BQ$yD
zsq+5I6?;h=&A3$P0)>%qLBuBtxh2bG{&}`b!h;c?h>xgUV-_ilmb+qjWvLy<hq^T;
z{Lg3-M<h?qontI?@;n&P6YnQwVz;X#<yOylR^>dI=`1qvs)3*A`unM_r`HVpOyT)n
z!rvp&c#`x;bKdqsCo?!(0-RVzcA}#F6$Xu+Lct)&F*;hIMD?$)Q@>2Y5)oaxY=AIf
zX$-ZQL_0)znJ~%Bo{~|5G{9CA?l>GoBivA$#Z+ASf9xoD;;d=iM%T8DiRK`?ptvFE
zrCA{uj7I_@(bWQ&;rip!ax+}42ja-%o%Sn6M!q<Aq|=XOF8nh1<x|Ve=olSvq$_@F
zrG~acjsX)}FlJ&C?q!mj_&I)I;xL|27}ke`cIM-*Yh97rG4V_Mij`pE*Z7Tz-{N)l
zz^_jjHm@K|VdqlV-IHQc*E8`3u9<ifZy9*a#M>BServjt_R+4S@WAq2>~_y89@PiY
zWMgru<=LI85SRSU#GTk^;2jgc$Gax(!bTH!%i|sqzb8(5zwM;%qB8J-i9g_vChovS
zg~yf?h$r}0pF2Ej!}Hp2Yzh;-qK0J}_5E#Oa3!w16NG|8?9i6i;8nm+0d3u}1-Eg@
zKV^MscY|TW3<20R+0L8JRVE)#>_faaI33K<cGc+2YVXBjHWsYrw0)UesB?+{b^Xy@
zWkFw8Frz22!og^j%X#8A{ce&xh?je<yY+K(tICT`SFr}03aNCZ)@ahKb<tw(B+j_h
z^I#aP$r>w_mYr?5eqG)hRST|OLBrNw)(Z5+sKyZXe)pKN>ejqm&f489+C(D9UI4jV
zveK#0L-8hcdq(FRZ%Mt~C6WNfSx_5z9cFhz27OW~yd(EX&FMGGO}|-j`pu%#Z?-Aw
zY}VuZcoA08z4+WpNs({GcY5m$s6Xo^1wJ!ccsI6jZ2AkZ9Xt4?sPb)YN@evgtU`{m
zYg<1;-xnB^*G;Tatp2pRUicFIL`{`HL3;KEGSmLF!4or;Pu)bn!aFF)D68-}a;0=W
z{W%6onS5qj;cqZY#`e5%6RZ1h^21yIEZoFx3Lj#ul==i~X7i~Vxc#$Ie_K3Q%4%^|
z#QFZuwqHjI6*#D2kfv97>j$p#e*ZGRFLNZ{DTuAp80NFU=QfPc#ye=?W;}p{c#v~D
zaS{*V40aJ?H}NKjSVA4+M0kWayNNkL)Dm8y>~-wXK0A#pb%$_2aWX{65^E<6V&;jq
zi+^6~^xVTlNKwxpWy#`N;AI)@CZ>eu8gVD+@y*ov4nw($djO-9_;ZhT<{snR<CGpo
zZdmpI2SWz-8kqby?*FcVeNPzJe~Wu%4ICg70~GG%YSP*d#RUVmh?I)W`e}2BGd$qP
zN0R1M?jyTzVnl~N#_&nL*YY>Q-{{A@>=v#w=xb&R5)5ra9_z7=TH^0fS`SR3ANwfV
z&zS>E>x0^FcXG`-V*9plpx+)wStD!;JR|loJ5L#yqI?=p2Ap>AE#6A~1^MfI_vyX-
zJf4c=ajKKYNAMI^br%5>IIes&qMQzteWx7dhBG)8fE?jloRZmE_$&IPlzek@T6&yD
zpU_Bt;4+;+XXF||BnhftY9hIh5`UND9Gzea#q0GWtdCQjO`xjqbfWT5T={gO@+?jT
zJMW3wHx#xC-@a#P-<cKcll~;Z`CcNCwQ(YIi9}8(6ImN4Vw1?(6^KZK6e8bGBr*~w
zvXDsR2gyW6;zZ7qNNoio(xHXOGl@h-<3#F-M9w4=8I2RUKqBr6MC6DNB33fi`Z$(H
Rtkw!xavTZPoUXpg{{XU<FRcIo

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/SpringBeanDatasourceDefinition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/datasource/SpringBeanDatasourceDefinition.class
deleted file mode 100644
index 9410c06904f16e7f967ba5b9ba53b4dd97634a06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3321
zcmbtW+jiST6y4+4mM?14T$<KgdW8}vX%yNfEw%~dN>Uv6;*gS3F0!pUN*vouR)BsA
z`~a`ODs%<bV)dED7x7ToBPp@$sKuo((&)^YGyCk>=ZyY*_S+u-uA!d506vQ21Xhw*
z#Z3htClGcm`6Sj*Na7Z5%f}rBcNG++?|K4Bd?Kee;<$%T6>KWFui!I*Xvxs)s}+I4
z{I>qJuGRE<RV&(-S+8aV!gYPu5QtTDTW=Y5OW=g-wr86)EpN7LI>n1-wXWNH7Cmov
zP3Q9E#;#Us*~X4Whi1dFwTki3tedvksB2zaZPAUtcsP@tW#DK|`ppXTjixsUW}#8x
z7X5j%ZWQ)*ONO<smuj>O<{M?bwxL_5{Pv7td&?x=l^y^z_N=m@6`L~YdD7vaag07d
z0?Ddjdq5fZ&S<`2RkfD0>Y+uRzG+xHTDeiTjc;vjuGy@aWnE^u;F_{NYS#2-HtqZN
zm{jCpa8H3Ac{@Z)WNq#QLKPxBACP)!&#YAr=qAOHO3T^rMu2bSFyaf&iR|k~QWcnb
zS#kstO<l5R8y2zm`^b@GaoW}`9)QfaQ>?d2+eTUHFkGV^1x7m6@Ths9i0RIlIrq~q
zc%Q|KDrI=pw@w~Z(AjkIDpwsV+Io41*d0AO<@P|q=K|lqqHub|-7T-)P%ET(os<b=
zM$<iL!Y!S4!N|2tevpfucH-|7`6I?4Og*Vi5}ag1YM0~CX!nM)Wvq2uUtvcXPtsFx
zTH^3QGJgHgfuLN6lit?;c^M*34=G~VbK{<%<v3AvxLh`6N4xmqW;7|eRq+~LS22WP
z1z)K65?=`nwMn0|Ed7y`tBMhvQt&{9juI89qKt|P18g%h|F1h!9X%}!Y)>jqVpv5L
zTPjR!E7(y{!>+*cf5+^lQ}d2$-(+qXv!C`FyDjB*LlrpQ=2cQkfwv8->{z<pummPw
z?m}?o<TkWRL25bLj(8QDhue)DNYE*=0~o9fWlL`rcnLWd=Y4sLJ0G2rJ#3q*)4RM%
z64(epaukTK*xbA9D8HR8ky!K!W!_O19)>hA_MpU|Uc;XR_XZZ|<q8W5k;QrbA`O6t
ziavy7LGf2BBvtCXSv{OP?Tk~1bIiKq^9@=wz6IZru_q8eIWBMV8Fh^3aE4>mb--Di
z;}>sbTwri67N_~+7N>1<eC#no`{)ay@H@hrPY}t3X^QScVWmY<k$uDjzQdFp#RZ-s
zk%^|FPm#<hDTSWu<%wT$EE7wGQ?Y#<58>Vq|NNB-|H$BBNI(}5<MR^#0^ea)qnJh-
zIgIfSavViWU;~#Ouy^T~W4;&h78K4V@HSV)=zoSQN0}Jmda1}!nlWVln~XETw2~+=
z(j<8t#uC{%#r>x^Kf*cJ>s^lAxhtHzO6veZ&u~`3H3icOX8y*ENA`7wzJd4nlvGdh
zEw>8)jDDF|$Vtp)`ihU~u#f2sy*iJHtadNH?pqx37Q3gN<%T)D?*+Ndx6C3sHvS8u
z^050H2nolUK?GSRlACMvkfo^Xzl<b#aK#`kDO%iJW;yx*AM)7^Rqcj48vs>c4)fmP
zSwBRztw$H)93jp>2ci_a<aZ%BR;WAH5@RhtCzdQA8EY{xsZe)PD}hNZIY+$wFU9s;
A2><{9

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/mapping/MappingItem.class b/ureport2-core/target/classes/com/bstek/ureport/definition/mapping/MappingItem.class
deleted file mode 100644
index 0289e8e8a07c46dab95dfb90e8988209f3d234ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 770
zcmb7>&rZTX5XQd+N&%}V0xJHAMh}3AHO8BUi;0Oz)dPn6wyanzEh&ZP(nMq8!3Xf6
zjI(VciuGVfW_N~}@B8ia{p0lwz%e!pP_UXu25U0ZRIIDmU{EI984HGz(dQGcJKXK*
z?ZCI)-U<Eba8o!8*;CuKgBC-&-smu7&b%&-6b;)ISL1;x{2OjMp@?U3r^9_)=5a9-
z+}R_BBg66rx;YBOy*~EE(DMVmD{iH*?Ya7Z4~Jx`Uq<IeAO-}G>xrNf0ha5HB*fh4
ztD{o?-5_zLh!H(RcE{I3+Z+3qIJYJE;y2p^xd;t;6f|U^YRExlIQ%a?iB30qZT5u~
zV23uZ(C0|ekEFvJsne-|Nk@uvl<9ObS#7?6J%()>#cWutVxI0=)PMyPDI+s1QT#dl
zgw(^#a4m7Tgynd+6|#|4bN?Bssda(sz$S5Sg$mU$&&Ku=O}<A`mlHwKvmo1vAeCg0
V^eo6Of$aSOA{Qz_s^QaDJ^@Ttf*=3@

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/mapping/MappingType.class b/ureport2-core/target/classes/com/bstek/ureport/definition/mapping/MappingType.class
deleted file mode 100644
index 7069bc6f9574d3a4f86052407f08082cbbabd42f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1106
zcmbVL-%ry}6#nkoty?MEm^x*m_yctvx`M*f7J@-YG*upkONdW*UBP01ENw^Pf2AW4
zqtWo}A7wnZTcku^*lp6&d(U^zcfNB@fBpXU6Tli)3Xrj+;sG8im{agbg@(F#>3Phm
z<kSVCkw;0`Wd)BJa*^W=T$|ykX$79qi(>nOF%0cN5XMH|K5%>|b^_n<_+a4phsNu%
z-TOGOTMSB{$2_uQ`daEfH{Wh|7@obGCQ|O0yF)u-Sg-3-1(3IbKFKJVj&HvidObVb
z<2@lvNh0qaFznRLBYw;cmy?iA9Fm@vK25R}GqAYZ<)I@eCOopwJ)*1p%RyCci#l#F
zRR5F0OTEh=$L}3dU+6f8K98vZ3{qV<@@>nVTz-)Xz3mUZ_T_Wmpr)yvU>I8Vjw7m5
zPBpYCs-vMShG$O06EqoCE;|((sxUO%#Da!d6g8AkWGJ2&US!UYwcNlb{;PF8rE0f#
zWLq)ixSp=lmdm54m4f~4-NmS_%~hIfjeZ7cb6$`GWQiXr*Muzc$S9zKD<Edt-6JcO
zIs*HG%o(Ilv}3qN?_A=m626M-6Z{%7$*EeA8()z<gDmiw3-}v!qK#3QM=kMFH3%gb
zS0T{@D2?TXQ{+A;?lj%`bp^LX>bRX?7LmstEKU-6MMA`CeuunYQKVDkPf$oUs+??Q
mvOmZrjcBCy<q>8&Ct!kYEKa3#K(cBiE;C`cOXUz^?*9P`=><~&

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Align.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Align.class
deleted file mode 100644
index fbd20bdb4d1674636d65c0a7114d3af8d4dd1b8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1078
zcmb7CO>fgc5PcgvapJm3Yaq~2C?5sll*TP8r$kkws7RowJp>|EoHp(zaq$Oooc=CI
zC5k|xp7~LTSvR7t;F7iE)$F{PH}htG{r>h7zz((wP_eG#37%?L*6>V+fvWsjc`WMW
zv?QXIM@ilr8lE$#o*2XocE<^QyFZS_2YV8Uk6{$s$70|HZtRAEJr+E2MuRZ&?Uv^b
zg9bx3a)%>|)Yf~g&b$3C!`Az`ljKghHxXlo7gcNiXtf<43x-n14aC93?~CXy?|by3
zC20=_4DD*?gr9QT<H6AG#*rHg8`j)qnw`+$UXMqv%s(Sh1MU--`7Z%Ot|^t<WhnoL
z|FzX4-Q$r<eHXf<CXY#S2Bj(;`KIH|f?KK7`@zI-&RO^_jY;o@lgJUTT&atm46iN~
zF|Z_eWZA$b>I|E6jo&~Swt>4?HL!@Hff9-g#Ve&{wX`CR7Y0OovudR}IqaVZC#KR~
zrnPB%d^~QXV1I{oJ!@lcn|9Zrg;(}gBsoAg@dHa0*%NtG6ky^8h?%TMbjzbp!M-4K
z0p$}}47cc?OMGR*mvMWB-$5pM)lIeb71;}@5}&z-ze6v^B?>F3Bz{tZP?B*Q3Vnc9
z+gLqE?sMW!(_MvYxF<`;{RFdyJRV?eR>&J_M4tM0s7I!zoFjjRLSpD@Vk~5TkV~1;
g8Xc)qEOgJnB->?kI+X)zt3u6XW(*HW4%y7(KWrKKU;qFB

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ButtonComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ButtonComponent.class
deleted file mode 100644
index 0addc4ef0f91240526cf97aec4249ef9b045c5d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2252
zcmbW1Yje|95Qg95n-o_hU?31EU`#_C2P0w<LTty7q}+<RhGB+}vaJ|_EP3Q(CVc3B
zYC9#&(3$>#{wRiBNn;a5nKAuxu6uT$v-_U&-`6ky0$9PzEKXu&3ahv^g&fut+|D9}
z6&35;SGlRFsAsW(hKf6EbXUbD_ggBqdH+|Q+*5F0!2<;k1=6<BGHroe^PTa*&~3x%
z>O0c2oNkRa2lAtBQg7H+*AdX0ZMUbl2GV@54?VN*dQ$J0yOv`~%XRdDX?X3oyRO&M
zH~9d0NXd_Va*(OBO+z4ATzpNd+ir(eXPTB{J{|U2ruWKdaiCn&Z5#G$!?SoEE~eyL
zYap;baqz97l&-Vw_WG`4I+8Fl(tRj<bj`=biM_luosQ{kyN)#XWNk4nKT12;6<GV9
zZUxk?DVsqJP8DOLsDqKk>EdAwPAEIs32MdG;ZUK~SAPB#S`0>P=@&;}nZo^OJ=uGB
zyfS$z12r&ccE=rhZS%gx)jky|)OD7ihV%GY!6Oa7VNSzY%n6){YIAF7*;E|bsduao
zd0(a*3tXtO!OE*@c#I}DPXwMXH0mv15_wkRMj@CK!efQL(dm%htNB~~z5H^ezgOF}
zT|-uFb63`ShS#;6GLNg38}kLLvr$m+RKqho7dTePw{2rEAfM97YdC{hfvG%A%7b2^
zq2V+y%+&QDWTUPVE-k;nf`)Uvw>D`7BDoScK2FNB);qH;siKoQ8@&yI@}y_NvZpu|
z^rDP@pB@OEkCWsfm4*eQr+C0V0FQZGWBb)f`3}5SN>7V5GP>v^LVYl~Vn^p<*ys|f
zbc0Vab(#LtlOQeA=bGSh(^s8f9r!(|*YBy+)Mv?##7*r5npMe8P_LCfLzMnP;uDg8
z`qmeH+XS_<<aG|0*eb9^9+zn*P{5VY&+kZ*Ct&j*q~3f+I+xjpQu-UoeW<x98ZVXh
zk)=NOQ?Q}&_*gKW=J5<Q`#AmwIZ1$nPm@a!<T(m`mwE=64T6LK6b`>&o)84CVj)D)
z{W*}P@Y7>=8CnJrkMEHl-J^)b@Nk0y@I5l6rB9fSW?~*`3N!}Ej6gDe))}M}3!+6q
zim@O|@gQ0hWQjno9Rb2+XOL^LASa?AdMrpe9^^z6q(UG!j{sr4G01grNmy;)mnInn
gS&ap`f#vY<fzlij>1_g8KLUgw0E1KrA%UCU0F^WNH2?qr

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/CheckboxInputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/CheckboxInputComponent.class
deleted file mode 100644
index 1904cc9a2f0fc70130689a39547450919cb69435..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4101
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
H`p~}t_7_46

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ColComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ColComponent.class
deleted file mode 100644
index ded6e5d4f8ee15538f9eec8e6f0c202105c1335c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3614
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
SR?XurnxT3C3LmISeel2fZ=JvZ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Component.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Component.class
deleted file mode 100644
index abf6cce5bb98ae2694dbc4ada0530cf0a64b0993..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcma)1OKJi^6s+fGCVmK6c!<d+jgXy7L4py4=mo~{IcYP~Z|HdjbG0mT01p*xL3HE7
zP1T}4R2}|*{{XzAAEO(iM~GD3v@8hk$t;u7tZL;iv-4buSF`4gbylr7Q*-LG&yD!f
ze6U-yAB$7o>*#s5O}|r9q%JoL_15L1P<x6^YeJl}E`KT}43eA9?m~7x<B2VT=W#4$
wC61lGoJtA9dpBKzgs1DC`D)9VMg&45{05pWLK7_@aQn;=;-C;70yfY&0%h1ztN;K2

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ContainerComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ContainerComponent.class
deleted file mode 100644
index fa50167cb3716fd86eb62985748e33b6c96bc400..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 972
zcmbVK%T60H6g{2{33*UxD39_Ky8u$HN?kRGP1M3-1eHMSory^tCU)d;D)p~gsa2&e
z`T_kY#Pv)lWnckajIVv>+;fkw@1N^mzX80%b`2rcswiQ-f{h9`E7)R~jRz{}S*aNo
zqM`UK_{6D%M=Et~hU%H>YvCqVGJGifK8Rv7;@#BAD^7&5v5xoTrP9hNqj@TYjR%*;
zj(Eq6#zsr++J~fBKJb)7hEi+yf+6gf9;weqO3RbUs4MNc=q7|TBNL0{LRjU`Q!sP`
zl`=f1wswM~?VSmRdMaJ#@4XjWg`2g#ujTvYzl?7!92e=&F>}`lU!&gt*GIFpTQtIO
z^Z@+7atyUIGqJJ!sC;u*I;Pl{H~#e-sG;6K85M^2Pk-N{77bH2ONr2Ze%c+%*fG3)
zy56)+;SNn}2!<K@Lhp*=EKPF&KgV<@)M;%H!YML}GkZV5zGaj-TFV)@iWjtR<OIxP
zfldrB(Ig?C{E1@V*?apx5cup8e0D8E*QxwQrm&o|rV3s?x3oyyT-_s8(#}o3qTLdF
c)_sfL5qzbTAS;qv+<L@fF0w)*s~P+C4HQH2KmY&$

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/DateInputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/DateInputComponent.class
deleted file mode 100644
index 2964631f77aa95b48210365f5afe6bee66f0c0cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3711
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
Z(vTldZ}sDuf1`^d`6av0(m)Nq@gE0#0AT<C

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/FormPosition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/FormPosition.class
deleted file mode 100644
index 723e5c14745b6569217f681350e2586ea0405c40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1124
zcmbVLZEMp|6n<`#Hf@%*Yt`!NbiPb&I&B<OMOwyWZ0IOXs1}BwZqu~OOp}q9`M0zK
zCyKJq{wVR>EVvB))El^$bI)_nbDncfe*OOT6F>`(3y`s*;vViRC@XlNLPK3_dLHvC
zIdy?(<WUmms)C0Mndp$=Y1i~7#vll-4@Tr$hn^oALu+Kac4&L95m?+e_eY*TF}7)Y
z;|1}3n?W9WA6*7zrT?P)ZmY-e?ES2va!1^WtbpNpU7tCKyy*=shEmsdt=G|HVEJ$P
zz@Zx@j=no$*r|69_z^c8?v9OK=-ckNt<RctrR$m8>2u!}GzpjN@(EE^{^eoFbwp9u
z8LIzD<CWg0l7{;>RiV(c$1V@48w^riIPx9SNglsUh2C<bNoThF*QtYQ&x?H1+O|cN
z%IWqtMVT}#h*2tQc!VZHYnD0DP=%r4I+irdqo|>TB17@K3qk@z)^t3VlDJ&gQ}T8P
z2bLL9qEFHV+jMvkv{SIZjl3AOy|G4<uF>xyZ7d3MfKK8E7HUEod1Mq&!6gtgS$F6Z
zOPzv!LFN?FC$bo>(4LEZRl-+sHNm%#iEq`4-1v&@DP)1qT)<zW8|@5*Mbu(HRfAB1
zaSalEfYMl9IzjGp>`v32KUZ)=q>h_0W*K?h!g7+x4ha#f`5p3JMUhUBKSm)oR5>>0
mvOmZrO=-6F<SFKQ$6$i(Oq@#TfMnH3Tqa?-P2~_`?*0MNPz_@M

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/GridComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/GridComponent.class
deleted file mode 100644
index 336320688ea59e6a472496b3bea7ed505abf113f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3096
zcmbtWTXz#x6#h<{X3}(8FhB$WrB!KYQvzD3z0hiFOD}1Q6pP>mC&{!ONM_>93CK_J
z2e^FkLDqt@(6wAX`QX3sZ@8A1@64pR4r@hyIp@sIzI=P{Z=aLj{`&D}028PtkiwRR
z8wo_P6~{+vzo}t6j#~+QjGaEjaJwI$;7&j8;#0MJrs4Ah2Jl53_mujV>cdcqd9@VO
zQdEnnVOPVRK*HO19xXU-(R2mGU4j0*|8d(Y%6&>!>ykyM<WMJ>yKg)+vL(ab%Wg~8
zviD{LqVjRY<W_J>p1{#Sr7EpbHfMQ~3Vqwwo^8mgORbf*pJ#Igr<~1u(tMDmLd9`q
zwrK8Jwk0jc&U&Wd7WQ`?x11$}MW<YGY}1xAb9CFYzH~=mV9~KXY1nedC{-CCHmhvs
z_;dQg4pA*SMM{t4EZf|ymh+~2%gC1~N#>k_QQ9$FOMTabQMqq1hsmx%U3aZw0~Mo7
zXGNAv0_*9necUu{Hh^hJ^J_VCA*{rrAaJ#7hb@&7&<cU;f0I`$CV_~T7dY7gZK1lm
zYr5>kz_v6B4>pX7Ur6#+0|^vUtyp702R%~;JR>$mq!Z~5Uo)y*4aFJ<qv=&8AE1Nn
zCbCA;ca>PTyk;p|P7)999R{oUpqNZ<h-(;*r$cM4(VQAYojg=%Ci7Z{@PANPV_HG1
zW3_@bLaF>xtt91~)rd-Z`IA^z|IZ*)7?tuZe~1;J;FQ>Qs&2ttw)|mf;rT@sTF2Ws
zPlW9kLO=<D;n||~@LZu}c;2-U*LgH@&XbQz=CzTs;qF=X^rewG9Tx5jT<P`(XaS)b
z%Hg|5<KRxv@IXfiWgTzeoCaHmg9>S=<15VTaKVmFbQ_9IsgJde493;Pl4V8&EwQL$
z65~3~;H-|<a9YPnoYL_+&hq|i6l5!Z-z-Rh%iTw<<wEW?+Pf-E*N|#zVn(IH%R(R%
zHa;B_RiDnTE8H^ny!<OwxnWA9Xh=g~BqV54%plufiW}h76Ce<`>N%uZ=I1asULo4P
z;cfB;<ehE%TkCw*+|!qIf~N;Ve9KZ0c$IrZwSZ4&MD@ep*&KgoSNxr<pze@=9;WV_
zlncD&e`|axg(5W95lXV$1^3?3=MYbPl{D9wFFc70JnMl1Mlr@Owglr`mGQ6WK`-~s
zpAfn896cMEWb^>Nx5tv&=mFxRPto@R34zV=7w8xG24{HC1%AQ6bTo4+I(C3TrT^XE
zzh{z1)G2d-qd(AN4-|@F#JLV}9mWx+kzx`P1V2ys3q-I=EroCtQOf&qk?BPFy;;Mm
zPM2_*XyaJMJ9w8xo8a$*i2SK0=Zc1_f6zbQi+WDq)^eIU%&D6!UOCL71%ApePKLq9
z3HTy`WEuWa9rF1m$WwL5Q+3Ff+aV{LA-{*IS{vq=R)lHAM#r8Z*=VBrYXm0U%c!bM
zsX(h9DW=AnJ_M#Q)8Xs%GaPI8b(Ov*U*b!#QTdw1wJ=}D+kH*Z*Yrz#DTXUwb8K}x
zPoLuW_e>_@GbG^Ytna3sr|;u~5aVO*#`B@Z3s?*>PAYCTM_vdu{t!#lY8@}mLc8%&
zh;cBr%Zz;;D>WxKxYzsJr|KAtN6_CD)^XMM)Y;$QCRn9KP@EWFjA8l?qO9?>9-8Ng
gcBr`!r~<ig3Z7_h^%f!CcnL&xX{lCk_?6xK2SY=hUjP6A

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/InputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/InputComponent.class
deleted file mode 100644
index 874d687c7b77552f6cf26165350c5440b412249c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2796
zcmbVOTTdHT5dIF>-eqGF;si(v38qbAE+&Q&62JrqP$1=6Akfh3+AL<l-gVc<5y@MB
zK%c9;^sS02^`WU6r)s4Bfc~XcRcCgMgD*%<WogfzIWynPd^2;_fBpN%p8)Q_)^Htj
zP521&O}K^y1&bPdnA1q|P{qf*SyHjghbszJRjg@P$0sT_RBWo)Qt(K_Ma-$#=5>b^
zKUMLVH@g~bKGSdxpR4$Sp?3NBO9fvk_*#K3;7{ubBP|eGKGdJ+v9xZbVw=)2tyEl~
zIbm9R>$;<73~4w5KKV3jkl3|Zw{xa6ZA;+Za?;Mk5;<uc#qy4kwH+DTGxkl(J&)xK
z-ANwo+fF97%+5{>$w6R(l_mumdwRDCf7ae3{0qybWvu2i3B%da6KRr!mhGgT-qszH
z_eG&k9+)|S(Yn1qw6b|QYiF{yWmuBjH<>J1lo=vmsi$t74a3?qoLSqF#<7g|)?zLo
zZ4XvSdTQ^&QaQdrLoOk3rOM4ret+L^xJ;W;Padu4S(g~<AOSUJNSADZ)}AWMIFqfW
zN-CFoY9`Tg0&-F@f${oTDz7zrY&r4x7H^C^|KH|exS8?><%lap3TbV*ZL83s_oi*y
zc_(Sio7`KM%G=^L&p{Bk5K)i_B8i(p+`vtNw#otV_zz+agyNsrGoMTbv5%BMCvU>Z
zw4Te|k8tA;9N3Qej5<M2M}l}C-2!*(O?!hz(wNhw@kp9!>h~t9wj)`f;2;PShXNhp
zoP3%#?ng4ZlQOLV$4ni_@$g{wI35uYG+?7uA*CEUpN*6oj*|sjg@=kS5i)JBPTWk>
z00>;0$Ypiw1Y)1^8_1c@jPar2>~X{;<0yzQXRA!aSe0aHj0G`(+d*VNcSm3%<`MV7
zJCRaeGit53F|H*JjieM9s+Zu>jUX^muT5EV)Ac3oEahT+lh?UKWh3Xs6Yt$61wEUk
zyF(yaYbLA4v^3zSvh(g{nqI=m?U?eQ!dvm~W^V&^I&q6h*N7_Z6ZGapo}{yOdXw8q
zV5%Cb7+h7*@oGu$wy&E$JJ%u5Mc<$XZVCGMHSi#~E7hJ>AI}-B=SYvnkDfiW8z((M
zYq0M%MBlGyc!kE7v~NH!JvCZ^cCzh2A8UEK=tq<RxzR`}5Tn(_6SHWfAMo-Ge2-tl
zztZ;`8VR<5z;iT5LrMYa&I{a#hMM?|PPI_5fad4WqM`FFiiR$DOG{CqWIh;ugNp<j
z3SBDTGMTp05^AGI0qw3$Uw;8t`0WM4QO0Ja-*GisI*5ke^U%wd0y=)7pc~z!=jqc9
zgrO2`twdrM5qFEI`;eYvMA|e_u|O1T5ebqg_?FWD4ukj}L-+y1_>um1{EQKou&_sl
zM;OyWdP78&ik}E?nCQJj((~~DgDwRlR|9`zx|7cD;+{t+CP{~j5a{cFh1SZ_jKWVb
zacSB-t&*nzWzbC+bT^TPSL~R(2mDM6C+t-@Kw=<%s>1#v41JME?irT_Qq?1q6v)&W
zfpFh(AQQM>#5x^FV`U%@Y6db{GYhTKc&?`LRBbx7N;(%Pi^Vgt;A!G4rfUY$SsBPu
c%|IU14y3a(kW~s~?TkQpoH>vgw}7+%0da<kj{pDw

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/LabelPosition.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/LabelPosition.class
deleted file mode 100644
index d31a0f40d85944eb06ee09f6a8ff57f07f3d5336..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1132
zcmbVL?@!ZE6g_Y4)~%Ecs!o|G{y<%au984BZXp<g3D}6qbP4g(TX`GBt|e{9-=!lF
zqtWo$KgxJtS!9cT+H3M&?z`vRbI-lEzkYxF31AIR3sAAF;{hIOnAh+~hk>fxtUP9Q
za#|8m%cCUE6%CIWlq5W6c;>ia-|obT_-GFzaU4d8eIUAC;3Zxd*s<V|d)N)5zU}ai
z@ZW}U>S!>izUU?l+H(7)^M1R<@chHnv2rKeABdRYMb(-<in<jZ2!@j51>()1-x1L}
z-tp;1OT+JV8D3YNBYwhdp9ej=l|)|9YgkjKZ91XL{Wgz0$ulBT1KuZ2^Isx{TvHZy
zgQ5JNJa()$RW&*Es1Aje*9&+;9ic{5r6b>T{n6u{vC!MWpx>NQzy@_uZ-s-%6|X#5
zCv&35by+C`b8@2Q4Lm`eVSTD;F;IqW;3gIg%%W(Zgd#)nvJ+ATL)P`ffYP{HwZ;_g
zb&iCaP^#<WHQVxe95=>bf15cOwXwNM6K~LOqHHcma)3_a2j(hL8+lX|VB!jhnXG$s
z%B2s%z94fB<r7&9*J#hBzB1v<xIV(KA(P(frds=o>^W44&rINN(2a3{!U8I(pQ=G9
z$+!xIK0vFjES@3vIdzZIT|U=vOQw$7DP{?I+`-Z)kzEoZSN%KGeN$7;kUvEsHFPyK
nX0kuXr3`7j_SGR~TBl%=?LwSR>40QaNL*&baF@y<#oYe`zjY7b

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Option.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/Option.class
deleted file mode 100644
index 9695bf4b01825c5548f27bdcd778dd053eff9d5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 761
zcmb7>%}&Bl5QWd>ul!U|1XL8G(FI^aUAWV*F>%$%0>l2cT%cH5QVP$diN?f*58y)?
z=eCVRtP9g*dgpXz&UdFDpKtE~E>X`TjlCRF*q5QE;6TA4L)zwsuo+7FgfF>fb7!RW
ze9v-5SM+ho?S){-Tw9LicNmh5W}hK-;|@qI>Xsw!7E?ob_uQ~aDe11s?LPM`nMY#E
zA6s*V3*B_5nlbmqgSPO*%=LV2Ack_V<vQA2aL*hMU2m#&XHp^i>`3@}h*xej;{dbs
z?}|#}cY%bJL;B%0WOa1R_uPeNid#!!7edFj+<=N4@+vY=RAiwrwEu_Au(eub*O&;?
z#|bSwO@ARl4-F1ZG@IUOFzH9JK$%8wCe_v}*i%rZQp^Nm6&rL`!vbugNEw-7o8r&r
zXCxlinrpGmCG14aoq&z3TIVlFtgQ2-19jp&3MN#8JQLYVG<hFMU5*7wu7e!Mf>h!`
VlItL+1akHVh+L=ysRmcy{Q_G<e(eAN

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RadioInputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RadioInputComponent.class
deleted file mode 100644
index 1c43dcd1a17b5f84a6230172da68d275c198665e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4005
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
McsNES;~uy5Z?Q@p3IG5A

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RangeDateUtils.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RangeDateUtils.class
deleted file mode 100644
index 81e24a3ef75c383594b4f927a7e9309d7afd0f95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2346
zcmb_eTTdHT5dMz2crhkWhmfS{#k3^`gJTSYf(<0bY=FdEY8wdY#agcyykXh3c9#_L
zl-DXxRVzhNRrN9IOG~8))TXM`*Zz+{@+Yd!S=+(H6h&2K`JD63&gGlgIb;9z_iujy
z7(&*AbBMYT6ENn%I3@&K^WZw-0wx6{1WXAK1>6uYEnr5#tbm(t-149eQ2|N5&+%p6
zjRgizIulQ2vQzPl$ly!fmF`JlP14uHY1>rw^%z4-!q6>S((PqQ+fo<=aek_zpAr|7
z@r0NyIaygqQS3#AHj>AaB<HFn=_d>wN1?Kg*~~(6N=z}dS3DjUx1?w1r<3GdOp1w&
z0McxoTS{hT7psJ6hUUafJT)z5XEWlQfDDD7O=suCjF`%%#P}3B5wOJ2IHu~VJ;6}d
z-LuS4pD^;2O>0usmHDmBoML9AoJJB~(vT%>Su$0Q%ffoQpjr$gN!i#8=PX;<2ydB6
z(J<|BURmRgRYMP3ie$=#HN)Htr>KU?lw>PQwyIgYjJYjU%O?yiZSU|f*Sc$pJ-M~E
zrkJrB`3Vx9fy>G<T&U45d!Y>NogxKl(4?HA5rMQV$s2Q0v7A!7Lx@vc)FfG%F|@p5
zQi`>_PKsX>mQwVjjV)7FZm2xJv&SoNg?E-0-RNN${%=KOXrdHMn^SgU*^3q2W-!LA
zqNMv}O|q=<fNW@?&3tGm;J0|0#{;&qZHFXHUDu<gx?ZqjMJb=B#tu0s8tE@?$JPwp
z4q57bB^ntds8L6R3JTYb4i1svOEqs7qW-Iqu2^8gja4u1;8O<oSeS>Vj=DCMSMR+>
zVdNEsviZ<xS8P)<*Hu00@2}9{#{hY7i+Y~t#UP!Y&l_@$3=r>sjV7PUH?LYnP1=e2
zRoy8?PBY|<N)hO4$la0t{w{yWKQLU}?y1h?C?L;CK0TBF;mz<U{io(qdE1(@W=A7b
z6K>*t{`-UHPaYmT+I#uvDZ#^M-yD4ZLj|6HeFjeQi_5P@(~F<?Uq1Ni;Ng$F13vTO
zb9_P5=16}bcUO^Z8a1WnV+fYJ@E8sLYAS+K7m_4ER%z->eszRIL6J8mjcwv~@a^7<
zr@tOP`TFp?pBUKcv3R8!O$Lgdw^mfUz;Nz_>)UgOhVK!}l2vI;P*kZ{By)zolPqhl
z`K##?dP8-mb~GFW+o;fO@9wGb8>{bxi+<Pu4=$nu=RvcLkPCH$FIM3uLT^{$ON8I4
z!tc`4_p0z2!tYn%R?_!Z;ZDLIRN)T^e^iCL2w$$k0b<1XAfq)%48ycD+8cuVV81w&
zdueTSgw5!qv$v#x5UvnvB9nfSaN|Fn1cBSVzPdfsKgOk?uVD|3ef0IY`6AG=@&u#3
zzNU(T=a@osN#R1!=RGEG;d0KW4xG<riVF<W`Y{z`1f3Wq22sT5Gf96V(wLxudfnmc
zCmZ5~2nJ~9r$MIx{4_)-7p{`D0d<}Jc5*mOE=%d$r$;V&)E6wL)95?18!R(#^tJ9j
zL)+>;-tzhOaJHAeduZP!{Sw6vatX|m$D35LTht9n>VbKOQb)<JLxhw_#)&Y8NIhKM
MW;&0M+=bD902~%sfdBvi

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RenderContext.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/RenderContext.class
deleted file mode 100644
index 52deeb56ae45d4b9a3b9ac9d4458f70dcd1963b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2512
zcmbVOZBr9h7(F)$ge05rQp8$RKwC`$np(ADL!ku}sR699Sm+Bb$qFlBli6&XI@3SW
znNEL$oe>=COsAjwqa4rOz1h5N?TlaU?tSjP=Q+=L&fVnSH-G&N;2IvqaRLi5jN+>(
zzK$d8O%`QjNe;_$xRt<dtVD4~K3AjoCW^apB(X4nf_$#YVO<Uza>u<WzK!C(K*%f$
zh*g1jS$Fih;jHO3fx*HP{i&X7IA$fsKwcnLH1{msY1oFqa_8!tH?8Q_UasiarnQ$Z
zl&Xih-MV8O<anZ1wVm8<!>p8Z%U+WFJR##X-PR8c$FS=H*Z&{WrQ~MW*nMJ@92Z1m
zrdri9ERXnRH%u>)vhmooOvkKRxw@g-rTxcM`!KiEgvs|-Bgqbss4gWE=%174=LM$H
zo!Qh;U$xApKxC;}reuQ!(=yf@hr5RTK;Nw}GE%6P^vb4gn{uv#5oh0|7&ij+3#NVF
zu*!zLRJ9!A7l$;*I#Hk1n#jL)aecq0b=Dh%5zr(lLwwJ0RPWhq#iiXbnShczEhCUn
z7G0-nq=2nl%60-8^W1CNO5j3Zrq(%SB(}+NF^Algz86+`H&)UC%z~TYpUY>0xW(v2
z&#D4f-vd-2T#~mnS#<Q$0k5SpO@cMA`R)uK7|$qGt<e^{7$8F%L#2Z3Q{Pj)(&!S`
z7b#w>Htdpd+jRZgVZF;zQw>unY8b;wfnir<_bS}c>-%J@;Ve#Rn3ThZayX4sQ9RJ_
z9hi86;=JpNq2VFE7Z_^w&g;3r$?nji{L&aUo4T`8+R?CuZ8`j);Ya+W;b-j7g1za2
zd)iTDM}AKhHYF{EOSbBDzo20@rOSU!nR}IIze>Eqx@pz#%I=+L?^pBKHorW2t;P#4
zaH)NRGJmh<lo0$ZoKCO4Yk9z_Hq{(W_iiLWn0^wNZBMIs^;Xjkpf=GMqx=;E`Vf--
z;9E$V00JMm@8g`)5B~fN=d_DIpWvL%@#kmI&-W>uWBfc3e&^3(n9pqXB}6uSgi!W1
z!dov9IYM9SwLd$3glKl=2m^m|cNiaYJc}sDDMZL1h6ysA<amy2=aJ#~30EgQbX>qi
z&X`BBmv54H2x&&g`1IDs$<AAom3TE~7|UXsqh!3uxZIt}zCd*P6=EU$gZOhsLM|&=
zADB;O_i$5w_7rAtiR%KFkyCgJ3NJyt0S~VmEYk*-@WB%JRDoT=XA0~OHcHC5La;u9
zB|`WO!)oF()t<jblKQ4b29Gh6-Fku0cH|LtKgRGeM%LWDGq3PL7!PM85l`ze0)y<6
zOgT>OH<|nvuC!^q;uBlJRsQ`E+>^p}?hoN}7e`2OZv+<JA6)pg|0sM`6@C+6sKPhM
rQx={i|Nd#kUs}a$N}NwHw}#m^%1NJcl5yD>0w9k$?iTpcJw5*xX_jDW

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ResetButtonComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/ResetButtonComponent.class
deleted file mode 100644
index 18d8bb4e13a83cfde16ad06fef370136e1337f27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1427
zcmbtUT~pIQ6g}G(8fpcsSi~<viZ%sG0Qt~<J<u8asy={&<71j`OC(KdvUOk_|A4<n
zUtmUO`~m(b$Gc6fBlH3F<=(ruyXTzUd(!VezI+3)j!FV4Wa5}lAcBm7yE5NPAPZeV
zE`cjpP_QWTl7hVaaan<(U`4^Ig0(pA$Fa^ZTC!bRR2ZUqZl57m^%|UEqGr4NMYmn&
z{!6p&P$yOMEYsOHeOs>k&6qf_1BOb?^4dl{5d6^S`n==$!f5cO1hzfb2)OB62Tjj!
z8@oK<V!JDZ=T^OT$8)(WiX=jKk44*Ic&7gal-uBb)pG?u62)BYjrq<r9Mf$Xd&0Nf
z7Qx1?@K=Vde}pAz@)l3&l98a!FmsM(yK6h7gV+*#Ue~wyjxC>SX4p-arN$(#Vv1q<
ztlmBl!;MnC_du#R?(lLpTx3<dQPz^!z-Am<Nj$(qhN>2bV~3Zuj@f9?l?&=-=SW>$
z>l_uEj%SL3!<(YmHvN|E=4D-2r45>@T8<e6Wvwn;HHiX9{Fq9Me9+b^NtAkxk`Xdf
zqbwV-c|Dt9n9AmsEyuPF^=8+#<b3tqdxoShC%Z#4)^oHu`a#Ch|JZ_tcG2T!3`IjT
zJ00#e81nkLfeo?B?-_1flyaBg2kv8-tV<gVEd7M2A6?wagL6Z)(K9M7F81W0>Gk!Y
zMwdHkW}VX)qzEtcKj!GuPtjim5CxN_qj-&024zNhWZ@L-GZhh}DUSA<X-rd{3^(99
zW@ts0#7&Cw@LK|lP~P~8$m>%?Q?V0_EH0d2lyWLgfoet8V_}_;^(6`?NPeP&A=x;=
zfWRg2I%P?k4uSimM1fnlO|%Sm2J{~h>zyq1>7OtC(s7w620F$=K8mlFQWIgC?4>_c
pq%lIgvrwQSNAI-)4O__c)TklPKuxKyMj^ekv_C?+=6d(hegeQaaqa*B

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SearchForm.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SearchForm.class
deleted file mode 100644
index 6bc3b3f047f798ab640df2014b5405fdb2e59dae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2405
zcmbVOZBr9h6n<_9*$_5FV~x@mN^K<}1jCCW5=g5k0tTeU;<R6!B`jez>}EDM9sMc&
z1%7R3tPbt8<LCZ~{*TUR``q1-Y$Bb>IGNeK_vGAjp68tB+~lu!zx@f|Djvmf7K<8g
z#1O(_6iez|7{VDW4`T(zVSJ5m)Z?axTf>N9HHzEH=Z@N}DaX4S)-`Mh#465F-LXwu
zHU!R;o)|wG`KGjL`I6O;1%aWmRkaP-bWMRfJzp=EcsRe;kml1o9qNuN^ZVw3Wn0p6
z?0myC+{)pB;~wQ#Pm&ahjHxTzj??hm1Qz-ZvlckVIFV(Qswgm!ncNi!uR8lgnJ8Jd
zx!pY4Gu?;AUX7My$*CB%UBk81zGV!{LyMHJ_MN=!(NPdoYU!-Yqng0IOy2<>nD)Nu
zt~$0fpUJ|cU(A|eSMz1*T6R@cyWI_e`Mv{psw<#X{P+Ub`##?dOd!<Q6BvCD->s%q
zBLTvUm!(m8x@FY8T2hD_Hd%k^Y_g*9swvxuxKCzURD-g*`=0Sb#T0LJr#qMFQE5SG
zBh@W|=k*gAtoOQq7!H*qLE=G$3M`T(JKEQX1W&TW3DOFh1a9=NwBSLHeyr>?-HN$p
zsc}ejlzc_ayN-((6}aHden5|{ep5-y2UPvIwZD>Xjrn7LwjV2ddb}Z@*UXjlk>OS?
zds;g6rP-PKvvg6%J(P4LaZbaQj&0nhPIT<xTOAKj7MSg~IBh-Y_#ER@`Ep*RW`>9O
zPRB0Bb);}XV6NYYof`1k>oC8+_r$D7inenRZb;KLq~mhvje4CkEHK>?O`uq(%yVa6
zMmo{dwJH#`+CfuYlW>xZ3eXOX#x`#X?|S=z<7IoBk52r(<UU?{N2TN6A_CnW?YkwS
zF3ZgZzTowLmcJt*e%KoDfVVr(J!{CdMjIu;=f~XT`4)T+W?w`6;<<jpXT&pJ#HU>A
zz5_nP7<WSTh);F+4-8<C?~UIP`u;TrwsOhvD-1r$zC`30n!xt-F`@!LVT_9*fj5XP
zg>$3fsbdU>pj==4`*$v>t5xn5;y*Lk02F{R;sn!2nKr@QG}A6I@d_E<#w8C}7Gc`s
zv|QqfFj^4R>Pvh@kWt*kWlWHJn%|Eg^cJHUG8!iTp@%@WP31+4O5ub`KO9Cn9J;`#
zysBJg`U!s0m`4T+m~4Zd2!JlMK^NMf=X*gXgP^C7Bcbl*vEZt9A+L6R^Kz#&&)32<
znO|Y&{UAGhhj=!Uo%$6KB>}$!>Mw=T#~^0BNGac|4L8!#*9^UUi73l?#`d$!ay3Wl
sy*hh|L@(62Q=sz48`oNgi$REqj!J!q*9dXpe;_K!D}gT%WC+*)1G>pZkN^Mx

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SelectInputComponent.class
deleted file mode 100644
index 73e82345abe7615da631cb221391ec4150713544..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5879
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SubmitButtonComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/SubmitButtonComponent.class
deleted file mode 100644
index ddb9610a1f37be143790ab7ddedba21e7d15f828..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1116
zcmbtUO>fgc5Ph33o7B(}prvUFEiJ@O)0hLOhZc|;2?PWV1Ql_#olUzm*^QhvLPGoj
zehpkw2_$|1KMFDHL`AeYMBu~B&U)v~?0aMX{PpbzfP3(Za8R+ZT0{mF8#j!<S;QLF
zZQL@!hK)@dw=LYUP-Q6W2`ThLhOFxyFyxx5!x`pVLh_eMKjiW2AnegjsimTzcM!zF
z#FNdOJ`zKQN3BTp{cx!Hv7f|zpknQJc-H_6CH)}};^?TW;=bQb!oJY^iPlOsRezu)
zmwK1FFlV0;)N^-ctXEuic-&M{^ACF0YrPBJ2YxS*hkjefLLL&V6^-9A?EE7vLuME<
zET2Q)PehN(Q;}j@C2_<b3qw<R>J1yFHwPDSiDBt%pA#hFe$%aPIB?-vs5#g|o#ATL
zYeYQ}9lPB`Mutw;`{-aB4TianYNyn?9<`DEWbA|gQi6DzHUEr;Bw;WZkRlA*?m4oi
zsPl)v`?Hq(OK^sT&`5APMNg^pli8=|G;d08#G|d%c#22@cgk#G9dq=hnI{8glqEY)
zkx!nH&(}`CzNW7i$QIJgMO>z}Gd_S4u24h;aE+`<{)`;5<oCWK^Y#SU7xl@alp7(x
zRU4r|zGRUZ!6y5rUb--L#njR67s}7T)LcZK>@sYW;b8@LQNa#Y(;n8wbtXMfMLNAi
RUD)&wxlTFeQsoqB<u@mZFmeC@

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/TextInputComponent.class b/ureport2-core/target/classes/com/bstek/ureport/definition/searchform/TextInputComponent.class
deleted file mode 100644
index 2e0ecbe4743d8042cc1ec088e8d78824b03cc339..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2140
zcmbtW-A^1<6#rem_IA4nj!1!4yKHM`7g$!UEfrX*P@uF6tt?XUdv<q#X=i7~+1c90
z_@Yr?O0;b>QAuh|8WKZneF0;oKAQM<ly%?y2aNIDnPurh6G?qJ=iYPAIrp63Ip@y&
z@y{>!0K9;VAN$ec$J03G$BXFY=<}i9k6QF_#04J^<T%Gm;{0WfL7_avae`x59F1^{
za-8HC<2c1}nj^t6&N0DphT|;9D;$#?Ngt+sc$J~9Uo$jkfT21ZnP#XNGBYYeLqapu
ziF`Jt+EYqOCyA6W(~3T=*qYdvgf-5*mSgBoq|IzBm2=b!vAnHXrtQQs>a1|AnMN$9
zDt3B)*0i&+DfN;wW>|S=$jn-%p&Cvf!!AuoPC8kg;dFS%z9v;8quN8J;gHk5NaDP5
zQHkk_F&9fZwr0$cXJ6VoW$1ZCw}gnHWZnE9;=j(isOb4Er)N^<)wIZ~KItgw3*(CA
zqUFQ159bJQ0m~^uttyvdXx$d}U|!QHFS7S1&AgpfM>K)|p6$?ei--aUqCJ4uFyq7P
z0la}X89?e=qb<2*XrqD?+(GBErN(7}og8$th=&4r3vUbZ4ylELIp?yj#zU5p$q<~q
zhpkJYpq7ct0lW)^u8=KVNvrdw2sbVlZ?6{bU0?s?Rsbo?FmO32kc-PgGnm$uTrMt)
zCWwln*rqNI1dtY*l8_GTYL?m|*KOr<^I?YFvw0&e+9w?OK(xqgSeD~);jLO0l2Juh
zZ6_=jzWS`NxLmmTX<_k)Kkr^$|M8o`ja$Xr->-lEQQ^xw>t8JV_3M@UKQ9zNUMv3g
zZSm$6@3e4z;r`lUyBr~yhn;!bd_VX<Ju$EkDQR1E^0pDA09lAi9O|V8IvAD@2s|R)
zgmXATVsUNnqt6V((VZGs4jV(`*1o6^d96#LIn^1|jLccZrV=`;&CnEn=!6~FX&@ET
z$`GI%9`JrByloCDCb~RRb&6%t+%rV~!@_$5HixM~zvOOvMw|MLDKUrTXKIYD9Nqcb
zRJN<gqWms#%08i_RC@5ZV|rq=(?h<Wz5+ls4KPhL(Gcxo#A&8c+p!Av6D_K6fM}g7
zY{o%a2RsElgG00fWQ0i~jMvCn4e?~h3aZ9CyH-&BJGfM{1nzDo?xJ>P6?Kwt1w6Wf
zU6P*`ous{+xD+5l>w2+%j0o9tse#A}8t;(XYB!W-`tAU&MBC7Uz39U}OcEENb$Hj8
zLrWq;GDf-+=tLJK(?a@Dbd#?b=?75tHzXgPJ>kQ1r1$(rDy)k<iBy)|R7!DAM5V_m
zoO4l0a@j^YPteW{w#f_D(|OWk%^ut1u@;wY7`D>RHEg2=Wm$2!mv&`r_C25=m3)=h
zQ?6ABBd=ToXrS1Gly^JosWeT5oIvOpA#<F{HbO-kr(CB9pZ5r%YlP0%gwJ<`%@U!r
eiRE$`%jGhbOC>DpaRZ0xKSFfS5xTDmNB;#(G*`F)

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/AggregateType.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/AggregateType.class
deleted file mode 100644
index 2a258557cdb0f998ff701a03d5fd3cd36d869a82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1502
zcmbVLT~pIQ6g}I9CJjMK)gp=_h|;1GQShr3K?J`lI1^>2<5OB=jHU^bCXD_8e~;D~
zaddQi_QfCKe{j5aTeXb7Kr(Yr&fSx{XYcNQ`}y$;fH^$KLP15xH7uwoskp9V6pI{|
zG#u4waETQ+G>kDWYdFq$Q^PppiiQcsRShQ?Z)uohyshCR;~fpB81HJBV!WrKD$wUf
zVX`T3zS;<zX1x_VFU%xzHp3`3pEyswz>B>wFt=<!am*#xjU3mGorkYBow7iGBWcB9
zvs*%?u}-l}%kiB?ETBcs@6U8AX$qw6Etg``e#y}b$Uq}Z0+One8%xzkE0(~8$9wUT
zkrrD5^TpDh3Mk9r6GvdM>IKeP(yTktL%Z%%MwOM<p9-uNtIzE%+w|?gHLW=E0=Hb+
zi`jfNY}o#W9eF%OcOE6Mn>1bi-#G*_72b&jfx>?*+$n7cDDg9oR-d&zH?U*cLTYf4
z2eeAV@BVzVr}RpYG%LIJzChcqTVWD4oK=szlizVDX1G5FihO=c2JT}`;M{IcmVp_p
z8@PZu14nVpz!-<)9L70Ja5%wXlEX<3r#MXEn83cjTf}SR6Xu5jIXzG;^{jur{+x~|
zt!BQrqszYCYL$Cre|C9i)$-yjU7=CBxBZJFY!V<OpAyNcL~<*U3`-=>63MniaxRg~
zOC<k5?l8BHDl5oh8mA#}hS&rlKYAPDJyKthenU*)EX9l*E0BH$W>-Ill+5aRW%>j9
zzCvMrYKQ(DWsHsrvp6rusq3WT8E28E7f`29k8UILRu1=0_xE=d^K2a#rREYeT*jrY
zksq`We!hQ#Qp>C9ZD{Y1l|)x0>6gUllVm`WeHlpxCCRCh3`vsLB-t;?fm}y-P_jZ-
zI4s$rTt_(~+2LGP{&ys&e<mO4Hr<q((nh~k>uY1cs%6?3v}$S_Lsm^|W4~3)QR*N8
m<%S6;IYN+a<B0VRg4@yQzE1rDhVdE&`s%dc3a(Nvh4L?MgG|Z*

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/ChartValue.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/ChartValue.class
deleted file mode 100644
index efbcc9959a579e80a51580051b8af9d990302284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 987
zcma)4%TB^j5IwgP3y9(q@rkH0_~N>7r*UKAis(YazSJvLu{EWT_*ZH)CNBH{Kgu|B
zX`oSJSaf=4dd`_S)BE-P@d@An>lq}mkj5gG(lD`XVZ}nx!m2>hxv_&#pjdVMds%OV
z>Q1%;_237g)Su)D0}cg7j$F?Tj|CFtt(t&&;$JC&T-Ei|S^K`Of=j#Jq{>v)ckE`(
z4qVQoq8Z+}Ede>8%ayujVb}L$$8NS&w_%Ns)HT&mp*{=Dl((w4cE^@Y+iS>+FmSyF
zAuK{%K0Z+AeFFS-@kd|FF@xn>D%1uA*2)9O@fEOZ9w)+=26l@R1Tq(XJ8;yg%Ztfr
zqV8T{A6cZ4u~5pw!WxH^z}^t^_hkeo`U^R)-ztaxWO)dQXrsHsLc9B|3|P=V+eL})
zS`u_~=rPzIT}IByHpNlOB)tV!x8EV2>0lsBkqJNnV-&Mp0LGD{j2vT<B9nLN%{W6m
zaf~sSVoamQoWgX(tVB%n1;%ggYK&|4xHFiIxX0AVpnfCUJ8wwzXU^#AIvL#13i&Q7
fQeaQK0G>FHxk#&T{}qYfgKWkIN%jUQXsh!--ZR&q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/DatasetValue.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/DatasetValue.class
deleted file mode 100644
index cc48fb2eee6c066e0ca74e91575f2df17990b5ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1634
zcmb7F%Tg0T6g`~;CWMIuL_{onD+$C*P<%gmYBb;j1hvXVLz*}eW>PZ~N<YQDAD}Lx
zrByCn_#gg)J1tL7B89|7Tuk5TJNMkar|;>WZ@)f$0Wg852@GJo3ukcFz(fL3j3=-U
z=k(k8I4<bP#RM+lavWFm<Z1%faNWR-1d=-T8gA;h$vCF8osMHhW2X(w8kjS1OCaSd
z&z6;C<@vVjJSxlxh&uwwY1i=s=>*HNQd1p6v*RCsOv={+omXwg4z3GC)0t&~*tA<x
z0zF0BQ46)rRpl+o)e1d*MR$#9C6jaBbjE_`wl6SVTyr<ARX<Q0R?SmY*9)wYTGxqL
zgSDlXv}R-=ebre1ihxm8!P2WLGw0KpcJN{08bNTJ;BYR`PxK49C9R5d%GP4w*-n`e
z5r0)+u;t5CZGByN{2r@%ZdJ4T2R6AF$hD1mSq)jTQwDAeBo^J8x2EQ7y&Jtd+2nK%
z6T>)UpkU$-?g|X-&f8eoL=ht<=CQ!G<V@VdeFG0nJj4hcX%mYW;c6z9@JL{PYZALs
zQl5!rtmrI{*|uDcd7gy$jDYo@oe-F8MW~lmPx)Fu)+Xgpv9!Y~H5&M*k+a)D0_oNq
zE&XryE47=GK(<|ULoY_N5P{tP>Shmh)9l=W++-g+WwolD5^G4eDxp<a+ww7)XtG@P
zR9Oa0Gtr)ew-HSl=i4Cu7lyiZ!n(V;{(UM~dBH2Ps3@l#JP*%sL7>a8@hs|tKpmzF
zg;pLs0H@m|912b!xxj54E*#~>GytlT&kzQ2AhbXP2YD9>eGWJt=8b333fhj*4-oJ8
z62TFUouPA(i2$<^fMYn$nZOC0<fy?pS`Ci9N8~N-PVDdwY-}5Q3L{PIcf?o<V1GvR
z$p^%WW21F+)X}*z)@Ou<^LQOy4Oc=Ndb;PcUy;q$VWyIAF#H)wg7;*jDF*b^k?QN^
zP)FbV7-Mv<y`ib2Ul$k+$(<o3u%tK%^^(pY37x<xjIp>p()<f#c#V%@1z9{J$r5)-
pZ^V&C!A&x8NXBMJC(qx(DA5td>+OpC#EOB_267$zYS9-#{x|2OoG<_Y

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/ExpressionValue.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/ExpressionValue.class
deleted file mode 100644
index 9347ad0f8433f93cc5e4f2eee219ea45bf9af8d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1176
zcma)*+iuf95QhJCotPMh6gTDA1GGRLr^-UryCQBXxQalcCHGFcq%Mvf*-q8I6(A}Q
z7d!wDg*v;k;;31mvb=}c{r;KR+5P?J=Pv-e*tTI|rG_e2ZLDEkjvm$U7#kKgEj+RC
zl)=o!S<c{gPlD5cM?pN~2YDLC!#xIDoQ+eFWnmIC@a`ZP@qU(zPkfS!agye|T<4?Y
zNJRYg6d=6%GK|Cg6~nSOuiomB?|p(88r?7!ZzrR^NDqU4L>9N341%Z^q@kP_Ml(MS
zGlpGF97p1#bVYIU(;%9NnK*iKPQh41ksqFqN&LCjx{ibbB|-2Fg4LX%Nwnsu>a?Rw
zp5cYo$-mFbK1e3%K)ea%5j0CR<+&rBI;i8BgBolLTMj(59NdIs!IyoTVQ0QZ|2rFo
z#WJ6F{Sz^u>)>5Or#O%WPnL3f9+*kC%;iHKMpVScI7l;5ni=+WcSKXC8CA`d(}XdX
z|Fp0S9gTy(@86@RQ>7<G_W=fdR0euyhO7YfCfVz_MQwv-@6`^#^}mDp?F$%w`v(>-
zV17}|BDF3tzzVgiq_u|ISf?MjL#$kNu|&NbNl%QvCYB5Rj+&F#uc&;cJqDy=m8`&~
qQgPJSEL0e&-Yr;OuoeFsjH~e03|yJQ_i$eWn^$393qMftJ-h^)N+xyy

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/GroupItem.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/GroupItem.class
deleted file mode 100644
index 2e7f8e4e9ae5ebd8eb237d2d16d3382cdb3a6ed5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1553
zcmbW0U2oGc6o!w}uB9d0%03E%!T1{VW7JF<S4<Ny2{cp<L{abE%yjPBq)MC#{uM|d
zBrf;?{3yihq+e^Zi*jQ-_Bro)eBSua-(SCpXpeZFGE~md0#(dVHN#Gpo@A-UDD8@#
zWVBN6h;zZa!fo@0_LbXy&M4=2?upXMa~aj@j@RR@K+7{8`m*o&n#<39Uj_lrdCxnM
zU4A%>NAkvp(ABCZn<`MPu6*gbo)$(cU{tAlew#bUITc~RJHj~&AR^)z$=~AZsO@^b
zgiwA&fy_e88EVz#brons*-&j)Xh1P~F?GB@AN2v`GW*I^`hZcYRBoa_hoEG%Tvx6<
z4tp)>e-yZm>6qt;Zd3Tmd=EC$`c#23saYrTlMyz}Iv3qg@;AO0_K&pep=h=(^>Jjx
zTB)35MK%})te0lb4X6!?QU4h|h0dIg*{Ct0uv?l>z(6ccLZA^V!`n<6_G)JHKWti@
zghi#*L0iU!3{UZ*NniRyqYkIT=SDE{`Gyzzj(n}m53w{dv}WFtP1k6}rYv2tDMxvm
z7HNsm&a5Yw{}}k)$FK5Tt0Nsv_waZ#c-AShj5b!5ktar1vCd$&qdio^dO2Db5XlS<
z##QWa%nb8F<tMRkQOFublT5Tp>lp1gfQob-UyN?h2F8oY-^u!lLyN}A+lk3H>DD0m
z0MQn5GL`BNvc{$J(QXNMD@O{&IBHPdpqaZG>P@<x0Fs&psV0Klp{*p4)HFy9Ap8=L
zxY>;E!U}7qBk5_7-2{->mHR+>Ko18Z?=g=$lQux9sIPHn_5k$k5}?@WZDhozW$>pJ
OpdD9vgw^B7rP4oi@>a(H

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/ImageValue.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/ImageValue.class
deleted file mode 100644
index d49515ade6a31cfb2b2530494514383edbfada49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2278
zcma)6*-{fh6g?e6CW*r$vMFx3U=o%Q1Vm8~kxc_yLSdC}lhB62ki=wy_$mH_4@iMl
z`QQimQI_}iOcsWTm6v;`XYM_H?&;I>=kKrI04A{!g^rmB9^r8W7cd*a6FiMlnB(O<
zhi4oXI6UXDsNsc%B@N30!GdY;3Unp+%mdTNnz@XzX&0?rW|qFm!$MIY%1M?=Rz4?S
zB-8nQBUQ5HN26Sng?!OAYTu3h{Eo~TOVtKK36=8YVp<9e`?T)J4_3~y3EDU?vt?;)
zs$yzu{cP<pGqFYxyVA<++Vt>*tLFq-V)1PvxJcUxbR?~u+$is-WO2((W$8^<GM_fH
z+h)<?wfiz??^-4Q3C_`2+cz_En;8)mEhFu%F9pKAAB#6LglgmtY7SGgS_^bjw~x$i
zo3@$$xNa6)o{^HY9T^11V$JO5ipG*eXuC@DXmf0<l54c_8)b){*m<Ii&J}#Pjwa4i
z8|_#-aDj2(U1il0ejaIaaVsvH@EiMo5KNAhe&?8m>_N5(6RP_n7+b5Tv+8<@Wv)C&
z9SxQ(Hcv<G@W=SLboAr0h7}#FSkrL{-5Or%c!h2qNv!K=M~9A14j0j-qX)e@`p_#d
zdj78b$7uqcHFvyD?a4GbKGp<;Yp;=JOC2w_TI_MMSThc*cXYgoeJU0V+VYU^t^8Cr
zvvm2+7|WS)HvS%i^jFd$(1s8KtS9~10xYS@q^ioKyvii7%A_&ncIu-8qIiW?24z9H
zHSrVTyDA%?7*a3$ah0BVBPzf(T&FB>12-vh^B86R7Cc7ah;jh6-od)wV6}G;x7^;h
zRL#A8i4(LOBlrWYUlFE7=!k;Ga4ib1oicEjW*wrrVs)^6F6?bpE4m2p4i!4w<_JGP
zA3}-YQ?%43i>kLHG|#Al>UFAID4v{U<GF@#&&8^VL|nat8g-0nBE=B*BNFlwnIIw$
z8W7=gWg-cGEX|8GMOf1fu-F@nHC#P_`k|EE^`|%EJJbki=C#cU!d^vYeVfOW*Vr~^
zjwbA#VveSmZ!iTro2R&saUUX)Zv<XH#ey%92@>4vk%3c0yhL6Qk);Mi_)0O6NnavS
dFOd~rB2)fEqFy2|iO8!4MEFiKk!dyh!+&;yv5)`&

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/SimpleValue.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/SimpleValue.class
deleted file mode 100644
index 2bd6c8ad98e3a0f657e7c01418cadfe61fe1f93f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 804
zcmb7?OHaZ;6ot<eN-fs+6Y!b1Ks3~aJB=F?S40;O_60^9EG;R;#DAqmW8%Ue;Eyt%
zDMXFBz(sp|=icwkncI1Le|ZIPi0v#)EZaz9#l|Xf7V;Jf7S;sJ8_yp|f%!_uyYXD#
z3)*fqj#SV-6385@K*c8lOU2*i-MT>fG;9%`si;7n54sH*)x3tE$c0VMuX~Zw`Dig6
zU#Y&pL8TdX-9|r_*X|&ay)cU1mb}zksW5O8LvB@dd%mn|b2MVLWn8=MQTU*^I}V<J
znjkzuILQSTN&j)qY&9H2O?jrY_1SM*mvyrP8|w}%Ojy`(u!${!^8b!N)vs+Y8Xeh;
z1&U*6jC`kxdfNNr0>e>d`pFDw_J0$@HZO_^{(e4&J~uB>ir+S}d`~hv<GR6^Ej>e&
z_MTweGc(}uJ<VPqM~ys*0;ZTP54%~LVMZ=d6;zwW+(@&`C|FBBAa%z$RMQ^7nQIki
hSRbkI&SHTp+K<bq`^?fKjGyq%H`x4y7ujxL=>wAGyWRi*

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/Slash.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/Slash.class
deleted file mode 100644
index 9782113d7c5cc87395d2ce429ce31db76c70fddb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1111
zcma))QBTxB5Xb-9>s@WF0tXx_D1v~!gV0EL!|<XpA-U+o5rU7syY(oR*7WuWd?z0y
zk(l`42k=7~XSQc9*1g1so!Onv?Eg1A{rT(r4*>gUd2sN|MGYHlHrZ^kdF~)^&=e3?
zw2o+93)K2@kV`3GD|w{^>h1IBG76I@9fTc~$LZjJl3vDXtPTY#LGy%CUuAu&m}$qU
zd^@`6%KSL$CKRc+vtE>(M0w2TanM$0@lc@E?qwHYcc|pYaFokWS+2sq{J<B-SsGqO
z$w-EsBpRNPpgoZ4RLc>jJ=6y~IMU+u>3tC-=hEr*xC58+{_Gu!AM1t|f~Kh@hmwng
z#o*uXEaY{vQQnhpV(!e-WV`$}KJH`2#~rvnJT`aP__!w!{BMf_vy*3j*FBd#g*6(H
zLld-N@#VC$_<rq4LVHpn??NyG*;zV;<OTU^>l?(4PMafJ)4>MnwD*ey%wvI00*h#n
z{k!-ptk0$56=U%d9*m0*iO^!H*77Z^iL|GqtEl3szM)ZMjpZ4Q`(x^dMvzJwWZekz
z$P7{`gKQGW))WwaU<O$>g4kt{zzDKp2C>T^+XS*R1%xNeAdm5cY<V=*FQw7!8bMa+
c!HeR_Xtr-rErYxuki97&{EIQjnpRx@4c%Ojs{jB1

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/SlashValue.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/SlashValue.class
deleted file mode 100644
index 123a92d76b23bcbb825846fbb49b8137ac4b4859..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1738
zcmb7E*>2N76usjtCLvwu#=aCNBxxJBr4)%)sh|i66agYt-Y4ncx=roMb}I2#fQpcK
z-~;$5#JRQ;yKX9_FLP(P=iGD8jQ#iD?>|JePA`h2(_(@0w8X=5fof#%Y(=M4oz`@E
zCMe^bn1ZGn2l7N3U1^&}(|0Y~+!UmHUFq#BPtas|-1Duj(Xc!phlQqP+S2d2O3+s7
zc&pKIj*PbFt3v|`$Bye8d+Lj2TfXJk#)<6ql+k4J%{r)xZRx3v^*7R&f^L59*}iq8
zT9#+EyXuu~JHBKXWK<iDYZ@JAPwmT|XB^1Rp$9%0<|yMmR_{#PaTQqeTU@V>4$GC6
zpzID{f+iZ4tv>XQ+RELP;OEwzj_kIiYw<eT%=-Hl3K}Cf(&C;_^@^$dU@mB;Tp8wS
z9vMycJnu!5+4A{3mR#h_{uNC1*^-w~Keu^V>sdp;#B`)1uD~kh&ieE9xbM++I{i|$
znOaAKyC4*_f<{JoGl8>=fYW0DzfL@yF|?9g7n@Gc?WngFU-CrIWB{-6OE1wBO_!)Z
z#S&eml1}R-dQKZ9nxLYf<q@RBg!nw-kLP3iKy`dU<q;^Ncd|5UYG_r?<NFd+yPRP(
zj}Kobyim%J#+~CIp>gxr8w=*+SfhWeC$Y{WUPCM(!Yqt4SQ&@{F<1RX;yWf9&0^$a
zqFXeFkqMDN*Xaf#zG&=+;3Y&p)5JF(6Ug}lQX3#|50G)$Q_|Alg#<V*dx!2uW$P%V
zp<uqc_>;6)bTQbiKx#E$m<zL_^4t`=#FFpPeVm=`|CBOmA<ILAgw{R)$vi!bNIoGB
z1Z7xICh#H@v<g9M7YGWk>k$y4%XwVjIJm<qk1<=ICm3034Uyf>{-A7H=|)0ncHsBZ
jp?>Gm;Fk$-?00#%-?_Bkb+osAL3`or6I6k0jjI0v9iVBH

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/Source.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/Source.class
deleted file mode 100644
index 150df73ff86fc610df7944abdc8422ea76d96261..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcmb7CQBTuQ6#nkoty?J@Or0`O6j9d=S4r?`6EOr6$s!MvCB&z$TxPLrN!t;AmX1V>
zM#Hl|%6Lw<$cR3;+oU(=p6{OTeBZf0e|`M{U>#3$P_d%pAs%U%*YH?}feQc3EM|2|
znvAGsQQ*C%VO2nl<!LNXYdJyR>PE5rU=2cf9E7oTAP-&NjorYvPHb-=t#&X79oZ1j
z<>_%Kqli)h+DhkTYj3+Pu=;MQDw(8eBv7xI)7@0Jf&(c~Xt}<8Gw63^_}1=vbfP6C
zcMk<#R9Z*&iEVkd-?Q3r==!~eIaPbbR^ZrP#|~YtJtk0nyH7mDzl#fGnrzpGK<OXc
zugwmd{oW<LxwhN$?U;NPP%50rHXUz#`T0cYZGX^jPSNxR&t^2GS1$W8GYaZ#g@HMK
z74rt3pe|tk_rML5U>UfLMFX?Q8z>+zkiWE-+Z0GUUf>hw^@=$mVYhoEotXN1HfhS1
zXGc+E0`_M@SF1KQ*XX4h^t_eL1tte*Cw^eA%z7xJB8MWbftV>;rk$5Qg!qiq1(c5z
z3EZH6CdriuU&75XejTagR4=O4FGycNWqj%i{uZ4WBNP@;PV(dip_p+E3Vnc9tu3A-
z^C?MB(p_HHaEDvR-2}6QEbd`x+{g|I;Z^?zb-$=7=g6KRmjt?+1T*RHlv0NDe)iQN
b&Grm}*+$}YY6m2%OyW{whWlg(i+S)HhE($Q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/Value.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/Value.class
deleted file mode 100644
index 2a86ec19ec75ac9a1a05209ef903dbb463ead984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 237
zcma)%u?~Vj5JYDY1+lU4Be3x-?Ch;fEHL&5p5zek2p%N<nuQ<WM;Z5MY^^q#eKR}z
z{ybj*Hkd`2Mo0*8soY7{ogysK<-U@=6ty&^$Xu&Uxg|tQ93Kq>YX%B?6Zze#tLR$Q
z*w%@&x@e=Fwnp?mNDOh_!R92hU0bM~uGyaqo0Y#oNdHYD%zv#8d8G<BArJz71PDUH
P2qD08j0r2;*z1VDl~+LV

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/ValueType.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/ValueType.class
deleted file mode 100644
index 04e2773e796430757c31a083adcfc69de2d7c7f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1328
zcmb7D?@!ZU5PrIKYgdYl0pmBKf^LATC@8v#1H{B+kq^Zsi+<@w8O5zz+K!-qg@1@2
zbR=Rl8b13+8Sh>e7|}25l6&^_?!9~N?(OeC-+uvE!SfhoJkaRhs)AVs4>ct5h|QXc
zQH`8y9PwDiIO7u)6O36ElZ-hPQ;bhlOf#;lm|=XTATJ^6JN0JGmXIk_8g--W2lhLo
z<=M@K7Z`i?zT-N9({PO=tJboOBHP{fO*<<=vyYpe?fc}FpzK+J<=cUTh*P(!lrK^_
zusr5|&GHWjKO8%5l_KYg8->@~rUc_nuO*{Gg)d<_mG1elyw%tvT>}NjwO_UBW!u}e
z%G|jkvhM6l*i01;ts~2*S#H%Z1CIn})4hsJ6dDz)R<t~a(|2mfu2rW}iGTCc3UWN;
zbqUG;lz*8nN|1vChq{iLPSv#n+Kz;9iXCdMQtKSfcctETTlHLTy4QK5W~1d*>=zDC
z<=VxrGdvR=*ZJ<v>e#@hgr#0Ci;j70=~%#`j!}&17-uuVW|GYmn`t&P7^BLUJK#q6
zD%Bb;Ng7V2yPDi7AKI0GWUqFQZHsQ3pX~~}SmV{K+59qn14;V8)ciQB0tiW%K+-0V
z<Ow8&0!gGm(h0;TcqWuVMhrJ_6B2F_W8_C`L;8x)8N#25Nth!W6}}|J&*OF{egz@%
zR!hhW-w-*2%<-Ws@ptHrejbGs(!x*Uq$sYqj4=HGWnppZ6wxoj-CgeTxPm2?j=Lfz
z0~H1`9U-5n5q>`YfLux_;Zvw5hzX*}g7gWZM+E5?<XTja0YT!5AcKM=R6&LW8IGUF
zjl`9ols(+0%UqJ%=rc=^Hu}v{w2c9?q_i<;mee+e%u<|QjhH8pxS#X!Y1A-iS#N1^
Np-vC?sC^#S{lCdcC!7EP

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/ZxingCategory.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/ZxingCategory.class
deleted file mode 100644
index 9e95f67c2caf860360b3754908749ef7fbb9efc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1108
zcmbVL?@!Y}7=CW;)~%Ecs!o|Gim2_-6%;;gA(#n?W|0q-CFrMHDYMwM+I2+#D;<d#
zjfT(uQO5U5BU|(fyC%I{-{;=v$6bH@{`M2V8deIBv83WI?kSj6a9@Q6L%hs9rd2AM
z0#VJQB<5uW4;YjVkDPGdWq8zb!k*RX$L?Ee5V`NdD7N<9126DmFAS_B?hjn+)dw%=
zHhJuJ!{}q3A@@Grtt_>lw05^_hR3fbYLxWvGprltL=EI-;-b{@0{6wB*KwnlyyKHE
zCF#6#z_4w!4*3zcd>(WyJC4Xo-JC?M-U=P=w|V3Vij+qVc#r7xe>o_ohKO;4q5K~S
z&&)Q19KZ3%eZls+0gowv2FVbGe8ch6%}+;KZv}&1<Ko&k=*(0*97K-0?TK{su@kL{
zd^F66>ocq2A!-aO7rho5%CIzC$GnDV6g8AkWGJ3TFSIjc9X||6!DYi7@wL-Abe)(~
zu8$_w^m)HuAA$Wnz45N~%~iVD8vPE^=A0l0XeNGOrXp-nMMeQSE`gY7wMerV>JaP;
zGN+I}(Td>;y>m&eO!zXcrua2vlCP>RSHB{A3R&PYWB6<IMLR=b4wa-%X%I><u0o;*
zP^!!GC&+zH%A<7W+ZEgp(s47vEFh0tSV)CDCnI9izC+&A73l=|V-%8wDkqDn><=nQ
hL%LLZ@(@$@F_>UGGpCXqkgW=t%cKmqDGp)g&L8G*26+Gg

diff --git a/ureport2-core/target/classes/com/bstek/ureport/definition/value/ZxingValue.class b/ureport2-core/target/classes/com/bstek/ureport/definition/value/ZxingValue.class
deleted file mode 100644
index 6aa0c16513c795ce8b664246fcaea50293299c58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3081
zcma)-Z+8<#6vm%PlWvo43)D7(_zx9LQ^-Oss1%D3s1(|wqy`O&ZqseLZJP8XTP%Jc
zed7z|!0{Yk@B#c#9-lkeY~nJ}yqP;YnfuId?!9yK*WZ7>0I&czgGt;?V*;ybtYKYd
z_hk4YjW2OuW+fRmWcW&kvJ4Mo_}aoZ7Ah7VDx`k&w}Kr7wW2V(<N39nfRlFfuvPUG
z=2olCeP^>Bcze!a%R6Yc0%yzH_8WfSHyh4lw|?k3CB1o3AsKi_^qyMXbsxJ<-EGvI
zQqb}nHTlguI%rXOyV=@zxhW&xUb{^h1;=nq?{{avx#iWJTag3h#;R`M)tap*3iAf%
zml!KY#3+V7^dGNM^QPZEsJoO<6_Q<*TP-P!<Yvp{Epmgxu~om}tsm}hdaVt2v(A;N
z)n?VLm)({x-{E31*zw!udzewm5;?g?%?tEgVLCT!3fx2~aI1T3?twna!nX<*oi?5v
z5at4XhRBdUK|I0}A9Qlgn=<QTZ7&EHlDQSRdz$*U!%|4|*J#f5PO=rw4|j4@8=}+o
zE#!uQ4qXLEUs%_cMVSpfo5{T#t?pha6?$=RXEs6bUim0oG{SpPftf09B2??v?7Zm`
z|0N-C;{@qep~8X@!(1?3FR5LUbUzg?nK=GOqnqUA@G(kqy7LLYEu|m54HgMs$E2Lu
zznsifL?zS7(y}j4<CuPBy4VWR0&Kj6w{5(FX$#-kIE85&uOe$>23ZS_Y<!O&Y#hf4
z8&fiz!fQ58<8>P+W!D>clXW&kdH0T0INs|$_cnLEDqBr%2#N3w_IY<Ym%{82-rd4J
zH^koPEwcCiBwb0NFwAp^{1$PBJ$w?3H_}K*{P>TMkPvFiaBIsTYs-jh%b04*C~M0=
zYs)ax&QOop;&_H%4y~e1<^O>CU2l7b<EUOdiFY}-I~(vG&hks)eSE-CoYx2=&e{Ak
zB%WgAXJj}_{sN08^&5W~K~L>$pISCl%W;o|#EGJXSxV(G7fKgsMLPKuqau{(6Uz4q
zB_phJI3N1<?(_`SuQBIBpK~g5F6cnWotAi1f_5~2`Z=s#L^67H9w~gN6|$XOp@KwA
z(j(9pj38rikjqApi)N6qILH-(EDivX`Vf$LqQ<k#M8(6oWCU5jrO>$-k-6tc#6fNl
zq&NUX3RFNYM-|hb8eJg$d0jSwe1wlpAgMUW9fI5)03t6$Kt3^oB;yfTH-cO-gCyf1
z_X$!O03uIRKo)V8qtsh}MAC7PvJvD{7HP-%U#UsQK`I1!H~>U?gMeJaX9kc=9ORJ^
z<T`GcKr(TVO@dShfJk!^kfJd)<8hE}Bgjp2YR2Ory9C)A03uyeKyG1~V>~r>{P{MF
eAfMxQ=-f*U`-mL}X%VD707TlffUM}wb>|;7nKga@

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportLexer.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportLexer.class
deleted file mode 100644
index 8bace22901ebcb309749676c09366f6ac8092f76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7732
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserBaseVisitor.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserBaseVisitor.class
deleted file mode 100644
index 22985ddd36ffaf54924c869959e0823729cc184b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24031
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserLexer.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserLexer.class
deleted file mode 100644
index 850e5bdd35ab27518a561bb5dfc4eb2bbe618a8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9870
zcmbVS30NFQcCPB~neHBj0h$|uxEU@npu@JT69JO3Ic$MsV_C){7)e-M9u2bPQ=t16
zy6;=ofliP>5|+qzSFe-JZnC-WY*xETHclKTyV>3BX0w}DZ$_dmp)dJDef+QfSFg_Z
zx*EOKw|;&1J|Sc>eMu!w@?#D^agcWMA2RtVCqLuxa}NLMAQJfnul-UX|Hb96Wb)q%
z`8BWpMxjKe)IlPtAXCvnG%Cr|rck>=Rx0FOg{)S{2MYN}A)hFuTOn%|vR)w@6|z|&
zTNSchAv+b)tB^ek*{6^L3OS^ZBMLdDkP`|yrI0fUIj4~G3c09|K80LS$TfxBP{@En
zZYg9)A$JrqtdM&O8BxeL6k;e;R;Z#-RiO@rhAGsk5K|$aD>Pi8E`>%YG*Y2a3e^-E
zt<V^S#ws*Uq45e$P-vn;lN35mp~(tOQRsMurYbZ|q3H_EP-vz?vlN;Q8>cxO+%nB|
z5HHOOqxrOeL!m+^$h62omQu+<VyK7LiXF6sPL$~+E+;$43OYrm&rsrOZ1y#^tZeCM
zukR?ITS`glqN)!6GLN@C(CYWBn(Xm+wFg?-e4gf|UJn>dqa?a<<#Mmz*Id@o9`L;v
zDDyTg_fb+Zb~kUJ-SaXSw=@M{4r><}NvdybET)83QW6eLD+4g=LT_uAPlT|b!S)hf
z7lQSPye<aolXzVU)+h72Em)tz>-J#%8D5uz^=Ek<B8AWS9Ivav`cz(bP+|jpNiip3
zA%ZhILj<P|4-uT(6(Tr!M2O(*ks*T9M}-K^uZ0LMAQ~1>=4)-`bH-4j)OPy(-av<+
z^H@rR+Lw7P4!YFNFRz%-NjyaQoZ8x|iqaZR6QHfEwyG9MB9iLrQr?mTW7jOGs^ax=
zl&Dp{rGb~hY3*E*Oo?ND%d+L8niNXxb@lTrYv%Fx@sx<AHRZgT%GZHYr@_>fHT4zq
zf-6af9yJT9=LA^>C1Dk>l~t8im)2JXmy-#DRJ?{;$b$JQn|%;ROIv)ny=>@RRZ(9b
z?48380z!&U=!RXCSI(=f=Oh<qf3=R+@}O3OyUB;$v~@K5YP@Z}l@N@Js^0dl@_Jgm
z?aMrM0e?&TG6*cy-_`oi!qr$+2@{o8HP)0?SJY7w(OB0|J*T#+vh1P8v9PwRbk2gR
z()kUPq>mlQ3p<*;OS)RU{?#zPBhazJ*B)Aequkf&_ceI~zGg}i=Lesch44%*Y4w%1
zw|4}*JoI6$ah9cy_JQGCjVpcr7H@0I`@ZJV`Wi|!i{+zDNsZVxe(d$}2MyX`wD4uV
zK)q#svAKC;9+FfB#|Xz!)za>(>1tcz^VfS}$$WO$YwJQUED3l>DFv3dz#j6dnmXD%
zOI8MaD?D9(UuTCu;Avjj>Y0yK2r<}6mG3>DKeUk1W1}Q9H*f5<j~YQQ`}CIfmcUF(
zvU10^=Ai<I;`6pm%UcNH($e196?m%OEY`3yIGTBWZ(Ez!Ker_qA(X_xvc`xZC)my(
z4Wme)bzk=qx2PTsMLSURP}<Y>IqD;2dQ)p?n_@2C1#JPx)djpwE2_Pnp(A(Hb#(cg
ze0-%4JWrf(5nr^Ee3yL7Nq&#~zLR{PJfI|h%-fsKjBbGi*0r=j9K%K9B!5c&%t<;(
zr<1%xfPSAo>!i=osSp&_*@~7;c9P#E-=f6*e{?>Ld|CYN^)HX~{%F&NFK%A>;jRN;
z4Bz<C;F>S`jtPb4kU}Lv6(ms=B}tVen`)Ens$G&*SyEI*QdL!Qs17Mi4U?RzQwmqZ
zC70@wBGd>eQjL_N)F??)H7Qz+mSWTxDOQb@;?y`PUX7O$)C4I}O_Y+<Bx#&FPD)mj
zr4%(q8n2F*Qq@!`O-+;1)pRLC&5$zHOessvlCsroDM!tb+^Sp3Rdc00HBZV{^Q8i{
zKq^!Vr3vZ;sYor7JgP@3R*R()wL}!4jQ&WXB-)_ZvB=`XqKMX_!iF885+;U;PAK6}
zTu>sQL_R7}Vw9*siN+Em#)z?EtUXpg?uZSKb;ar@#5gGN|G#33H`X}f#RO}yB^a9>
z31Z^o#g=I7btH;OP{u(?epFJ#6mdM1)UOv?s?q0271JITTbj}DNE6e8#g=Z|cBG3L
zwhUv~ks)T-GmQI=jPMLshA|>$+A`T%N2Zu*&tw}Mnc<nPOtw)B@@*l$9j$t~6<F^L
zSsw_s9^}^8ay-;>D%5fstj~ci3re<_ZOdkT4v_Y2cGZy`p6$wJ*Tft#N6uk49XZY%
zR}LEr%MsmnH@oX_hr3;FHZ0}_i!Imeapa15Q1ZomIp5sm$am(u^3APb`C>t^*b2;E
zM}b)Qc(E0lM;(RYgs+t%u}JjTJmv+5M=Z7%n|+Sr@M2f7d08xmQerDH`yC}>s0hMD
zQM5_2O|^%~;Yx%W<%kZ8b;gG$y2eGMM5aciYnjp6G49yBxPtfz37*7~q)FqZBtM%n
zb^Nr{8ELc9OEbzcE3)QgSLVFruFkE^dnLb4SRlMAGzg1?#X@6&w@?%!?1I}}IKks7
zDUpPkGiT41gn9FpEt7-^pc93%HzdL1@p^57en-Fa?Vj)4c+lPbpu0yDCQg%ttgO5|
z2jZJ=Ha9O{-q{%ltXgG*wz3zRmaEXa>B9%z{SP+uKDgfVVC2RR)~x;VWcOERd%ha#
z{c5QHtC10#5ax`C$jJESA$Y_D_^~0%h$><jVmM+1ViaODVk}}jVj|)=#1zC-#B{_=
z#B4-2Vjf}v;siw4G5o+24?mL-ryxFyI2Cak;ta%Dh^2^Sh!u$Q5GxU1LaautMSKOZ
z5z)(0Y~pD1ag^WYsJ3zpYv&mL4#$X99HTzs82t&ySbZ%Q@%nl$67`K-jMF!Bk)m(q
zB30kcMY_J5i%fkl7uouLF5LPdF7osvTomZ1xR{`iaN#jFaZzII;bM}pkBceB0WO|3
zu-{bUIA_z0lU&R&E^#r-xWPrKF~migahHn<c9x5I>{Bi(*#$0MVrW^-?r>IXc60HH
zi94z@aSsd3U0nI9i3@Bnk8!rh#K9Ju=Q(RMaaym5gEckFrGn5b@fP1w*(V4~m&r|n
zuxz>9B?!w~<Yj`;V&|=IuaG|ygcS;}x3<Zj2tu2K*V{Yf6@t*wDK8g<PAAvA<LABn
zE9G`USQ+5s1iHAU%f(w)y(<R<;obMR=DpSODnVHNzWlBry#E2$fAFE)DF`1%a?6iC
zmS+gU#~QDHqOXzP69j#Y-p!Y%ck4aeT<?kDt@>JhojeQVx;Uik^$l_^&<zPlH|m?@
z9H5($kZ#tu$k{-*BqQCbZ<C9GZX1tuyS{@TgT6!G$(N|_)OYcX=)3e@l)Y(awp-sL
zF9!9V45WMYeR3nveOXBN>j(JG^aJ`q`5ll4b5MOqKP=AydN>#95&f90+AZiu_2afz
z@&x^ueiZe`;RVKbbwWq~fy98(Pv)cglzv*}&8Oim0&&Jzqe4YLtDnO&IA^Ru`Kf+h
z&IJAW5Wk>blxG9K7~+@oK6xhaz7W5xU*VqAuK))h=vVb?D6i?)aSzw^8@Q(%dcT|j
z?fv=y+7E>6Z|b+u{+2$7_JjHm+7Ics(f+o62jw08F7~?{>Nl)^h6nqZeh>Bc^!suf
zjDH{6xdTS@Gq}$Y{cK3$LjihxDnMdDgS;GSzZ#M^Lvol)V@(l?ZlgzD3be;q%ZE4C
z8tZt78taVB-0#MEV*`&cV}r2~^&3O_O$I)1#wG*r4r6mM4!6bF%6DmOHMa49G`1Pr
zc{Cf_jlDSh4r3>OGK`(ZE*y53fnj9y8oP1$-66X@#uglJkFf*g-iavo8T;kw(0%`8
zqz8<HauLvj&mcWy9Og%E95#;Nq(_XS{3wm1#xaz~o<p<a#tAte)F+-tdeS&07XUpq
z9qDP~jGP7ZjB(ahmoFG+jdRG)8GYFPsc~M;gZA^r1#G`yTtt2`)PBi0jdqs|^o!9q
z6X|8+3U2s{aTV8i)#%4_zh+$L&!%x5IF~mJbQ{QP*sp&!iUH#$k0RryaU0L|mN6)Q
z415qcmqW$?+6@`EP~M({;*K#ad!YHQftMu6p!0`~d)WS&ai2eG#y#UR<oDq(D;^vp
zq4p8BhI6*297Q)<%ZFn<44n@WZ(FvOVGyu&Yy%&Tt!L}degphT#=CC}wQppbkZ)pm
zJ+sYhE5B>l7PbxhZDr_nwvFLShizy04g!f$z;-aa&)H7aYpcu_*e<pc$J@nvQTDQP
zD0j2HxXwKc-&$-B!`Bwu%kaI$_OSyv-+qR#C3b)v#C``u?FSjYpx7aH81;wQ5uEQx
zX#At>IF5ge;SI%(F?^G;;|y;mc7mP4@lP_mx!5U&F~LrU+D|ilhS{0WcxPD;&U2RG
z+mfASc+;_Sb5Z>%!>fy(e*x(Qc1e}s)Go3<)dunsyNLQr3?r2Fu`9?gv#Yp@D-1)5
zU4=hexi_wb+OM(e$gjVM;s(2ATkH{7Kf7tG%@x=H>qq@fhOc6Fi(!a?97O$K6^bE-
z5yx(`yQ&>Vzr${${x19x%x4=8zMny2h_TOVP<_wr!P)McJ*o_5Bfuea%r(FjK`^@+
zMkvVp+#V!GrrB*`M4CM>qk65mPKDdwTsI%-dUKO)L4jayfWNaHpx$U=V1nF$?VC&t
zD08!kfe8`=&fHRu&0B+iHkjMY?ed$@eY@GKhJoB+_SzaI2<A?ZuNDgCE^`~&?=mqi
zfnyw+y$eyj+uVcQ_n3R7iBkk~uenc}I8`wBnMYCXHxFR@0rMd8gCYGP^DycUhxic_
z!`D1wV%UPjur!aphSMA~kE8i<^8~-{%oFBG+oB@DJZYXndCEME^0avd<(b#9+gbCR
z>ICz1Zy^2Dyr6~yJ#XTDWnOp_)fde^)dlKHCI*+;2miw0ez+X`dkG{4nR&&$iu$YO
zH3c4J^V(ZTubcgH1kf8M#u!KpCbQqfATkHcn=)U-O%tQXyk!n5CBO%l@b2mSWj_M%
zmOaKLxCw{g-Wq|+W+Pk#yWn9y2oKz8ct|cmDBohk5EC20le^%2&cnLk4>?hAlHcJO
z2;1bMDMgbYIW%UPBb0or_65A<-hkIhpQn&f@{DQw^vpERq<l$9<l{*pN}S~tb4wRg
z)i+kxmRCUDE|@cIEUSgYXiYsRDpodmJAHM&ce;G-O^~$-t8EH+TZ39i@GNL=X@Z2&
zLoU8h@fsv6A?@Q2@H`cyOx?2}18R3Sc~|<NBDz07{0LBTw=BgrUn{mLZoe<k<!?uW
zX@EBODz6{e48$D7EW}L2B0v}$a?VH>Aua}#+<^`xvk{+1ECjT>+q**6xv0!TOm{oU
zw|U;_JKQIkW1jD5Qm?YDvy~^8rpt7Olg^~GoOCvw1sk7US+lUTs<IrCeYs<f5lWbq
z`yS;-{Z3j+=QwE@EthG9lg_2{C`lf(bLfkOlfFPJ`SdSRk~F3vCdMe){*-)UFr7Je
zF7jbU?|=Dd^7PJ6`8L8+f^uUEd|>f+LfY-={jK>t2z4iXi)mW1(C6o0bf9DIlbOvY
zHGHzX+%a;*W2m@o>X@fE>Th@sAQf8G0*m*y@+3JWvALCFCRroEux@qRl8)Avrl4h5
zpo2dOrGCG6H3TN)uFK#tY95UMN-}a6l|3bs{Lmjyi-}M>Bz<AxVA8vGX?f@i7^Jr$
z84Dkyc&_)M5+2R~Y@mQ|V9b5<A-`q}ZYX?8C_QOgnYWOn!$-_^_{cGtB=ck})RK8V
z7Gxq>NdknDE~pD+74Ua0{5{~SE&P4pA6WQ@z(2C^kAZ(;;cI|*TX+xfwHCe(_<9T9
z0DPl`ZvwvA!nXk5YT?^}Z@2Irz;{~sF5tZuz8m-+3*QTTpM~!Se!#*H0zYKohk+ll
z@T0(wS@?0_CoKFV@KY9k8u%FtKMVYvg?|eCyoFx?e$m1&0q?W$%fPQ#_*LN7Ec`m~
z8y4OVe89qQ0>5S9gTRL@{5J4A7Je7_u!VmH{GNs12R>rqzXkjo7On#~ESv#1E&Q9n
zKezDTCMtg^W1Pb00gy@jt$-3<45)_>6DZ*;1w`;4K%J03gkL*E^&f#uB!5i)<WYo&
z1BY)CpjScn=j1PlNd6L75ikl;>L>I%NP+wnARmK}YVy~B&R{$F8}hfno}7o0?~%U)
zo5w~I9v`i4jL|58FDs$GuM!z%hmWfH1w%y4A0|>mem}AG6MH|Ahlp~Es5hWFxIh;y
zpODvxjWoc~ypBW11-pk93ImZJkRQU}l>9yUhtMPwki(~L&GGp97F*UQh6bVJAK|2)
z*jw1+ec!V5l^*r|(HPT)Ki;*;(sgv&e;R9A*W-PcTKbMo`vv*uCzot{yl=}GeHHRA
z<jY`RX?8FO#FJWt7IB+I4HK<lh(r$%S-MAJ8bmF&Zh*KVi-RPtu0hh`>l$oYLS2Jh
zORQ^<wWPWRMH^Sw5NX$v0c9-(P|?N%s#+?bLrVh;)6xN*S_WXamI>(6vH&BrY`{n@
z2QW%=18Q0>V6>J87^CF_#%cwCaati@yfy(aK`R1G)I5MmS~1`_tpqSxn+TYqO#&RR
zO$JQWrU0gC&j6-t&jMy>&jDs?QvtKI=K-^|X@EJ}bU?Q@129*c37DtN0?gND0~Tnd
zfQ8x|zzJFzV3Af1=+P?Rgu)`T@PsHopt<~j=J5l1fgeyMKcE-E)ULe*C~H-KidGG%
zYBhiktrjp$dl}HFy#g4n%?EU8b$}6CJz%7^05D2h2&ieV0!C}E0mi_Lk+B@&IK*>E
z;E<>_048a#1CG-c0VZp20H$b*0mpNbR1Rqz(m7;s$kg71?KDOfJlYOuZSZS{Um1QC
z_>JTwk~8>UH~=aK2Zt~YP7dK5TpS`eL~@AYpmB)i5Q8p`MHk1Ri{sJ73FzWPba4{8
zcpSPo8C{%$E*_6APDK}|p^MYe#Tn@0OmuM;x;PtMoP#cQql<IV#d+wye01Mi!^GRr
zPa6BlTSH{Y01=>aA5LI^P;puk+?n@Jlj$I!DkR+@O#-RoY~tr6YE;`is&#O!=Bryr
z==tC1!(=HuQ_HmQL9%?1v<&du&NfKizDHIJ5Iau5>1mPzw_wsRSpiG2B@L3+q#@E4
z9OHZZP89Ldex1ZY-38ZZ6qF>A0{`7)7ReP{q)7NRnIgK#3^9Ss6f?*yv6##jpChH>
zTv9I9kP2}D=ogV6i_PRGVjKCXxSIS-Tu**39s+rS`~vR^xL?I2QcC_6UQ|T<fMf-0
j<SUp}Blcg3NwmQAOJe&K{NI*el1#Wq{ta3L^6&oxorz;X

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$AbsoluteContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$AbsoluteContext.class
deleted file mode 100644
index 3f7666575518d7d8bc35aa7d34f10d356edc5211..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1776
zcmbtUSyK~15dJ0!<XR3RhsF~@&4H{UDn&4gF<7xeuwaYwb+efY3!B~4?1X}!;=jNb
zEPb%_)gNWqn}b4Ffs_wB-P7CsO&{OPuixLk16aUf824j{;6V&gJoL0w80k0$kclIU
z*)Sf3F~<-paLZ!Iq|#+a)K%S<mQeQ=RME1f+2E=aoU0la4b#@Gic{k`FNP$;NZGV`
zrPZi%q3KnNEQzvX=+>4lOmE*chUB*ClJ`p0b*z@;1;>_rUot2q+vcKR>8{JkVX165
z4Yle@zN@wbZ#qJ%HP=!%+Uf^gxLkDBnNv`dQn*ynitmaW4DsT}LV0CvMJugW7zUS3
z+mv~RF|W>&T{8_`I^sBoH>t~?>W7d^Z!rW7xzF(GKanU|-7t8QI`cYp&M?|N&}b}M
zrfX6yxpa9)-_un~x9jS9b%z_$Ysg;bFT-p<SPT<?&+wqxo8x>RILld0%jGGJp-rh9
zyK8#0ONQvCS+{jb^JQ3D)|Squp6{pj?m1~XjUl$_w1mM|O^=F`XK6F%wTU5hS(+(O
z@mRq)o+y~dBt!b*$nH!OJjFs7&lEhz3x>su1O1uJ@bc23e)MFB)Vb80U2YQ*Ql(NK
zw>+5gxE(Q^=E16P8Z^r`rFwUdq0-0Q=|y!fo<C<Z|9*i^lfIWtVcWE7!mDoaJl<@y
zEZ%;+eC`US=y8nFqX~K(iA9Lhs?cs8LDGOoW^^ogguo%`0SwVP=-HzM43n;Od@zCp
z?HI25#ZURgzx9nD^NXMMi!b`dk7JUu@bb@7wgHl{%ohYR*&~EL)9z#it8Ijdj#sw=
z^2aq?Ck%!pZqPput3lGkN@jmz;1h<kKQNH_iopO5vn0bL>2IjrotWntEg=zoe*!;w
yjGx3!+#>Yb6w&FPXSqX`yJVrBCuk&IqW9>VZfi5RLNY=72)T{YxS}K{5d8yndD5r=

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$AggregateContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$AggregateContext.class
deleted file mode 100644
index 8d895b601c13d41783f32e82fef2b14d026d9310..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1623
zcmbtUT~8B16g@+0x3mk?f&~E;6|f(`Dq^CR5KR-4O$r!jc%Qc8GIYD!Ot%gG6#s({
z_@dDVqp$ub<K5lTs4N2UVdvhtJNL}Fch1a@pI^QL*uWDFODSkrP9cd08uDqxQAneR
zl7<xxs|+c#DI8C}kwP&P^M$IbEQ33qt&IMLp?dVMEeuZyVbp|bONZM#Zc~&Q;uW$C
z6IJPmonE^xRE^hdie#&9gWCsONq;^F#=S$?Wyrj=EF~=NiHhrZ;@D%*O~(<cV)JfS
z(28=k;kJ!>*Ap$Hr$on9p3&^u#$MpQ=Bg`HI4=H;MWhm&(vjX4!%9B7k}!3zXP*)%
zn}q|)>u^PVV7PP|!<cmXZc94WzDM;iFq4Y0gy(~sPE#B+#PS6SCU~PEIt2dW9Q2^Q
z0kax4`apK2=c;m{dc^zOu(@LyyY(Z{@TfqoAO58ZqYI42V#xh@DsMZdC$oM9oXt|L
zR^B2SV^njawaq(&;~m|Xmcu<dFox~T+Viv2x2{tAV4ni*MiSk3d#WK`Nnc#kXLYdV
zw~0>fvbxc+217>{lMIE6lLp73;~^etSl96w8w}4bPCQ4Y49k&s?2IxQlBA}Z+Y*ki
zXVbjG<s1)WGQ1!RyZQgPSCL9AMph9iKhjIUr*bImCfzfJr~guee}RHWCSqUQrS~jJ
zuN&woV;Dt>#x%{=5hD*s7Bfq+j~F>2e*`*>2|u2m!Wj8_xCZ06PBVI|FiE4IZ&H4Y
ztX3?|e?sg7xnX*WEYdk7($fLNLbz-IK?#_`jR00d4%4)nVFot`u&ZQ!TCvR1`yph=
zXy!LYu_2>b%n^jos7;o(#%$?3;_onC`i6M%Gp>!`q(nABmj1?r8bgwE$foB5)LfW3
sBsq(D+#({kDI@HGAGt%31&UDTvea0=;(PSn54=TW$olQo=$pXkFF7c%CjbBd

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$BlockContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$BlockContext.class
deleted file mode 100644
index b930daaafd0cb15989cc0bbf0b3f2ef2d53d7049..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2228
zcmbtVU2hXd6g}fjy!ay_xGhjaTUt`EV_*v;1!C7wOe<M6P$gF0H_pf`+3Z@oYb!`l
z3I0X@Lm%i1Rr`S8wLhxrnca!y#4arAgMH`go_prbxp)8m=dafQR&mdSW#XGW^0=!0
zu9>)=M**uQ)(SB3Z2>oM)5I+k>jF8sKM3x+es5QxRH=3z+auc=MviNBoG_{j%(eU-
zDR8{wc=Ew;Z(9akd)wtospI!-cgqeOHP?%C(IY1mD8`5_-;3ma#A(~}WYBW$FqGWA
z(dqen)^-@lU27P~fgeQHPUu=2@$hFm2xXA`FHho-Om5TZdv-)8fu$b~n2+N;oVq|G
zeW;^w^(F&0EA8t4fDjN4e{F$$AW7R(K?F{0j3;C6O>$42mMMQy%{Cm*iJAhJDjh%Q
zTecUufi+sSf}s~Vd(ui$x-oR64q9(lx9B&p1L^UVQo9K(INr$Lb-ey&WJi39VqZoI
zxb5x8eF39V<(0E`uO|ltzVjc*Q6M#|E=OBV=tO={*BW$fuWvovek^-Rh2|*P<?Uu)
zZZ?*{$-^prGB{A`wGY5))VkeR4hy_*Z}+}E&~m@u=&mOvGfB7kA@|kTRYssnHvM7H
zlRrADz)nrq!xdGYe5tfT5xAB1=<-qh7g0x}i0?p2t*1trQf3jK;|qc6`w_GNinxtC
zCcZD?E?NR>?{}QhD+Dg2s{wX4tzBId>`&(_6K@)Ktpia`Hpa!negchYH#U!SG}PP2
z64$Nxr%L)}aHvPlte%ybBxaTjYdhxAdgQn}><a=n-=$_%^bh!fI7rZB8Q@EPeG2?0
z0a>s|U;!B{a(0zg(3&fy%qti#In3a=J_aMi634~l2u|Q*&OV9HoQh#i^IyT-hCx4|
zK$tVHF!u(Tqfnz5>SS_EL(u`BqD&BhGx$t{tr1LdBG|kUgUufWdosbRpuvPvw}xmF
z!XSjXQak$xvcGefTr02Q8&8onp2ZO7l4D~&CeATeaYpbJnW^lY$FhdKOsn>crTlMW
zNR?0+zf3SP#*Dtk1wyC{?a`_Xm1}Qd{))xg8<P7I$1-?Xqs`HBcP`F-Lh?CE#)}v=
zNm_YKvW$zUFlv<^$=j%v6|U5{!sM0oBVA(1%UsIf3O=GOb2HClCFHoqj!ZjGdltEW
E0oT1%RsaA1

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CaseExprContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CaseExprContext.class
deleted file mode 100644
index 7253e63930b280832ad324788664693805c63bd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2000
zcmbVMT~8B16g|^ImzFJPRnUTpg4hpa1yPY!FljVtQmTQ5_iZ~V3(Ib^yCwKj{0~0h
z3q~IdzWNtTOw>gGh4IerwppNR>qBQ|r}v(F&dj;<>DT)Y0G6;OAuC}nhA8fcVLpZ!
z6bW~S5y8SR7I9C)l7#yVLp9arFI3B6NTkxG9d%z-T8^eGCCzqn3<CwT&KX8an!(Gh
zy(+gVYE`G5M9HkF`j%>G;@jUGaJDs@q6-B2^q^@KOvB*^ge?~hgIfh%wQWuTE2Wyb
zr&Mi+?<y^eH%-e?>b9<IxJ#mAbITiNPC*f+=%&^%REP5XN`ii;Qu&OEe1F9PXt`A?
z_c&Ed|33l))96=Zh~zaxb5<GVQYF)BD5~M;ma@O3SS`cR_PF8+-e~FE7n3Wdw<xcv
zTHK&B>^Y4gt{MC0u4Xhg9o3;@k{jF+z(u3Z4;aF!v>>F`YP?CnPyT@HSlnk-q1BdV
zYmRB<e3R&^(NLaOcX&<MMB4ZMC3W4!b;n{DJ87er&9;>m`@qR(D;4*y;-t5>yRJ5U
zKd$F1E1su=bXWV)>tm;>0z+)mY*{t_OcNb2e%7t?qJQY7dUZF$a<8FoBLuuD;{hJZ
zSjHn6NlY-L|Bd8dp^O#eB;;j02Kli+3Mblnwl^bFpZW&$olQ@`bSiK$?!(Y_R`B^5
zIhn_hKbuDF*&7YIz_{zv_M5^`PW9K?0rhRVL1!^!x>D)t{tlaMO|Mgn(@p%%n4*8n
z^cZ)miyQRH$LQ?`2Ei~486m{!Yk_7)vy@4Mju1YiWe6iQM#MJzj8R(4UI@<N0)1U{
zW5!&VaT*288p4zZ3=_=65eAMCIt}&3g&On1d?-r5Wn3W;COqnc6$va%U{WSK`4)q3
z+<JmjOeC|fh_G)i*pwI60h2I^s{}%+xJIx-+I39%uyZtv|3cF14x*>>dq8E#M`Ltk
zHwi(g+oM^iOJ+YJ@(Lr_V?;9VAcb(4rFn>E`gg!RH;>~FB-qb@;ADqm64RI=9=9mN
nJ6EwYOFOq|Ck&SG4>(07)3g;r1__!Iw2D&Lc^ZYVONjmk-?ba=

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CasePartContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CasePartContext.class
deleted file mode 100644
index 08dd089683c34445f0439b194a5b8de17535ecbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2604
zcmbtVU31$+6g?{^R$?nD7zi{Cq)pS}k2HdkKogrZ)KGB74bXV<F5AN0M3FqQoGCwr
z|G-0eDFY8odF4kjoRwswB!(!{2kWlZd(Yl;?>$$4{r&qN05-6vV?)Pg4tad49-rxW
zpkpfs1KT>PdCZ`e$LHA5@leOEKwkb(_uQ@wq~{70ilyd}b!wTzKsshq4uYz{RNd>^
z0@s?-wfBc7ZQE~IZHGIBrq{8YL(7-yJ>HxOp2-1E*R6s5o#h8a5A5fGfYESW+pjy;
zU|{pWcC+K1nC(GeADctp?t6Y<b_b66G+feiVEfT?^&AvKnmv#`*9z#zC>sAV7+?1N
z1tPWd_gw_6?(ovxVx#n0AOb@2*ASR)J6`9QIeDb)IO;7%ojNN?S5>7WPqKpfJ(@A#
z-s_|xffVxJx)T4Sw?MWgT^Z~MtQDJ{-!m;YaD4N0!}N!4AWv*FD)rN$W5>Z)8>K_~
z^)26a**&S<1m>iB>K#kBcMw<s8^q|@fdX#0UHiE}rdVPHvR0>K_X)iFAIO1k$5FMo
zI+Oz$cz!jOhhw=t^V{~3-BAM3PosayZZf&aSON=Y1@vQoB%=FQz^PSQt*}0G<l8xZ
zV)bJsKB={~BQ+<(-MI?i7`wz91ab%7(C^rfrPBVp7j?R>CI>5(wu1$#X^*a6l%#<#
z@W?<NUkYrd#z~4sU?a6(qMHre#;QQ+a^JXV419&hI=(jW4cK`PE_a+f_XO^ylMbhE
z-14!OIBstj6Ri*q;ZZLqNB#U+KY`jsHx9vcVX$T9LS>BRx4?ce{d^mFjpo5b>6Isj
zGEr~iXr4)@%b~(b{GSxm#MtMDZ<MB_hH#6YR)Zg0@Ow&J%tOO9zI{w9X!UYIdx^{o
zE;YQtXI5=%*YPITMsx%Pyu-JJ@XUK5%ym8$%tK`82jmHJ<0YnEK|2q%6hbXT$6_ct
zU=cS6BCv!HVz5nush9{hoe9CF&x0)|;>yQh0?U(VWhc;DNx180Xx-w?%UFpcNzlqh
zw6f<TxpN6EN-qX$kXDAY^m1kCSLnZR8KpX>a-tQH)k-1Q&FI)TM>_7{ZkQ1rA2M62
zVnvi<*fm;}Ep6uKF=AA_a)PBcPEr{aBB-LB(5j*>R{q4yPnfT~!c6%$%xZX1q0Q0q
z->I-2q8RU?psgneFOFke#2W4~j&*uO?V@%}?tH`@*0T`zjcU02+|uv~-lkpQ1$iEO
U3$xtgn5LbkeV<m*xQW?+0I8CwQUCw|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellContext.class
deleted file mode 100644
index cc42e8a4e7ac030f820f4ddbb63f5d3adf321776..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1727
zcmbVMTTc@~6#k}LcIkzSRY4II6tNdz6$=vE5R)b*H3bPYyl>k{S=jD2(`f@g#sA;~
zzG(EpU`*7gzsY#^VpE|?@nL7q%+C4Fcg}ogzWsdv0YDaO8t!XIMlp<36cMB~WMUY?
zLJW&o(x7X2z%bktPLm6H#4xrMm<7j{{7^E)i?+>0!7^Gc-eSlnQ>CiY&?_y;5A?R+
zO-D$**0S_%&)hOZiwl38I|Y_w2p60hr!Xbc=9}$Cg^RLLv1lhza;k>4YY5X_2b*EJ
zXHv{qfm>FW(CXmvd;BQ2nm27zt}`qoOOB}PhAl0jce1)@+tO@s-Dkbsws;UMS4{1a
zU(*oWrcw;-#xP>q9p}Kb>pRkrlpZTmCF@+e;6=N}4;hqXiZ)fFTIEdwfBF}6DR{uF
zOxCX1GNmJOsnWjDF?7qY>-vkzKCenjQ0w@ADZ~B=_QztF__O#&&EFTWd;y$%rd-ag
z6O9qdxq7f+G=p1=?3i`ikfarcjePmZS?cQ-$vudZqG$}!9j7g-{F&)$X!5KCm)tVZ
z%?&D9hP6SDo>q4p53wA_6<lRVoevV+WE_u>)vyxBDjqXr&vy)Zt4G@m^MmP`VKmTS
zx0~|Gp6l?soJ8OM*3Y&FL&TGu%Z1^2^8Y%sua?t&GwLf~Qk>6X&$MdPsdR_`(v#bQ
zoAe6x>mkh2OBtc369|LUg%KJ@X|)1{EFhLngp@Z>P7pe#We8(5s_rlK6UNDo`^Rtz
zmubaZInd}r6bVA1SxaZ8-y-~)Oy509Gt|#e)h`~zjDIYEAO}of(u37-4cF;3!xU}=
zu!}Ui%#`uTS6xV-(bpbEN|(_zZW4scs6jJ@##H7bhF)ScbAqAtJE$QXXK2=FroUk?
zN1x<(B-9@s>V)svB{_v#xJ^W6$iuIJyE98WcW8%-m%v>zLYSlPo@dR|K_EeEH=`KU
KeVFD1BEJA2F4#5z

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellCoordinateConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellCoordinateConditionContext.class
deleted file mode 100644
index 36647a3b9829d72e2000394a1c527ecba1225616..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2239
zcmbVNTTc@~6#k|KwzMl~<)VmqL+u4w<)TPyMQSu81r0R3`LJv!u&~{2rdt9(#eab>
z7=1AK>TfV6#zg;x@yu>1rRCE4uybZ+=X~cf-#PQ`@8>T7rtnh1SQrsJP%ti~rr=>1
zDjvzjgo4QkLYRtR8jlq`Q82^Mk>!@fkch=|j#$@p+qHzYJ*A0??V3fdxq@>o&qdL+
zb!*8f@RZac$<UiKZN5|~u5ppq*DTtJ<{U$}R&`;@b#=4D-7w1xBhpaTaYTWTT%L98
zg6W!$O%s>zxD4uoZF7;e^m3Wg`GuU}6t%Uo%eS<O;3Y@6TA^%d%ii>@F3Mc^<LKGQ
z<ZzF1%r--RlZx-dJf-3P%}NZi7B&uJqcASj0xj1f&9r5u23FN43tef`Hr))FTH$UD
zb|%)k??-y6_$outaCaD{|4X0T(G7!_=nCgzXOPIdtUS?a)hwH?BU16)roOFfmTs?W
zZ`L-sA(N+U`+ph6+QDKNIL^J@(josQ+Q3OC^Z8VU+_<pf>c-ZhUaFF~d&OKQ+7b~N
z7Ss9JX4f<A#9p-%Cu{N&or*B{D^r%xU^BnRWttdbtrAnkQ_M1CT0P%fKa$8QQb;q*
zwvN(BR29Q`rXqt8hWPm~Ra&TcjyVM{RLmpG@cMkkmbw7LWXniL#la9-=WgEF;x-X7
zwy@Afm+T?U<%%Uco!?y2u{zdxeJ*txo*z=3Hqj&)la(4WoYL+q;S?E$y;5oFWPV#^
zc-KZdI0fXe<D6KjiPPVU#!{zx@_pSft%8ubq+WHpx{TX<YEH0=TlAEv^x6TPAYAm&
z*h{Mk1Zf6@5*Pb|`v~mOJb;TdcFBF^J1)^&_0J%Rep*r2z!e&${&ZD8l86RLzvBSG
zMu;DE5Rn?hRa|R^==32v8zFw42r-P2Dny2S4v;tD#7A@`lKW6T(5gO;Umn7Mf2!&P
zoyQH_Bn(FRxlR9ML`9MkYbf~@q4(%X9#C>Vp*w)RB*`#I`rF~<C@fDZzY$gb)Zq`+
z@P}{*qlA8!H2fUOoqM!%pLQtoQN(BxK%BmWH%p?A<ZUt#p<|cP?In1Sq`bHxk`m}T
Gy8i)IMtYzC

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellCoordinateContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellCoordinateContext.class
deleted file mode 100644
index 4ddb8528212e0b73b6b9cbba225e45f6e9c1d3c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2041
zcmbtVT~8B16g|_HZYj%G5l}!yLF@;xf~ZI<kTfxAQjkEy`?j5wfn~SZZVCPr|AP<s
zg3$+quRfTVsEPg<<DK1w6sXX~htAB-+<WdlGw0rZ`SbA;fCa25NGX_(q7yT6n2jO|
zO~IosgfZ8Jc|2CIpx_BZv}9R!S(v)R8DjB7epf%xwYnn=EiY<Lnjw_6%5>J77bah?
z?-#jU(2It&&RZqj*w$?!zx~aSvm<H@gIR7E*)!;@Wjg%OVNi3X$?dG6*J_;1R`Vrm
zUn|xezNgh~UbSpTE7uHd(_L=pc8%NKIN21C((Bw370RBx8Ty+<+_=Ok(?-yX4ARRK
zawVQi{0{~L6ZFe5gfqev&N9PvJa5?*O*b9G)(#dlyKXvSpKBiZ&AP$;D@^AS+vHc(
zZEn(iw(Q2xEzARJPneZ0$9-(I!W{{mGt2ytAsA1{g!EF0R|$CaAIOf){j3VK+7>n8
zSa#Z%jiH+r?NxD?m!xo%1MigBH7C~`i(%-zuwGYB#WmjsP9{|-xUbbsd`o+4dev9x
zTBfk%sk|}W<#zb`*a?b26|`m5?Gk?}WK9fTR_?5<D0-<@mCmr#s_En<y{mYNXDSx)
zT*U}R84}lH`H!e#326lx6)!-FT)y7%s>)=TYE978S$rY-3a7R(5pQ@Pw^^Jjtg$im
zocCkMTy~>EZ7mIY$N^Wc=lcvpA>Kx*H*0#QsW+;PA=xyorWHY@>t(hhj53uy!{Sw9
zl{LLiExTD<+@pVkDE&tO9bo8!iU7LlYmR0{vyzMjjuAYfWdJ=ihUIqTD|%_IdM4<@
z0DawXZH8Q!VHzdO3WDSZbP>$xF+wK@T!i}OLJfIlJ`_3NCT<Z3ldAQ>as(D6FeRB9
zdykHHZakS&R60k#BOLkRf{lA-XJ87(aGOBL6?X_$QoD<BA9jXjc^2#&dwT}y(frv!
zGw8!Hy0iNPA?fYYEa{D;J|p}FJ*g9flOLc2aFn7sLNlF)+>7&){DoNLcLU>*vm{3_
tfk{f_0eN^AD|e=7=OOI`!D9Xm$0=ljwgN~ZMsti-on+QeqhvOS&cE*wEdBrh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellIndicatorContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellIndicatorContext.class
deleted file mode 100644
index 14e3ac64c0b5456cfe3527c128182bc71def1dc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1001
zcmbtSO>fgc5Pe%Gc5Pf*3M71#(gH&H0DS2MLR&<nN|qvoT9o_7S%sy}ZnWM+<v(%Z
z6o~^rfFFgJjiVNc9wK4OGrP0%p5Ghouirm@0yx0a06P(UJaS>zg~tK*0_-#RZ>5s<
zh~Y(}r_Ctg%H}4S9VBL|tQ?EvBR7RGr_)??wX)*EcG6~_q0-eu!LZqrN_?1(2f}>f
zgPbbcJ)QBq&y95ZWwByE%YxxfSLAuBhBD(;n<XDZoGK+uH|IqmsOz|w>2WeBtT<1m
zMohG^$*{<i)5WsXQ^sf4@pZ`5gd3qO!^)l*Hl&*AbE!sWmRs_{QW7>2);TB1;)20z
zG^t3D{I6$v^7X{%F~j@De+qVdUS{bJ(V3o_Oq@tJ$@;&BUwz>-PPSGZP>cZUF4SVw
z@r2=URphm!Wq7{Y9bss%Jo;uI`>4{LbWa7$Nv0UmE`>)g5VYDmbF6)*<r*T25oLt0
z;fHT<gZ6u68)9tIjsV!gEh2HNZQQ1Ax_r31q<u-*oq1ck-zb%ozAJ^D1zlVoFX^13
z8daR4gtCKHTXT3<dP?x&U*PH`xQ=^E@Dcrrbi;48=crtvOE<@;hVK>(wX*BdjgR}}
Ui&6E#LheJ{q#RMDO5X;;KQ##HhX4Qo

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellNameExprConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellNameExprConditionContext.class
deleted file mode 100644
index 5c185fd1b13db966e8a66f723fca053964445ea4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2045
zcmbtVTTdEM5dIFJ3kzOKEmpL5+j6mPYq3?K)Wm3Gf|n@qrBBOpf~(6eIV?thO8<p@
zv1uO~``RDXbk0Hz6{L_puruc}-(1c&!_Qyez5~c$RY6jPij;!1lyfS=cp<fU1zH#i
zUWV}s3kqH<$S?%fxMeY<63K!iDw=M)me5WznrPUrS>>85IM<3?R83pAww*H1N*j_4
zV+GUZ+l^|8i=tk#XeU~54Ba}=g(=sq&47Do)){7`qiwy)*H3F=&9Td-YdSV5E<be{
zBAd3&#hRtp>zr<XC>TyvE7e_otThC$Il|S-bxYgx)LmWFxoCc8d*M>BzMWl)n3Ge6
zaLaeo<r3xGx0g0c0v*now&~^>#yc~~C;CUdZk<gYF!&Aklp*^cC={S>7`#SxT}||O
zSFeIadf@}JZn}=hCJRUUiLP0?UD0+*N8E5JS>>d8$}l$w7DMcBI-J%1P-0;KoLstC
z%;qVKk$qP;j<@t$i&vq2vtsKmv4deNS6t}~onGQ*PG8Tx<tItr7}R~IAq>7@N>)#H
zl5Sp>i6PN1eIi)I8-`53_h;Ma7QtIAMKFcs2v#u7ko-4F>pdgLBB$V81bMt?SpT<S
zA3epe+&@l7p9d@4Ejq{CCN?EDHwTzHqhz_)u=v%;$R*mI+?yQPoA8=xwOP{}`xCO+
zf`(H&+YnBbA@1?K>o{TfI7nCbm~`D+EY&|xsS%oS9-3BJ$T}|dqPfi38{1u48;|I3
zAxwW8zz}EzV}!n=v|50lG$5E7pYUJ6cTTzwWAq)C`zkO_dZc*=w=h8~hCAKtW8Lg&
zZg#Pc;Vz*_|BEgE;Z)R5_JK?IuZQ4og9u-RFoo$BM4kfn5tN$xf}vFU0>hta)t<zV
zhY)MtY9YwnW^j)%81CZ%oyl;jBqdfn{R7G;jHWN4q`o5P!+Dxyh$Ni`yaK86rW!<4
z4YlFNukhn|NM&buOcu=o%AF^)GfO*E_9&i`;=?ogJ@>Q(Zj+4Dp-R`H2zk|+BpIf4
G9HHNQZZBd0

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellPairContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellPairContext.class
deleted file mode 100644
index b63f44d8db842b8b1d717ab710b92bd39040eaa8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1802
zcmbVMTTc@~6#k~I-F8_73xa}oQF}pFZi=)vCL|<H3KD2|-!2na*zPvdDS@BjzrYua
zJ{V1mG3swJp4n~-0s{46=W_O(Z_edA=g04lp8(9Ds3EN*iHusZI&|dJX<Wn89>g)x
z0~60QOlp{7h%Io}Wk{tn<!x)%GMmzI&9c*wdG*iV;0%3b$K%V*T9u26Rdq>{D*LwO
zu3N%U_fQy<TTX+t72t~Hhy~x1d`~hMCC}qx!L=F<P73p7+pn3`hU7bDQ}DVkq`A>>
z&DG$zVu=P9t##}K6uFdKb2dFok{v_gl+T5-FE&lflddp#XH3!bq*LRj6r7tCE^3Zv
zxyuw&zDQ8HbSZOLeFo;xS7L}49M6$O27QgoPKa~q%LjF2m(Q#-L~XgpF#BKj<c?+A
zyiQ4eojxa)Ae|M;!n)INq%ZPev0cmCG~ZOWxvk2r?Y90hjCX^@F!VPa_Umm*Om%@%
z$W<yqU3%A~W$!Fm^^jLfh01)3o5$TPb`x)iouL<0;ryns`J$tkJbapU6RHmw(wAka
zfoaSbn8kAgH}S&297Y*37n_I0Fz^!d8uA7Tc*QVxvEkX>!7zPk(<2U2OKoyl@prgK
zy*Z$I;?x{Sv^9ts=~6dc6HP0MCv3mIzbO0~LvO&bc3(3rchNX)tFY_NCUN%P6X0YQ
zbiCPe+zr7!%KdqyT5Y;K7#?Rd5AM@|)oJ<yF);MNKm@&Xo1~r5u4VfN4-q+_V+2=e
zjVrPC6@7FzS}N$r0Nn-yo$CS25UmQPfGF7k34$3tMD!%iw*Y6Tr4!<iHimJ75E$`t
zG(;+rjzZG2?-9%94sqpO@ZOP6-;ZJG9V{KUa67=dgS&*FysCv*Be^e#zs1$uXT-A~
zpha+yqdh@8X~lwgb@i(D6DjT2G5nDZ{s`_-5*Z$lMJpdl@{lBBB#DBh!o)lxpvNSN
U;0aQ+r|6U<wQE5I7)Fr%17bVnaR2}S

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellPositionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CellPositionContext.class
deleted file mode 100644
index 6a313633d88d8540fdf9183f29e53f99ceb72a13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1632
zcmbtUT~8B16g@-hZYf2eMNmXVMeGN#0wqD)G$te_n-nC_@V;#)W$1RcnNA!0DgFl^
z@I|8!Mqm9=#=E<fU|0m=!_K{PckY>Uzvkz!uipR^v1#I25+;_CNZ`4N>=@$6jUkVM
ziDeTj4DoI5x(xYjuIj0l<w)%+Yf!XQUux0emR6iwHLf~BI_|F5<R#ySB*R2iNWR<e
z)VZoTb(bvZs@HJbLq`dJKQzYmk?1jG{EPOyp3uUR+n&_?L^GspDY@EqonDXAp-Q#k
zb*y?%^S0Gjyz41#HG8hLAE<kd>TwmWixF@{%_s{gbcJC#8y!#Rz2A5FkVDDN9g<(y
zQCt$CYr8Rw3pw!GLbeXHqbYi3Q#>uMeQ;Yg`3XZTn<Jy)G#b21;IA)150V@(t5LcS
z1trN-rCjyc890{f$d>iCe#{%10yGEVUy3j~z-TOnnZIlEuKTAx>o>qD7izUqg=maZ
z%#HSr(;XIh^gy(vqp4;LJLTG|i_|MOiG6raj&5T}9(aA#;BSQAVzU=pVbxC)Rqnd2
zlfo*j6w=5r<gRuamLr81STnJn!Ul>A<*OYpZ&Ze*$YHzCoD2zSsG8U2(r;<ozQL4E
z1)Xw!Oc?gF|2JTfEt!vuC9)5xaY9x{!fn#PF>L*-E&NFe-kgYg@t7XA1U+-0H;rKw
zNm|Efw~iQTKq5am9s7ilQ_@F}qSf&2#u~;+Plac28&kBSrwbWceSe$$V<gRdVg55>
zA4v_}lO$nmz%Ysd#6oy%2tf{*#+?Ax#0+NXG{aro8^W%T^l8N=Gat?%Lq?nD7{$&Q
z&EY;l_>4Lv>1xasejxrHw+r79&ws(K5u6rC8YJm&JcuzQxrMaxGC-XPJ<mwaVIB{N
m$V2i7bKqMZk!67_l({q|){poJeNO{z5tAhS^qTZdVDvZbAhe(W

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ComplexExprCompositeContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ComplexExprCompositeContext.class
deleted file mode 100644
index 2aefaaf578e1b12279d8be8d33901b20e240f0c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2192
zcmbtV+foxj5IvIsxh<ekKv3}lYA(nMq9TNVM5#(uKuc0Q__kT5;=*P(HJMQGDgFh%
zVCjRUuYQze&t{<(Sh*ArJD1+>)2C;;d;a|W@e{xd-o}tmB83SxJdI&e&3Y0H&(vxv
zhUpaIc%CBN7csnK=;gajQF0qiw`EDrkj`W)TgHx|x20w46{{uZ8M;dDCjINLSPoxn
zH)>o|jhd~rE3RqS8-}pd-WPVs&sK}!wnDY}?z^CalIuvmD;c!1<8V>3jaG}3@=C>Y
z8+xrJ`L^B`yy*(5Z?<gxqqqEEh!z)}ar_KeqMBH@>W(1^gW+bl>-AG17B22R4066m
zj+Zm#>=j`cm_=WiA^yI}g&|$RkR!IPsOyF!ZK3bX=%VdNtHE_CIM=IOG%Uxk*XV+X
zL{GtTELl`+uE-_3!4Ng&F2mv#k%*OHn!HJuzLYs56z_Vg6x4=AspyJ%KM`%isq61+
zTijHs7~ARmWtg}O7Q^82RNZSHrt9=2a0>Zq)w}K9b!nK}t47n$`PD*ou2VNby2Z=H
z>tkoh14DA%Z3~mHSgOi~PFKOCs!@i83s+58-fDP-Sq-l-$B?-wl7@K{G~C64h9X88
zvgcd+H>zO~OEJ9Bu#6JJ+w%?2FL~-pbuK@)ZSJ=gY9?cuz*TrH<}jCnO|9>^9Yf)?
z8I^Qs?R9tsywa7$39ssIbB9thQ~sZ2Sk*=|s@meF+uU0bZi8XiOY%}k|77@diOLQ`
z@Q>;6M1tu`%_cNjkMqg$q^G09^0Q@c3KjM2S=p}6%4<>~RgDMqHZgj@fNq*K^df>j
z+D*}{<gr|u9U!t#%Lw{u>``JC#Wh-M9Ti;1P1+53Izt}JEgBWfBBEpmqzLBr0iwUa
zPD1r~P=g&cABqexj1dB%#|(FTuxSEQoZ`7_1JMI?pG1lWNX305M&&Z<+ZV})B9qL0
zLr*S$fY?{s1;a`NxFnCbBykV-34_sTJtTb<Si{E}$^S<D3;OcEh}L%`BG}K<oTQnw
zy1XMxDz8jKn)L?oM~?7EFotnLe?%6YBUO^eBzZy-iaG6{ZH9odB#I!18#JeBl_Do;
LBuKdngGl@X=wn~P

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ConditionContext.class
deleted file mode 100644
index 0766f70dadb76b96ba129fb4e12561088e17af3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 985
zcmbtSO>fgc5PjPub{$+A3M70KNCBaI0KW8sf^vyeDN=+`i*nyMtFYABjn<o}{3kA)
zB5~kO5rSWYn2oI#(TgQ)d1iNZ-t&8-J^%gXD}X~h@v&cphX*b^bm5VYrjG*#@3mCY
z_8FeHM%v6Gu54nW)nR0o%F4Nj-g1))bG%H%Kr1WGY;V{eGn5B<Dj0T0Qi(Uq`9zp^
ze3DRQZ=_?MjJc6+pBKyay-XQuL@||CYL#;_ghQo-86-SS1$FdBv7Seh)QZz+X~aSs
z8%@(BI^HZZEm?f}FISJuEVvQMG8Fd0up`w<pGq}5vD}h=HY8CqVV&clnu;@qQmaix
zisXAc){BovM$Z}gt^W|~xJt1l_UegVnphl3H@(JHqc1=36(>tY2NS}_whQ$T4LoLe
zRTOz;qzuoB-3f+n;gPq;I6#H&pnJ+-PA<iOc0-it1^iBTe~qorwA@0KVwEz2Z}5V1
zT%&z6YeR@#+7SRX+#nLS+QUuiX1ImhIqeI|?yOX6exj67dae|F-_V8GaZcwH)v4kX
zMU)-1(pjT)sV4*f_zPUQ05@<a2lwe$q#ItRyGHpEow@mmO7LsLP|vz9+<3T4z8F>S
RZRFm^b;?z$ROs75@CTY|=K%l!

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ConditionsContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ConditionsContext.class
deleted file mode 100644
index fd82b962f51312a574e70a0641deb883a3261119..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2388
zcmbtV+in|G6kW$oJou7J4Yc4ET4(_~ZacIDXcFTV0!XghiyABM6Z^<L$z;ZwIgZLV
zAR!?kK_&PD9?DA*JfQN*M<Ldk8JlVC5GOo%_VJ#**ID~IfBpUY9{^VIg@yMmTq~e}
z>*n!+h1CLz_|U>fMOgT_h#Oe5ux?>PAm8=9p3=(q1j^M~d)GN|?4ee!-BzKd!Q7_b
zlLAX^<;lCl{T&%}oE?{%a@+4Z?zR&s^FL9}>4z#5IJG%K4SCY?krpVmJWmFjt`mlm
zCXII2-?w){E%)qUAP0V+?Oy2G52E9JCkSN_KQB#y8Qxo}?>U;D0?T8A@n!cWLOIEO
z3EW1L7dES{+6gF+AOwWsuf>G!`ijXe-liDyz5RdqrjR14YsaFR_7=!Bl&5r4;BvL?
z2YuV|v>Vt5t9CH-wAz<;T$2YwSB^q!)wbz3a02PE%rm<QEGX~5-&0<HOFNo%EcK-}
zz%8#Q9|>fuHKr@)bh~mu;9G|v>p&)~Iy`NwP-#EdNIKbdyuN*JXIFMjFIxxkTShlM
zxan8|r=RcjuLh%jzkUpyM!nOC>a)OjyL)$>K{7OV8lClc@X~af$B8$=uJHze!j?Y_
zy7Eh9#`MhOKwULM&PvTXfC6i?n*KYhNq3acz$Ya%aZ_M*W|UM<mT(>y1Zqe7CZ#Xo
z7CyD`SqYo?TwwiZ$HUf)z`L`J0M}#Ex=GaBZx^enl15u^)RXD$y7;^w*W#ob_s(oI
zSo)=?!^tAv>Ev<0dV;Mr+S((^>An<LnM!Bs>~P3qMh}(S<AM;l@n3CirvEO#H`DIL
zTl|<6`H2HRVq6wjKn9Eaca2gQ?MgZG6xk;{X0XI(&ZzTWW0~htY=TpGh5ufSY|cb5
zukmSMZX!!Rph%drPciolnHQnHiJ(r$W(gD>@H#345jZ=I)BF@p-yX{8jR@w=Nlx=I
zr}-B-eRl*WPEP{XVt`o&Xsy)G{fgW#Q4UO=3MQcZ_sHdch`=tyX5#=Yrv7b$n8aUX
zs3zT)@J<4Ih0?ssE}#E-3>l~XaVpGg0>`1kdxS74-={Pwuhjp9^%#rwXC(I<UdrG}
zoib0!w{uZ3W0F6joc}2mab--hf+}hxvO<rz*hW*Q<}x)|h;mZ(E4=b5RT<cLnX<x{
S1)7zSr;fXxa-Q-W^8WycFL$#5

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CoordinateContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CoordinateContext.class
deleted file mode 100644
index c8399536ccaf07bf956dfe68ba89e7d91188bf0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2036
zcmb7F*>2N76g`uK7^iNb0Sc6@&;nTivy`m~1rZ4;QdmTzzPrvS40Y|uaVq!}{(%R0
z0l@=;S3U}H#&%1f0g?yL9beBqbC+|kzyJ9B1;8@y8>kw%RDg-gdbv_S0k(mwQ^@1m
z6t3fjfn@_X1*To;c}>5gTqg=bfnurLdg*LC_8?N8-BSIiCXj0c9Vu|2rF{8hu(ct>
zwzJ_;Q)~sU<E=ZP((kD<7rjt@f!Rh7gdOEOk!%EhBws}WR@3)o*zlZwU-C%3<px{!
zMn969_8^qKAdKuz-?N{`+h<PLmtnFl?E#}(=9=mfo|XcK8^dwzUbwa=oJsB+0a;t+
z#Scr(@&vArf)NmkPg5XYSH6l?1um6ZLD;n&Kk`C*d)W>Lex$afon+woz}v}Vtyx~D
zUC#-n&!moR#%e2nJJ?iycP(OBSdXrZG%yJuUkPMOW$lpTy0S;$2Y*41LYaEi=5Af}
z6{%B8dE+^L*M7S3Qo5Qs#&+_R(TxsnG?u{J@63AL+hN!B32^Gwb~`TEG~;zQA3MF2
zqL1tCm4xQQ?ygP}Z;D;!4FZL=U=X_Uk<v|ZbT56c=$2xo#-+Q!y>X8&jUv8<TexlE
z4(?i*#|eS*|KZX)T3A8NK;6PUkd!O`H~d?N3S1bE&zvkN57WNoXjm)_)h8YpI|LgZ
zOf$dRaiZ)sW2=tm2J3hrrt7a+Bk-&=L8JdU@OE4tCYeBGq&p)UfgPK8^g?+ZcDulx
ze{oc|@)M5gQTO63e*^{o9)Nuin1Y22rulY_QcxO|V&(&~@3_rihHGA{O(unVD>;IL
zIK;QZ@tL_8<|tPUb01mS0aJuI@d3H7$ovVFi=pO{V<{93a16%@A~aJ|uqMH>1T!kt
zlOM6~eSDwxsi2Kb19@|Q47QLQ+XXXl5~m14Q=BHO4($vUQrOFs`djwkskgh3NtotP
znAsFgFlXlop~Ksv)ZxunzajqyGu5xiS3beW;9Zq+KPA8B;>0CRS}2;+LlMvKIysL;
rEYXqkv`7-GH5aJ4NKF=^m}a=dE6Y@6P(hKh$eqb!vs`s#M_~R0ElDL$

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentCellDataContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentCellDataContext.class
deleted file mode 100644
index d39e7accc208ae1936feab2a81efad2234bf6d7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1782
zcmbtUTTc@~6#k|yyY#}v3PlkW6tNdz6+ww@P*Y>lq#%LH`?j5wh3#%Lof7yd#zal@
z(Fc6d=!3ymf0Xg;#Rg%O5+8QXnb|qtd}q#g=Eu*k-vBIPS;cJ?=@|Nvi6M%tid-Ch
zn2lo&^C~nIcNqFx!ftUP4;Y5leYa>^lJ84~M9H$aD4Ke^&D#uxbf#Rhn_9Ik`L5Ox
zyk!fi)!U}F;kxU(XmjC>(<i|443VN;=X6Zju=rZ1S>>XlS4~<;mhGBuZt22s=Kf+t
zZX0xFs@M^NTe8Sa^QkWNF1IJWQwfG3MoPi347tKEn=ad;q3M=1g|@e-iH;?WCfB@N
zHaaHv&&`)ITNKyQ9Zn2AhcOHo)}Fm<SdC4oOG=uR=zbeqI^ZR%&i5I@=?pC@dacG=
z1pfFh=u&W>S%thUqislA<TK?ReNWd+-D+sht2?|VDM5A5`%4)HCm4)H*ZyZo4qCs<
zvTzQZLatKDuMmv^%DJ|?s<-^wMmLRyrAtx}!)l@O@HF+6^W^TIlcCcXVw-kH)c7;Q
zQP$XLVa_|(M3w7R$PCN9Zat~_1ny!Xff0-{WX=ZhE1AGOEUH*a;65HOJUTnj@3>%@
zGtBfRZH7T#j@=$Bq>oj`eFjMX!2&qlDGVd7`cBYdc#;0^)(sSUHZadXg_9&bZrg@g
zr&gvS|4VRAkFL?<71U&yq6aogFD?)P$qxfG4$^E1Ve)`@HW><kLih-wLz;##M5E&T
zQeI)0{Dij+7jThgbZr==(SaxtM3}6a%}snp<RiIWc#JHR*HDx<F2tm_&4-`>q%h{f
zs<?#9w3}fZSA5txvJSKGaOy)B(qr`Y7^85P(FCp%gu|#wmX5}F?mPNkVla1vzU&t$
zAspt&s$}VJ#Ldwo`3_0ty^EUiBD*BVaShjr$RtI0ci^l{(aH^4q039+COIKY(|61D
TW@sajq`8w(obJ7!Y!cC5rJL<d

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentCellValueContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentCellValueContext.class
deleted file mode 100644
index b82d5c3083943516b3a50af6f059fcd6b1f2ec65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1468
zcmbtUTTc@~6#k}LccqkzRX`CH6tNdz6T^eCgczHcG$~-9>HBm$DNDDz&FpN0mqh=D
z|G@`+GWuZj)gNU%(_M^8ffAc^&Y3f3zVn^S?2n&cz5>{QZQ*VP7VcSC9*2SZ<5<B1
z3wa9#26NN(UA4uqny&@2ZF66F((Z5AGV+z%74~y3Lm~GfPgDY5i6d3678(rcO3)Gv
zQ#IEYJ5jeOWSuuXvgB%k!@UNVuHGlcv^sD@hPg^4rSMfnc;w+l$B+!!s_zR~@pu>t
za(r5Ig09^RmFU=!6um$yyA^u&-aw5h#q07ZkY!4($8|7<kuzhMaQ%MJasBqb;)=3i
zRpQnbO6OnoTjGep$QQ_Ha>o%p0)KJ}x{@L(UY)dt8@eix<wEU{_qpwHzisa}4~3(M
zsMU{8sR_e-FdU0v_U~H1=pEPl;RSFuOZ9qri)c(x&Q52W_mZZK?YnKCE2=-k_GbO@
zN$Oh{$vufvplA%4{UDN#c;@PnnLF9mbzLUv+^A!a#bt~!6wdcgI*~;YB@3%rtYMwH
zc>cw+=Z#@ywCBSxGidj}bIZ`k|Nqnvov-3hW<!UHrXXf_;Cd~3Jq(Y|>al(nJM<wK
zHrH5!NuM44Gr)9zXwA^BN_&H(RV*!hLh2)_DU8#aAqn#(O!F18v|o(fFo9{>(FI&V
zjzF|_71zj{iiz0-c8#PyGp1+WlZYWrZ8BdE;Ii>?0!L$q>*S>wbxBfa%$L5yc!$Z-
zHyFjwNT=|jMDh|zI!*sU@(pt4+X3oqeDgQSdECG}MY>5h;)vR^K$cr%p-SX%o0Jsp
T(0_5DEn$jehFmn=NsRph6Izvi

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentValueConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentValueConditionContext.class
deleted file mode 100644
index 2130315f22215dd3dc3846f7d0ac3d7c6a551ff7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2219
zcmbtVTTc@~6#k|KwwD#KC~CzUqV|HUA}G*W(F%s7TmlU*J}t`x7Ph<1bV}f-_%HAU
zqYnmO{Ts#@6a5Ruvu$m*rCcfxJ7>=9oNvB!=A1KM|9tukU<|Jn42KZLLj@zQ)D%1l
zLB(TN8CCEki~z>M7{^lu&lF5Bs76@`Zp&5ODszUutVhi{w&c5#HqF^K7g<X$m3WC^
zIu_3vPC;8MNxrR>1ur^6YU?FSTdqu(bW!4>Iu5k}Ofht1opm~{CuiDxp<GzwBCoGm
zv=YfVhHkCu!gTf8Vu#!`>D+-PtaVeGj$LQ@=D$fb01-Ri;u1rGymZ8drrXjI+Rm6J
z%C<BMT$6%xEzd>4v~_EN{BZr@yG6keo*_{uG|^6+JeGvll{RftW*B-2t$`jxCf0_d
zP1dRSDudsUy9}vwpb$abFnE!2V>)(1lqxxpr+BTJB~v;g70+$yJGy4+_J+2&w#5xe
z&MG_AzYN3eU@`PJCd*#&U&4&Gfs;<=^QjEcxUeF1V|!jN*0L_RVs6;Fr2J->Pv@tO
zQm30ZK0}&)ubmU8(-=Z4PFWay)^v0J%F(hJal^!rK2Mpcn8XxA?5r3nQb;q5opt|^
zCuLO(;JJznZZgDA2dJfkiWitx@KVJqWEo~oH*DQhnhIp{>^M#3!O*?I<#O5L^&(Ek
zJojE{fvLG;8bg(w$C@rWKzMm)o7<G!vAN?cTeTE_%&pac;S~2~g;QXNR?4Jh4`g`T
zPE%;?@eR>yU7?Ayr#aP8mFK2ut<%fGFmY0qxY4Tg&=#Emcj(zt>16{tLAdCp@giyC
z@Y4(kCnC&$0N)|lKB+!LXzX%-1;3$>=4y2tE}@?^sx(}s(S;bTK?D-L{RGj`Z2#S3
zAE?`3!}XfIheBtSLT59?4-Z7R4l#h6HHZum_7Rm(;sd%8$pa|wN%K1Kvx3lH-Bm-N
z{kVnOguy62gY?gJr$ExhiYC7x@DAO{Lj)2Z5%gg{Nisx|{&rLX6moY4e<2e5?ZJ=M
z@uRqlAws`L7S#Z{EB9&T0j*HvBZ$$&hd6zS$}EW<l7n;ry)NiRkS@-T%OpEVMoFq9
HZy@*=S*3Iv

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentValueContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$CurrentValueContext.class
deleted file mode 100644
index 598c6cbc814a1befe3bdcbe6242925daefa2b205..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1448
zcmbtUTTc@~6#k~IU0KSlC@P`?BK87oVt6pNX-t}!G%09G)A#9iQWmzm&FpN0KgB0C
z(KjFT$>@X8SAUf8Om{ID7J=BLbIzPO^PTTpW`F+r`VGJ~ECZ`14BR)cHi<MIOky1m
z4HOI%8M0N!b5xCCqtNta-{PKfr8U~NWauepAgmW$212$%SJZt^i6d2M6gv!=y5AEF
zGfl@6yWyZKWSe(gvgDh-&D{={j^4+{jM{eshWUCZrSMdTyWue$L$2X@Le^a#1cIDu
zP1_$>-9U*$E0kjBOJ(%}*J_Q`h)%SwCBRiEr6Jcr7%rR<!<6HV{6oj<?<uY*3)UcB
zeW7&T4X-DT7}A9z8MEBB#gM?Co`J5Uh>O-Ht>Xla@@1viJm4d4x!mhp&$|c0Rz%bo
zMW<B!<k}}=F)aLD<CnwZIzPGuPPN=_S87CKigLCOcla=F*2JFE_qd|kGwf8`Pfk;>
zT_*Q9PLZN9n0tOGZSl;}qjKYPOSg2HsB;$`fgG-4f}wc6f82>2N+=uH$YB#(4At{5
zo;_;}>lb@640GdFpPW~QR^k69J#nT=iHs5li8>##+IQR@y%>ha|LUuL3cK{^lV%w!
z$kHc9|I%Q(C$yThYtTMT(kPXeJ|p#s)D$LZHA%vJjjZ_wIodBrZkWO>?dSsLkS7qW
z&Epz*GhD|)47*8EpQUG4KahwZv)W|79mD0K;~0)c4L8Y4Ga8Vj&{!=0K>8J?%iobM
zeL*ILk7bfqNYZKM1j%>EoA1Y{3(?I#Bo}cDixlZL-H0M;%Mw}ckcBFd$6ZoVxJUox
Qv9^L4k|w!my3?5W4F}GS!~g&Q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$DatasetContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$DatasetContext.class
deleted file mode 100644
index d9530aebf142d148156aa1ccc6b50126d976e13c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2474
zcmb7_TW=dh6vzJ)JKosdrfGntgaW;!;7jR3NNF3prp0OLO72C8mG_N3xZBvf)_5GX
zABFG0LwNzg11hh49E5~~P~pFqu2OrU_QUQuJ2U4u=ggdQ_P3Wm{{mnOwt>$JC}PXN
z)j)n>;F^K!1(>*DV7rJV)QYI%rh$fmF9iyAS9;q0#+6E-QYyE6)w3K=_my?DWvMae
z2GY_>N~<l^!1bK|1HUV40@)^|z{!^D$p_=XfmChhpwE%jmfvyu`;Kyh?|3k)AG;%g
z<sC;mBdMFdr{z;EVA`H1RkQDmMw0V4S{;929gMU*w8lyfeWk7LsBi6t>LW*uq>A1f
zuaoFd-s$y}>^Yh~tlWO3Cp+C_a5KXv&52(cDt{=Ie#V#|#cBet&jX*ZCcDt_y{@ZW
z-{TpaA~pU<_>Fn^Q}*0p@!{^yon3)k-Su4E5V%}Qzv}38cgKAhZ(g&@`?MQ6iisjH
zvzfpN*E{kLU9Y#N!%Go1@4F{;0Jpuad@7JBl{uJmIvqJA{MLWa!~6?9Ycmt~-I1$(
zRV%liI7g1vcf6kU@ZgE;Xa;H=MYD`BJ-~F9!0Ff1_Sx`N>Tb@#saM<WT7zz!V9cGv
z`_3@V|NNfY^Bm2b7Pwz;Z%@14m?!plpE7r2_U!p%)sc7Ip!(LPOXW&%OuV^Sv){xm
z+-5D#x_)D_T1<R}roi=?0TUG=usyTsRI-~mhw}pEHxuGKGO>d@2JV{p8utXQz1c9e
z0||VT+B>HTimil2(Do0d7nGrG&(U<3<MK%wL%nn?lfpL2dQDH*DMy$(W>_t8D`jSu
zW^a)b{WrB3E2$@vT7fK?(3j?8x8G%}Vfy@EK?FS{{1K(>i}U>RnfxDuzdLfV%=bxt
zZ6ZUBqm`9QnIEw5ocaP*_|666x!-Y$x*4s(D&FB28w1Yp9oS!u?TeMw4DGWokeNjM
zaSTyR5bxr>X~bfLSe!)snTj}z52g{h2$7pa{FRFMFzq1L(hlP9WA;l)6s)V*1)B$v
z;ei;H>e(M*d`~qx#{wmCFOkdr6C%z<%VGo#Z~+$y3A7Dd;%b%+K8~@UPzH0El{4QZ
z$na_m9P=oXcvM1}h~R1ll-wHY)nBpnEtab<c*{Q_zkuge$^s>4v*BfjP8y^b*^qiV
zvP_&@M+H?na+wxUG6W-mb5}UR6k3HvWdWb^`7G2n@iyfJZcya1w~!B(VU2Q;a-A{=
I<9+1+1%Hf;CjbBd

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ElseIfPartContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ElseIfPartContext.class
deleted file mode 100644
index 4a261fa9d63b5d760c022aeb07baaaab5e4a9c48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2615
zcmbtVU31$+6g_JtR&1+DYuW&5p<kicaa)y=KogrZt!cp-x0J?{ciC3mO%%x^%bD_1
z_zygkmoo6clvjQdGccT$6i10&q6`n#U9I<?J@?~W{rS&tzXMptrjBJDD|r;~g?fCc
z<DQPyJPfSqs1`7TS^-~SUB`VL8v+ISqVBm}8A#6+D3;329c$k*hk<m=rW^!SfvLLJ
zwFTyy(zTxs_u97Kvf2)JicPO$Iop;m)qA`-6}*%Kfpd?Xf!%oV%<==`2llH#z-YLx
z?bjV^FtB-~*6etDW_u9WyXMfh`<@?|-GO6150~^D*nad}90Mb*+?MRQRzOcOX&go|
zy6*e2U`}!4IAC?1mu{3A<@B^CfCvc5UqfKJ?RcGCX62!>Bi5^AojNZ`S5>JUPqK=I
zO_~wl=Ko1U0x67t^;GdEy#=y0>B?YT;AW}m`90He1IIV_mrZ}@26E3fqhdcFI(AIH
z+9+?+uW$Lb%l=92CU8c&``)f}ds~4OutAKT9Vp<2+qGW_Xr(eMkhMA;yHDVacOVD8
z9kXh2wJirS@ce2l5yx_S=6CHKyQ4&+???YKy2-&!#uAu6Dxx3y2SU1g3Y=P{)e7r#
zhVgcGpIH4^jZbQ=wMfxPy6dNjH^wgW27&yRH}pI9W2yB2{<u<atLec?rR`vWYTBcV
z<7zVS01pk+@wLE8YMi8K1eR0#CA!(bbu0>$Pxg(Q#=s*y*71#jZ^6!6JK6DFlTYAA
zI`ME~$4wuri6i%VDbWn!AU^2k<iMXj>c>ev?#3~gjs}}%F4V^13>SD-N<ZTc{SKzW
zL;)^Mq%%=<91kI*`b+6_Ia&nn{g)ur+<3}Q;6bXAO2SosWDS0L!7nRuF^df5`1TpC
zpw*X(nK#g0bD6<eKC@~&^B2x>ZA3><#09?1hi5(rVLs$j!Q6*NKcGOEi*GRX7MbHv
ze}_=>(Xkkc4p_iNf(Tr~$1&In!4xNgO=}_8^f53E30{R5OyKgQu(IP}X<EWvKN8ke
z-h3I?VkU{OvQb#s<4m$Aghc_yU=4;v;!Jhr(l5||<}ylkUgbo~A*<y>uq)BAQI2$c
zf*WB*bbQKesfv|Qj$v=ns%&XzXMP$%hSk#wi7>TMmX=T<gsR#et*Y8W<qypKh}p_p
z%q;ziTn4Wzw0T<oI~DdrL~<5IZ7vb<!ieMoZbDJHO^>Kw)Q-uWJKSMGi*e(qj=RgP
e3_izs+H1U^z+>+r$30GK+G*O4XjK?jkoy<2DXi@P

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ElsePartContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ElsePartContext.class
deleted file mode 100644
index 3f9c59d890f5212ac308751ecdc0379ead92154e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1735
zcmbVMTTc@~6#k~$cIkzSRY4II6tUX^s|bp;A%;eiCZ#Ggyl=OYvUI!K>`oi}DgFl^
z@I|8!24DSA#<Le1E>(&TJLk;ooNvA}=R5Q3_xB$FR<SPQv5agIBT$k^ASWZALJW&3
zEMZxOD&q-5tZv$Riy^(`*^+Guekf>Kwk+<HOwDz<%kVO*RCK$o)?L9{YS-Z%+YxHR
zHPs#8eWy7tcY<;LG*W>fTCy9QVZ35kyxMKoxl_~XCaq*Dwyv3bnqzqLa4{<O4LWfA
zwdr!g6MaS-!xK0cOB~`w!!pDs!(z5#J55!ygz2cgRn_TQ!f10fpuW>Jd3a!<tn5)-
zM{~GE_c3%B!>D2P?3Q6QcZDV>O;)DsY;xg&m#qdrWRS87Eygun=N$rn^%r#E@Q_)J
zygkD;gzXfR%7NC?R8zB>>f8DO*99dg_kzEa;ot-ZV=+vgEy9P+Ng-CQfK$xZYK2Xr
zF-ke>t!=FnRx`0{G%Zb#U>LTGwT+9^H?NX=c#cA+F(h~GuA}oehNq>ei#lBPu8Ar)
ztZo_BhTVEb;%Pj^N*XtClR>#0AuMAW&#)?EEsf`R!LWXLVAx&f#LciUoS+%TLJ{^`
zs+c`h55Lz*^@GcPu|KHTzUEH&FjTYu-=YIWog0|hKqa5BDeW6(gIbnu^k2gAda+8+
z(x7I-9KDzcdP0FHNM;zNag1hbkjMj4xlBa*0_hl$Bbr7qPGj8rC6zHjemdBOYq(A`
z=1GG_528#E5?MKypZSXDXL5t^Bw0um#HDQ?Vm8<oLQnuEG3CR`xP{xan_(JvLf9p;
z9y4ho@u?3PFshznB=s51;4VRUjM`-BXiVpSBK8qu`D4U#-w==BC{I=<OMjz&jseN{
z$VfXr>SPevCpnFKxKBi8DI&N7Z)J{F9?%M1UIq`ziC~_-N4~c}8-WbXy^K<H?;~V0
GNc;hZX4iTE

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$EntryContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$EntryContext.class
deleted file mode 100644
index df33e0cd59f62fb34f26462df8c94af060cba9c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2177
zcmbtVU31$+6g?}4sIir#HPAvDptPa*BUH4cv?L}em~_U2`!S6t?~1eIZX-(`X>HPh
zKf-_Dp}drV2d2F8qZrOgipPx=nhX!#ySuvg?EN_R`tN`K_!Gbywr$)fq6pW<=SJQ%
z%dH|x_`=3o2{vw*@FnipxNGApfx`Bq`vSE}wH-!1*9){CxuZ2V8U|YRrK=+;-Hwd<
zD)9V=;lA7um}yc9EVfl39}fF_GU|AHK5xqHu<QA|UZl)9yPVNaRV?6a2ReG*3<E6>
zHIJ<zkWth3;#l(Qopv|uyL+*g2ktPEgD}$We(bwXlI>$Jie;3pE0Z{MrYH{wk&I&%
z26TX7Jo84LJJiZ|+bY)7nA=gkz|({kxUfCe9=q~*%BXP$Z;s<_Z1TyiN~`*RFa(6+
zuO%?sP=V5$0;`q$0;O4bGW2B@&_=7eOS^#=$$*JIwVA-Y3P$093VJ)*(@d7rliC2c
zf_-^Nrc|oNA+Ot&0|MVW0Xbnz;#G&-*;TR9VYHFe#rJ}q`)Kc(?3&8hqx37I%MUIe
zOW@+`M0-9sBHOJq;56!;PExIT#@ju3;0-dyK4^5-QyNXWyLpy)Gwdo~AVqh=VbqoP
zmFba7)0DnpD9cKnwgnulgRtwT)nAz+y@Lk6cCd*p2Or==f$E#FvPwF*hi`0r>!6A6
z1a80CFsE+?uIEmhDKZP3BMCd<fn;~DR$6SUT*JIEwV2U2>kCeqYn6$zCbQ>=my`2i
z;dMKK#<bZ<eoO^m%Ac@28CwG1SI#gOCMM>Qqmzu}*giQK$2*Yio%qpws{DP927$Z(
zMQGFa$+*vHTzt&GloJ1KfLU-%V4mv&Pd8EE4zO!h;U%mW+*(-7)PMlzxpz_(T);a#
z3A~Go)Jn~*%)CtVnd9bz9P>-b6YnQ5OI!`i7QL`2OSN+0@=Lt+3WeiPaRO!DrCR2R
z*<HpmL4@gv46H@40=4W~efc-c{>p6{QZX?eF#|s&U{_MLF_?{yaD^Z=WxkfFEpQdr
zGT2p0^UW&!GDbAH1P&*nw8lwV!6!s8(e){f+e`JoVE>GT`YZbOJI+~nQKy`v<ky)b
z?WvDHqKuy=0$v*XxP<HYl&@B3k(R~WRC!b54Qp9On&3L0T;-L8&+s;7nY$v@%9t~1
Icn@>`0%$@(l>h($

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprBlockContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprBlockContext.class
deleted file mode 100644
index 5c930bd33ca793bb981e9e1749210a2c610b827a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2226
zcmbtV*>2NN5Ir|e<2Feb!d}V_C20V&l%-7w&<LbRVG)h`?z)%Mt!qcN6O~WlA9#Ql
z5D2kI@WMwSj$;$GiGfr+Br_i0Idf+2%=pL851#<cV@ZXk;z}B6Tvc&R#q~5Ym{)Nl
z0~I$jxP{v)7E~+>OmuYD)K@Ke-}B6-EpTvUm!ay|zTEZ&vNhY5Zq?E~PkI7N`9j@r
zwzO5xmz!GKl`Y5hwKdPuo^{oyy6Z_d{67~9SrSNAoi!;iSvPI@xV^P1-9|t~AXj$`
z-TLho8I%6H$;eX=wp;F!<rteiZl&R=^gEM9%6uMJ1;%S#r3bsXmmGKb5_QzjJsILo
zRwK2CT;2<EpLf8xY}%$@5xAJIJ8o0cZQpXW&b;QfZQtCIT3GjIZA(TWOSQrZ{aU&!
zZC>WkZY+vvcbrYrZZ7+}&#MtN_Cizo0eH<`liLDHzCdG2Hw@V#_`N@%`>u?bHK?ta
zp6NSosZih0JGy4+c2j$@x*-jp396m&Ei;TyFdj?b(C)^0(UMW~T-yUqx!7owDx@*a
zoQ=&#dMg4MTjq%9KD%AuQMs`=NWHR`+@m-JMiWRcJ8jpH56z(e4-XE}<)BQwxnYM+
zpfc>y`1#DDgtEZRp;2~CfWYmc9s3$Qiy0gjDE!+$>Y*&|prYb#7WZ&pVBz16(O&9b
z1_HCgjT84~Gy*$DdPg^O*Cb~yzUc<1GuXpH$M*;cJjwsZQi~m`x!BxdCyA}!<x^cZ
ztu?L;-sayLJJ<z}xys{)8K?Of%J91cq`=jIN&Zjq=>`;PKxQtNP~JlMg2Zb+Ca^C$
z3R-j2v*9u9$3Z@E#&Kj2A{jy?`yt-PLL9}hL5PtMVx%A9V=M%FG=iux5rxdux#G+_
zq~1^slSorS`HU2E3lcdM9*Yv815V&1K?3a*>y)5=24^GKOO(MoWh(Qk2N{$Q%GVu?
zlwMuV;XEON(r!^QG^UGRp}xdK@e9el$7lkti<D!Oe4Ff6IwbiGIpup7^-$>9BRP#(
zTwv5ZJ;Iv^ECpKTXyFy+P^6N;MgA^zwab{GJi`D%M&lS`2M8RXOi~`E9HE@X*e_VN
BUqAo=

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprCompositeContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprCompositeContext.class
deleted file mode 100644
index 2b8116805e227378553a6a5836982e39c96e90c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1000
zcmbtSO>fgc5Ph4(c57S;1rk0AZE1z_QQ=E(g(4AA$x?(+i*k3IRWNmSt@Szz|A`By
zNF4Y9{31Z8Fl&bvi5@Ir%QL&P^Pb-u?bq|qUjQ6n*TJR>8xKu*WWtt%Z3jCH_On>T
z`iNn_J&<bRhe9XHpB?xr7doDD|4pbeu1@lV_odK$t`CFGkfG6+W6rQXhy{P0Pe)w6
z4Mz!8HU=^ZlVPZ0vtJe)`dyqc+<rArRbNh1nZ^1KAA=VN!BsyAvy4;Mi$Nr({wUM@
z%+D21rPBU5OZ<~!S?Vd{-c@{uWGW367n-56Cx*3H%;Z@tCZ{^o<bwqyY{Ip19*8lY
zGt}E1DpDl>E0Ih;94k3xc-j6>!G^CMY5IeEDsvU_<Je5H^{?Tl@55P0wyF-ugM$?l
znjTts%<#M_^2*UNJgIg^7<!dQ-x*>D7TrnnG{B5ximS8>P^TAgy1mT>YM*FXgG<q+
z416QdcU+^@cG(6G>$D>PZr~=7nAHYuQ8!&a+*#7@Q#NNc>!XPUqg_;f6l`93x@0qg
znp81@e98uCbr+~#$|=D={{mYV;1=#K!AJBfBiruw7HC|eOEc#*gI@(hv+TMsW8)s#
UVpP3f$bEq8lwGP=^sQm_H}FpGa{vGU

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprConditionContext.class
deleted file mode 100644
index c742ce16d2eb8849da408491abef69b38b464b82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2188
zcmbtVTW=dh6#m9ev%YN8U`h%umjVUWcIna(psih}U>X$UUes85-)u(dHtSt$JdV<z
z!oMglLGXaeE6+#>B={+aZ`PY?<G5)I51un~_MGqBkAMB=r=J0=;2R4cmr%x4bGQ~h
zG4xsqHkQrpQwu9)6!2LYpW_P)*Dc%-n3MYhB~Wo{-N)XZ=Z<s`y4_%?oBY;^x23?j
zZV<_PqyCmuJ#Q-{r_zmmFWmH0VBRTnPCp8U0_X1#uoFkyfezw`7cKX-fW00?QguRa
zIFyuH?fP-w-5P4S>yDHh#7eu{!_a-0TpxI9DAoA9JPnV|6*q#N$kS97D5o-GQ{Nto
zr8ToPgVb!(%nfI~_TRJxM8My=K<@qnfjYg4)sE{$I#ll7imOJE4*Js7N=mmURX>Ql
z@E$WxtMjcO3Upgw@pvZN&guP`)Na-`1@gY$7ij(u6guenz8tWwx1AHBN-Ef6e4D{A
z(6MT!O%{65j(dOWvGh%wS$pHJ0#|0i5?DIghEE2Et++e`POH)DC6zwAp*?^1t~W^g
z`EILsb37AScbWYcS8+1l6uU+X0;P?3q<py+m<hUYywR_k`4d=~budh;+PI0PjTUYR
zIHv`$(Z;Hcw{hFXm$)QQd%0#>NE=_FW8rHXcd#aK>*b0k3^Rx9)cTVR&F!=!^}|sp
z(@n$O^1hQPTe5Ku`!2iO7LMu(w2rHB^rsek98AV4%Ud8`FW!|A+t^uuk><2v&pT!+
z3w}I!vZmrb*K0BmNA{k;#tdVBL^Vy!VGgp*%&jyvzQoJPW)?V`_|<t7gxku*dHtkW
zFxg4A*_4^byZk@0`KJY(0dcW_9M17|jZ~0Y^@=z^?kTT1Eb^Q;?BZ{Dg?D=_f(l;a
zYblX=J%M?Hr-4~To_au;Fc%Mye+DrL^?L%fG!{#tsDLUi5=7ulyp@726U_Kjs4p(%
z4{&A@>5q(4g%n9}sxGDaZQ3x-l<GfVzTP;1^*vwNu>Q>WQhM%7iCKD&7;I=<ro0KP
zpJG)Tzo76P78=j!){iLW@U%f%BBj(^lCqMqTKo%@;@=tk>T~=mKEQ`W|A-pnlp2mh
mPK_MKTuF0VCs2c|9IoIzX_X(#H1aBn6rRHcQk(Q06#oU6+FR-X

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExprContext.class
deleted file mode 100644
index 38be23d7f0ebf4838714b8126cd19297ca2da123..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2338
zcmbVN-E!MR7(Htn%dwR-xJ`hx&_V<CPaBaoElKRUrKSaE+?HuPxmTPWcN<yq$Z{q;
z3h%&0xd{UoOu6Nu7|u$HM~xloa^c<8?tW*__j5k~{m&nN0@%Qgfv*j$=TX3IJ>1d5
zh92(bVd9>FZwkm^vw$sZ8>ktm3uIIv`vS#Mx&6vMvaL~|9ILH{L5*ik??4J%Xe(Df
z8};|4-?8@{?iAZz*LL=7U+M37GZVa2LxIBM<ALAw+&~@&0%pr~rQdYy;ZXAMUc2k{
zt^Hvj53P|e2c92T2Sdkt5iWnU{h{=uaWw%$Ds#K4=h^{n_(F@6$1m(mFt5-4NCK(W
z;4@pLR{8%~3kbzuOCa}rAbmUVe1ZBDZl2$>Y&URx>uAIBM{c0{(h7Vjt&a5j%C((m
zjC#nXs@cqVUm#mot_m6gH%rrvqQJfwIWi7jtySKm-N5#x%UsQDCNQtuBkxeTz1_eL
zm=d!m0}b4A59F~xx>RN$vUayC2Lyh24sz&q$f`sC_ta1^YPGl!9oy|$&-Y)+t}aF6
zC_1Hg)18}+C9wQ<ss1!LE!W%cfm5$`I$=iU>2LS&sXd5m{%O6l9qA@XxA8vy#@J=P
zAduhnMt)a5QCejmO{!u|Ym}LqRYd|DvtC_IXu-sNG)z3eLlfWPk%=b0GjSEy1j_Hm
zixX+$F`gLs-oy`JHOx*Vp?ra_rq=&NDYHw(B^cK>o6Yr7A~j(PI<2i_lUsP(PK$QJ
z>^vDx(9oTVcpdLhx@2%s3wWZf=1y;DskY9;o@@!k4ppGzBd}ANy-_71dK!Xcy$V#O
zMtQ2HDE^Q|^QCeQ*f<0>|Et_}R|p&06j|eQ{x_NY?*a@E7Yj(?0>9Qd3%y$@rcRK4
z&1DLU9J6{mvxX13Hlr&jVu@eN;hm2|m`^xrm<LGH4k!@j@(D6;kU9&s9zrcg*J3Cd
zU<H>6B5-92r^Tfcd~g=%&bgdE4PicuIn`rMxys@aIc3k{+)WV5jS1z(gebxosYRqT
zy)!D+E5E_`H4K0bQeJzL*+e$86@p!hu8qMA#{CO|=%`<(pE}m7_%epQ#aW-F7w3N&
zLq>7mPWYIP;iypDAcT&0pR<nlO7$<~e#S!e4RV#=F_*&YD(5_Bo@T;KMkMc}m}w+D
yUKx{IK?!9Nsn8<IwBD(5=O%a35XCs<xA^25w^FchiF1*w0<T@f99Qh3nEMxGO;}$5

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExpressionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ExpressionContext.class
deleted file mode 100644
index cdee6abb923e33a157566399741eca4134abd636..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2716
zcmbuBZEqVz5Xb*(JHFU)nkKX<gaU0Ttsg=ULMbJ7O;gi?!F^C-<^9E3+-vMRYwv7@
zkHQx~LaIbTq7_9#<t-ly^}l!5Be4&##haVmy_?_8%+Ac-pMO379l%wz418kXdL9LQ
zYGBhq)j-X_jXV}nH}Kg4a=5vGE!;BDFz~s+qC6a^hT9*wp6yG4Q@4-K8?NKaLtmiK
zbR4M~J<Ic?C$Lp4wK{I!-1B^SU=EcWxXL&8y`H%p3?Ep^lPY{(Od?hVG7Wd18!okM
zN8TIu_oQlDdp)kKwA_x>+qIOf=h0%ue`s^#Wet;_XS+^pTWvN|j%m}5to@CKG8D~V
z5OX(Yaq^fhsq-DnlOcDh5e;K<Z5HyFHraV4{h@L~`to)>iTU+e_!Iiv;lwD4{uV>s
zbp%eoI*xE5-s#pXJ0&vo3Dj)I_Ui)c#g?nOrseoOWsa_zYUucOUz%YeZ4Y}g+PK;*
z?NV=GDd{jfr&i-3+s?>6u$}IXZ|Qs&O(u6&`WoJJ_T`~Kx>(|3*6MWRfbg6DK=+l5
zENgSLYqNe_RV}q1StHBrSx(oyzxPOXd^%{1!ngD=*}-I%!0Pc*_;&EB95!a))GF<E
zwN5h@>2v4ct~H2iD!0S4wU|nb!`)hYbJFzsEWStkl(-vnbjKa4j=W>*ias;h6|U$o
z@#LoMA_6z2{WP)R6mT1N1g=dDIabgD*QZt-t5<=|sZ}RRQJ_Axa$<EAa1rkbl>VC%
zC2#>>;7bF|0=~l6v)G={m@iFN%xpJN0mf~mRy>l6!L7rJPfq#C-oQI0sJFi@5_nMj
zKbJ&eQI`|FORQv;USLt<q21eO%VIkHTVd&5bdQ%~QZvDM-tCLL?16bOa#-ebg|m;5
z<_K6QucXpXk$!>H6HZfjjn8cG>U*5xxDbAZ(>TMK!0TA!a}1FQ5t(ts4~d93@zx|_
zE=0_YBOWIr-p08}L^ecZ#}Pj!BF^L8NrVw1jB&)zi3k=;glICHX~xGWSI$1e{7)Q)
zq0CbPzc8dv1H`%TvnZTYz$IKJM30In@oRxHDiL;_Qol=O9>>J+aGo78C>0;hI^HKi
zA5NcA@4Qy|1G(>TqVfW{@~_CJ@T5YyK*_h6;J8B@pHuI*fVvuL#x}0u3QXGZ0X4#O
z&?_HuWrHisqZNF_L5hErDJGU4UBgMr4Z5uzTH=4CR$QgbP`*JqM|qY~yYmjEL3shW
Emldbx`v3p{

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$FunctionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$FunctionContext.class
deleted file mode 100644
index 6410c6811b32ca8178dff2eac93eeed9a96acc35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1973
zcmb7ETT|0O6#kZC18qU9ii&py?FEb?-e_fX7<DpJP@%(nXx9=*lTNy2^r!eAe9#vi
zeQ@;EALaPv(hNcr`j9=Fv*&#0vftTXzrTG4uz)2Er3^+<)-dbKxePM6r9sakjoVq=
z!MujM8WsdHMpHV<dSgjXpj0T<T(6~@j<P*{cR}}hJZno`c~a_i>9sA#v{&7xtOyJ*
zQwkifS&m%owKt_#H#co+@-??%+8d^4`Tvn}SZ!HdT0ieO4Q08`vg;`MRte+`$C2K$
zZFako28*?Z+txR`O77@APj*~S>CLXKuLavzrq`8TxK8hbVoE38MCi0I+fw;8o$Z^&
zx;XSRmOF5?{V)uhu3C<zmIP)C$?XdhUhCO1id`{^8}#d#9-A+4WH*5^%h`2zET^@u
zOvPpkgDq@H<%1heQ@#~Q6^c}*%|=6Z2>#?B=)s)^nbmo_8&=m+u2(76w#{8rw@s&|
zzuerG4aEYr-SCtZCKs5DB{2Cn72b9FbeJCir&_MpD@#mcj5RlQR?JSssnK<-<(P^z
z5m>3#7Z0YsG)V1HoFb!fF4o<i*O1RGpV4OyvhSAPCf?jp`IEyv+!uIyRQs6S`}vl`
z13b*(49*G^4@ZmcHHSx7)KJNxipK&E4|fbX8>bNu&5gtdBDCJaaDfrBvhMCk$Da$s
z7~o|YkN6zNtQPiMZSYiZfRY(>AQ7K80e$=LfWT^D@Uia?ZsL5D5_^(36#Z<Lw=BEK
z>E~VikE4D^gZDNeF0S%v&+x$qjzJ)c9M>`a%_GGfFjAVBNqxr9NA8C(&Nc1pwHG+f
zy>Cq$OyDG?z$r{}_5JTf{@GGKMgQR+NbQF(_CRD~2$C{_FbI(%lvXNV_=01fxD7MN
zP(rIAt*rzQS3<K0f=4)qsUR~A=W&770vB;9f}NxEvrbK%`w&BhMXm11C>3XP8CMA5
z7uBX@XiSxVBK;oY<sV3wzCs(q$1>#zB~OQgHib#PMqXPBP$xsrILRrt{u&dxPLHsS
lzGj-58EV-4JZ^9^gq!>d!LEorWuE_|G&{l7zoXL_{R3Sz7qb8W

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$FunctionParameterContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$FunctionParameterContext.class
deleted file mode 100644
index 658d75d9baf90e4ba70d24f01fae483d554b409d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2026
zcmbVNT~8B16g|^ISIY8XRltIZg4hpW1yO-k(2$VS6g1G_^HL^dV7uFFrvzhSq9*zq
z{0~0h3q~IdzWSq#cXk(2Y?b0e=i~0ZXYQFf_x9(nZ{GpTU{OO_!*~=Om{7xH6j2x&
z?sg)AsZLDeo`x9>_ZixR<Yk6fBAMSY_e`TEg=OSLRc7ehlC#Abdh){NtF`hbcMImG
zMV46JDVo-X=?b+EjBRpTR2c@AYj#lz$9`_QW|>RwE;+X3`;tM=**0x0vs&fkxs)$D
zWn;4{`L0oOdBt(1u~oH<HE&7bRqp!Z=-)6Y$&PhVvQ0?<44pY5b8_6%22R=5Ppm`A
zEYLA?iCpskq8XT=UydP?6}FHI4C9Hs<CYB5mX>Sm%@}UYmZHoJpY2-B;sJ?FF1bN*
z71QN5U0};$3|+$Bb9RMYT9>AztI<nbD&U;G#rGM)iKI%%EEai%fFJ(_S-L#Psz9p^
zQ5Dj0Gl5hr(=Hj$Hg|YYiACG<zY@FV<eFnK^qm&d%gV8!rq6+sO&1E@J9QD?;_ixB
z2~@d~EzJAMu1|O2JbVM}B%QzzU3Y43kuM8X2mOswom5psFV(8F8D?5_9j()(jt6+C
zV-|Bd;uvH|o{bVbpN@HCG-P!=0%`Hd*@0&iA;VZ}YNl2as4$Q>HGz>t-RpR*;aFbv
zov8bC97DD-jOw$sH0TxkJh3)(6^0jy){DF${J3bF)<>#oa!reZs@KbJX<JxZRQU|E
z|I(`}>s9L1#}`*Gbljx&AEiG9pdHj8p(BJY+D*~SXx37(&>_MHv<#t}#)vX&uh2tl
z-FHDRF469?=hNrG^wX$d77?a6pp#$*57Bmn(4SDRJ*Yn4Er6l`4B#q(FeTprEJt8r
z0@G6Ip)Y9v?474_imG7k4I<iG4{X?XI|0)$glhysPPk66irNhf2e1<~t8d}n_@@&{
zpXR$dn&AMB(Vg8Q2t}_<v!WMI|3Ks;y3<F9q`pE6;UG=(1)Aw=n|E=3lJ61IKGZRe
ypClQ_2u3N9+Z5qntg?)e<qlcGV6ota6Le&fOd+HYqd7*a4syFlqhfXi9lrs<pCumv

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfConditionContext.class
deleted file mode 100644
index 2a5f322fb76f9e9c4498f708afdd0a58dec1c09c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2178
zcmbVNTXz#x6#h;!X4+(0YS5wq6{SKhz(}nMBorj#T5*MoG^_8^<QNW}%*4q_SNSRa
z2OsdIE`4y}t3S%+H<xA&WD3EDoU`Yg{eAm#_TKsD-#`BXu!Vaju9~omDB_E7xfU*)
zMU?QRiLDY$d{x5N_{PL_6E_45c{mOP%GFx;sdM1iQ>|RPt0ub1yS6`&0;jsllMkk&
zJsI?zJ(nltuHSduT_;fCcXDXxCu+jG&QERM8z`-OkAjwmTEOafo($TqGnq*0-0JrI
zk-az3a^Ic?a_k4%9!y;OaU?!+f{6^`bz`25jxFz~q338q1xoiAz|7DOb8)m5x0PaQ
zZqv+-YNz)9&;mm7*Ad7)d?Zk(SAH<G9Z$P~eXwN*Q%|drv~?h*-IKvcd5-&l*{0P(
zOL<Cf3tX;dgW}9Qp1Lv#yV<Gj5;t}N=`q<0!vt28ci`_UZ@8l!&170bsYBw9H;{({
z`D%?J6r6rvj!Asy1m-A;$g3XX*;Nyz{h*l?l<Rmy`{CYG*$+#~Jcw@@U3PHUTmtJa
zm)x`QaoKIY1y8Hd>qRfS!g%}p_nmQ4yZ2kYn{oZ8-Q9khcoXg#EeI5M{Atja->a}&
z&ditf)v(w2Qj4~Mz}BLw8>uR`a1%`nE!?uOjoTJJ!p8!&H&Z2VXyFdNHF4KM8{Y{u
z-wZslYXvT5cEDUQbKWFHm{d3C#f56>aiS@5TwUpLwfZtnpfwL;LoenAA90C%J%3+%
zVJmh{LT0t_T2$q!(IxO>b@54(0v>mGW;4|@L&@wQwtD1K`-yS~91{Z9Usv4W42Z^2
zhFyHhf0PpcY=8ndGO&UiR{3>}yWnot%ef=upHs}?RH6pM#TsQRR>8Y?k6-UcI%gu9
z54eUjw~;3fD3Rvu5sVkey-MXrRO_)?LPY>RM1>>*XK^ke+ay`&(^7qHJ%5CEUS;|@
z<<wHbB*HdH@Ezjw#GCcTx!+Ovjba>AF*I&WP%v~vaXwa?Ib-4zoR3VKOjw250-xbR
zLVJaK=vIDh_176?m`xbdlt=lQM;rK@6k&Qs+{5%#8h^w51*?r0bnXu<<?y`0eVIFN
zjVST4lZPl9&mz`1W0jec6<ow6TCEZhKTLR1<4K(-%v?Enp$1J}=1~q;aGHCWQjuz9
KEK}li#`1skW<VJL

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfExprContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfExprContext.class
deleted file mode 100644
index 221f4d687a51e1fc85d786ddc06cd5bdef10d529..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2451
zcmb7F+j84f6kSI)R${A3Yal?{Lhty}R<xug#3m`YDR{=cOykMB;v5_`iex0&q@U7%
z;Gw*ffd{6%@=;9JkyMQwo7R4i_Blsquf6tF|Ni&a-vHLo*73EDwIWKmqvNiU-{@E`
z!oasWHcD7Pql6~D)3K>zOQ2x?{KWD@fm7{h(em6-9&>NBU03=o#|i=&2y9fUot}4O
z?ggPdG>5(%cz$T^2afqPS`s9Xe*C^N2GtPAx4eBRu-vg-`Dl2wC;hIq=kTQ5@p_iC
zYx%a?Cx`j)z@|kK+CComDWUaw>}ND-zbKtR#-wPIo;<TgmN^V<$L!ca$Qz40cHgx^
z`Xz8?JH4G6e=?!eoSn`DUSpFcw<_&9LOO{dAZ$Kufd%DWoW*5zPc2jC&3O`cLYpiL
zP207@O@Zr`j_3DH%MBgh9IcuD&<*V)X~rpkI&@@WveB;YQg2}S(q$dZtj3Jn?#Mf|
z-TqE!g-nFem!Se~yZiE3AXll<*@D&U$pL}y{SR{J%Y;>zt6e*=L(gv{Id?3#Z$938
zCVMLD`Y8TN@1{F99ZO(kyl$Tl-q!BzIdGcwZa1ogQ}nlY_|O_84e+qp-H1yxOLub~
ze-rE~EwKD|yrJKd4{X(PpG@}aP1O#})U5q2aCg?L<D<a9J$%nuGPCwX)f@N$ErIp9
z5HkH>;1VtiRNt?k6pn%W*w*pDz>oN8KF2dNNZ{IR%_Fds6n&<FGqn)SV|Li|GMns0
z4&8A)4%W++3BV~6u@v=2Jc9)~mD$JL*xa7pc(tj~nA&X|3lWpnf$i*bq%isKY6LYe
z9`SE8%`PtTcWCfG3Fsg$PV;?+yF18n1(a%KE%yq!*U(;atD($yL4DFBKIGbnui+!C
zaK~oCr@W;gZc!=-y;jb@!UreS4>Ia{qW&4LYd9Ohoa0-;Y>|mZNhbNT5tIB$sKW?q
zCBBwGQ32=iIY9)zpqmqJ6=JsvC&AnduTtt3dnAEqlTR*ktA6ee=)XslRaA<~zV-_W
znjb-2h_9u5bX>tzf~ZhmBQq79FHuQgZ&0dlxzmN;Qph;aL55K-WmH9t5Gq1Plqy22
z^?$JN0!#JRSg8GpMGY_OltoH@%}1$=Nsds~e$51JH6^)<I<Aw*4Qj-xRVO!jV)BGF
mQAV7kuW0fXk2KuIGUX*2P#!H|k&zepm@-efN~zqqfW<drER56u

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfPartContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$IfPartContext.class
deleted file mode 100644
index f614af00cd892eecffb07e8b6ad66d2e516024c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2595
zcmbtVYjfK~6g?{^R${4XF%Tdv^hxVSsh}jKsZAPcT5!gF#*^=|t-6~il1G*^<)`o;
zU?vPRVah<K<s(0e;jE+>IWdhh{UF`d)!wuB+}Hm7&+jh*EMiT^qK>5;4BSw!uXNnh
zv7Cd6TRJKRW>7WoHCA-o*0CyJ$fq^m>&Q_0o<P1(Y;4*)wlxT)Yc*s)tO!ii{Ej1V
zvLQX^!C<@P1Wmi;Qj>4^ZQI?j1F60f<y81g_61JVpFXmKkl3N~JQOhNp63KL*Y5Wn
z{=V60``cElA39ssAaHtq5L%tSYdwjUwCp=U{Jt~-M0aM_W!JMqTG500f8Gy|dVGjP
z^*E;u!;t`1R(R-Yp<a9|5CI|i)CHznuHW8bMD8d#^m>_IPaKo9smjo%FPS}KjbaG6
z_BLTiAw~R`kHtT2Es(8BPlhW3R|^e4=vuZHx`DN`Xaxf=l-rIKC;G|2b@oGEFK*DT
zX9teQ+L_plWhcEIe@lAZ_0SGkAZFJI6>#0_IL`$#g(5SMwcBl{N8r`}K@I~a@v6zy
zhV0AG4=PD(xVG1|9=0}}wrUQ2C;m%z<H?Q35||%to*#Pq4Rrk&IMs5q8Rh2$`L?(2
z+r6X<?^m0*;!aMxyK)@933ibu2;|oNLC|*YN!9ls9PZL<YHBc3lUA@mWzwx204$4m
zLM8QK;v3vCQNy<aOB3Uyn?_)9V!Ko|o4ANe0>z_klcF(k7x#30XX1OX@@^b$IBx0*
zT%N3PIHi+<Pa?%pd$EuzglGWoS8{sD&yCs%R1ceR1Wx7#3&x20BA(p>jl$%!ZFJs`
zZMxD}H^z1vM?&OD?U{5t94EYb-qZwYRy^Q!w;!T(_uxD)RFl^%c#9GjbI@>-UtdrP
zO1+fV_K?}-Qo|{}vr4V~jCZ&;<1NVJeSXbHdp?X{KH^)!+(w3WfI*nkdzg9!?I6@{
z1T`OTOQ2|g1)L^`z!`j!fGrVB`9!ekOawN45bW2KUq%8ZaCRK6>=;^mDRX^<)_I<M
z78epvQna!$t?WThUK~M-O_zYxNh?EIdZ~QoH|W1`8HYNjVxs+ltoCOFb}rsFjFFB{
zaXE^Jjw_6o%2)x#1oksZ6|KxE{ih*hoV}MRnwepgN+=UTWo?^MWo@DS8Z$p)uKWr!
zr5Bjhuv@0gQS$FpR1dL}uaVdON-<s-I=O(WP_A5~MO-gRV^Q-tHB4weDI8UC*QwI*
cCElaFzyl0!dl$3RaY9p0Q+`aTXq?0Bzb1*QApigX

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ItemContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ItemContext.class
deleted file mode 100644
index ca50b7e5bd2cde4d6dbf380f4858eec22ad99cc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 965
zcmbVK%Wl&^6g^YFTGyp%frLk)EmSBEz?%pO6?GG-lBEct7G>`^qhM-}qwzQ@|HOt>
zBo=%CKL7~9ry%acRvU?pg)QGZ_s*Q-bFTgM&*v`y`grVM&xMT#Iy}^2-@$={Lk9a*
zEMj%S@U%V5<kSy^N~AyU`?3%!PPzXklsT7YMZyP}Q2bII2b~dvImjlQVS5-0{<=uV
zT)qv*33YadSrjItP{z8hnx=Xe=M0;H;%P<0-~~c(IY`1h=d}4^7-gwH&K1A#3(04h
zRQ@DS{Ilh<lu^c`6`EtRFbgFYilMdxhOJo4vx`_v&sC^MH48}3lq>Bs5EFjMV6;2b
zq)2Ypqipu!RAwo|%l7~2)HFt<h}b>P3K{X!SdXjquf6B*!+A(<>W;&MgLNI69$I+B
z(65VJ9VEk(df%U+S9{Q%5e{L||E4b!Oe>|hK~(^QZoujG_7+(CM9Vd}6kW<Nzri-Y
zW0UHG@)$g9Q$+wYutOwzwTqi{n&B31SG3P4>pi2<_(-Xwv~|n;v840L?TSt-YEnll
z@+oVm)m^~2)>DFiu7Is8a0_=T@Cm(&bi?lU7BH{TrJG-{%->6fW_jw$jg7nHi&6L9
RQto}+pzKn|qGt;me*tRf-m?Gz

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$JoinContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$JoinContext.class
deleted file mode 100644
index 3ed57da429a0b7247ddedc028cd3b089381fde7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1660
zcmbVMTTc@~6#k|y-F90pqJkm{C}J<bDk3qK5KWEAk^%-A-ly%P4BgH)+iinC#sA;~
zzG(Ep=&OH4qbB-nJiA*7rmKJtyXWlLIp6utZ9e{d`wqY|Ry54%&~Qsf0vQe26k^Dw
zkjK1+1r3V~(MOw)8FHCy$#&`nSFYt4-DSh+C|5Rx;W|PXW#KfX;?|~J69tA?ktD-#
zNh-0~X;y?&<`s)9qb0k_tzGU&@4IJ=xqGtBkXpB;D%#2w2QEX}R7yBSi?`c?ey)_N
zcGIY|UC}T)j%eAAYt-77vF)o*xziR-@SZ&eLsTML+YIqlsieEcFrNueB5>XASfWRu
zU}ks8uf-jqh|Q_p7zU;4+6}4dJ1%!AWoA+`b>Vv8rmBeps%R!l#yGE5MT@{6{srBy
ztk0}WHQtqN>Do>qTiWMcZdhE^jjhVQsJfJ;)(!qrhT#c@V=;{V*^p<g-%VLM1I}u`
zTrR8;jX}z}+SuT&UT2d#vaYyG4P)3?EkEd|zIK+}dvUT9jX~eBJ5E(Rk=|U5_s_wi
zS0?J*Y3C*l1Gm#Sj|&Xhlbw3)NaGHcG~7+oF5P2TKH0H<N*U%tH>+<b84@%|WxFAi
zH_E1YhLueE6XNX#!+PfbwkdS<a-rNq=Zyx$XHndfR*e>m;r_qc?`@2Kp@hW63|(3Y
zy25|~FeIVVJ4Ihhh>`{*awAjGSBM;v9zmMkanG)Q!XWAC;0%Uvj=tz#3iF>1^Zy*`
zPg6rEUVM|{M@eeA{N!syUy>Sx*GWSEg1G+GhnNnI^(c@7E@I55rC}VG=rqG+O!QzE
zNP1~SM`m9fK?WIpJH{w_l+hJT5`@R7Ns>ZiBL4xg=NQVrM=bXS0}&kNNybUi-<V&c
zfaG_K>OXwcvB2|)<OHtb8WEWykD!L0WtuEAWTDEB;yNi2+@NRH*KT5jq}Lveo?#?^
E0U*MxN&o-=

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ParenExprCompositeContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ParenExprCompositeContext.class
deleted file mode 100644
index fe80790a25d93574651439278181695739237213..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1997
zcmbtVTT|0e5dKbENH5`HRW212v}l?lQ3OR=>ZQsIGX)*!FutbYSORI%NmB-XivI#%
zaP+~!SAUe_CJhj6xpa8w**%-xZ};r2zyJLB31ALO0v^Q?ha@25QaO$=vMx6*;Bf*1
zW)e{FM8H#qSc!jjKB_i18DuF_vh1p&nvP*Bdvl82G#$Oh702dWDRaA~o2s#9ZSfpK
zq)3!upro68ty!yZyR23Wk|ax(rW%{7t-E($7;(1s2E(Z5>HU7)E?Tv^)zBSYv`mNZ
zI}GBAX>z-0sEr0E)psS$swtI*!*`XY&Fhx!C|eCfS@&4NX>hxBrq2bXF#CAW8N;p4
z&fn0}uk5cA1i6Z@>(%X(T=wR5Q+EmsZ>4JjXEqtanzPUF>Y7Lly{e}1IwkwHbU~%P
zw3eynn>tm<vU8czj=HBRhH6%o50xFRIrLm%ul1E-x*IHpp?@3XpnlRMvt8iiv*mKG
z;1+npQMKJwweELXY(uY_szWWqu$nI~wufHm=Iy?p40)ppZ&*!R<IB3+=fmxtIOC>?
zLAq)uiI~MRhNY|Or#p3?NFzTlVg%1cyuc_!=5jc{up$=lQoy2!9P-qvmm6L-aSYKa
zcgohTyHBR2m6a|wN<UeyH;uE6ke33*^A<zyJiJz10c)yOSaL@vs#*1eW!tJz#k`Jf
z-xds?x){=Sdw+#>9uxWejp_v*m@{f-FT&!sZftoQdEuf~bzkc(;|}AANm}<|`a1x6
zz>t7QXCK{WNy>;u<-xJ=5kiN=htN-FuPbL`7$Dx&CLIjoCQ;g&7^2g)pZDz(axzTz
zkz<7ahqxPnNSs0pcM4&=QwS3Q`?C;6FzSa;pnyXZN?iVi9yxo2-mi2EK4Q{C7;0(x
z5s*GoxI-8WV;HAz?sIBHU94307lbe9&mKdNzatvLVU}o&D1D8135vU#ER7_a3gD+s
x@l&{qdxSng7Oe!jl1Y->CkdrJi3h}lkfz_1$2~-nXp-)6QoDhem)+Zl{RMa6Bt`%L

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ParenJoinContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ParenJoinContext.class
deleted file mode 100644
index 52c997bda462e436ed0d2d1d4e909066c9ee66b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2461
zcmbVOTT>HB6#hENlG_Mu6y3$^3TiIsD2vxbbd8IKjbcHH_hD#5%VZ`s=}`Jp_Fw1=
zTl!$>t3SrFYHKaaDy=;|Gl>HUn(#n(&&fGopYPn7cVAz<1~7+e92Zm2a4C*iwg0Y`
zIkj9)A&M*NbTy7^X(VwyjT<P&QDR6|`D6LWaJkKp&*rL*Th|R+TCTn|r@L)iiU!xE
z%eh|TZbR6H_0U=8MTS_Jc80O4u=&GwV~x8tW6dH-rs|l6wQ9IReFwsr+z>5>aqp%@
zN7!Y@mi(z?&?>gg-Lhr0TAVbBRnuwcYc0t)^|s5Kjw|)`mZdLyM>215*I%c1V=1SE
z<PCCxh&(a2481LdrB_8u(r?KXQMV0ApbY5>>2+OL>`^Zb?nMZxI8WDH&sK8#vu0p|
z{wfTqWl`VgWF@iG<gOtdm!Z_h(E$^tTq`Ko2GnO5DG6K1dBtddd~&M{QByu;xUxS0
z^1(1o-lQtIo&ApEUOm*PMps2kP@sxI_ASG%>q~1-xT*3V-|~NDm>C9(;qcCae%9<1
z_3RKhr9!Rd)yIJqX_%W2jAqao4@$KgezAt#ogap8fSscosCHJIwrlbQp?dL1Z`)i@
zjlqx|w9Pc!1Qo&Dp!(CHhR|>ew>A8MI~vNktKl^M)UbdlhTM<wf^2HIhx>6<G%VsT
zs>UB1?lB)25_K+X&Ze4mGug^8%`irm%WaDXGlK@zR5p|~Z+vyiE<AKbciO2I?lIfT
z51&TpR?2R&!+<<EsM@(_%tf=R?-Hide74{^Gz>?*y6+B4hNU6;xoZ{>?{Ey)Dm@%~
z4;7C@s5co7c>a_(gthLyI@i8e>WaPh;Ph!}{6<e&lpa4I0m8*7tz+~xOH!t!`SD}X
zZA6~aIf8LoN0dDF9zWAr^L3EH1btDP;|OUf`%APd`*=P>=CR%8A42Bw!2B0dk6_Y+
zIZCU7xkYY7XipQ&(QW+n2GQM6|9Vh|eYF6J3~&s`354N9KTgN{ar!UhRHDo2WFJoB
z6WbWs?a0TF`A$x!$c>W}YM)an;6$OFAWl7@{S+e9aYLo2L+CW70;G8&t)i34|3iT;
zY$Nf)i{ZC4eGXxzy1_|d8fOTD;VjM(f{Jt_z?v+)Me=Wq7TzG4e~DBC&kMAtX(z3i
zR{|+@YwQa$v9BTg$u9mRvd9s7o-F(lQIY~lW=KMXm4Tn^^8|E(L=osXM0<u#%HSaV
LgQe>4S0w)jfk=3q

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$PropertyConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$PropertyConditionContext.class
deleted file mode 100644
index 10023b0e6c7a93fdad0eca94e38d8155a3eb9ef0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2183
zcmbtV+iuf95Ivhqor@_YKq#RUC<Sr>45dKYgir`ns#Kt&QF(TqRWNnzXtSx>PvI}h
z3kV(%yz)5+AtVrD?3l<+T1er+JF}NLduDcK{ORYr_W)+`K*8k%lDMMasw*`G*Ah^1
z-JQ%RxRFE*vq{{<Ed{p~6d7VI;k3Ar+YE<Se6{M>l5a@{b;-85s9Jiv&D#v+Y;M_b
zn%a6>@(rycc*_w|tG6xfsi&^!qRmBjobCfFF+{3PozpeTrp+IBn(JKD^mU6?Qp=8^
zTWh*7-MPOQk<U%Kb3A}kH>K&=J$BW9BC`vGScRUfFyzTIM>I6umX^>qXEo8WrP<_~
z6r5`{E}EvTTaSsq>j&Rz35MiD5<N1-gTy9aNq8e=(>7&=VT{mr(POA&hj+5yx|CaE
z2pe*Xq4XapL{K*j-lBY1$o?Tp-n-W*UTbFCl#VFnmS5<bx@PHiLwmCRf*X>YRW`f3
z43`gr#gN{eB-^dui86BloN}R7D^-Zbp;f6H8;|sspKb9~vtjF!a+={$xi&vYonB)9
z4C(jXzb8kxF(g)<jxhM5>E`;0!BV;EhKZs0ucf784)YAzVeM6vP-d7N_WX1pT~$or
zj*1E<8FGII@KZs>T`VZLr{X@U4EO$SIM_t`3S(|)jQ+A<7;SL*v}5sJ@s_iJ_x9Rd
zX=$H^&?OeIrU#A@Ud`FyHYIg-X+O)oT1hzT)@aOdTHA}lX;PMZ<uTCn7@i%V5e%67
zj_zHN`Qg)=>c-<&eQsKH;rd(rQ&qT8@_ObTodD<Pm!#5P3y6YnF-GGNn%zX0G$5Hz
zvG8kzK7j4eG=vn5BkorGGmet3c8}p0(ln#W!Z?jC#EcIS%a5fABGPaFC14-x*`LHI
z-#$Pg+NBWfhxi(RNcJEmFzG{7h;WFgB=T=Ck}tf5@``3bC%$<I>Fy~XfzIO$&JqTr
z_)O8B>rRuTi<K#SMC>I-3m*{6zePNRodU@ON!pEg0ZO<h<KK~r{|Mk`diWWf$26f|
zAd7AQ-Ia^9a*0+b@+o9V2_Z*c-qQ*=Omd1YpuY)55vPX><2cDE$qY%A<Y~lz0aYeu
A{r~^~

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$PropertyContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$PropertyContext.class
deleted file mode 100644
index 333b29bf64051a51aa5528c92a92cb6c5fef376e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2103
zcmbVNTW=dh6#m8z*<`c1)IbVpftKEUX}dJErNnMph=gRx4OL>LQbB@^J-E}XcdhX_
zYJW=qLm$dZ5j>#s%8x>Pv%860+krF>J7;(1oNvzMJ7@p?=Z`-D+{CvIuDZzMnuF_B
z`gZxkg^L>wR_Ea0%Q>pua&TL~t+!=l)GtbEfpW3bh;_#gA`@zV|E8}8JnKr|Xes@s
z)Lj(?;bz>HRe`AuN`b|Oisa^?yDN1w*bTW;XvD1`+zGU@-`VDrd7}E%eyHP~)aLm{
z92xn{2zd1<l6oTy`h7`-wMHxM`n!E2_xypDy;vK+-4Fe(<n>{o`%<Ut#StjFG}Ft_
z=>$W08te!Dz^Kq~sJ`L(?6&Gefg!HI=9oh5<X5i~{BE&cIyr)XP<-kF(=`<-vo3J8
zIJp>U_*;WeW=X8pOFOjd1)8N4IJTL<yo&bYJr#AfO<<T5uOp2Gu19V8Odww@S%-pF
zOZEtS{|MxS9f?;>@?=N#m5FsV%YPU|9sm2?r?O=$;OwWTjBavpld%Mr-zL@b-T|>z
z-vOsqX*R32R`ZOvwf7+CW$b)VYp$hq8FqL5UE<BKOT2+ywH*(1OMa(pKb#)t?sZE|
zR_eH1_wW_&2;4cY{%CJ__!?^-s;GH5gR=sq|3}K|=;1Eb9o+M9AKwUEo;V-ID9K(V
zm74LMj4YAsY>kPAlLpITM#7BU910hTL&Zr(#R0p9yL;hnJAvA`*-?Is1z<^%aP?ry
z*okrS_MX@b<)c$F+D!-EY&=n6n{7@m{1-WG4<}=K!o4`p-+{|N1uzYPIe1*>`L)V@
zK{-=ix|Dy7+$+B4u#oA&-NGW@tu}SAg!d^0KEQ|6vi3J9?U_?9(0pptyg6j<Wai6M
z&*5|e^AT4IbB}K1DCY=s<~81XgZwDeqXcR>Rm-4gfRC|45Me2vfz=6?PkgGJ{SDK<
zCimHpTx;w;#<crG0(LG{I|Os^2|gtV!@*~SwV|D3>QW!CQQEWo()pK%kT#oee;f)k
zf0(7uae)vvye_2;Z>91VoEKQAykWwA$4m~dDwMO7Je^ANo;vvx3hvKC5w9FNxq^$h
n#9J@ZBCU(vxx$?ycUa8=(hQe)Wtm$!R8XLFsbY(L3bX$L0R|~#

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RangeContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RangeContext.class
deleted file mode 100644
index 9aee76e2d86ca61cd8d652dcf350b7042d9ebcc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1859
zcmbW1TT|0O6vzMD)~1&LQn_gHhM@F<L~eq#R%bfHOvi!_ba+q0P6?z*C)qOaQT!J8
zf};-(zWSjY&!#C9sUz@^-Ob6K-#OXyKl|(V_a6Y3P*RXdAdajYatScx<!V;J%Os+h
zOG3jd1@jDHj|+xWCR^Rt4|T0AOiQbpo+vOx%FZrl7^<2!-)uMQ+^y+#i!7<CW9Zh7
z?wayFFh<0l=`pBVy4~Pq#}@pEz-q;|xm&h$&*SuUrD`}$t?mhaptW7za$KS9dX~23
zFF)z7$KB32-OHh5;@f7!)&)5+B(}LYk5IXidhz-}E<lA61zF8hvbS<(U?x2khG@~W
zO;M7pTamImR1-rSF)ZK8pEA%5gSY7H-)E|h+t74dSgv-sq`7Tdm`$z;mvhZO<r=Ma
zOwSaKTL=VTQTeow^?hzg2`Go1uMD#{VKIzdmdJ6dE0cvAaEkd_&9BSAw$P1(4ZRg;
zZKGIQ>*%#N-O^3|H(+Nef)td~b`8F6N_CH472}-j4FwAfi`Ulgg|t*GVoAj^UaNS3
z6&0&UGi3iy3QD8m4b~JCR21=+bn$=3J}tzMxvn3ze1nUvw$*K8YTT(z&w2ap+!ajk
zjWKxHkD++gjXJEaDmyv%M5VffGqN3GhSNG;cbz5`%GaZRH86a*L5E$sP5Meb*Eg%a
zy}~fy=TY7>tzDPfezX7EUH;Q1U8UU<>(wkK=~`xVX9E$M6G$QimEPuQmUbnVVy6h5
z&@zMp8l%!2Q!z+uwX+37NYUFpf6u6o8KY5R-XTnWK$0*MrwE^c{f!#(QDdEL0g4<j
zj{5{*B-wNTE72YaOXR*HlFOgs&KE!AMOwo>ti(AhfeAeHS&#6T2r{u|z)I(TBKjGF
z`7=aw-=KtWlBYRFGwq7_znqX!V<Sk#Mtk__bAB36@RazI<k2}2X?aGLDYAsYQo-3w
Z6X-daLU@5;np3ojV+MEqBFta}@jry{_}~Bl

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RelativeCellContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RelativeCellContext.class
deleted file mode 100644
index 756ccfaf619a5aeb3b682f2e89f0f8c9e6698164..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1632
zcmbtUT~8B16g@-hZYf2eASj}uB6eF~6)`ckX-t}!G%09GMNRZ!+D^*Q?QFB1HuzKg
z4?f_FMjwp6`lF0@cPqiL2*ih-d*|-lGv|KI&tG4^0ocGp6L*p@v7AH#cTHr*5QjB}
zEOI7ROsq1*OTuv&vKg!5dM%qP?RfTJ!}j`0%Z{+MCxl%SUPmhKY`IO5_kBn*OjM*2
zTm4R5cr{*k$dazO4eso4Px||zF|K!Ik72qh9IoX+_!pL3rNzExNR^cmUdiFTo}fd;
zO2h5g^_~`OyYGpv>uI~$bL?uMKIdLfc;UJf0Y}t~f>cr$8CEjU@r2&hz9WVl@?~p>
z{JPu|iU^(AjbU7>f!mg<wXM0P=vkTKX$kFvmsL~jGsH3$84ccOh%SLYIRQOLa=@%c
z>E4k&sa-E`RrdIR+YVPP`&oTYG&BWh4#K|_VRV4eSPZj&*XCXKPkq+Ufm6uUYWX73
z7^j#U?M>bt7I}1AwiMS?GltDV?eTHy#q-2IyvL&37?Rs=-)o4c(r>Z3<E^mfr->?e
z*49a34R#7?Ofy)gI}OW`!adwKv7W*MY%ml~cRaaK8I~i5?O1a%B&eZkZd)k7rOV}W
zOzBk6DM!bIp_=)>0gG(OY-B8veMpTHuqy3Jr%40H@aSJ{;ZIWV=0x0!oAj_H=$Qk(
zX$+%C(mF=Fb;L*m64}X_*e8q}kUoMGt%h$mUSOQ`RCop#F-1Fix-d<v?_VbW7)djm
zTlkFFM^Z!gBuN-AVHmFhh{f>O5P}>qgG&LdiCN6iX@<+VGK5_v>C=i$&U`q83>m#X
z!YFpgXdYJy!e`VWNmpY&_XF|wxS0Enc=ih}jNl+g(jZBH<3Wre$u~$FZv)iX(DRVw
rJQi?`h+HR+FbBTn23Z!#LYYfbV*QA3(RVx0mM}@uPp?Ve1V(=Y&jPgk

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RelativeContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$RelativeContext.class
deleted file mode 100644
index f9b7b0bcf97b0934dc5bb10f854fd19ab2dd13af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1624
zcmbtUZBG+H5Pr5Tv{#N7D=%7KQPjR5r-+77ti~oJO-eECh40(zrW{=Fn(elMpW?s3
zFBtt`^s7J0ICpIcLIoN>+|KOW%(FAI&+M<?-@XG_!<#4`#}UI)92%bZ+S4eWO<)YE
z38ayUA{)grL!=-ahar<nmps`pxT_p#bk_{oah2T^hLS=UrjSkB<xbhFi<}=rl3}`J
zyQ17_)`T>9%^^#o<XPO=<<j=|ePcxJ*=_Q!2!|`XD+->g#Gzu)i>@nV!Qt(;Acu{T
z<u#33TZsdsBSp)T%BZ&;qY|hexoivBTbIs3QA*>Rwri_A!>nIV(XHDSSDrjQ>qF}L
z=)(|l>0O4fr4AY1{U;J7%PmW^r~~g)moz=7)ui_C+HIR^$)!vCyvq%TyA5Nfwl6G2
zg-5%+zYNQxU@^@9eOE`V!F{ccfU}u3&0L<+n5-&p9c=Sf|I)Rp-Eg_0dt}(&G&e4$
zo*$+5{yAwnjUit3I?@tbwokc*i}YCW+r*H%E}e8d$BK@dFm$}Y97Fo*$o`$^c!||0
zUg<P(uNl^_4jj&4hPT%a9Y#-vSVJh&I}k1rAyq7nFwNnV&+VAywT`x=*QC1)C^eWd
zhVlrrGl=RB-f+%l{{7ONC;cFs!k+EarC;6pWxT0$91%QHLuLhw^ayJ7I09i1i!ec}
zPP^4$55zJvv*8njj>#6nB(3A*0j-QF(sf@aglQy5GNQ{|KR!?1A+p6YUl7h@PZ0S`
zyR!&80m6LGtB*kbn8yNPFx<jz`se4;B<W)%vp+HR2~*i07|VRccnHT?l2MZMHxgtQ
z_dT@=5?b{Pe)1GQi6rh2`dy0XW$#<=k>x&Fs0Rr=ASHx{^eqP3BitaFpnZ(oW~f~n
I$ysQB0A)YNW&i*H

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ReturnExprContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$ReturnExprContext.class
deleted file mode 100644
index 4ce72d0a0449e6ce793bfd460fd36cfe0d294cb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1741
zcmbtUTTc@~6#k}Ly7a=WDk!3YBK88TVo^dHV$x{Rq#%KY_iZ~V3)|ghI&JW$_#b@0
z7mYp`eDw#Js0n)ZVy)>KN_^NkGqZEP`OZ1tnJ?!bKLN;LL&XCXsTf9)jv<PSifkMs
zSdL=_t12`V4;jMzq$L>Q&&d>ROY#%RkSJLe7e!NVw|SdkBb6@K?50+2OMa|%1aH|w
zYW23M?YYxkU9`FI#>GCMJi!<3I%k+D8y4T`G^<=x^r}fa$+BJ3%>!K+&f4D$%R__i
zo7&^DBdk6ohQja+2E2(!q+nQv++tWxm2J_`bW55->*h4kv82)Dn#X>xV{$(W`BM6T
z{93x;7NulpH-<68>e|PK)!3K1q)=IjGTPwM0WVo~e!`%n(zF@TYc<{?@Mr%(mxBAu
zDl|JV+J>}6K3zW2ySirTRzrJPJ>oS<0jgc^FGUy}U@#WL^xuVe)%snGwM*a>vXx4H
zi)f5d%(dffz2#Rlx^FZrovKNB*e+By2dQseCU*axG~LD!+qXNS#$OnYo@NH6xay>d
zDmScj8FIrO?N@mMkFb`&Ra|38Uku<^F@eX(saQ|o37#@+UhL@i*MPbimWER_!?>@)
zUZWRMeFbs*on#+e_rV6CwsuALhY`bW>VNt)P}!Nl=mO<T`g0i-4-K<Ued|13!O^(x
zPDAd{`xMksSfF<^N)IUz25AjrG>+419SY5WcqSQA-a$D-=#-WrOwbr{ekoruN%Mqv
z3{$v5E9MA<MhBuq5DHl}lbw5y@LQUC?lH1Zz9FJ~cOmAzV?G2qU>Y+ntcvTnL8lpJ
zanpxgA?q+xCKGRZkRGESeT<YIqdD9n2!~OVEM1M+>}QO;#(4G&Bbg6~gm9WAtCFR^
zVK+vP<T;YcPZxFC^X!qF#ckXnBJ<?o<-pllpq;z4L&;0x9!)}6r0>2vTcU$NlGaW{
MamxEB*(9RB0FGhbTmS$7

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SetContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SetContext.class
deleted file mode 100644
index 48384642796c14c552660c13572ae02e3b28904b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 961
zcmbVK-)qxQ6#nkgBwOs<oZ70Jx~WKisCjULFxg9C5GW$6^!+xy)VTECa&uGW|Ky8L
zg(*W{{iDQlo3IXi2`1#6dwzZSzLWg^b8!ja5Kn#V1@Q3Dnn%_=_Ob8dfWdp0$iy5o
zylC~6o`hVQREP7!Q0LMlQxSgPIurUdPeo5jBhJlH)E+X_dTJ~fw)%+_@AK(M=#PAq
zQf8;GVxA7UPHbEzYvxmuF$4o)N)(2AB&E>3lxLZs+M9l?rr{_v;w;Rym?>?-ah8Us
z%VWW!u+LT~M<igzwUCCPGJl56M9$S&A}0gG4RK}>(U}NiRYr0w&KaCmo04Qn>w2ta
zUrw}|GQ4g57fp-e#D;K#fy#9(P7=GT=D*@zedcpcVyZ5q4j=2*H0o&L3B&8Elh@YB
z@Vwf$XXsX5b9;ybxb&~ts|IF?lHH&vf<rgpce;BEtbL>78UnHbdH5Ib{O`Cy@qW>U
zI<_dH61H)RK<sG;x2c=q4(^t)FUi}Qv%UM3Tmk9Xl>cK1S1-yXoMqIYjAay(x1(-n
z0cXXh7{0tV>|PBwajzUcrdJVfc%AM7wbgW?<|kbL*Ak&obX}?OaG!KB%05`q-NjAv
L0cBizHnH&+pEKN&

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleDataContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleDataContext.class
deleted file mode 100644
index 7d88bcf6cb51068996a524649e99a45d6119c35a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1741
zcmbtUTTc@~6#k|y-Ch=uszvKvQF}pFxhT@6n$(bx6eP6i`*fL<h3#%LJ0<W_{1^Cw
z(FcRC{wU+wZ7n5Wp!zcB%$ak(bLQNB{`&SEz#`sic$z>A&k~5^xzA-a<dPUeK8XTm
zHN4O;$B^`_cE=VCZg&Mks&;y-xQ-GBia}p<93d+<_dMY-yvydQrrS1}o)UXTSBj1+
zm9g#F##X>?a_I@#J7>=06&WHGcbl9|RxL+tblXiK>%3|E?yIiJ?FN^YfA0$;YR4kC
zQ$45;T=79<rBMSJvZgqqCCjl?nITaVY5=;N9RYP<SIjjS!lpW4So$Y>3WuAf=upDn
zXREGk8Qf8}H1-z_*>#lF7KV~S7(rs|#5F9>Qm!oKs=Iuj8#Z@Z#>eKaFcp1G+wZ+H
z%#MP^kUm?2!_J>F%#VOmD%9)6GKDc-Q{3EJ=be5n<29@0a79hSuwJUKoDaP`%HR8b
za^%e~qT7|GShf64nm*r)bAFmM7!1Y#XkQ&K@k+-H%<EV{njv>NSie#_jpdSt*E-%{
znPKH}!!tuP)VmA|S2rHCC`0zDRtys@p|-lV7>q?JJ5;P-85GxY7xzRj>>+EaPB`li
zNX&FQhpW<U)AR=&dOFk$o1+X~u&0Jna`71CuRcfAtU*MT9n0R9!eO9A@ON|ncN?_E
zF7k^<v~J_HhJi4sF)>c(1l^W`JCMw$Soj#B6R;x^hcHQJl#~!-xJJD0^GIR}*NHM}
zw{#z(OxhumCGuYo&KHgm`AoNAgm8e6?rHTANFUR<MHmdXk)by~oHkJ(D^vJ^u}_#N
zoM0^f710om3Pd%c^co4GOZb|xC{i(P2tPBx&)^R368b%|=tb{K?vvyJNhl2|JR~MW
exe4KMz&#;FavtPlhCUmotj!=rG*0v;;=ch8F7Ctt

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleJoinContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleJoinContext.class
deleted file mode 100644
index e26857e173ea58e97c1261a15e32a1e76fb93aa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2348
zcmbVOS$EPv6#fR<0wJ^&ZB^X&0BT(7(t^04RVpsWV&BtrP8}N(&JcR^r}!`Qr5=6o
z=&L`<<DHPwSc-xV%$-c`{pP!C`1$MWHvn^}CtzyOaYZdx6S$`2b+ycC$l!+B-Av$C
z8Y$dPV;&0$loBX2jCEY$Gh~f?{jIfWnH^s^W?i)X61}T>Yn)-KE?oY+(_H1UVXZoJ
zlC68T<*ZmzsORu-%zq==4EvTvv*qw5Pq<aj_4zwO*K4lJW!16TZB8oXy6rX1)wa(!
z%#P$OPx|Is+c94S+n1JXbJ<<b_JI+t)UsH2EuSnI(yxhr@1CVTFGjd3f>f%|HS<O-
zKRnT>H3Jj$t1%>Bw79f<Pm<GnaP#E4X}P{5&CNMec3fXHx#>&J%?6iE;abjf%0R%T
zsMrjt&oEII6qgFcr{?o!FFy0e@D4=`OZgRsxb44VxcPqo#K^L3-lAH#XZ*#DAnOeZ
zz=~)K3R@|xO2=~7%@?b0xvlClvDtmgaB&nYhS@*s_I+!+cCU?qQ!X|dK}s^qzGZJb
zvsz&TJS#UAx=j?NTN%aQ5IavdFlftON7{T*sFpj}-yD}!!!pbb-As`h)o}+E9d~h$
z!59`m$9+7|QN=?YC-F$fB2F{p|7{*-Q^#XGNuZ`<2~Qao{%tsD3XI})q>yQrt#kiX
z$Khd1&@eh<L~<64sO_SQj>5@5?NmGWnGI^tt`m`4)eIxNhPT08Vz6JecHi(#Zfj7L
z8?`~${lkJf)lmJKw7u5*Md>xk>7ZYBMk&L~5eC7IT^O|O_(ZFmp)hzj?e1!ZOu(r6
zMmTGdy9~Gg)+8!&!5rLU7~m9r*)sGE1SY^Ri7CV|O;1-zGLnfxmTe*Sk+w1H3)L_l
zN0#<_R|WeqOHT&_ox=f4j#dS87jd!!(gbs43-Rw@yP+lmsM)Ss2t@`sf};e&aBL4w
z(=%Hb-wl);$mw_hb0Xwa4ml+Y(=)_rVmFQ!A(ZS9O7;ky#OV;JLZp><TH!MVs<?&Z
zryvG9and7LS`SOZ8Jr~yhI2Si2r5#|5Gz;wfz$^~7QZ7^_yR44k42JclB6{j<Umum
zj!z*wJ{`f&_3(4J0E5u;WYNu$Iw{aekxt@Z*)Ulb3Fs0X#c&xjBy;pqr%Mjd{~Y@N
Mf<q)TBu^pr8}}@55C8xG

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleValueContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SimpleValueContext.class
deleted file mode 100644
index 7435c2e5fc26fdcd47d895b3725f168d04ddaca2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1921
zcmbtUTT|0O6#llY4TJ&}6%bIliM;?(L`92?!XT5GQj`YX({`r>(xj879sDW&2Osc7
zM;{b))EWFwjweZBaJmSL57~2acE7Xd@|`{W{pmA+Sv;1Ilp!G{qYY^ZlO2d)ssqzd
zB;1v7k3mv%+VaZsIzuXv%-T*_(Jj|>l*X*$)GgPjaK&{vS2XTa3`;k2c8O;gB1<G0
zy0eDGbM;DrJDOfF$<mXxi@Ld~JBIh)G)CMlqegpqqf#~brf$~xl5M$s*JX&Qmc^YV
zQ?J!Hoq3uq+7+cxbNP-^cX-uyT%}Yqm33czsXI091nYRKHwrA8+gM%n(uwA^bv3s_
z87{7^WtX4lDCpcqHcLD6hGn=543i0Q!h!$wx_K03Mon%KuBtoSqL9xGW9T%jhP`80
z<-DuAR34^M#%1n$&Q+_#cNxNoBpIW6vB<0B{Mjkq{Vw>CY1EHRqh`3alSyW`^@gsP
zx>Z)z3fsKsQVpa=uuB<=6BPSm=>5BSud7E5oVkFX`Lw2G7ATBP%DK3+s#lvVXwMsE
zOLwWO46F0nlh)7|E|Pomo+RDIAm{D6Q{*oUkAr=!WSRELM4dY?xnh{X{TO=D$B;Z5
z)NDtLX6}K6hcP_D97E=8;Hgw*m=F$Q3pW|sh)<fm!!3`|s(OJbj{8J8F-Huq68|-T
zLO!O1nFvWptnp)7+A_=%O&i19zc}HIk^dqI?!^ebd~Ng&f>wrh$h3CQ-weW}ku?<`
z3BN~ZkMs~?v_?I<`~{t)$AUBH!e#oS$4i7C72)@V_$wm(O%eV;h`%br_lxjfh4^bC
z{GbT`O^ByapelIvQ>lJol2R%?^a0^_qz2`aNkaaPsQklsF&rFgmXHAG$92D~5(Y3x
zrx}KDqv>{vq}P^keC+M9%b+7aPec?x?#NBtA{Smn6_Ru{2GR$Jyg^rbACc5YTnb??
zO)^T7b|Zd|gCGylBmeTf_6Eq~AO|o^%wZTMM8E;hGDenhvJi86aGR76Cg{84YYD_j
Ldi0X$>qh$@582CT

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellConditionContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellConditionContext.class
deleted file mode 100644
index 575d117b353bd0269240b3440e2d2bdac4224e8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1966
zcmbVNTTc@~6#k~IY;SU@2w1Nu>b6BzxhT?FO&Uo^3L4sw__*Cp%EETH*-i=k6#oUj
zVD!P@tAE896MZ+H*_K)<mDY!yb7tn8?_B1bvtNFF`~+YT&lRX)gpp8?lr$Aa1hbNR
zpkOWn1zH3T@kqhEf(3>^j$0N(QcdI?x1#B`uv~3#QF9x%Fsob>F6Ua2yH(THtqrHl
z(^7{h!${t=`9`B!;%-qdS#%Q1JBDs;>8>gFt;2xWHtP)Wf@xPQF3sf}yKD;6v566U
zUob@1Y@53|ORv{C$-c}RPE{+_1>e;gF0VPR(8_g7+w|Dix?AUNbDimpN{)t&6H5d-
z);3#j+s#tgeVgjiCksOv(>6txOcl6j!!E1+qyEuLC$<>;hS+CV`Y(NQM>h;!qlCUt
z|M8q&>WcKRTV~x9j+;*8cl147vvj+ny(;Z+Lr`eSUh|e=b`UIviNCAhpmtIT^8?^y
zQpI9AOKw~&2;JCS*K4hE3Kh(XtqUp(hV@KwrQ7xFAhEaXB*>b4M5o~zeASf2JlS1s
zb23c~YQH5DrG{K$Sm{@OrmMuFc#J1eOkp{Sr-(Bo&c|xKY7{F-E67Cg3{;@G^A*o+
zDTamqQ9Ak|SmC1R>~foGNnKkTVAKqg=4OM&#>u3}s2vaP4UBXzyk<BZ+VsMHRW@1B
zaB2suu2W^0@~ZrdDZ=n(kS^{y+|F*UWba{nx;v=_JRfu0rd4)j4r#pfR+sU5bNY;?
z#x(s0BJ`gC0-&jji?j~YZXSN(fM9ZT+<ye$A@M$p&^jc~m9H2jKH8MQ7{+PGa2b=d
zO8uplek2+5lYZbB{?icOIv^r#h$+Nd5Lq(lBdBolJuW0uM;LlXyG|#*dk7OvsTKms
z<0`HZ2E%pSpgZYKm8isur#?e@i{aEUl;j5leK<@J4H2c=fEQp`N-94PQ+{^f$J_XE
z+{7(HpC*lF0_4eUI=Mq9l(raVi1FbrefK=>J}wcB(`A^%VhDNJnIIaW{S}0M1LKP<
Ay#N3J

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellContext.class
deleted file mode 100644
index a39b57596f5c970bdbca35eda0723c157cbe34b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1594
zcmbVMTTc@~6#k|yY+DwA%0=rHMcr<ZRW8QRrZH(kLQ;^>4e!%sQWmzm&2&oOr}!`M
z1)~o}U;RUxXpCpKwIUaxKJ1*!p7YI_Ip3KtKR<i~u!t8L9;T7ROd2UX3bn@?o(y3C
z#t?EaHRLtSG9=2v^B7DcR|#a@;=b~vwZCY|wy)fVu#^<SvW0B8KKIsxZBYnwNHUC6
zTwkoW8#N(qUh~M4sRR!9wzzadyX#D-9k<0WR(1WlC&KN@fv?1YV$fH8U&yk@TP;B$
z#flR&tXfNnJ*zE6Gmy&KZh6*bq;7E860)<-oB^Y<28*umsuDxGDpYTemqs6`y}Uwh
ziy`i)1BRvl%BOO;<A^4m@|E$AtBuZM(<N`YEmsAykgM$SeQtT&uUoHcyTVa)G;P20
zmtnRaEQZOyJ960k-Ie)1aEf``E|jQ@;i}@!-WqRqTbru7b)PHh6~kK5UOroTsh_iV
z_sP+2VH1P4bi|4q5^L%#1?IwQVlb{s868hCr{g*-9nUbqkh?sy+Y=qnF|T1kr@2~U
zSiU^*B9<~NTs^r*MuucvC_C5_J`uoJUF~C5<3`Bjq!Tm`S7gwjsg0=gXMPwq`k9c^
zLwr78&5PfX(}X8hMHQ8ITyI;3C!~qJIDND2iRc+RXHGCp&s>V0KOhcb5Qb>g$(oOB
zAZd<{$Bz*^B3}%{v<^}Pw6C~Ex*qC;FoFz8MpT*T=9efsM!vN94skPojKo{AP9l7Z
z5GFfOT?C59B&G<1;RbHfzp$1D$q*}>|BQh*xR(Ef0rNcuV>rr_)JW3bL{wcmjMTm(
zqy0F6pY7pik;N@SzfBpP>O;>R^4uj4-9ZNTNQvP-ebbTl0AnOGWG5+Xl&&j9avZ5&
DmkzyN

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellCoordinateContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleCellCoordinateContext.class
deleted file mode 100644
index 32943da84711ea13ba8cc67b85aeb1b3dc1597c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1987
zcmbVNSyK~15dJ2KY>wqHB1aGfMa_Y%aww7*En`tdRX~fRc<^nrnF<S=-PB}5!B6pD
z;0u;MSorFXvh3Le43I$L!%p|ibbozJckk~%KYjvO##;sPFv3VENJ^RtBZ7I!JyWm{
zfdVap=XjxDQNa>JAjd6>AsJ8P9Z}JA+qHytu&jxO?V44txq@@8$VJt(b!*Eh^R(0<
z$}pTaZNAm0mbfVDC5uj?dB@PL9bK4m-#QGqyJnqXs$kj`i%WAk#}Q@1b9v6OU4G~?
zs2jG;Mb6Uebxy+TdBdq{rMk=awT9p|N4Q$KZfV;d`$-pdE}HAyHL&FBka58t!`&_p
zyr%^8Y_lT<SsTchw&`XW!UgW0$F>^p9r>SLI<dpxH{3&pmH*NwcXY$xHOlV0_%)B~
z<*`W5ykpi)*AeMNeosHpHA}ZE+Q-r!H(Ux$IcVN8%=d%EFm|yfj%sIhvDgPrCRHq^
zv*gBL!PSlZO}*ACu28|OP$5x`Fl=UuYgb**_7i){PJ*n-M|2v(;OnL=?eVLnw;<ER
z5bw2YRBF!^hHS6$a~;b}#Y?<WF@aSTuMuNN+>F<HSruzYE6AvL11i!FH!I%UV+>2Z
z!?ZO;u)^J<v(IfRsQAW4AJb=uG`AZxNzP_RCf@ey-Uvx|!)wOVrcKZ6kIPOA8cywK
zT{u;SNw3s9%@u~v{q%D8f!DdmlHDip<tC+0@Vw0JnpRoJEYg(et}Y|?hIfbF#w`6D
zBJ}eB0-#BZL0X4sw+KIRKrlHn>OX<+n0OzCX&sQ~!AXn|uQp|H8>6(N0gG{3rT$7w
zKa!04Nk4E3|7D1&Hi*bM!~|k3h%6cO5mY$&4Y!i16AXN%UAq(09>Q2ts)a!En8H26
zV3@{zx|8lyiAt<k>KBwR7)qT&Nq$GrhvO8{5K+1fcmal`WN-%2;A|Uy>>NLa2bdxB
vS<+}GK%P9LlSgzyX^Ucx7#|+f_r&9#;ttUmU4}_4ijbF`F`^OLPa^ae-`g-+

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleExprCompositeContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleExprCompositeContext.class
deleted file mode 100644
index 27d8ca066f3ddfdd4534cd07433fa53ec1960338..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1798
zcmbtU-A)rh6#k|yENvIiiUsSxqIO$k6+zL~YHT1ODQIXz;^lUkl!fi?W;!MCD82>W
zVD!S^tq)~9yIrxyCA4}o=ggTi-}yh^e|-50U=hz1+)H5$_ftsXfzRa?Xlaa~kVX-6
z3LYw$XGrh^PcWoch*Vui@&n1Bt~m}DRom!vc!yy*uhmSqtv5T8@9AB^Jy%G5yJPE{
z0sGDn9WHw3Y#&gG;H&O7XPB&64&Ugun_M)ErcIJe%{2{s%Mg}-4}}T2W0AdF-Evws
z?;*84w_{0u>f6fTuAB`+o{g3*$C4F>sc1WI@`D?SLMUll3~^H)FueLtBy!d;P3}=;
zUgvABXz7L{ZK3Zk>Z0pNtIc&OIM;&;G>F@>C}plFX|-Kr-_UKtY3Xm9yWEr%xU%1S
zWtbZViy`}G$qv0=Wm^~mr(A3_N)>Wrye<uMZ{6_1+9&H)%P}N%7sGnF@#1gSE5pPd
z+R?}wL#pm}g~?Yfzw@U5ZrXW2O$u~|#eeB@6_4;(#S|7)JVBO0J0B%1kxHYwq~NKF
zXIN&ap8qi%v$K1f;pM<6QH{%xAM`)NM2pMKuKjyF%lW>-1skNarbYKhFOt6BRH=C0
zADc1L^$u5s+h&*vx-}wNhWA5EXaqpGQKE;WF!+>FD+fMScPx8baL3=5(E$fT>c_i5
zOEJnWZquGl(*6eGpti+0ofC9h3hqF<kYVv-#7@ADNF2i?oui}#mca$$Ri8&17jcOw
zEjMIChze=PNR}#mLcCBsM&cvg`VpoAgltbML?C@kV}>vot{_KmzB_HAK31;y4I>{g
zQ9Qv&;WI{KI4TlVh|+5!@Gj+RvT0=4Odo#k6hDWnxJKyL=||6dUvh&aH%UTi$lw++
fG0II0cLMG%DU$IZC$ki6lCn074ACUf%SiqNwv`9G

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleParenJoinContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$SingleParenJoinContext.class
deleted file mode 100644
index 3df4d1d0ac332ffdccb92fda70022172b7da4992..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1928
zcmbVMTTc@~6#k|y-QKuZl}p77irNdZihw|C)ifcgDQIZreY=chVY}OGrv!eA{{mky
z`e5+Ye_@O!`Xh{Ix23M7T*|}FnK^sTH{YDw*FT>=1DM5A3HL(?Aub_d%VY>%r0m_4
zga=_rm<~h6LkW)<f(8CoyjCo3FeKxNf@xJ`#SpqB@65_p!w_1P%fjMZE^(`>8H&DY
zZtygNFGrGLu%H=ywNWi|tE7~5(nJfUs_5&ArP=3}(kC{xI>T^LGb%cF?t5u!M$R+@
z-xUmzykT%Frz`b3C%YE~)vU_py5QS#!{Rm567oh}m)D#vx!1YXTqnCD+5|Phs|?{h
ziS|7U^u%*RyF3Xmw5C-yk3!|oXoe=T42$uL;U(4?ysFq`n7<eRgI`fqUZdbWkDrn@
zCrl+u;JQ}VglVM{g)L=Ak#)tW$gj#<Tov><X{Y&@VX7A_%IN>u-m4vDe5MDSOsZ5$
zXNg9CQ7G#6ic)KpO|Ym{3`I~0Fsx)sOUJ2adwF~7o&?=S`7D|ZOXbU&U9=;|D{I;g
z6GQyG<r2XR9y83I*M8DfUJ+{Bxd=uvAHfrhF(l4LY2`D51uRNfiXe>)!?Uv;Pi-8A
zK!uBvxor=Gsdzr$!$=q)&$Wim+ufFlyAtL!clso}CMlOUWyl-1yCk5RwY_D_q+Y(_
zRB1=YGrZ}c2RocwRJ%7t^5kLI*;Q1!4!7K<rf)dIbm6qZwBPB>(Jsx137XVin&dzq
zXnr9=Yd@W4NXtkDl0)O(19<jn@4*1Aep~PRhC$lf)?|YrTqa2|!!WJ3|6I#IoQ!(O
z-**UaC&YIbM7Rwx(v8CPZWMmF{QprH#aN3%mI!-@N+|gOeaX}T{O{@He#B1)VYq44
zVnFtY;TmBujN>}}v!7EXX=BAwUm(51K<W@u@*@Hs?59WuNzz}R6QGc7>HCGK@3#v-
z*2a(F25u7iE%Imv(AG?l<~C_4>`~mIjR%wT-F0^N5G5I<bBN3?A?QT+DuRCjif{`*

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$TernaryExprCompositeContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$TernaryExprCompositeContext.class
deleted file mode 100644
index f8c73b6729452b86904b5127abb329fb070c16ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1831
zcmbtUTT|0O6#lj?gkAuxShRQ-HEod~f}*X}vC0fH1s&+{;9DAYN+3-#+bsh>#eab>
zIQrn=t3S%|B#qcgMp}8<bJ?@sIeTtDet!K1U;)n*+)H2t_Y;WYfyb!|a!Cv!pF{yO
z3LYw$Wk^acY+W3@-FF2;y7ot^IJV^bk|DKX+gwyEz189^hL>utYB)`;-jaM*YYXl=
zLTXzrOI!EZ_qu3t(K)A2;}scV6=#bxj8{#YueF<XE^2z+B2BvL7`nBo3)7PWWlV0H
z<aVkDs_8l{Q}UA-m;W=QUL1;TxMbR<EHg}a8L2qE1`My&{yl{u6my#lQA6%iBF~9L
z!Rm&=T`JKlwd#n5rrXjI+TMaD+O{;CT$6%x%`ZibxJ{FC=7?ghx})#unx)$f?OlC`
z8<IY*>~(G#W(L7x$n+NN!2Mmg`2lcBg<7pxrZ7e~q;Bl4>TXc|_=efAbxCc;uv)4;
zKOK5`kiQ3ha^#I6vEj6Z!Iw?1_a;ww@2r<51sX%~91Wks93G`Gf%z03Bg2q88!V_)
ziUxU6!IKo8Vu|6+*$>0U?(Y_U(Kk$312d@ozGoO~aJk;L{>*7f?JA(ZQi?0N@IL8$
zrRz0SEUJ3rGh#UI!Lo3g3|IZG4O<Ni9|joJFoa;agpW(U|9PXP_M@z9o7R@#Hp9}t
zTGspV8ZF2$zqn0{JWdN9h=LjzqjZjuwCKw~GM{GABSenD4oMxsIGw{}1eV7I;!_@v
zBrf6-QCf4z1Q2Dij*u>q|BPt9aD><=lDZLQe1uHLDnKB6OyUY*P%)6DJ1?9jQ4cFy
z_>Q5E7%LoODE|e+5gZnXDn#iv=0}(CESZKho9n{Qp5SLOg=>U<onCaJ_cS+1bCWcb
jhBR&w6QSHhaL4EFk|8<wb23ezjZ@a9ktP}^dKvLw+D8^(

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$TernaryExprContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$TernaryExprContext.class
deleted file mode 100644
index ceba554da56336708a2db8fbc9e7a5d5fe16811a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2779
zcmbtWU2hvj6g^|d-o)Oft$`HM0%@BTf23VnQfOm0O>0_k>K58qd0*R8caqJnwH`<5
zuRuaV0wEy*61?zGUW(`gDzE&giaWa-v&nAAT6yr?*_pX#&Yd~;j{kZ6@-G03xUb=w
zhL3Z|;}g|f*Kk9_QVu$*8ftk=;$|MpxTRr5!)=DVcv5%lu8_j984ATxbHm&=jiD5l
z(G&w&WtgZtUCwa4DQy05xYg!v%WPXTQfN9I(^@xOp}vE`3HekEXs*Rw+jO7Z-RZlu
zf#f@qL2uYLck7lp7;sv1v)OUBjP^kCO=IZtzT--xJFtw$UiVAW9dOrg=c8yuY-&yP
zY*Uge?brA(j?sRPBH`4MZy5!wF4Lwf#YX8!APh{<ufdRMTTW+_j^&QBBi8qi!a5A)
z@m(5=?;dx$`VB{rEb^;lM*LQf!Y_p6(YrAgy|6b!wkB*Lml+m{O~>sSrY$Yk*j_Z;
zp)JK0H+=Ct9$GvgUu~4u$**s^+$KFHc4Igu>}_XL*u6DrO46I&<5B@P>@MG7NEb_V
zp;@!j;e7&LIRII@JYdzL-ntkF>A2M(=Pc9i8DF$Fct>TOw(ZYSbn(H(V=>I^&B|x}
z-ORi?22QQgYI*l_jN<KVJ}~=1dOxVOmi!VCrn@{&ya9HJc3{Y@IYYO@?+H~<PDL~S
zvMNV(Q%NfYLpABr`DljgxP!WmPjQ#wT4J1V(l9J0_6w<5$2=}Dln(a|M5E&#KGX2I
zjs{l82|8Ly87?Nv9(n@;)d%TBHT--rqz13D@5(v+giP=CW2i;lsH`TVL8>|7B}XU}
zhDXKZRXOCiTNq+<upCP$Hu0!Jc%14_h1I3%!f^fnazd4khxDxO9#%M+aF!l!ot|@G
z3WSSkq;Q<Ru8?J9wQ?c#0_o?}P2mK!SvAbQ!b$4u{t^`M7JbclYu@%?-l0~(+(MfC
zfIPvReu0TsNbQIE+Jl<$mjzJdfLWX-5QZ~xoH8+-zB!Q7dmhaDQBE13Q)WM>Zx7)#
z7sn|Z!|D42Ih`Xmb2uO6l=V4f_jCH;5KffT0a$|$JxzzMl`CidfcCq0FY4}c>X6xw
z$g-b2usMI(=+HG>#0LaIt|-#+D+!cP4qz9^s<~A5w-KVRhMz-GrUEpE3Kj@KsbGt&
zQo(HHZ%lrN>B=iimjA?53ePKKb7X0D!qb<}@fQ@>uc3fvM;vEy373h7K_0&T)X0Z4
ua)n0HV1+=4S82<SXedR0Ro^6gjyA~CvNuTSDzH;zGi2W-tHL;oseb{b4AiUu

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$UnitContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$UnitContext.class
deleted file mode 100644
index 9309e0956f4502c212dd0c2a59b76e8243f5edb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4089
zcmbW4+jHAQ6vn@e?Z~%W>OxY|QkqhV?W8rNX%iZgrg1K~I8Jb!aK9+_)={F!L6%Kn
zh8bp<VajEI8F=A;;Gw+0zyniW`J))lN{ZsjTd?yGoz+U;@9eJjeBS*1&mVsRn8u!h
zqJs4(PGLjAYYIvVHWic=Y$@1Q@VbIG#KSkENZ>66Z^tl*cVc)K?<sg+!3PXVRkhRx
zw-^SOoK~)GSo|J!#Pf#1&77__8oa?UmrNBZ^@Ge#!{YmyrpXWMrj@BS^i0WaZm4F1
zo6hypqpUfGV6I-}3_}IY;Kk;_4mZo{j!r#^LcOBu+p4LFd$%)a?P`=Vwq<CRH=Y~a
zr*G3y?(p5FQL(hTLHSqQrbo^8GA*B)*a3U(qMQ79oHM-;kA(z_SGcZk)Ek;J*weYT
zTW`P%z2GGTk;mk^YH2Ml9y6RSwcVa9kAy&ZhAU0e<c1~EY^!>cKKE$O*X89~>S<nb
z3gsMX%PDpt!$@07(c@*zoiJk?gc1fT_9Di_Bt7(OPv~PM@xm>)7HBR<W#Msq+O0k{
zv6XzWyu7+xVo1{f>t-#Z8kTNmTGJV`X;|6;&sZksnKCyIG(**kRJ202xV~OkzFlPK
z-z=B%#Z_t)x7HQ~C|KMo6zD#yQLWB1OeW=A#~4aYox78n%cr(Ucc_XT!qByhVL&rl
z^?l8#ZCa{Ddy3_0OV_w1;CZ9U?@?JMQ`Fh7Rx13E;0uqT+mp3NR;FohYgBo4b1qfb
zQ(J0ASB+X`eP@qXEU^YH=PAulK0!H)w%?-$_wnJ8$xZdZ$xf8ZbMrKe0h)7Ve@#7f
zoiehi)eO}lJ7!qRmTz_reZH5uyLnQSjUl>OZ<-apq6wcK?R5F8Vwvd6b^EKpFw^a;
zz8{b{RO~R!b}jcAHN&;8rN@rUknLI}s{hEjkE^w7xx_zd*LE#$b2!^)y%F3x38Ky4
z7^b@?9NSngpUUS_aa2%^V-8t{)c@ypYc>v!y9#P?>_Y2h&}}CLhRae%>~JnRE4gmt
zt#dZnR(ST2iR?{Y-yJxrv@r3?^?gn!l*wfNaY~srM{HXXvtYQBJlP3J>UU}BT1ZWf
zT*)3qZdcQ*<mUAC|I2fPP1`>#lDrtF<7$Eqx1dNT6O7Pxl<ux0KrJAaPV@zSMc^U&
z9?)$c&d{}AJPH|jirR7KHH_gL-7!3kXXxrf1RX@skN8lExPXhDh>(K_`4N^B@hqO}
zMD#m|em~+PDdIAcoe0H2D1O8zQbY<9orti52>TJAN)eN|+KGrbh=?EYnG})1i=Bw5
zgNXVOpGy%_^v_SnM~yj%m>=<l6mcClT*Q>SwZiG)aYDrX`ulDAu(z*fWco8Q{g+bx
ztW1AirvFN+e@UjlDARu})!&rq&&u@QNcCjU?)v3v{Q^{LN_yhlZy5N6noe0pDI)YO
z`a|E@hzrhZ?h=v!FJqn{qIC-k^ftq7EV|e$6veZ^@Ts3Yq*LkNw~Z*^eUTiN2q7x{
zfFh;F*u-BL{0V~-4>6ej9YcM1FhOycB0UY--r)@L2P8s2+SCz8=?!uW%UGd-tdhd<
z7SZzx_2j9COeujo)ab*j^jEN3Yj~1k2?EXV1R}PVouwG0`|}h-6vruw>0F|yP<)<Z
Wm|~h@gyI#tMk&5PF-GwkBL4#1Rt{hQ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$VariableAssignContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$VariableAssignContext.class
deleted file mode 100644
index ecd9e3576fc012997436d77239f3293a5e585edb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1990
zcmbtUTTc^F5dKcPbm@hQML{bnDq=6dDi%dr38sljlY#~s-nZ>ZS=jD2yW0l;iN-`t
z^w9@=(ddK0SAUdo_CnK^RoeKlXJ*ei^UXJNX6D!L?>_)!@kB&M#9{<tEQwf-AOcCm
zy(mJsAH@nDh{%dqWf*PCh9Xx~&M>j(sRdoL_>sjBD{2}y3aV_H++@fnQ>CijkSeCd
z52cpDo4R31HB*&#9QB24nA~vJ`9825gHX_Gwwsco@$FWl!i}=)I9}4LvU+OZZ3@=D
zLOw5@Za+0mrLJ|TZ4S?*2f^l}SiHdyEt2Tqt_>4omnGqa@`|Qd8w`udl5W%`S+i6_
zYG);*rCCaYOKxU%S}OP4<%+32vTMo)*C^csn=y<jT3bI<wEC_kTa;8*q}Qr*%LXrM
zHGaepOr~fvBv-4vN#L7*LAMO<F)Nd{r<jVR8@W{JKyJ&DDr<G=dF6mtEecR<yQdVP
ze}Mj24AZ?2{IbctM_w5MC!Z;oa~nisjAE`HZplp#B)m(7AzM_B3|sl~`dR85!^H0S
zNs%{($gbWps{EN^H^|J{GGDgSL@zgJTQIB*dbPiUVt9y04B3J0yQ(vW%ecajI^WhS
zfEd>BSj2h^Ipi5O&Nu99`<`ZFSQxA!7{<LK?lfdR+4Y{zD59?MFPpRd#W3a6Z0`_Z
zC@24SeE2p<+BZtyuAnk@m=*RFwMOkvh4HT<wflOT#;0Fn;wDY`2#tMU1T@buPU{5y
zts+Po5KYGe!7m7&AaG2-0Zh^wvX6vUxIlW$y@oh0(jN_7%+T5gA-E7iKg1hf2&y*^
zqDU-)1S_U9vtKdtnN*iSgd~Kw2np{Th&lI~$AS!yz*UEth*?~t+YHxn!-HKSX$Kda
zocPp%bc1@|#VFVbYL4<0aDr-(B-cn}ej@Z5<CznL(%&EkaGW7IN|H_mCrvKN4~PpN
z9n@*pvO_X~TewX`=E=fMqrG#7b{1%d@*l@tQUXZQmvXc;#z-dU(2giZj~6C6MXNw^
G8sR^uKp+1A

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$VariableContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$VariableContext.class
deleted file mode 100644
index 9bf0042b9fcb17c1795b04d40c73269dc8df96f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1618
zcmbVMT~8B16g@-hZYf(niWWr_RKR`!tB8rAgqSoj*`%O>hWBYZmZ96-W;$)~r}!Uy
zz!!}^7=86e8Sm~EqOuD3uygO+oqOioJ7?zmkI!EKY~ZPhr8G<|r;)-#6ZtVDQ5ZuJ
zB@-(qRvFSxQ+QgwmO?QU^M$IfS~mBztL(vst@`w@BW$gNuxmnfq{rP|zbVQL$qHG9
ziK_I(Zog9(s>bUsMY2`D!QBI{WH28FlloBhX!U8h;(J;gYX-~lJfSKs@AU*N*sM1E
zj$Q9*(YE_abbY1mX3w?vLiZI{J)xp;@ee4XWNb-K>TQOVe0&{I=3d_w!~M%n;ehhG
zTu~PoE}h1Zk>0>>ORu%Bxu&X_L$$Po4!|9+DUKNu`2qzE-e`y}fj|EXdf42MS&iC!
zAbV2#s$8fZ@d3A8?zQZf^&`>HRG>MC{!)eU1;%4B<bFSsH{H{7S-%3#R;gAiZxf9S
z)!b<B@b2(%NB3pR<C@NkVP~thd7k?ARcasZQ=r{Qp!<GbHN*=UNNeW24Az1+(aBv_
zHWt=kTgYOXp>T21@Hi|y!ebNb7M@^(;n~HB@gikdj=f;#gvpR1G1dIG@B%qI&J}KE
zCREAk^<db||No_mm0>ZqhFI;9SVA_HL+Li@l2PyeC57PjgzrntzPLwES&AMu&@09;
ziZqR5G+Rf4JRnt^TuOYv$O-u)uxK=bxG{kY`Bt<B<CvluJyV#bG01l)KS9<kmgYVp
z@t)i$JxvzI6bvI9LM%kfh7gp1>$nlZn#f^>Rx{khts(3x*??AJGW+ffGGa9S3!}st
zqgmW0h=5UtENzY1(l;dEV!ZSf$>Jwm8^KA5tU;FkCc_#dk~w6JnGiJ>WuB3o#T@Ps
mk-L-;^&p7MQ)Gc6)VVA*HmLYMeGfu!5tC$t_L}rfVDu-dQLXL(

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$WholeCellContext.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser$WholeCellContext.class
deleted file mode 100644
index ea3f3b4e831b3cb81f60b516eb52f36731247109..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1916
zcmbVMTTc@~6#k~IY;P2(2w1NuYA?tt7X@0YNfQ#10tOm<-fkylVY}OGrv!eA{{mky
z`e5+YCu2<X*BH-ims%-E>%-2RnLXck&YatqUmrgKn8!;6$uPo5DM-sb6GjBnQhKal
zCISU&1W)i(!K{KghCqRvCPO-zD%ws})huB;>i)dyG%aD&xGEgZ)e?7VhNYS7c7<mp
zhIWRbqG9p%X06Pfl2$h9CSJ64&D_=;L!Q0MfY>n_48w1BY?DiC1=|w*KrlpCEsHw^
zQ)@IhX=IDKT~o^q!S~dr!|S#q)JnrtH(l|y<}|p|TBpu(kyByawkn1&Y>TKy$cA@l
zTg%fEdp6L8Ckq2P!!kskOl@(|rd>?-&iV(JO>Hyyb#cJ3@LzaxN7Hp)r!c-s{v&m6
zz)F<FZKGib+sUSiyV|~{nwnKrH_E$Q7xXk`zx9`4x*slvvA;8ZSU=7BY#%(iOsSO3
zlN*CuLeuxww7OS1p)I3oX@ZJ@VJ%l$?sh%j&)YpaDY7P$Xg3|5uNbm$$GdB6Muv$Y
z*=xx}sreQdmV4Eo>MF4)p5b{E6IhI52?>VO<y>A?qgX~(K`x3HpaNaG9C$$^G0gRh
z{Zq{h!73LedyiXGLCMwCK88t*kef}K45w2em+VNhI~=kX@wFb&fu_9rld`pfx?Mk9
zaqJpH%&qPA#9-Lyqhs4J&%N{8Cw=kgJllU%<gP!39mA|RGF~)5E{4muxl{L?w#6h(
z^$1OUAOM=C7^F2ur&;((0)pw`QU5V~M<n|&MC*XOSH5DH<Y-F=BN(L<!!?Z4D)9>*
zK9Y|62_HCt|18C~4vI*dVgd<|B2NZ=L={fI$CY&E7z6L<)ak@`mtm}><uQ;xZr~<y
zFx<jz`X}9~(Jr|Xna@z(B9=LUlKz084@Vi=L$uT1fcwC()Kq>TuKeuaPqg_HxP!aI
wK1qmH0OZX*y17p`6t*~~NbunSeGgsf5w6mnpr2t<izDPlXN>j;ov$PG8!tu|(f|Me

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserParser.class
deleted file mode 100644
index a40114b794431d0dffca727c6ac1ef2d0c1a7a0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46934
zcmb__1$-3O_W!web~3Y*C2SHb5Fj`Nr<CHwY1$wKiWX>q0D+Lu5GYW?9g0(2OK>Mh
zigc~+?(*v1zP{I2D*V6q&g|}NNZRc0^JkekbFR;^d#+8M`Rn3kB5LhObdsu&xG`Pf
z0xFu~&=plY#uzM9(KJODh*R7QgPcmNcyeh<IRWDg+{zmir?|yaytpNZn=H9PtWr^_
zB+^xmRjMdSBBH8_n(Gg9U)-lD)kHwDxK-Db8cvi_Q{+eyw_2J~+n_pTxphRvbw$E@
z;#ObW8i-p%acks6x|*7jYEV-%ePc~&Vo(dEsfcc-Da{SK$wXRcN=t*<C{0C!S~-=Q
zl-8nsH;aUAH02h9I+_XFija1i(q30O7}Q1SDDX~B)PR~g8`RUR=~fZkMcleN5r(*K
z2Hj!Cb$8+kAw3N0r?{QC0qJSb05iIm$kkiiZgV0GacKq(6$yt5<aUEb2xNpn?l5SS
zKt>59-JlG!h(1m{A*8QCnTlIe`WZAq>F)%Bz&j0^B=SrW$N+<;n0W>|@q~~;2Hh*7
z?-j^h2IZU4gPnLn$Pj~OiXw*^G+P-aS~*-(Mi}&<GE7tMHt1nxm=h_Ga->1?%)FyS
zveDvpkGN%s+Zb^hD{kY&Ez^m_$TZ%dm7?~Q0-0dYYJsd4$V7wI31po>vJBcNkc|SF
zWYA`_qRCD?Atc+N?IL=+K&BY9%Z$zuHRU>iB6zAnk11|T>duphy4Q&yMCBQD*oqqI
zJ`X)OEJCLlbV9s&zCovy=_36MO}WpYv&wW$nQ72D0cRO>LBQDt6$yC1L6^+L4`|AR
z23-|_4;kc9raMs_ihbB1zuCMwPCOxGu0c<mA@iJgLdblBo)=XwFz7{Pp{6V{=w)T0
z6M=|aY|v|F@+D3@A!MmRZ;9l~40=adt|==FdQZTW27RC`7cF0<DUTTRv9jEWl*qB#
zpic$CJ{8CsgT4^R7Xn#p(AOp{V$z_YLIu}}64pBrj`$4*{Uj3qB#?~;{UVTGl$s*V
zCUJXI+&1gV7ERe|(C^ANP1$bHpUMtR*{Sm$I=@rrcj<hL&d2L~lFoB<o~QE}I-jlc
zhjczq=Zkc{Oy{d~zE<ZOb-qRCJ9NHB=lgYjNax3NeoE(sI=`s%%R2Yy{7IcZtMeCi
z{;JO3)cLzQ|48Sb>ikQcf2%9IbY-`$?9r9Iy0TAK9@CZmx>BGk2Xy72t{l>p!@6=r
zSB~n+F<m*XD<^d2q^_LOmD9R%Mpw@2N};Zt)0OkWK3ve*3p#sAXRqk&HJ!bov$u5i
zj?UiG*#|oNNN1nu>{Fe6uCp(7_O;Hw)!Fwt`%z~<>+Bbu{a0uI)7dpq(nU=vGT2b%
z@mS@Oa#`H2=*m@1dBR{Ll^q6MS3Kg$YbZX&uPFfmpETGQ<ta^hnvuKfgb8_>6EgBM
zyXWTQXU@!L<VwrQ$;|7XoiS}%<}^mJx94W%gd!6LW=)xzojEuodwMuWV)yBJd6_x+
zk)h@L=jBe#%*&q@%ADLiGdsI)#+1ySGpFVubX-<`R&KcLDz*&8qLPc%P%OGa$pyM^
ztRp@YG%eJu@&hunGxD=$gkPw9*D=#_v!~mLQb9C54J{s<k)JEtZqf?H<>rmc%CXb0
zqDWdoc(s99ITNxoONn(2$jF%xZb7_B=N=jP8R5$81y~KJ8WC2EEH!SZt5^c}kcqj$
z7Fh+B7kT<;WQE_+7?_zKYD1M?({siOuJzBz10(YxC_!434@QMT;zaYO*>cC44YI1L
zWHD6)M!aZcTSTNxC5BifX>1jgDBGMnEmEAy56;NT${2(93$`%!uAHp!t5_tC5N|hL
zD>Ek|sFF$H8zW-V@-wG|%B~o!t?RUDSrfuSosc#jX^PQ3){<9Chz4ZlPtVJV2y+Xp
zTXyc)$)Ortk!bmz+0!!7D%%T*khJj;VdZYbBkC#N9Sn-dAwwe4Bn-;T%gM-_6%kl1
zB5=x7LH#hLlO(y!48`Ltku5p0TK8OGUuKpZYw3CM65~bcOwiqCOk6#4^7F!`CvNn(
z%&}P_#h~0Cy}B~0IU+qbZ$k5ooc!#(<}+G1&zqi;pEV`3`MB{J&5@u3qr}nECPEs<
zSq$i&F?M1mqn0IS%gE1Z-XDpxq;lA^pd`nj(W6^1Vrh)ZA!=GaYL#-Wpl4)ed`t1n
z&F5C)Suvk)63-6vxwUv!&F7oNbBy`iMm%fg^DW|8H=o;zXQ%nxPCOfoRJ5gK3xUL1
zh^*OVA+qXn79#78vk+N%c?*%XyDdakA8#SD{saq=4M;=-go27XD=^agp;Hh>RNxgE
z@qYcqQzc~SH=sw)0RpMaNbA<GUwY53eFa(taozi+_mfDHMEdmUDq^al?7nxUr;F!m
zjGXD2<MXBHiGXBA#(=B|6T>0Z8O017G$5^SZxLUEk<ztq5Aj%2v_n>%f~wQ{4(i$4
zY)LKT=zCY6ZYEY6-C@t6-P61F={hLQY)%~%(sQVMg}SIOZ5;Z+tnpcy^7ZN=cY4o3
zgUsCZ1tB0(qQVAviympc(*_BoA!;8oP&_rlQ(yTusiN_BrS}|-^73YhIAT=Z3<*g)
zql8e1P#md*=+tE(Y;#a+A$KxpER<d7iX9iqkJpm%S>w&vAZEr{wT6sKFn6Y9fPyU@
zBg_?}xKNX%!3wrIFJ$Dvr%;k$W3$3m5}GHYXISRjG^oK$urgDE&(mSfgN+HMW)v@T
zj}_gR)g=VO@`C+5;uuvl)0wV|5KyU-j4Bil7kyK(N>MCaB$;HK*}DZ>Fy87J8C8<e
zK^#OhdrHW@j6jbVd`D4S*i{IUYHY}<2r^it3wa;mWLCcdFU=(S*kDf+Y|~WB1q)JO
ztj$pil73p)qYJ*}B)ELRGBbh>A|msqXJ-ok4HYJiNS~B3BcpjX+?M78^Yh@_z|zHy
zPEUihcTFGNw`-rC1JTma1BdnL)-OG+doaWp+^>7rZg-`39Wabht&*+j;M}npW2R@L
z&q0|+e(vPV9IINRM<z@?oUqJsjFJYJMtd*}JNo&qIXSucaO7ZN!2?_K!g*v9r)9z~
z$j+LbIj-xVzM!xzW#~m5qh(x;lG`V&J>pSXxe1y1gKX`q*sxKFgmHAw9f#hde0o++
zX5Z;k#$@IV60V7;9q$U!GhG!c(2+ke3-6GcJ~nqs^D)!%GbcBno|ic_H!r{WxM|tV
z2gpar72d?WTP+FGjZvM3jY@8OI1zFsp#8lepHnjOdS#i+g$5vN3CwjN?SQZZxPcCg
zBxMYOB;8U<t2|7(n2uRc-_DHcH7vQElB{4zX2z5bjRwPBX5~zs4$Z0k&&iQknoUOS
z(2%kcv98@^0Bw}f+0c8Q2QD=(xy}KZV{<3qEg*6|XO7LBDjty0IU1HQBYSNAOh&i-
zpQ|r7Fh67L<UScwrBGmk3{z>C*3y(`pcA3$ASOnptwZP>)eDC*S{@4;-!X~?-;f=X
zY|shO9$R<RHQFYH@`hX0tzlX;jI=i(T!>?IMm7Y9kDdymjh-r8{d~!!QY6sSEg|yZ
zGF(<ZFee{^acgwcD&fua(J*K;WHVw%!!^vymqlyJvzUQI#~jg(-x>`mBRq6DR04ZD
zmA%0w<i}Jcda<w@(J`9#h@pn?FT%uZU-rfn&y0ytt0mwPm>P9UM7IBPOYE63AqzJz
z=sLBJh9YUw-wL;)ZQ1D&nHBTEvJECJqHKfxWf(=(276Y_Hw#;2a}%SpMWKvgdPHN3
zZpe-)Z%9bkNsUTE#8BG)a*U#o)#8~k-;N&1a*w0xk?cc$C~p*<NkmS}@uOD~X4!Jd
zJ4GX<LT4k2W7MJSf_g)4EH6M#?8AYm<m86QlIZ%Z8?$3&0|PTb90-53bP3C9o9IXq
z%!s8F82O0dPgF+!#_6T#jC=|Cv6cf*J~*HX4!^oZLz<vJ8!;J%hIJ`BkxDKCOG{vu
zIS7o3S+>bKv?B^;*)w7p3$>fW&Zug)O*}?dyFDY8#$eEbe2KEl3z9P^cTpL%;+e7D
zhC#3xl!k}cU80eX?zXJq7IiMWbd*#87XHwx$U%Nottw%18QhAZRV5XG6-bP<t%0{_
zwl&SrBPx0oo23ZTtXmW`E2R)Di(+JIYoR&e(f$9}K-*M4sMq!X)INI|Sg3{431N%U
zJ_}-p2^EFP+cRQO7&C&Qsh$qe5JkL2c=-dwXjgV(6w8a{Xy|@$N-0X+FSam)hD71a
z6wizmaLgtJTLK>`IJwm`8qx$y4do9rs(aaqRB9<$i^up~PPE+;O|u4u7OOy{wo#2a
zBeLFH_II%5!(IV&yh76LbAnNIyr$?DTa(1QMA7k<Tm&{8z-zP5Oh)Ckg<mMl=qSAV
z8?$4(17;cot!(q6QOz`n_YCC?w<?MeeTgMt*M%fhcy2aILIpF1n-mqHif6}05BUCL
z!!yHC`Tl4`#M&i9DGJ~JhTPa=0y7q#m5ypmX4@Vh7EaNWPEl#-jrpT6gT*sr?~8DO
zBIeVhayGi#vW8h5g|kso0oa6t(L}_IepI808+UgIDo0_=!fOe^cfwX6bl>KRLR3Dp
zZ51Akh@$(pXT(M$NWX0jBP!`HzBwj3>AxX2HafwVn3g#OGk#dUXi&<uqkY0LEv?b;
zQm4G_3GtSBn5cw7%fzg+Q`BHRR}@3r(8S~DQ1#s#mYuI+5FaWc$XVI6Sah=CGTTK_
zrmf?XCAouUAzWPND2gktpt4N8<JfF#nL%kN77-X+U1MPG^t`c|V!eY=<r^1Mnu)a!
z7jMMtx_ASQ#aV0+5^FE;Rj}aFY(i@nufws}+i+|dS7%tlIOU}i-)&v<<&s5TpE>&J
z>P=r4o&2(J&ew;xD@_7L4({X*#i=+PPKQHvs*V_Ej6-v34&A9coKC01a2k$SXRO2J
zbUDg7%Q@nlagOrN@(#Dt?TB~AI})4;*m|4jsNk&NsOYTdsN}5VsO+rlsN$^RNOC4Q
zsyeGWsyVAUlAXzp>dxwp8qOMyn$DVz6laQ~ma~?lwzIaQj<b%VuCuPAp0l2#zO%lg
zfwO_aV|agqm*a8#PKDza`ln*&rlL6PKh-hLumUtkmf>(Y;vCtr4n;M8nwn>*E;UY_
z9&3fj@EFDVX)&I;MvN;aF2=JU)(q3IcNjlS^Q<s5mlmga9*G66YM!-*8K*0{rh6VW
zbeA5dd$z^`S9Q-0LkBTKKh5dcZ#Z4fIH%`eY$z1*hW)1*o^yubGU5!+#aMextP=dW
zG?#a=;c~g+T;64|F2$v~yekctQcnETa^AH@IVDbw^KLNW6#VeC8BgWKPb=@;VU%~3
zk1Oxp9a~;;TfcZU-h04^SF9hfW55!`PfPHgHWFM3aS7hSSQ%o5oA;Om-y9>M9AbTQ
zMTnZ<TVy0CiKYM4MBhduQK^7mMft0wh+k#=s#w1y1wS>(chE>uss?{*Ro@9iVt6_e
zdOB}DDb>VJt>(L8$R{OPNmi5n3k^Um*}ud{b|uFp`<KTiE7foOsnz|Pj1t0cOlgK7
z{jp$rt-AlTQQcKNuDZW4wz^V7{L~u$BBO><Q~b1=fjLG^SIxMZf%&mDl@#-*rUaH6
zcm`YnSj+rrwE}C6TCQ4gwE`PrYbmw=?x)rc>^EvFb;3WbPT-hP$5kh;PT*v09i=XQ
z_3*2YUjy;uYE0W64Y?ymH(YV<gbJ0aR86jtQoC;bhN(@OwP@A4P22VzJ9p{Uqt|V>
zry~`wTD5xhl$1Jk6<(|MlN)(Ig>&v0F77d7#a*8w?#BJ%?(!@aAkMQv0JmqS012Ms
z0#xwM5ulQHi2zl+YXqq3T`xegcZ&cuyn6&l@fHYB+qY1Fx;|N0ecvX5HS}#3Al0``
zfF?d!Lo?rQfwk~GCO|9SApu(ZiUermpC>?D|4{+j`_Bo`(f_yrode4S=n_~dK(~O*
z-XkDu?-e*D0&feP5#aVfp#bTD^8)nkuR0Wt{Wf^+4^zbXosukf4iL`+28#Q@K^o`E
zAVoaiHA0PX@WCV0IGqm}p&BuK=m@oH93M79O^N5j?-FT-50>{K@;+4Fhl%?LRow3$
zsXG`SIZjP3&qs|@b(N34N2|g4JsG0pj4@hG&c}=sDaYO|@1x{>w78F(B<`8xT>#@J
zXq7pikcC{1iJ2liD_h(rO_cY^;yzgu_iUMK$~3ixo9E=Jx7X*nQ^oVtJP~_uj=1Md
z7x!uR%6q=J=g$!L>C?o0#(koo`(~<@Tzuv%ts3XEW{c<9P7!<m1Db>L2OiW^&L8y5
zQ(YQ==wU6H^M^fi1>%|WkVxj4>scV-JdYF~&pgk3iO=^elyHGZ^4GJ_vq+0U`bDua
zc(G@tXsu_7XQ^nrXQ^kI#Fu$i$oS<RDTbaEo<}6U(j!H|v(mFl;;TGTK0S|kq-=Or
zd)A6K@T~Eymho#mYb9LkStsE-&wBB0p7rG<y1}zqbvwCdqvugI!Qh@vo{cj6QO{Nh
zH+!Tsdp3Kd;Cr@sw#)FX9x2|QZJr%!g;?&{?vZj1xI@P8C@;ZI&n^w(<=N%gEu_G+
z+fyLlZjWcLeA~UAeG=d2*)P*S=8=l!+3z_h@dA$&bx(okfW!}Yq{?^>dZg@o4tWj>
ziSiuw91;BS9Pu2LZ+FylOcME6yv%mob3)S*eZq56Hs_@0lx)r^&v{w>Y0nwioHL%Y
z5<lya+UF_soR;~|c`izL-XpckbKY}7;ukzpbv+k7Qr$d7p2uZ#9`{_5&AH^cESq!L
zb451iN}|Z-o#UM=n&X}8ohOoc=XvLgWZwDS1tOVuK}DHtp?9%br5yJz@=6KvF7_^y
z;Y+-WEVxv{rCup2-eso6@-FwT6iVw|;gzBSC`H4&va(FR%DYx*v-c4|=(%?_AT-^(
z#w#TXP)Zu0lpycgB$;iUcZ23c<JNnnAOT8q=iT6y664+IeN-sDcawLsW+2_8UMV?%
zQc}E|tI1-vcz3F`6S#M)cbm{~?>6raiEsBxf%ES0N)zeb>6L;8xJ%~SRb7JJUTH|Z
zd%SyPZF{}@v??fOpZ76|KUPyF+wVP~#Ui-CE9DAM%8&PeSIU+5p!bkkzXJCj@*dV)
zNO#zKRJP)X_n2(_QST91&Qb3%36Is1;JEjUS~rn<Pk2wt#-H?_miQ^}2^oLdE9Jv`
z#w%?y;8_`d)@O38&?}9!_nh~<kU#Hv?*&=y1@A>6H{Od@x+3r6GX8Pz6&ZiYds)_Z
z**8bxSG<=*xxP8@Vg#J)y<$S2v@yPUK52V=^L-0MxxNKvxxR(o<1*bsuas}#Qht4l
z>d4^5zKv?Ds@%5(uyr-=TMF2=I`=IDY*>-|mIJ0%;=UDtO)7KWO2B4SxNj9;izM!Q
z1Q1m9t@dry>Y&;+fK>t40;T}21FQ?U9<Vy#2H#>??*^Z=aloZO14=;$lmZMW1sqTc
zGN6=HKq;w!Qc?k>Ed-P{4^WCKpzOST8|%sHHu)aa8ld_|8%T7sZ;MtA=oa5rtrFnY
zMlyJtZ@U%;bh~ed4BpXL2JiIk(#j)vS5t}Z_U)1A9^YQgjo`h$eQJ+7+_$f}jDE~_
zK#NE4eqVu%F7O?c(Fc4|E`0}lQXYK=Tgv2ze1~Pr4*QPC<VSo*)$|73chq-W$b;{g
z?}W^L+$Y7-ciboC&UeBm?Ue7N@0947e5ZV8)GoES@3ilvEcdie%AN0w&*b}AU!hD_
z=sT|^A^ka@lv6-y$9(5~(!TjF_@rF=F5V=IDe^rooA<cyvTV*J-xak@GWT8fnc{fa
zXNut!zw842bNq9K`1$AFEVBFO`Iidm_0RV&6t(*o_@$HrO8e$t=$BgJU*umR(=GPP
z9@W3ZFU7#W)Gx&aP>P3t*)6iz<$ftO{uTa}dUeMAEB(jR+v;)uD*rLTIR7L5)e^4u
zuh9~Kukmlx5&_rx*9q(EU*}&hh~;1J-yp27e}i8dF8@Zqlp;VA-{hA>_dn|2EX&*M
z-y(Wi{}!vBt^RE?e4Br}EO)zqhb(u8f2S;Wr<H$~f45Ax+rLM)XODlc+P((&@AdDK
z?b>Ihd(6LIrrYl?km(Bi2V}Yf{(~~zLH{9H&msR|S<hkr5n0a>EB{fy)EfU$ztk2$
zsV#tyO1d5OON$F!T3EoxWcV?^6c+z+{|OfY{3rY;wF-bI{ik6K9R5>&X+->|{nFU^
z&-kUW1C&DKKif_gQ)m@)&VNzuSd;tD`!5L7>c8MGlK4fxlr{fFzqCRAq7E|K<AJ$q
z=M?V0<i9M1<Z@t+#IN|Jj0NTdq|gNB`lYM|<_4t63(V^zvIph|q(uxY2&@pq3oHyQ
zl5kOAiC|V>abT%d4{%99$`YUyp1{(8l&Qcn<g0`D<pC*sfKoOCD{hs=uMDhHyVd4_
zRe?u@!w`5Ruv+4)15#E3YXXwifwh4RGX1)Mv`B$<0cn8(>$}R}4FPGG0viLHWa~Bs
z9u>V<;L*T-(TfE(2et@34{Ql+mEl_h+hq8*fHWI{?SUO?uev<2Bd}A(?+omc@w=?}
z-GMz4-xJs?<M#&kNqnCb|5!lw*@4FbvTp|5F5C53V7G+(yGu|IIH1>IJa8azQ0RT&
zU_f#{a42wCNJijrK$@w*k-#xD*AX}xI3)8O3rMpQI374E@#6t$rUEB=O7x^v%&EX>
zts;s!-CG8q37mz0!2@U0Bw83a=fp$c+#M1<AGjdfaG{St8{av6?4)V%u~)*;-3+g@
zz;oWa1fI?s_$80RX(;d>^`7y~^(}<)KL9&<8n*2+EX`7=^HGTEMF`FkaCaTv{kV%a
z=Pg{k3-5{zt0f+8k*8GTEEaa@Vy+iktZ@*-#rCkhF1C+7hRn)yF6DXU1x7cQb#^Oa
z+pJ4@k&kdGFDWmJvR-j1uPU#(l-I@68_Jt5<t^oHO?k(qysNzDQr_p?HRS`B@}csP
zi{Hty5vFE|&9=7L&d$tpDIY7JxRihKKNvOoyR;Eoa$U-&{5F^Jnew?y`9k>|%b#U`
zH%xp+oGfxFUn*a@l&_U<T>LIR#Km)Xu8WW76I^@|U+m&*`8v#)M^%3J;K>bZV%4R5
zt9-|(dzlL{PpFkNM=O}{y^Am7%Ng}3b9oUPKO+xYx%e19mQlAdmxW2wOzUV{v67S@
zluxkB)usHX{Nz%8R{rf$ei3{vdpiZ;N;xa$QvM?Z@4w2gjGC4xD7`W;|2wX~JhO$Z
zyrB)%SlkB7$BGH`hNH19w@FINMuLq0b1A<m*RcFm=2wp(quhV%;;Z;0F8(F|%Ecez
zSWs<S=E92Ye|7Om9A|B!%MV@zx4dFOrOZ`FY&CW9JU-3EXYl(lv%v3<uAGPlM4^Pm
z_jX3};>9*&Mq}9Qn;u<!9>>CNyE0QvsH44r(hOGL+`;mcYS--ikPHfWdoLO@b;GVk
zMy;c2Y0&iWjeJuyGJfOsL2Q^RbIrkhWf9v1U3>@M8BP0bJM^NVnYq?!TPze*|J}v6
z@U7U_U*>lx?Raq6B}JM@TRWn8cia9z7cb=JT>K(0!n_#wx%eKw*Twhq0vA8T54-p=
z4iDiJKOK$o1Q}$B2lgG6nJ!{;L~wWD{~>z`Tj{WirR=qryw@!n##-y^;yrBJ(Ompp
z{(dwZ68S^#e@mHPAaehgi+{_%bMaUCYte8oxIHSQ+?V+k?8qx~8-n>EpvBJm-&E!@
z!mGT|>t+PmyC{FS_^14{=!yw{al!glK-tyu#&07;(c22)w|_(-T4&CZnuxtO(YQwT
z&q5U24d&uc@~0T}E;9?ww%AH3)~d3P6e7QIQTBe~h8BqZKQ8_(e=ZtnxM35Si@(TU
zipE<P?I^xwEE<Ij88!2Z6r#iVGn)K2e3qo_J``+#$+qBkPh9*>{#G;&O{j#BHR~Cb
z2$lBX7eR%;qA^RhogT#`F^UF7?!JmB$HhP5A4ek==Ey5@qg*s>wY`w}MUW_Z*~s@W
zvzL8{a^rq4mvY@fE(de)XgawF@1^V}w)hSy7yl3cuZ#c6|L5YraSXQ9*3E8ib`ztz
zB@W@N<KKNU^D{(O;llnC2czaCrY-#g9gsgU>~t4D@r(_`4Q|DE8e$rV^Nx5>8r(1M
z5901<kTqV$iSuQ6&>NTsnq-0wxT_6jWaLS#lf2iL_qy_4N8X#^j<R7=BsxOgN8;{i
zke@4&F7n=9-kaba(;#QMmAat}Y$Wfs8n}2pv016U*p*bL#MciW`cA``8L#Y6HAjrg
zflWp(Y&+7iWvpXb-@#qe(|X{9XTuW9u+DDx$P68z&vQAjGs%U`KIJq=oXb&Od6`ji
ziJ7hMs<<53vLvccU{tNdgm5-cK0YuI=EtCkdAawQ$K~t)O&;5JI7X{V*<5E9-=XC5
z+`-f7|L|>?(leXW31afeGLrJEG4lAjHaZI~NFFxNHz+;7eOeBi4IN?v0>Xu3_11Y~
z>|(<y%O-#OayB}2NE4ghoH*y4nJ0oV8B+GFGH*GVw;#TRm4^{3+JgOlR$Cm{eT&j#
zM`z~c-IkFvE?cmzl#dQ{?K>!aK+n9q+&rA<$8^gC@nwewB{K8Iq#(q!Svi<?O8MKy
zOESlR%<?k<DJ2$e`=|g8f~RAqRJ;X9s!qwsAB&SZHN}?V(zBw~dgjb5`5gp7*x;#u
zkiq;wgM3Fucl>=zORk~B&j|<;YnYJAogv5@2T@3qas+!L>5bzJB{tWR<<KlIT3$Y5
zTn4^TFeB3vQ$~GDX{L=#9nwlJ-&7>KtO+tEn4*@6jnU#`OQy^<E2Wkji%7$MSG;ex
zDE57pH0>!Rfv4jbqhnfrE>teL<ady-DF`DD^-s%8&%&oR@a;RC!f=}(z?hz&mEBwf
zBT)r><YdBx%)Fi!`+Ls7yJ7?B)albE_RYKx%roCP<Q`$4yE%`@sD3FFu#-=2SZ!5G
z!l2m-8%66=C4yX)r|0D5W@i^~0bZl=-xg=DU6d2e?p@oYi==kjC|DLA6Uwa7aJwWA
zTow||R^j5FtSq3MrDJJ1*f9)4+2L<V*P#@x3rdtW7GI&6J_Y5}C{00wNnK+nW{#aa
z7-9#7k-NfgVDgP$V-f6X)Ubq4&6E%%(w4li67~vA%aWc2o01_v(TMLO2}^iGQ=lxO
zH<~qNOm248SmD#d^yTM@?^<=u%gdN03~Hkh-4Qr0>?dFcd&3dkOCedX(=E+&u;QVB
zsM!2=PQURztgpEVRYh<RwR)z;r5bTjSVUqdc4@uojcH+=s20A!mWi)%4a4`vux^H@
zWU+Jxn8fz80({Ty0G>HJ2>g%@KMeec4L=I}m<>M;{DciZ3H+1|KMnkh4L=LK(1xD_
ze%^*(0DjSi7Xg3VhF=1H*@j;Me$|FQ0o-H5y}*4o+z&ip!=D8Hlns9x_%k;AS>Vsv
z@aKWQV8dSo{*n!U8TczU{8iwu+3?qazhT4Q1pbx{e;fEaHvC=S@7eJ8fq!7bKLq}f
z4gVPUCpP?Fz(2L&p8@~ehJOM4OB?<b@ULz7H^9HO;okxO-iH4G{6`!96Y!sH_`iYw
zV#EIf{J%E*SK$A%;lBaDX2X96{)Y|!6Zl^?T*&Kn8xDEpWWyn^oY`>5E9W*G^2!w(
z4teDc8xDEpstt#{@)#QqdF7f7hrDv#hC^Pt(}qJ{xnaX0uRPX<LteSdhC^O?IU5dn
z<#9F~^2*EGaL6ln+i=J$kGJ8FSDs+QA+J2qhC^O?1se`|<rQr><ds*l;gDBe*@i=2
zc@-NDdF4qq9P-Mm+HlA#uV%v`uRPg?Ltc4x8xDEpHEcNKmDjZ4kXN2!!y&J{mJNrz
z^4c~W^2%{62DY!N7>!DZ0jaQy;uMX9I8sB{Opa&bjd6=1#+%5Pro36uaw0TI>|{Xr
z&4_QwTam(V0)`a$;cJ+uh@Ak$o^#w$2JVCS&A7YFc;1HJg6JFTVZ1GGhcb(m#*3FW
z{KnFdt3B^v<!x%U1ZOXbXB}nBs+bKyrjB@t8>)2_&zoV(>j>rTR6?~e#j}pHWer!`
zncsS2wOaAK6Kr|I)nXfom3Ihf#6jI^sg2K(o?1lCVX3D`J4MDRiakfJvsCURqD^+h
zk@!~SBvNTIRi$iMbR{#p^+qU&cjMhb!g$_;_e4IhgKZ@T@(`UWqPStHXQ+H?A-T^{
ze0pkQMJc3&)W(iNN=$Y4DWnRBu9$j(DsjS7Wyb}o!l_fLJ6%K-QqquAcfZn7CA+Ua
zw1vtW$+Id@)rXzyw_JZF)qST(%?qje5M-}WK+XF$ZhDqdWHn7MP%TB&Q!y2fwecvE
zxY|3!Lz3f4;}d9kWqObnP)!L7@D>Yb7YSHE2PIUbsE(m32%Af8nunANsX8sDI<$nE
z(o$+mE2%TBqVBYY(r7IWq;)ik*3-STf$pP?D1Rq%?n23%k#h?zqpgV9hLD}KPu8}R
zPS9>i?^Lv?Ev55bP*0B3)p&1yo8-$WiwADn!_)ZfVDKGiQB6|+q_!GQXKk-j0&$J^
z0YXgUeaC3LpU(Rukpm2?36^1>j>WPs5avM4PeoM6#<IF#nF?klq`HSjvZ0XbT_vaF
z8E)kZss15k$190%o8rs1xN75q?viNMXk62Rd><%^QqEC>AqCVQ6-Z$iBmxVmA;LPQ
zHja^DcbQ?05Y{lYu_nU?n_;O4tB~4QmtjN9u*Me8oAznk<SaFjjBXO<IUYkiH~I>e
zHx(RLz`x7nmmI%LU!tLY`dC7f)63+GTm`3}KuRw-?V|=rb2mLnW9Vs`NY79XJqPZ-
z0Pem7?!F9}con>QotD#^kb$?r^LN1O_rTu|=rQ_`4xxsl^e;M1pV0;S9QFT19{L%j
zenSEJmY${W=neWFseVF=pV6A1=m+|@l!z3xIAF<vQ01ROa_}+aV4x)jmB{%A-L3IK
z6%rE@-MuXK;}9Tn1lfNVA8fLpT0pi0+hQbJiWwDlv(2c)n6=r;!5JMs#4JZS0~79q
z1Y8p`(FY`UcP^r)QlP4zqh{?LNsjia)+Q!3$)Ty$3aL3BOk0p4SQxeiVewM!;<XiR
z6zvptsVc5cxb7*U7Q>Pp=cpz0ILUFA%8N=;-6Kq)XazyZD59HWlGc$)?lzO$j3j7h
z8=2&m$Rs005_hsRDDF`Lk%F7*9xWrP%LrlOV7>SSYRl;?wM%tR6tN|}PK@<BZM2G-
zx|23m)Hc(aikf2=jYUlR0BN9F2k{0))Nz;~UK2sNbJR(;t6~harE{u#tSDa;1?t_p
zh2n~+%dpghuIH%Rl~ngQ*|dsgn==KX3S~=mPx|Lp6<nW`+N6-W7f_q_T9PA4J4-#}
zizI1bO%l&SmCS_Y+UxQuNxzbWe$at$AV1E0&?f=E1H*jmGYP+AKL`jHKy>y$Q%A(L
z!w{@JK4#qkUxx08;a4YozqvDVcBSU5JKfBB(5<W|WwYDpK9)ugvfF7cOQ*%G53OMR
z=n*!6wy=S;iw&ZE>@GUQ2Gemiluoe`bcx+fUN(}RWTWVLHkw{z_s}~mgFa$o=yNuf
zzGD;UFE)`maE>^RO=5M}WY&yjv({`1yOrgz?(AN67t3R#*fchd<+J<QbT*gGU`yD2
zY!#cy*0TrL7WN<pj1S>Gm#`<;QoQLr45a3>=h*`GHd~1IUV?$cQuZC-uWXsrqr34L
z?>e-Z4~0e7Sb%Cui>?W+3HGXZ8YbK^(B?mUI3EG+G}w>)ZiFeI(<jjLk)U%j`+$$a
zlM0%>%SR(NM)m>C$aS5v3FnIX!0z9JD+B+bH??cG{{u9w)}hKZYS0@tVIsN&r%jjR
z#g;&;OSpy_gc<*`h<e((gkI<p+%d4vp>BM#kg7uJ4FS71QozDJda}FbPI4x@Q+ClU
zsqSnu$8E?lC7gL$X_*VIdsE%{A{Nq)j@>=o%#?=58RF5MWQN}t3b*zBw@dLYTi;&=
z7WpD1SHSo2?iXQ&1$-YiTR>Znz>bic9R)W|;N#<`s4hE=FMgka)I$GRA@yMAs6V?%
zgIN)cV2@J<yF}yJRY>v^G=q6)0W@S8^V4cbz()2YZDmi<ZuT@CV9(Go_AH%duhBX7
zI$dNhP!W5PuCkZtS@tr$f$(<_{yyO6><uYV!bj*qGb|sW$mSz_8R{F}g3OGw`i2yW
z`ICBRJd?%VbRCYl=_F*9;v`@{tR)ejSrYMH5#3>vh;$(lI(p}jM9dO=fT0q+nk}9o
zF5>xqlRtfiq{h=6@f^00c2TLii`u8U9}o%LRn43a+H%e-EoZ^?01BQjqS2a253p}k
zQcyt0q!bjOFDE=dBjL;F)dg-!!8}TV&VCCi_zqI=Bc$MGNWs4;mHk33*ng-E`!985
zzfxEBKe~<mMg!P28p(dAvFtC(V%KRZI`0`+nZ2JoXdYK-1&^UET!-K1qynBmhj}6$
z<1RYR%h4GgM^|`xdIsSyApB*(cX)*m_eav57Wa?axc^>=`_F;<6D{sb4{@Z%vslOL
zlxQ(Os}$yAXR5{g>lX8WETVok=JyxOH{gZ^nIBIJO<uts#MAQ9cx5vP?U8PgnFkgj
zo)+8kuPiNp!S$<1`iL1F95*DplXg)&!dHoK%PPdv8nZx{3!7QEGb({7f_o;+LJ{0C
z!t)0benwwNXbQw4%qJ2CKyGwzRWNF;f$?cQ-kwr1=xfP4QU~6NdhyOQfOn-~yc><;
z-6@mzph>(p-3zDwex624VZc|zU*F36KoI)T0T}1wd=M4#yQqkdf)I=*4<AZiK8&8?
z!|7FY4(J5v6NG;T_&vWTBow{q0ZS;nHlg@2BorS(D6%b~s72bJ1TS$4i)~XcJaCv&
zidbNyyd@TYLM$+FV6jCsz$O+0g;==Uwr(Px)|qS=BzU~ZWL$9Q7k2mDI`|@n6P=Rb
z9(7ILOr4V99F<3&^=AINME=eHoZpm?t)(UugBMZJVK7vToA46Wm52(qn3WBV7*Y(8
zGE<fzMG~C;4^b!}6HfYv^t*(nq|Bxokdy}?DGy?PWDZ<_c~qazr^b8%wc-n@BVPoC
zUQEOJ5*p2y(|EpuCiB&l$Jc<TYiT`S4++^okMWK49N!En*g|jd{q!C$pbz;j`iSp_
zH0+@t`Cj@R;n#Tq<9t7J@&h61xRVx37lhMC;lTup4N1rEkdCRAbW|bzPr6g%_p+ph
zw_Kyxl7|!6Ol}GV=6j^;z~Gh+wF$*AArx_LTTc;B+XbCrK47imX@@{8XFHyDnk<lZ
z<T3GFa&HlGEQB4|W#*A~WVbDUL23C-DLEjb-KH}iPX`5Nc3JUs$SeiMBc2Y6=Nr0~
z;j&?6b1;(VZO~iD#oJ5_Vm_ij1Y`<RC2q>c7OD^VcoOpQ6y)Ps$j9@Lj~A#3f01tD
zFHw8`GIiyzz?!^DefVoMguhN>_#2eN-=^vO9h%MGrMdh)TEsu3mHZ>x#6O0t{ELq8
zPw6!Oj4txe=_>z%p5$Lbe!hbId`)ljf7AQ?7s$?c^fCXQKIcDRX!#@k!T*ib^<S6*
zDE9P-xjEr*jG>1t>+*5fy0EyA{QL#^$+tTkn0}ZJ>vEmiTYb*-Qj81EBUp0O%aWsH
z_)s=Ex?9MR+a1yA9F-glGVPeaf>L!{Mwvsncse04>8-|7p?EHXRGl>QNU1ty%YVMK
z{H9c05YZv2x+t(<1B=X3q*OgFo^Oz<kx@z27nm#%QuPIk2Y<e2hJY-dB}&|ssy&36
zTcrZIm5P+4RH2$mRjRL4!=J58rq)VzYOmCwu1Zb1O-aGuqpU@Pl-l?UlXWOlsY_Fp
zdh~$Okmf6mXo-?ak0_04z0!=fD$Vit5?jz|r4?ONZlWiY*7THeGrgd+q1TmL@V5us
z;!g~=!`~6?M&Bsi>3gLk{h)NhUkB`rKWBF<Gn8&DPU+6#0jnxKLee!gBwat)q$@cn
zU68~yKGQB;Q#C#-Lb_&^B3(G>Vs%|<kS;OjwWx?j*`#Z<kgf!`)9%t-mYfVS?~0w1
zS8bepq8KO5iKu%dC(G7r45Z<bj{`A{M0lPdp~=6&R1y3e0{#sJ|Bz0(8~hsy{*40v
zMuUI%fPWd(OBq9bl(95W$)+L76dJCK2OlTUJ<3FytYpy)gwIC!gMbT^97*#O3@k^4
z`vF)EIqyzxngL2bU{Sg<Dc8{`bG-0ih`^DvN;nK<5%?>Mz}Jf?!$#mSg1{BrhMm9x
zLAkId+WY|*f=l)Xye8$x3d{V|Kj$}f@|jW-ma{4<*&le?tSmLc9~c(}XP?91L1^f6
z^j~oHRZQmzXmU1>lJU40oLvIWE(d2<g0rjeS85-jp2}+KtE>Sx*MpNAXtc7K#w%N(
zkz1jO+o6d&@CQ$K;;)MCp(mBS^qg{>UcyqwtI9$ACD23kwsIJM((?$k?l}D$;r|8v
zQ#l#Zw4Nb9;58fnuZQ^m1NcA3?g#YL_}sts18}&?5`Y7i0K8a4nKl6!F9e{HJ5~rl
zJiTag#PZ=K^|L@3p_#&S8iY$sL)?lBQ;X<(i0TPw%_hgwb0%vVV-~NCHJcny&zpf_
zI=PlLog7aun1NzG*;PanhNYgPiC54WV4c8J)vPEOx{dZqhHk@bEaCZzgeF6Cs2Ujh
z3>b=~N9B1+QC@&KeHjdV6@QiYH8AiE%2M8<T;(08<GXaf@;*JJd<b>?n3gM_;IG|&
zia&DuIc-yZz+bBUk@hNI(LUvCI;ea@XOwU03c|ez4*))|{1j5*eKr=p7-HcSuyBFJ
z!iuE-LHNGX!U`2C=q3AcIQwexuLxWaw12jUCfWEmS@5rl+hteaS0cFBDcP-=Be9o7
zxN!NTgZG-rfL20f-!OBOFa&VhH8BPC2OV=EF0ac1&A#0>oXeJ+E2|T>k+w_TZKSIx
zemmyi1-y!Zoq#3}$3t1k;UKp|r6h+=H5~@kcf?Xlhl_4;#8GEQdFts%q;y9Gy3<jS
zhB_+I7)NDV;;2fGII7V`M+4g8Xh_=~wP=T<HtluPp<|A^bOGU)5PlW#X-A`wBDTZ|
zo4LxfBi!ZDvmq`Pfs0ElF4h(^I8el;m`~_d?mA}OO`E(lWRoKodT?miV(A4-C0{S1
zDK?ho2$oiLm$S3<Et6Tff?4mE%B*;cS#rGA5975v#CWYb^1LlMWllrK(>u1(KK$p>
z3a+2BE9TTF6mt(2>V&1;16xaY_Dg6}Oh<PxwFj8m8%#|DQ*WonjytH8Bb_=r`hb~z
zX}F^wjdl#6@s5Es#W9HT9e2?z$1s}X7*5L^BWRB!llD8t(?Q2*I^?*Ajyp2wqGJsC
z5&ks7p96f=VXnpsZ~0D)=fs3B$I_3vgePp<>mla)!Q2%Vb1MnvVzjlAHMm9%OV&}G
zJ+>Hnlf}@PMRc!?p?QL#$?iBiLq9TEAhqvf$(%}-UVajau^Gc@QP8|6rAwOkq+GmL
zIu^wQG-=)!vrOc82sD2fG@lEa&j-yHfaVK9^F`Fov6#9zmOz=XT<Ta0g<4L194lym
zV<nArtfGks&qjDI;0(vQkg@AyqvXsGB`1QCt1U`Oe<j`0jWr?Ni1b%*%HJZTSOgX3
z?u#PIw~=zXAY~0VoRIJw*Jq{#hbNw#rn&o6k`=zAG<RQ^WSt>2=t~&`r$@$oWyVO|
z`bIpL==&sEx@Ec~avd^g3M-(<uVs-pn8N#HVP!Rir(pbqww%K9B;omW3E#sEm%vR9
z&Y<ex;6ZTk5IA@g96SyVo`5Ml2~&6)rtl27cOIO(0PVR5Q&<G;c^ukvi6%QPQ=a1r
zJ>a-X`y5_6?C{Yk$4gY`cp0Yf8EDP3bj9%;J>z(uUPt)b2!9XoGsi17)40SkjTddE
z@rw}8-vrOs7c-3;U>Zl+Oyh<S`y)*w4oRErS0<V4XISu<X=DE^!TuDtTd+T#DWx*2
zlEo~s4$h{Fo1h;qu~2yg*XKnvdl<G|+>ZjWkRfK7zB9$(0U;nims+xr4&efKuCDH6
zRjO}h6{=e%_IoJ-K@<Cft+ZeMxipyAB6?7?=pnQS)Agc7|B)pI2h0C8OO#^ztBjFz
zBn7m#h#nR>=O8DBMIz^K5jn5fa{eiv!vY?j>PN2MWv<{G{9(&=y|i4(?ut9FKM7ti
znb(}PvAF_sqmh4h8jCcLe?TnoV3*|^628wq6ws3Y@2LZv(2C?%D^ZeKl~UAdl&U7v
zP_+hSs5NPVT8nbj+B8kAL$lSov_P##o7MWXM{Pg_YAPL58`D{}2|cbhr6<&u^px6)
zUQutNuhq8nZ?zr$ref==+L38$Cl;r6W{K*ptg70D)l$2$x@r&BRPD)bQhT%Z>TRs6
zn#OKZZ)bhfJJ=vKosClauq^dXHdP(K?o$V{htxrAzB+_0Q-`wk>M*ub9nKz8N3bL6
z-R!hFft^z)vWsd4D^ka>tLj+xtU8Xpf$(<_{yyO6YL?Wy)-Z*etzJuES#-OpfmqH8
zZ9!q7<s~MTmmUpipz#L{)%fN=sSB|Nzfr?>e_%cA8l?sMvPccYA$>~&A2j<i_I(k}
zvuWUbp@FsC@umhQM#_b4s94#qfnxkDG%yZVFI*#VO~thcm)J%iHaP@v2`l$AlIplp
zaJ9vSO%iNkP)QjyL(CX07*fFM1@(kM=tbZ{1iFJNz~JV}{Q-+Gz_?~@Sczva&?4z#
z1b$}iSczxoB1GU41ipl~Gj)g=X6RCcUPLI$gJv-dltkKP2;GNJlqW*rev8oM2wjCx
z6evRB!HLir2%U*g6evRB2EYriB|4u1x(DGXQiQ{*AiRnhejCD3s0fF#LwF4{yamEh
ztOy4S5MJ91uYzzCEW#6Hcr_7@%0t7c6;cz+H1olVuqZ0@u!wyI>U*%C7tqu{R#k9N
z-3<NP0{z<t{o4-x+W|e>Ma$GZv_{=a8`a04a|N_hJxKf2Lv&a@0=+v%XVeo^q@IM{
zohF}pmY%_0h?mv#^oDwo-c}!{57o=`xq5}ZQJ<jiRWJQV_0u0}fHCzc=1`wuvFdXy
zL4BT8R$qipz6_mwl{HjfgHFD|TBvWaThw=0XZ2myU45VRQa^-Vehj_*gpE)?g>HV%
zGSx3xw)z#Drhda_sNb;%)gRab^+&c`{h6&&e_<Qc|FUiBuWYaS8{4n`&W@^ovNP&m
ztSH9GuEZG36QeM1jDtNDqq0|HV%P@={{-Qm0e%}38}x=)aE%9kCHp?uGh%~48sBE=
zWlc)>gBECfdxZ)W@gM&x<6niKQbu}3_-=>g6~&rLDfZc{v?=8(p_Fyq;C#p{Vld+n
zk9x($;E}S60rt<emhMPX8UpsWrv4I|Zb)Y;k1a~c<c_IMNij94W=t)rA5)u}#x$mu
zF-@p-Og*|erarZgX+S+=8d86R4?_45z)>+xgQUWWci08LCrB#l4^r*2JC3a_$8mSa
zbBH7nzR6*csFp>doFZCnBheZ`qWW$atT2fxOA<l-gd519c_3JY;sje81;IK{H%YJ#
zlnH`iRZ&8dV7&;lz%iXcuv<Z}t{_-<5Ud9X))U0)MIB=L(XBE4sas4Mb&t87Zi~5t
z2F9d=Sp8@W!ZQK0W9|$QuDgwJIU&N00^#=A3D?ac++(E>4&O1kk#Os5gj+8N*HF+U
zOt`9&RIpEya4<C`5pKi(SHg_};l_e+nIPN*5N;v}mj%L20^z2CaQPtI6c8>4gv$lt
zrh;(OK)8GmZW;(Ty$pmqP!iz|mO?mu`{hQZ+-M`*CPBDVH}o(}IQT~(6%2T!ZGJQg
zQvI`1E(EC-fmBOCs%0S6a*%30lyU>ewF*l42$XU)lyVJ}ay^uC1C(+-$h9#<qSBS}
zh@C`1r94^+iST6{i$rZKrM$n0Hrq(FMUbe88zbK^iE7$N6wgv5hMrAI8ahqcr*Dnu
z*|tSNz1ygt)X>`~4;tDJo2dn~jg4b4vWmgTD&`2NcMQ}!4(go%<xWD-PC>{{L%<%V
z^q5Q34~|0rm~(Vj%z3&e<^oMdcrL>80B6Nq4pFneO;hg=Y3gKX>IpkF`&pWLvJ`6K
z6GIj?^DSy($gtf;%^iZ8&D^kRVQSWq^n+_5=~rK1VdvlGu2n&>7}m(qZBvjWIJOnz
zthy0QK$lVi6Lv<ygookyiDB-;m=F?9pqL~IGGRDXf|-07On3!McnwT=159`mOn3`S
zc$+%MyhGz+-UqQi0HHqwp+BOBW4@*NG2hXmn9pf(%onsG=1bZX^A+tu_<n>R1UwP*
zeTX58Z48OrxqZfBNCK&U&^V2sty*%Aj4wi&yuh-mxxC)Bh<4d{v0Lz>h4ALWyl5!N
zX!gkQtWg9};i(B%agXST8p{}K*vFa*EIdq0cGufQZlr1=!m<Aqx)9G=nu$u7zpZLx
zY-1Z=u``D?mleU7OW|lCutM4^%DdStFFd7!ZD2JKep5t_))Irf$^5rS?1mBGJ}DSw
zoB?4jmMBC6unlA|ku{gF4Qnf)rKg9)x`XB<w`Ne1R*q_F<*B~rrlwjvwbl}-gO*6$
zv<lQ)t4MvdN_3Z28N08m&;%`srfAhDUrVOhS_;k8YSD77Hl5Jw(K)R?UDmLbTx&?r
zXiey4ttq{yHKR|o7W9?Yl77@$(XZM~^p|!EQ?<6trFCU)ts6_!I<N{_N0y{@Vs*97
ztU1DOLU<d%Tea>|<iwog1g!VV31wEn5<aohpli??u$Hg}=Plur`+sI@`~tf<33~!7
zSa#t;$Sy<<+3;a9%Pwp(Ws!~-(PK7Q+%IIYmDqt5mc@3GSwUHBFR`G+brhIg;>6L8
zYVv4D0giTT78`(A2a%|d4hm`MEVJLh`9slgo@V11hA;}VaqL1I=GZRbKH4v#X`$so
z4-KoX8dhDk5#antaDEgxKN_6B2b|9U=dt3djir0EOmKWWWowgYnl>36&!>m9>EL<}
z&C_yeu{M>~YWLE1gzrZ9KER{ej1b5AP-|<RYhIXR*#8w=i`@y1J#KNV208vjMf?&A
zv+GhR?83LgEOvchvFoEEI&5Rt5y7t3VzXtKU0qCSi@6`x+hk8r*NZdi9?7Vql2L<@
zyqlRkLY0N`ca=;FDt`}K1!<*KP;h-GSROjab37{k9>%Pu;O}9~YT`H&4rmDYI=v~O
z$=?}bZc|$U{;mXnSA)N6!QXY%SX)o6v<=iz+X$`RM8mZ$l%Z_}$+uCSwu5GAJ86!#
z7d+iZE3^VyryT%a57J@nG#%H@&?)UGoz{-gdF?oPwG;FL!e2r7>wq6<XG1*ijh$WQ
zvd?K7&p!(B{3Y=Gs>O4;aToixpI~iM!;3yol)`ln_nKUfJl?UW*zpd%zHEz2cE2SZ
z@4yEL&2nOvVxb9Zu*$RGLg;wM2`NW7q;S$a-r;T|&v&@nxU0cS51sIcXOkm&Z1V)f
z@hss9VCs~Q28V<rpy6tSs}HVe2ui?(wP3aj7v_gf$-^3_BMxiCvpY<YIy0nzS1h8l
zGEHHzH0dIZIp!*0KNQh9nd*G8RDHs!Ah>-chFKBW>-3Wt=0YSkNMI#8I5n-;k`4~$
zl_DIR{vsQ^Ia$V?0<rqR0pb}mKbWdv{fp>=Y~ICU%^NHdSp&y-Hbi1Dwz9CH;kW{^
z1+Pe!@OZHjhJ{n%1&0eP*qRXnv08Jtcs5%@o+7#=%eq{wtWgnVjh0xDSofHPT@hv^
zL&iwL6;OT=U6rLhQLMDF5v7fbC@s@g+W2s3D0_myf^RU<OeXz`Eb%PgK(GUs?VL_L
z%M-CBa<7)fJ?o^-HgQsClRT+20Wpy$bv!t!b3&ffIeCt}@_j1CxFP<X(XuI`3Q-s)
z{fnQ~iDx+?R!pNv-sK7mGgONNx$?`<wu0;9il5i<$@hukyiQ|fB{r7SBmpl&y*DU@
z5?)rW3TREjeNM9oM@C828<U|op(=V)O4gfEir$<W>#eAj-kRF!H&b`L4b9Qp(Q>^#
zt<gKs2E7w)(>v2{y$kKryVG&K2c6Y>(gnR2UDbQjlX@CGqo>pBdLMdM?@J%*{pfSO
zKYgd)Nx$d==y!b}<N6@x)bC<$eK4!44`E&O;jFhlg7wkwW`p#RY?wZZ-J_3Y<MnYY
zOP|2<^@(h@p2Z&0C$WY4WVS-jX6y7RY>S@5cI&z9fPODKtmm^reL8zwpTVx`_pvAS
znd}997JFTv&ED1TXP@W~urKrn+4uTG>=%6w`&FNhzu2{a>-s|O(iibWeKD`9FX6TH
zrM#iOj5pVp^Va$b-a%i<yXlYcp88teUth-u>+AV&eFM+XH}Z-4CZ4N5%4g`C`Gfiv
zK2P7um+IU2YJEH3r0?L{^__g5zKb8!ck>ha9$u*L=TGVd{0030e@j2ezt<1(-}J-$
zx_(44^rK3genLsnPb#VUDW#=;TDeU>qx93yDueYxWu$&i8LJm5lk~@xeEpKLQh!oe
zt3Rb|(4SB?=^kZ=?o|%yKBW-hMF_tP_>}&%><n;530pvS$|Y+}*%Usbqy+aPpc4q5
zQBnfIGfK)6!81zAX>?nDI2*~zahy@|V=*B`Icz(l)R_{l(;WL5rGUl*F#L7u{Z7;C
z@!zTI?{vrS)aQ4a`Ul;@s&%S*jT)7FW(nWGwA`CK%e}$!l;7sw1cZCjR%|Q|yEoH?
zauw2(LeXZLiWc@)bh(3p%@E;YzFq3(eW4sShvX@#Y-Jp3&`2659g>l>7<x4h1Q2jB
z&I}7^IwW#5s((ms{Ub`!|3x+R&#1osIdtp`=-8LkN&gBu_6^;xe@l1j-_cP0dm5=<
zqYV9b8mIq4nfiZdlKx+suKx->yhaNUz8G+|{zu5^=tK=Hrz6wmbgT_I9rM7wr|pg=
z&Wk()M>Dw3<e5@j4t&Ma;=~b)6GcVzw2c$b2u`#Ydt$?!m~GPaS;2{iO-_{LXks|n
z5h?DMJPG=c57_d~EiG@sbssn#@*$s#ie-yvrDWM6xni^u(+0wSIstD|K$B&Y#2T+N
zf!xkSN^(}Bn$9Xz-<d>>omHuovl?}DCR1-`b?W0xp+U}CG{RY%#yIQH1ZRE9aW<ft
z&W5ze*@~7qZ=#jXCbY`gl-4<$(GF*GI*9P22tNUM!Pz>*!rs{ZZTgL?Y%DAavG6ch
z_`JnJdE^JW^8)J}=HUya@DSfoHF?MrO&&7rm3!XC!xsb(JBrmIF;TNLlIk|Et{&(t
zygKRrYzDE!mKWjLi3M@-+`foj6pP3&p+NMFVj*ds<Sr(D#X{AXB6?ZGzk+zxjGrHl
zN9qL<3;I2a%$9_;xQ^VD!4}F?n3a-RyhLJ{)dOY|idUl&iZ`)6LJTb4Wa523plbp$
zhHd-;H-$nT2XYRDPz-}m+)XLYk(BBjMMItUP=+%D%pVKpkE7|%@eqKCG}oC$i=C6f
z{A}9boI=~2IkeZAONX3O>8$f!DsoOEk29a1cFv@ioU`an=K^}yxsX0^K13fnAEr;8
zbLa=>T)Kwvznlvhb1q<pb5TfO&QfhlU_J~B3^q~+2bX_9U|zNaCW$n;g!@X(KX8ii
z8kGx9NkvWr;2YMKx}UVv{YnwNW)qdyg{X9PV}3QP?#l%O3h51@?rThzm89<WV;yXT
znMZ8EXDe;_<&mPW_ZA+P7T|c8jk|9~#ocAJMsjx<odGx3;H18QXQ)s@yUOnYclUz3
z`=Rm&pz;Ty@`s@EhoSOEpz=p)pz{O`cb=rt&Qmnrd736W3n|ZejvjEHhq`;fZ7;2H
zK2B?$muQpoGVO6*fx3I>B*M=CUUK?E9PAxjgvU1}LW}S?5*Fm(ad7bUVnf9@<fizb
z-F~AKoyX^cEuG&7MmiwNxkdDrjgfB)Ms{&yYFz02-bl9DbiRS5^BBny{e?^D1IiNz
zo@gkpHMpKGqIZN|zZ=&3^`gYkcxHpdFhwslcB9E~aghID5xpmJz8|&-n?!7IPV&)+
zjGMz5rxwu%BIAe1h(UrdHCxTtkAzHZi^#V<oUd&WeJt{Qf_xZ5h<rPPv3TAUk#Bb>
zMv9)frTAY`^vbpd-VsOM#Y|*JHXfAg&fw63T&BQ1L#>F6IC2~1DanYZ6eEFBjYPWJ
zs7RScC7Nthp*$mrW*Jp!j!}&k8_BfFs7~vQnzYfVMLUh!^q5hXju`dmlu@597!ByE
z(U6`r8qsq`V|vkON^cp>=mVn#eP*<zuZ>pplW`OM&uC58jhmUnxP@s(JLWdpvr0xs
zR^8~tY8#zdBjZ-q!sx<oF}kvjMmp<a^kLnNUaW`Fo241Iu|Y-}8;$U>2p<nP#po*q
zI)xM*?hh@*vfQ8;v(XUaw=FT2+m-Pdi+9?!y`^=~2t_W#zKerS^1CyU(;QoiO>-ET
zvf9$8Iq<gtEFCxmZxz!VOq>}GO>=xIwE@!{pIOr!-OOo@Zthwb=h>z?_Dh*Cr#VX)
za2^%WVUuOkorad~SOd-tV!*jt4miaLlE?w)r*g1~rr?Vg7-^zA6C=$7qHIx0i6hN}
zvSGn>twRFCNK?+`A1_0r3a(EsKGOVLzDP79P3C4ectni>yMn@1SUU;3LfC;@qAriW
z8Cj$nlgKb8Qxzkdl8q@4`5bC&+)J&Dd}?P*r!K~Qbf+<sh8nYIj4_*L8u!zD;{jS~
zJV@(}hv-pbF6}ku(NSYQoiP^Bv&KSt#aKjd8;j{9V+nn3tf23VmGrBz3S#{zt7vRy
zRgAT)s<DpMGS;)E#s=07;hhoQ74QyYi<BXZj%X%5YL1SuIVJoBhrX5&Lw16rBbF8%
z9kCw4(GhC{5f@Xj$*dJdM<0mM5o=}}9W^BVI;zmaUvT(P;~xs=qFS5M$3ghixz!!p
z_H2A%v*KUEin)7;{X60A_=J=S>`@5%L#EmKO0u?0X6v8#Y#4`NwhqH=Ve6=Yt)s>X
zYHD1dmc~VDZJef?4T!gKmU<dk+(h^wgbx86WfTQX#oz4N_{1_5a<gx6dH7$UjxN$z
z;EzsNBpL<si_N|(is)+_iM|me>g9&F7$(svQ#-<rW%#>O--_=};mEnE(BE@HC#A#l
z_#wi%{87f2b&xm&dpLx1IRq;bglDlzAyy~mOKA26w-e?=jh8@He5=mDlBIzqOXE$D
z^eyUPyiEg)cR|9>XoT@O$oL_RHa?<p#>bRvd_uDk{t&|F0xmPYkR%rCMJ=hR<sgo>
zxfd&fb{Qv+({OIo{LGY`iSD8CFIYK8cu4U@i0YAkBK}C0MfJfJ)fX1gPd2LmEU12)
zyRMz;XNprD9${sCL1gDYlKbCLkz4FA66Ed=LKB{+NjRGxkkC%<-$3qbAorgj_jRft
zOVlzJe_J4y(;cx6>K_|NgJR3mkXW6D#yV+atU(iFV`&<~??d=(!1=Lm8@cOS<Q{4x
z_reglr-R&ITjZ7lxH~ld4YN`En^LHaKQD8m8TiFU?f(dB-!ArPg=M@@ngO%dvUxB6
zm8AUtWCmhukvq0FCB@dInz8jkzy{PbwgrgTl3K^6(#^4rseNn{>KWS<#B2d#wgfR-
z(5To}WiSKZmt+Qh2$9Hc1{nX5|Age?(}4%DMO*l%J(A@xm1HjjT#Qfa;KDgB*f*kD
zxNb>pe3hEQ1^D%dcshZn|H-FM@$}mfhuGw8%1b3-T4LK!-PpF&EVezhjqOO?VmpU;
zkNSc=1)kFQ&(crsfg{%9h=_<4p9fXs*L-5gQP=5of~EL_3RbJ9qSaz+d5YC)EMdtK
z0N|s7XVL?(w@7}=FSaXHi0w`_Vta-NiZVhiNkL0S%5qX<{an`XAYMV#j=$va54E#@
zsQot7emiPUFST}mskQ&cul+;qf^L8J?)^~vov3|askMJlO6@xTo&RChj$=adBbCbW
zglh@c&eI=7^yjd1^w(*Mb=SW{*M}*Ij0O&KBr-N|n3~A=z+o|oOc^*#OJt6L!}LU^
z4jkr2Pz(UVGynwZ0M10_1TYer0T7$WVgX!<%mq*`k(C38OJs2X<r7(X0CysD1H|Ku
zH$XxnO8`hrWQhP35?KX+iixZuK&3=h37~Q!s|-*jkyQamN@Pg@RTEiNfNF`X8bER)
zO9rT($f^U>NMtntY9_Lp04a$q1)x?Us|8Ryk<|vMlgR1-)J<e{0qP~PdIL|B!(CU>
z0yF?6>Pt#Akd$aBDbYw$A{7}xiN*k+L=yl|qA36<(F_2TXbu2Mv;Y7lS^|I)tpGrY
zn*czG)&QWy%>bZ88vsz^764G9EkFe{!d+3^Dv4WVajPP3c>i_)c>neQc>fLnc>j(7
zc>hiSHAK3a;+7(AwZyHqxZ$lk4?N9obvF*ZCxTU6F}O5bIxe?B+yZk;)G3|}af=l<
zm$;P^w>WVtFK%veix;;9aZ408@Uja4c-a*IyzB-5UUmlnFM9ysU3voGU3vlFU3vrH
zU2X%wyQBetm$w6emv;bwm+1iDWgh_WvM&JMsviJ&*&hJByc3{)A{zkE08IgCn8*eJ
zG)iQ50i-6f!63tsA~tl`DR%2AHsl-|h8<&gxD3La#&<0`RK*uwFYlpF0C?n8FR<a9
z1`4dzlN28g9T5(V6`_gj?twV8T5$b|A~tf^IW{UGrjU&;WcQpFpDWc0S;i$c<}?|y
z27&IO>iCRl)gm@#7~-oIvawaqv2kV@AD)D9Fio>OMUPVf8urG<Q$1Fln&ab3H!Cjc
zs3cPlr9Mtvx4;?t&eU7!g>NAYqC0TTK3y4y@JX@1D$`>Br#ujQO<5BAyRts^59I*h
zvDm+)QNhPi@r{IT{7)EfQkGF&^GTY~1d91XX~-Ivzb5v1)x@M)9T-(HMZ)=Ye2R|P
zJ2++X3qJWa9>a^D04D-|4VVS^1>hvWPXQ+bz5|#I_#WUCKnx*R4&cXtxqxp0P6d1o
z@Ls?d0rLP~2Al@?JYYWH(}2?fu|UIS0A2#T56}ZR6Yvz^EWopXvjK|$?+3gJ_yFKJ
zzy|>@06qkG0`OtL!+>)D9|N2VxC?L|;C8_IfSUmq0B!_a2)GV#5#VaT#egdTmjKQK
zTnacFa2epkfXe|N1Y7|)6L2M9KHw_AdjTH-oC3HS5Ff8)YXCC=*8*k$t^*texE^o>
z;0C~<fExh^0B!>82ly!99e|qwdjf6&ya{kCU>m?~fGq&G19k-50oW99Ctw}GU4U_b
IyUF?g09pcuFaQ7m

diff --git a/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserVisitor.class b/ureport2-core/target/classes/com/bstek/ureport/dsl/ReportParserVisitor.class
deleted file mode 100644
index 2cdf83205f02bc0053814996b2a096d27df9b4ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15675
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/CellComputeException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/CellComputeException.class
deleted file mode 100644
index d6b403553032ee8bdcf390014f0d64dfb2217f3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 634
zcmb7>OH0E*6ot>EFG*Wl`?9Td;Z7|W5qC;AQ9%hVtad+*LyhJ|GLil&!Ij`b_x=!F
z`4_~SSglAET;vYt<lgU|VV>UZ9{_BlqauxFTv|D_b68?1ha#}JJrF@?dG6Wa9s@gK
zDC(XYO76-5w<D2xtv%lO&#f1R?5^cnvd7R|H7@xz*KF>NwEeLud`W<vwE;s~_s#`F
z$*^2;963V~obsVfPQ~y{+Qn%j>4}+^7goryWtg6$4MQoev?vh17f4NfVl`dZw(dE8
zB*k<WgCfQZ^_fA)|DLcf1IryH@lsAWinC1PPku6}eJ=`3abU%1TeFsK#8U;R$j7D1
zu=(HE4Bfv*PLivCT@ouu(R%?5ZDf$8Ge=6n9DNiRd8!3+dZZOPv+LbEu-l}kNL5YT
r7R|OXPrC8Zg%Zl7s2>Zc5F=()XR(x@tPZi3e__>7Pgo5iD_DF7`E`{C

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/CellDependencyException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/CellDependencyException.class
deleted file mode 100644
index bd96cf456fda8e3825091257c421ec2e35ec2529..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmbVJJx>Bb5Pief5d=jPHA;b@0Zq6<sW3L6iRNOADE+c*VD;D|cZZRmWo2SvtZhvE
z9~S-r;{Zyhh0V;ow=-|vWM4iXp8)J*BZ-w1Vpz41x3EUY2FlmMZ7V;}p1C?{66lnW
zX?P|Gg$dij9jW+v^!@qc?X^Tm9B8A%LqfD%X%k`%ud4`4jyCFSH0UV*QgmEqa*iii
zR<JnZZ!#A4bwH>&(i_;FAXGQ@$X7$p4{dcP)i7iWc0;*tQw^2rDkH~7KYX2#YI!4H
zs$)G_Q23><dM$1Rp>#3TElO4kihU6j<yg8}7Q1ulY8ol56ZZb$hOqnB)NJ|OJ0V|o
zCcbP}n4aAVeQkR6N*mjV@@D{qO~jGlY%z);$ray=1&(QEYRnO5YbQq!h}=(`G8|L<
X0BrGS0gGIvXKh$QmJwl@V+6S`l2(aE

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/CellNotExistException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/CellNotExistException.class
deleted file mode 100644
index 70bbd53cb89f0aa181b9ca4e0631b81960a836b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 709
zcmb7C-A)rh6#h<I+PW^G)&f#N3;s|fvJkzi@xrQ!rr|=M2_alew-X%P&NREThBx3X
zyz>FLfdmsDz<1Cm@EMF}mWB&TOuU$L=6rL$^E*HOoPP)K9L*By9td~Kn0I=ijC)Ss
z_izJ^5*ABXB2*F?D-m^NoG7Dr-n}N!d%|Sf=)?+byCO>E#IN<^-(PB9e-er>lveg7
zVY=Bl6rV*934IW3*;wg=)=HO9Xq&zyOm&o&o9Un@<89H47^!wl$cY4}V|xS^>_?Rl
zo^?Vq2zrT?pMo@&LlfIT9))sfxu~EmqiECEH%BUAF+y8}a_An!APYWL48hwnX&lP8
z%B8Pg8)ePW2(wq&uTmBDW$a@L54dT^ZS47Yh(`o}zoCt7NLS99kH=VcZWY4De>Xu`
z{TJs$Hi^rY3HhcQaZwD1Quhf@uiL@cT1LINfmw60DMGEeGUnLABFg+Zz`vvp4>wu+
zY~?V?H{K~KEN?NggFK_a!jo^H-81B>`BM~D`BW!ZoT7M!(n&_Gvh*_NIm~m|+icHV
UkWs@lTO5Xw*(}8!wsM&J3;gc5RsaA1

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/ConvertException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/ConvertException.class
deleted file mode 100644
index c1eb83b395e9f3871b8d3b5d5b347670aea3286a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 622
zcmb7>y-or_6ot<$e`Wzi5Cp`+PQ|c|l^7b-M6<CFr61M_jxM`ob|A#JvNEyo0el`C
z8{^#-#Sk>Hm^(RV?tJ%5=H>nA8NfbjCgLcErIJE5g$;&WAe7{8SExYx-qq<513P2L
zwtX+q+|ym|jznT|-#kda@mGfAq4cC~F_gFMTR!HN%e}sJJaNQO6QH@%Wr(-^Yr(K$
zOHZ7S20fuJdCw&$Z~G3-;xv);)QsyJ889?##~)a|K#MzTq{Pry+7e$_i{gxh(z7`X
zhL|uE7lt7JXS$A7((6ajVuPR`=9opF9x|96f2167BEzJ``GJk_Mg}I*VJR@|{U<I%
z{jc_m=(*pI!xm!nM*u?=2_$JxkutDEi-ICeHA7B|v_X4vxBdwB5cOoKnvq+fyHzZc
mE`4@k1vygGk5%M}5wZ%4SjIf7My$<WSZgRotP+t8tbYKee2;?w

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/DatasetUndefinitionException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/DatasetUndefinitionException.class
deleted file mode 100644
index 3c28445e159493ae8bc00895226feb0bd753b291..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmbVKO-~b16g{^sZ5c{v3y2ob7ElWWX5)fb;zGbg)3C6#2{A5SJ5PKveXp5$L-04b
zas!DZ{s4c1dlP<z@y@hrLJbQSbMM^q?#Freyl+3hd<F0X^&Bb=2#a|v#eO-D`>}uE
zU=r0FYB{VBilGdY@H;XHmC@~&`viJLnBFrwv_jjC@FO|#<5TP7+V|@QA-k)zvd;+f
z_2vh0CR|_W6SrjprB52`9YSW$c#<&FR9YTJ{jLm-MAv7e+%!ENBzPRhBQRs%tB~-t
z*)x5&8(MklMu8ldz`F9hCkK{Ex%<M3P};Wk<hyt}V+X$vnbMRuJU<luWXu>Xg3~fl
z(33AzOr&;OzwNl1uyC`<^GNxg3<{XRDq(WeqWY$QH9RDg-d44-)xQL{3wVUbae9%k
z^S`$vY~EJ-I@#2pT@cdsSc0q=45ao5TmRB%Ot#V0c$0Z+hDs9V>g!{P4b+h5#{+&v
z6*!n;U*IT(Y5rr)QDj?Uq>VJA!1Bfw==c(;a{2<9P5#OgY%Y+!MDBA^T4w7c$rUVN
Z5wjfM85Uy>^Bi#-Mi!D0cR5Po-Y=|D#iRfL

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/ExpressionParserException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/ExpressionParserException.class
deleted file mode 100644
index 986337075b11587d243cf8d8e5dc93b6be89a5c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 507
zcmbV}yGjE=6o&t^x#5~<j3z<^!A=ci8^t1$CMKXPB1TgRlXZxro82%wD|rQ<z~`_M
zEPMbfU%<}i5YMicMzpXwXa0ZA<s0Vd?cou?7M5*fuv9>`fEuA3Nv(uGkUCOfaJs)o
zpaVjw69$nHff)!tmbu>T&Ffk7`Gt_*Re>^XLUrA}6xYJ>MKE&uMyp`d+87YBo$y=|
z=3N!Y!+1QD`a}$Ub}DY@@gl+NSbv&XbD<)_j_ZYEXBZiI<-}S}LTwy5_2k4bl+&F~
zw2TtIBcYkM`*qVIWX91bnf-%>VE4mVd$OmJ?W?~IX(p{j%)lmW{|kfA_^a<Yea|;E
z)?o1u0E9ZS$Z^iIvQXd?B^(@Q*=e(9an5fx?m>5HO_8IWx^?bcL5X$kqY87FXT|j>
MV<DYYVP#?Q9aXo6tpET3

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/IllegalCellExpandException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/IllegalCellExpandException.class
deleted file mode 100644
index 8250e878280f9f366fdc1f0d96681cdf08e29579..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 956
zcma)5T~AX%5IxhDwv>xt1wjNU^@Em5uNq@aYJ9L_Qqo`|+MsXSd)K<Sy|=k{OZZ#9
zl&FbMKKUbj@qZX+TQreY;>*sS*`1j)b9TS|{PYFDeca1nH3!047T2s@pFsf|c2~^e
zy0tfQn8D2qZe_4Zn2%+ogl@?wR$=g}@svQjgxPu+#6|?BC3Ig-eP90i<DlKxBcvax
zK$*vc%~I0~yKXx+^1a)SWG{@2+YNoG-4{bpms;1#Ekdf!Ucy{c1#++7ZOiDTXlwT5
zo1w?01ruO=>P(q;DkeOfkX;^ovS*m4+t6BegtjGij(Z~TcYYt$xSq#u?sGzhF@A*H
ze%OyZ`Ak_x>;Fz%JrqZRuw;#^MbL5gO{9X(lfKfvj2v7<iJP>P3UbJ)pyGmqGPW|P
zIJk{%3#tUi9;o0*XysQOxVU43?-Cx25A=UpCREM~9I5eVK!jw;s*)DHo(z1#cBy%`
zr&@W;b=oG6w>Vzx>{toY9cf0&*q2hCAcZgA+LvV299`tpe^GhfK9rt0mrB-zBM}G-
zTx6^b!s4XnTG)X71mNGW0td5fFEC1Aj(5aj<axcso;OIc7btFh2E9H(BA*-}Rr!c1
u!T{-fhS31o6HI>?#xL-i8%C^hjWsMXzC6mnc8L+^!ZNN5>#Q(J;OZ~rCI_Mb

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/IndependenceException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/IndependenceException.class
deleted file mode 100644
index efc80bfa05ba9805334741113f5ee6df36d43f1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 495
zcmb7AyH3ME5S(>h!Xyv^2_hXG5D5!G7nCM|6l75lNPlro;lR0z>@&*u@CQ^#6o{Ii
zprha;5Nq>jKu9#ZH>2H|*?W4se*mzDRTnv|lu$3BL8!(uQX(A4C{{+F_YMejOsI5?
zj;+vkAi_izZk}U3dwqN%6!(=@wnM0I_?O~Zc%jf^uWuuz$L-AlA>TD4Nm%rimM6(%
zD5Enm44J9<CSW7Mc8ovCyuDB{Vb>4L#2dy|UU^9*rzWzVoCR`fIh5DaBRQ2^bRZAE
z*ft?IiN~q#j~oQIZ;~jGM=Eu0{wlDYu9Yzdm$371dqV54ozv`w@32^h!@mx2801ml
zUS#B;#4k!SaGhtS!<@stxYfD?-DWdou5QMz@n#bh#*L3DEMSol&!dW^OsmGo!SXw=
C@qzUK

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/ReportComputeException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/ReportComputeException.class
deleted file mode 100644
index b4175e9713acc62aa540152cffaeab482bca33d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmb7>OH0E*6ot>EFX=;TYinOF+^Gcv(v2wHR0Sotu-g4J4mFx&N-~jd{Vn1TaOGp+
zR&eJZ5^rL)A{B9wJDihyzk7yxd3$^U&_W}PI4WVOrcg_v&XD(oXK}kHJl~S;$^H%l
zJ7CClr0Xm0svfrkk$AYexqrTX-DF5^Tdt+r43!n*oL_R?=I%h>9hqXN2(Y!<V~BU;
zsbH8hELR)`PG5M(yl<0JFr-PlIBg_7Hsk8d@)=r&DILA<D{-L*o)}6`>EaWsA4Nt-
zI>SJT$u<T}j2KE&qmchSV^?{WJBR|t9Dfj|nOtD}lOf%efoF<6E6iJ;zIHvF%OZ_T
zSc(iA|Buel{Cnu@qF6?ZUJYQVA%P^FDN-6{=%dicP|cFlCauw#Tx;He-9|k*s_DqB
r(rgX0q{|;&m_wcv^<y3dVuY;XG?w<0)gac=FRTTWB37Bm8W!IHv*(yd

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/ReportException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/ReportException.class
deleted file mode 100644
index aeed6b0aa288670d0ef89e56974ccbc23a852d52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 696
zcmb7?%TB^T6o&sP2wG7P!Ta3}NVFR_M&rgyq7q{S*$;IBBhZrRRDB3v#*HQ}d;p)r
z=P;f@v_w}fdM5wrIsf_Qv~M3TuK>2OZes|uCd}EG$3hZ|Nh~pB0-+>t*MthB?_Hf7
zGO$yIu>;==H1~9kw?i>h+<CCBF5b@=5_{5<dY>U*DBti~?zFkra4K3!ud!RKF~kr2
zYr&8%OHZ7Kow`s}UT;$-TlQTV#AzJqelo6`GGN#&yMD*12U@h8P>HUuv?K0a(bWXy
zT=o)2-+GrJ)(INM@ecvR%ph0PW6&&dPuv4d(Q5{~;)lu=$I`IoevRBRgHjkp%7o=4
zR#I5S8bj$H+zfLO?`7y|*%3bkzrd?a<=>e-^>#WL^$j$nyR>v&(cEoS6?X|cRw&kp
zD^6b-pm9hbN#`&r3nTO}a|McHl-Vb3(V5sNJ%c^=YQ`zrz3i;{Q;;S-^;LxoCP+~|
wvX~?f<CW`s9rwL#<7Jhe5R3fA5u>gJ@>?W^r2$X-$J0ih<`~aus<kll32ri<G5`Po

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/ReportPagingException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/ReportPagingException.class
deleted file mode 100644
index b8438ecbfc3df75bb9f3c879808b2647169c578a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 495
zcmb7=%}T>i5QWdAe;8X^tF2I1?y3cYD7dI}Qx%jbVzs!vjhA>ey(!6!=)%YG0bB_#
zd;lN8hY=_7XQLo)X72fznRB==Z%@wvHn3nLhxrm3B{T`OSVl?&Lm9;?)Tevf1llK5
z`k{`E&}JxtL>A8OZx1%_+OLG-meR`f2#vOTDXxVR2<<xq6DjR?mxqLWKRlO&s;jg-
zOvWP_orqDur0#|u8ws{!{R#8tLdAr2*9*taC^quSNg_E3Bjd;$PfiSna*i`_Bz*SR
z`J!DyZXEmR-5)s!_8?3mPwuMJx%KOT)pV_lDcFRyf7=r}fA4&U#S$$3b%4Vlj{^51
zD+?ulQJR74G?N}Pi+gdU^9Xv#X3AXcjJ9}l5f#?Wk15Qc%8KVv!)$h|&dS2vJDP-m
AHUIzs

diff --git a/ureport2-core/target/classes/com/bstek/ureport/exception/ReportParseException.class b/ureport2-core/target/classes/com/bstek/ureport/exception/ReportParseException.class
deleted file mode 100644
index 2e37c54a5512cb7df410d6c00d1e9d426168fde6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 634
zcmb7>%}&BV6ot=}KP?~#f`Yhkr;=D>j2jIb)I`%5Bg%fL6C5oqnGS}v3*X0;i3=aV
z7x5X~7;h_zF&N`w?&O@g_q(U*^V{PSfGyNa#IX>TN($8!78&w^P?EcCp#tf9=ZAX?
z?1&-T^u0iHPq(={5Q)3t?RNQP`jsKMD?O<j3=1pv6~Ez@%e}6(KXgQ26JTex%@A+;
z7lI*YOHUjRdL5z8c*iBDVEYd3;<S<U$c*bt88B?xj^DF7ffm=+K#9Juv?V^V)@fv%
za21I0E(Svk8A=m_kpDelODpMhqj<4i&<(SU<BuL0%$7e;jyRBE+RCJ*>)})eCemRk
zGHm=eHbedIk*|-$GGg?<0EQ|ONYb4mWnhX91xA``hMWdzgYM*7{Q>Mg>d8_yBez1c
pRm_kse{>;-JSpnOEDFR3S;a{#<0q>|tfgOAb0|fuGLa3;zXJ;)ltusm

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/ExportConfigure.class b/ureport2-core/target/classes/com/bstek/ureport/export/ExportConfigure.class
deleted file mode 100644
index 440ecc0a0c512d8e707f590db292f64b7b3f85ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmZ9I!A=4(5QhH&WB~;<;ou|S#a>K2V7wSOX)xI*D4W_8cek4|H9ngMAHat)4n>j;
zr<u(E_5Wx3^ZWG;;11Ia;|vqR)EZt#ZX)L#jIIdR^PA_b{?N*K)m9dSOyHF(4PkbK
zN?ltePhD*V7z^;KgRTslup?X@vB<7eFS-$Cm^)i*jzMhhPxXgGblbHxS#P$c;Kif3
zjB+1CVg9#Sel|Yvlds>L7316e{)BnqE4A6Nc~>&r6Urn|o$!Rqba9G3g!Bo7j{FtS
a?Gd`@0aDM<Pc_3p^r5I7jHEkH-Nhf#TVaR*

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/ExportConfigureImpl.class b/ureport2-core/target/classes/com/bstek/ureport/export/ExportConfigureImpl.class
deleted file mode 100644
index e9bd3aab718e11fcede3b19a8c35acfa57232833..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1244
zcmb7DO>fgc5PfSq4GAtuO9<hkrJ+y~Q|b!{iB!E*ARz@>DJW+)VH>t2w&ku7T=-2O
z5g~El2k@g1v+G1SX%NAOo!ObUZ{B!kfByRZ1HeOgMXca<0Xb~z<&IwN=CPB<y*wHW
z&WRifhV}L-f6x6P4+efm#WEPQ7~C*XQKD!s_=usJVr1waW#WV@Mm**tp+tPfP)bpW
zl0*Lmk0@Q}$U(qW5>uT=v)TRgWiyeZ-l^!T)&X&>?8`u^1BNG!3}B*kma~;^=Vdm#
z)a+sShD4OwG7vA5QBTCLcrR@~?DJul$5QVnK}Wrn)X-kLACCOqnG)}O>LCha<%<u-
zJT>Mp3{K>LQqM=xkhE6YGh`p5DdFpXYG3ky{Jq1{K&b5PFw`2&#c+mI0v~6tZfy$9
zT;AjP*pd<%^2Gkk3|D2!F*{zxPME}fkz#5K{^g#YNf%`_U0guHg^N`eMO<Xq{hvEw
zDF2!6bf_2_%Q7(7jb;~hdN?bfwqV23a_D(kT8y!zjB=NZUxGt^8EceZr^qL=4%v$L
z4a~bghUM*!VS5k8aK2F7#${To#1Cu`a+A1k5!V*Q>!?uFOV8s9q4ZZV^_lT>Wy^S4
zi;b(~yHsDJT$Cu6s;W`!8m`l-HTh&UCg**H^O+pWh|moJ+ootrlA9D|xPhC5nm=sM
dAKqDTI90Gg<eSvlc?H%yNpk@S!<Nxm{|&38AaDQx

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/ExportManager.class b/ureport2-core/target/classes/com/bstek/ureport/export/ExportManager.class
deleted file mode 100644
index 495121b26e30ab61816af7db9322e182dc00d9f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1026
zcmbVL+fKqj5S>NjDvBr~=(B+b>5B;=H6~taBmpHhfk#|mDaF!~vNimGev}V>fFEU?
zwi~H2O@ybDnb|peCUfTV>-_@&&fq8xhjAzph+ip}_r1mqfn0M!U#MhIQ<GF~>!v0X
z$Xr|IoKur`sNt{#lnA8QVrJR=j!z8&z4G6#u#CfXLu%2PTxkxhsnnly_AEIzbJ--H
zR2n0z<WfI+X;hF@b<Lz4-w}9S<G1rLIo_ZT{Rtaz`C>IqPiyFq8!L_dw#FC#9CbAz
zNq;l#;fTO#Iec@9=L)pTNY`*#a-~Bc?e{8+0Yk530#Ut2ARmakIv=;GhNdG>2;}Rv
zV5JnOEc5D^F;3t(Pz<(-vaoH}vWMtl)pG0syVVVJRZj7wx2Q=qW>?)SAaD|D(O<6#
zWS3Xtn+XRKrmp&m1aXW2fe2n7fg)@`6mb)y2*e;2#Y2PyW|CgUkJCT#7S=Pc4S={K
XFe`9ZU{2tkz<q&v7m?|}V=jCH*I_xt

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/ExportManagerImpl.class b/ureport2-core/target/classes/com/bstek/ureport/export/ExportManagerImpl.class
deleted file mode 100644
index afa5057d5145bff58e70011a076ef97f712c54b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7947
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
ATL1t6

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/FullPageData.class b/ureport2-core/target/classes/com/bstek/ureport/export/FullPageData.class
deleted file mode 100644
index 04bb3a15ed95f181c4515a27406f8343d545cf52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1084
zcmbVKU2hUW6g{)MK%r1tZ1JPjmR1zj=)U+y)0dhiM64!lcpvD7PF;4%cGu{OzsLto
zBql!i1N>3OGXo|RcreW-ckY~-d(N4=_xGQlzW}_%lLE5X%_D<79cnu4=Wvk2V}U{v
zB{Fy?2mZByXbTkkQIHP9H!>cmP+(=mqmH^x1lBuO@`Lo!L<OEkS_1hqH3(&r#=by%
z?)Y$F-;ah~?>h0{dn_15apLt-6<m0fP~pJSCR#`Q1hR)JRLPORR---7+iG?Noa5+%
zn&plP{nK>V^W$^b3y4%YQC|jK87sY?f=+U&_`Ii`MF;*zW8@?aOcP$oL{h(cljYOs
zAJgfgpWDAvKcqbHlj9p5w;N6VhE?LaA(Pfu8qK+G(&Xy}@b*>&N)$YwnT5hxl*WDk
zMCq<>%=YJn9)lv*P%k2fl_K&w6tF5#|E~sfl*}Xrl7Ibe@5=9Uy7=raY8=fhht`Ir
zshL@t-K-P<$J68`ILy~j=J`62&s-g@o9+(?cY6%W-5JAnpO4{uBW`1Zu}XGempAvw
zT4Vh_?%)6wqVA-g`%Ui1Wb}o}v;)gz+JlWP=0)o3TLqMeOk7oo-Nijd?aAY+?_}KX
zu)i>|jESrP>qc}!l9`GM+{c6IgJz4JuXDwXCB+j5+a%vv>cE<J@N5Z*z(XVT=r2#A
B<-`C0

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/PageBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/export/PageBuilder.class
deleted file mode 100644
index d20d0c866ea961aee257bb5f25d9f7e54de318a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2935
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/Producer.class b/ureport2-core/target/classes/com/bstek/ureport/export/Producer.class
deleted file mode 100644
index b7753f78828b52d0b4ca949f8334b8da0fe0c709..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 200
zcmZY3F$%&!5CzabF}f-UUcpWqx3Q7*R)L5C`^{#M#KaBju6Q;J58$E1Bw}SV{12bU
zyxxx|fDI-BLSRe~jWxN~OxP}CZEBfa9iOGQ+!*U*ZE~*Up)XNfs+*F9k%@PWcd4_i
z>S%Q&OjF~n=3P;>&}{!D?Yi3&7XK{Yd;K>g%zL_0my=AglC>KV2toTRKp|m(uuB-W
HH^ArvvR*ia

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/ReportRender.class b/ureport2-core/target/classes/com/bstek/ureport/export/ReportRender.class
deleted file mode 100644
index 573fde261b0fb03eb07dc203fe2fd42adc2617eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6761
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
E3$(j0PXGV_

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/SinglePageData.class b/ureport2-core/target/classes/com/bstek/ureport/export/SinglePageData.class
deleted file mode 100644
index 0b14cf1ea046e9b57dc8453b544ce4e16f55baec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1393
zcmb7?%Wl(95QhH~J57_CHuMsx+d}V2Ou-T=La3#iBBV&+BDKoiNv+`G#!>2^vf&|k
z4i+F$A+g{Acqqg_C#Gr=FNzm)=8VtGd~^Bz=jSf~yVxlphs``Duq9$!L|H^7hiVRv
zLLrV~FMR8@{c{CXQ^<Fz*E%Qug+f+z+Kcs5?}O*|;~;eF!FjyLXGcN1<Hh}+ukdu_
z_kO(<ow?2P*njWxK{x8fZnGbRCoba!owh6K_6``uYDHoHtn<q2(XKGDA9RBFKw+U$
ztBnNRt2PwO!{~$wXX-)6f89T8`n_YX8PYOak6K>X@OpvV6Qdcw3rJs0!SOFN)e&hz
zUvOS{u}7fNaGa0bf3fz*iEdh^fS2f=TG8{AAO92BYWuP9ClfO&RnBlSF|zpCN_Di6
z3eU!jH%+N<i?NTd?aU1CheJ~=97X+J%YPZjVCIHf{74qbLJ<!vOd@Y#M#K~>3kBpA
z%Hx}pIx6m@UdhnoI=yM0`mI=j#W%3V?ap!eO=KhkwTy(;C-Z<6XnmS?CZ|3@TM@T;
zpXKcnPm|}o^8?CRx<tlVzJ%dCyoC9Ub^~*iC1fdA`Erdh)-jC@+BY#zt26M&0$<5D
zuQ`;~Bx6Qv!eZbKbzzcMQ;cFHbayq=V#4&9r{uGTn6l1_fGwIsWH##ow#cx}TxG_r
zkgSSDatYn;Akr0`eMM*MJ_((zJ7Z`~IL&LEw&pYwPMe%dSf-TTxjdzotn(e&FH|zR
zS<+x&N2ebYn@!Rytl(Z!<aKBB>xi?P;yjq+eFk4mCCH2tJWdIsIKVV~W7PRcs`I+$
G-1rNP&IT|5

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/builder/down/DownCellbuilder.class b/ureport2-core/target/classes/com/bstek/ureport/export/builder/down/DownCellbuilder.class
deleted file mode 100644
index d020d29d254a08ef32223f4a4b5cbe4bcbd4c9fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6196
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
ND;gzi1y1v!_<xB^?4SSu

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/builder/down/LeftParentCellCreator.class b/ureport2-core/target/classes/com/bstek/ureport/export/builder/down/LeftParentCellCreator.class
deleted file mode 100644
index 24a49355fb13548136690044dace7c3ad6ebdd4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5598
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/builder/right/RightCellbuilder.class b/ureport2-core/target/classes/com/bstek/ureport/export/builder/right/RightCellbuilder.class
deleted file mode 100644
index 3fe87a2b380bcbea1d546b73afd911f99f4d66ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6209
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
R(?vkE!ePRe<1`QQ{|8mI@g)EN

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/builder/right/TopParentCellCreator.class b/ureport2-core/target/classes/com/bstek/ureport/export/builder/right/TopParentCellCreator.class
deleted file mode 100644
index 492dd3020fa261e530f00b23e932fb91876c7d69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5607
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/CellStyleContext.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/CellStyleContext.class
deleted file mode 100644
index af1d4a206e4967f9da97904f8206ba1539e256bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11273
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/ExcelProducer.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/ExcelProducer.class
deleted file mode 100644
index 09c382b6a87ab4440f1b815bd3bd97b5924145c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1560
zcmbu9|4!3T6vw}}>(;H7UsF(I;3f#88&qWf=nOH4{^Jnh495M}bvIjKTbI%*58zAq
z1paLzkZ9rq_)x}k+XhF{#ARm5z31HB^SS4I&%OQi`}<D-6;xDcC@NT2A)%PT4d@C=
zDw3g7R%vBJ{I@CA3<VDrY%$F7GmCe3eY@M@?mOG-9GY#r-)7jWSx(Pro_hSm@LfJ|
zT+iTV(L^Ce$8L9wW*BI^h^15+vcvp6+vS$W@N8^$NFZ+Nsol4|9fm}4{fI$+?zA|=
zRL$=5*M6_b-M415ODox$W0~C})3t>kEy`ZUK4sV*DUG1CL)U5f7I*37nL%g|i}kn|
zgX&RAUE@t4UA1;>elQK&F%Eoh;Cpq?<z}xcQcs2AGUWfoV9=bQXlh<Ol|hMeWSAbx
zw%*~K)X%h>s2qmsn29$UB6aoS(1l?QLW_myn2EY)S||JFAQD}zJHBi2mv+#WYpQMv
zaWu>z%dq?Z*G|I(CK-0dC54wv!xW}9<WbP@2-{+qXV@AAdaXF>LD2iI*>4*M&Ewz&
zB!h>;@MK*5*N;%37p>9Tm*__Y2NtDFa}sn-k)`n_dHYC^1uW>7VEPY8?=O)!hfHRY
z%+xuQuR-uF8YgKpkb{gxs(%Ty<Y{3z=5U)lhC7&#(68tyu|K1i%5vfo>AxWHsR5~%
zraT2CA8w2w6oR{0AdIkbbeKf;QY<(T2VN%d%E;h*v0zz_$#|8(Ya@ass;WSF3za{S
zWJ#KHi=Q#0e}h~q&&n6be1S%uQYv3S73w4)WX{rVK&P=p_68|o1ZP%4#+6FBE0uDQ
cN}@UUu^hE&g)A8lh$TbHrYV<IvL&qj0ZvJ3JOBUy

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilder$1.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilder$1.class
deleted file mode 100644
index 7c9380b4e0366367dd354146c32c5fa5a79f4702..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1716
zcmcJOU2oe|9LArMq;Zm^Yx=Uai~)t2tz}TJuj^hIi_>(BHBBK|2b7mNj@Nke?8r&R
zxI=;ufCL`^2_$ZTA%xI0O@a%wD<t>;NbmuW;2QCN!lV-kE+!<T`1kl{pC|UQkMI5Y
z%^d(sXytGePiJuu&tzq9j%pb=MwurTh(%(FSSD78<HRa)f;dT>B2E*}5@(3#h_ghI
zu!$0}MwE$l1Lq8!SC}_zZ~0xfRdL#;8(lXWovwGy?8RO?io0ghyW)p_*N;MT%V~RY
z{q44=kl2x8=Cm8|+!=-B%<Q&8suVTl<j95}dYirL4H@k;0y#3a5xGvV?ZiI){=wl|
z*Kx1ORr@Z}SIE_(UhI17K1-wJo30nwJwIrA@!VDCh9iGn4&5N?_~CBF>$ak%ffo#1
z$YTSQJRZekd2FJZ#}-~xIKYY(IN`3f8P$4jYu)#PW;u?dIFFY&tVYy{i^Mi@iFlcK
zg?N?NAzmY1C*C05BrX#U(I8x+NqEE+Vi#3~lk!}x{&ThNKUd4U$;T@pbF^CiZp&)?
zJyUCN+UC4M{(KmEaVc;*9j~KM(9^0mu6k})VfDZMy~5#tR`naV2Htr3h7<I7{i8Fp
zI~xzyIwcFGD6e(q!N(g>-1I{y=r1W*V~L_XfkbhESR|H+WnzUmPOK6qq*9!ht0n9{
z*t6NQ*|XWR*|XWR*|XWR*|XV8moC=o)k<MnzRO4CJ5_}#E-CIIgK0c2`2>*o9!c4Q
z>U|A$=XUNE5?}C_{0ga5^;4uS^ffIyq}32jYt4unTC<`VtvS)c!00{nf#G@j!1!T$
zR`>VPbJ|Dfd$bqmdF`Y0VeMn|z1qj=BibkE1?~IjquTe=$Fxt<$F)z<C$v9A->3Zm
zeZTgH>63l`9FxdmLO6se9KvDABUr$)<O+&dlPt^kUz4oM_vuPD(MCtIi+Av@<a>A@
zA4q<PkMObNC-@AvB)`O6d@K1Ke!!2CKjCNmBKa$R!|#%RD5xZcR7w@pxa5SIR)-`_
zbxbWvE~&GsB)O)xR86w3E-P2EsoJU|{iNJ4kmlln4^x<s?Mc~sn7d@iTq^&9O&<GS
bAUAZRe-ks9l}zC&;q$WP<Q5M~qLBFu*KK0}

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilder.class
deleted file mode 100644
index 4a8c5acfcc111831d5c10d73c5f17539ee1387d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5562
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilderDirect.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilderDirect.class
deleted file mode 100644
index d3f2e0e01dc560ed32c5bce218679de07b5830c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11134
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilderWithPaging.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/high/builder/ExcelBuilderWithPaging.class
deleted file mode 100644
index 400c0c47c4056aeddcc318f24f75694d1c37d8b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11722
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/low/CellStyleContext.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/low/CellStyleContext.class
deleted file mode 100644
index 4c442856bd59662e43d3c7c3e12737fc1e2bebff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11814
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
Kheh5wHvE6rDS=}E

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/low/Excel97Producer$1.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/low/Excel97Producer$1.class
deleted file mode 100644
index b6894cf8ba69457cfaff93fee7744fc8994c7065..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1707
zcmcJOUvJw~9ERVMq;Zm^Yu09K83PJ4Tg#wc+q7NT7>m;s#+s&(tOLrQIgZzQ^X$k;
zwsD699{>qHz$B2kWg8%b(1ZjRh$|%c07&owkl-5ed!tFG0xre{QvAGr?DNJx_VM?B
zet8!_2|GC)!;@JY!c$q<o1t0;j#FldIbxnD5evj3u|%98mWii{lf)_F8R9hYEOCY?
z6E;yHR){LGYT!8oXBB46#&y5v?$n%)=|)%0R=4L}G5fLCiQ=Bw_AdFM-}9r;+;BQx
z+<dF!DI~U}m^tMJJa<|lIW@hhkg7y&IXSZChu(VsYD-2ttw4^9u0^gBY&x+|zjtuB
z(R17@a@B#$^c8ZAs2{uDs?Sofdc*aC<)w`{YWH0)p1JH?bL8Kvp&LY9KisZ)y`89S
z-~|Kc@>oMHkB9L{9_y&*v4IyA4zgkePPlEYM~%L_v+8?6yBfz)oX1NX)*zb1d18~e
zK)g)6LcB_B5w8)i6K@c25*G=FXb~>aCOqO2v5mSyNgk~=c(m5NM{9XE_=F{7npO~9
zxBfO^b5<dLHVnPE5;)zi*HtL!3DsMdJ-4SY_uv0m;mAKr`bAs2UUd4J6ZCoIV^h;x
zYxmbWDeI#wZ*%JY#~V@H_CqHatRz`liL%T+QJy2_i4w6uED}q^31V3)<ypB}!XAJ<
zn?0L7n?0L7n?0L7n?0L7o4s`9e4|;f6(;3#d`Lb|RhZy1;vO=X#G{gr0g3OBls%~a
z7f^S<%H2WYHh;;_kxJD+M(W%^)1pIK4bimLjHsbCE1J=o6D{l-y@$SQc%Hs%{4hPM
z`+Mm*?IZL(+6(l&_I>nW?W6R)+Q;Z4+Kcpp_WksI+7Hl2wU5)sv`^5B+8?0r*M5+G
zK>LIA@qypMII<`ThcJP|I3jrzb6AjEL>ViRRr%%{l1=$0UCA~&=t}nRHr|nZ7w_SH
z$q#T7A4-0NPjE-_Q+$nYB)`QE_)+pF{ES~Df5mV3UGfhFmBf%rse&4lEUHO$SkhF-
z)x2a$olzCZ6}6!nl1+6{xsq+wQC;aL<$i(mVDWqgQ}z?GJuX`xGZze*OYL8<&SU=z
b<c5w8Zej}4k|{hPd|tMk+~Ofg6f%DS)2ClU

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/excel/low/Excel97Producer.class b/ureport2-core/target/classes/com/bstek/ureport/export/excel/low/Excel97Producer.class
deleted file mode 100644
index 71f1e20c4d030c7e4855528575d2adf77b1a30ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16799
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/html/HtmlProducer.class b/ureport2-core/target/classes/com/bstek/ureport/export/html/HtmlProducer.class
deleted file mode 100644
index 3a82132f3aa957f0a62917bfb59822a59ee176fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15599
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
GTJZmddQ}7f

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/html/HtmlReport.class b/ureport2-core/target/classes/com/bstek/ureport/export/html/HtmlReport.class
deleted file mode 100644
index c9ecfec4dbe466ae3234e7503ce2b2def11b515a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2931
zcmb7`+j1L45Qcknw3M|SJC1RpV9X&zlEE8;Lm)noAjh#liH#Ku6je}bd670*X;rIL
zD!J#5cgPcP0aZ>>#RU(*Gf@<O&#q3RQ3y9Zv!kBwZ@T}P(qI4l@h1^&&{38Q+RM;6
zy2oapO_|N-Y`$PqVRN6&12zX~I!x1-g3>jw71*sn(0t{Q^~5q=t5r9vf$y~Hn}U*^
z;F)U+$^>3uxrbIAb5X{38`E;@)P5=`RrB0#vnA-9Z?`=^xZ^r?d}V75%MW&~!0HHE
z41;$A$2Ciy>)N%z@mffbslwR`x;_GLYMr(!HLq!&bOQUa2{+DQ%Ft%1mtb=Tk(L@k
z(=FpL{u9eRvVZjLPUF~ey9hkfu`R#W*z^1*^9Wkg#I&Ev&>Y3Aj`$;ZYRhRk!H%GK
zzHlrkQSwd^cediR><8WEiS0kMPPk6<6|ZKw$CmH#ceI!Y8V+hu{Ewvj$b2NvhlJU>
z9h7>lS;!Z3&B=C#d@kn4T^Mx=fvRB>r{Et=4Xi#Kv=pa8Qw{t+w3x`3IRLwI<D+h~
z)6i!|a)$lSNS<(hVK~9pPS8NtA)Th6^L;7xm#3?NReOBjYDWc|!RD|Mk(SWF(S>PF
z+iO2+yVR@DxWcw4{Pe22n&wjtrMeUqTFu0@S{!ZvvvyAcJNiwp#=wztI4}!DFYp`~
zC;vK!y`zd2bRAV0zgI8419M2ChFQ=5zbJf^Y}M=fHG9wD3o|=V{TjbN23?`o4VtDI
zgJ#*Br#XY>*<4_=z-t$2(V$EGd6{y8@-IKgAOplVc;gOE9^n<DH}M)8cttZ5<E)s)
zII$d&TaHLCM-a#n5OM?u33^S=m#_~=at<nt3-}F(fnCOziBVuo7Jn!4n{;~vHYFD?
z(+cKB=m4a*@FnPNdIxrN^BKi{#g8!>Y`&`9e3jmfHt)bYhCQj`>I;euQfK9Ao|06M
z5f($QC_STbJ(&8M79_5MtZG5>dXTsZvIY=y0th#RK?+oaRV$MCMXAWT7G#y)i#87`
zl6yf36=VY-Hzt6vA{gX-El5%Yxv2$N(}N^ckXr!RoB+a-WDrvel2SpowIJ8^ASo5(
zHbCx70O32qAnSdQpP{2TI#MW}QDO@w^_-S@&Qq5c<gC4Y<vFE(5+cX2aVh9!N@Ko@
zba(k54X)Qcq}_-7$`D~iBCNo71%4kOG0VCT2{s9@4<*b7R&lTXrfUp#Lo432D&7Mb
zT)l!H>BXB?D|7_ps*Esxi}<x*kel=|fK~BMsUTlzK*A^H69l;hMT9{PG4`+Z6a$4d
z46pS!0Qz<UQ21<ZVMln}6du$i#16A;W46<8=HS^nql~Jm?=+}_KGmx#qt@(uApS4`
vkzZ1-*=^`<{K99|nps+q&!`k_9$a`lfms#g6d?8l5Pr%TWEa(n(cOOmYd-ml

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/html/SearchFormData.class b/ureport2-core/target/classes/com/bstek/ureport/export/html/SearchFormData.class
deleted file mode 100644
index 48b7454cfac4efe90c6dd6840342943b4ae26dcc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1344
zcmbV~+iuf95QhJC?6?Uo3F(1yYDp=r6Cg&SLLg9YKovp}R0^uNb=+;@kl4s}5RU~C
z2#E_GfQLfNY*Iqp%}sA+yt^~=e>0xne}4V~u#aXLHtv*A#15OgY<Ah~*>G(%1k8Rm
z8Vc0f1OJon4gIL+b+ROkdd~!mK`OAEN<RtuhjB7`&ymh4eI3PVn1yj9@VFhsBd?og
z@`E={<i|M4yc2mEM(W+0By)<#70&Xgc=0*M90(NL#xZfch)<+Ir5#4{&3M$6$veM0
zq?=kh4*cP<pM-p#UYc1yB(|1DTz*yz+?Ln*hyK#fd=j;LGJB;OUUeI~mhJQ`V9h=M
z&Y%{Rcum?CMY6BZ`Ty1go>1uv4y8gx=ZigcFIJ0DtAsWif%<z@63AVZJMlOP<YCCu
zUYR}e$XdJ=4lbkOU<oA$Wi}3$9b7_5;QskO7tf!7W=r<AJCH$!I_;uOt7^hv0s1mn
zLwQnAp5(}vAee(}l};XcLEdWqfcUDyu8=LN%MH}%+nEGl1*>!tSi?Hm`Q&dfzT}cO
zwaHhpF-<-oLW8B6_rAlJNte}a9Tv7#h4o3)RG!heKc>E>1u5h~cC;YZ^&o{j$R2^X
z3qW|l3~~cE$>t|w=0TcTkXzWCCeKa8%!522kk$ea{<93SrJabC2YILkxvigwl?Qo5
QAo~kIc-0uBu9ji@FAFH`%>V!Z

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/pdf/CellBorderEvent.class b/ureport2-core/target/classes/com/bstek/ureport/export/pdf/CellBorderEvent.class
deleted file mode 100644
index 5f98ea27ac70cb00c841f150bac3db2f58aad91b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4001
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/pdf/CellPhrase.class b/ureport2-core/target/classes/com/bstek/ureport/export/pdf/CellPhrase.class
deleted file mode 100644
index 71302d519380b0ed50bf67e58a1c938394e5d9bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3331
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
AhX4Qo

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/pdf/PageHeaderFooterEvent.class b/ureport2-core/target/classes/com/bstek/ureport/export/pdf/PageHeaderFooterEvent.class
deleted file mode 100644
index 12a8ab1920be19d473b2be2d25c7d7c884911e05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6252
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
E3++~m)c^nh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/pdf/PdfProducer.class b/ureport2-core/target/classes/com/bstek/ureport/export/pdf/PdfProducer.class
deleted file mode 100644
index 091bf093c39cb3456c4e4ccbd92b93681c3141b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14268
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/pdf/font/FontBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/export/pdf/font/FontBuilder.class
deleted file mode 100644
index 98161c577ecc3fbc69e0905053298ea067f5291a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6629
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
B>ZJex

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/pdf/font/FontRegister.class b/ureport2-core/target/classes/com/bstek/ureport/export/pdf/font/FontRegister.class
deleted file mode 100644
index 0c6334857673514bb36ac7eb4ce160f819e32fed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206
zcmYk0F%E)26hvncL9x-qLukV`cJ@?8jhtY?&k6!d*2Q=>3lHF-jJq~iy=4Bp%zuBL
zF8~`vAtoWF3^Pe4QLWjFh8UKs^{x_k!E4b<o*G@Yayyic!dw`lRP{Qiq^zy6aPo;{
zc{8MA=Q6~(YItUYEAKURN*hj(AG&kF3oGz{i(x)&9<qvZ6EHA%_EW&~8Ak8{%dw-q
I1TIJT1?7-7lK=n!

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/word/DxaUtils.class b/ureport2-core/target/classes/com/bstek/ureport/export/word/DxaUtils.class
deleted file mode 100644
index 51e09ff52163e3f899ef641e3596f65780f1807c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1167
zcma)4O>YuW6g`g)U&CM#DJ`gIQE@=qvD7Y_8l#nv&=6fz*$*(nwDZvngYpYZT$uDH
z_ydfI8znA`Yk!pSzF{EKDGO)u-u-yz+;i`pKYxGz0`M5SBGR}oLV_H7w*S`qxL4&z
zO=y&ULwNof5b*#Hg~M}hN!W^GI}U{*_C&XI_bJ1QT<tIjFYLa?u-euw?d90)YR+r5
zYfvQHwtK44Q5~K8eo%0S`iMbp_iR(?j$G|j89UmU?YN3I@vir_(^nc3^^L0=qXR0}
zpQv@yq(XAD+N7%FGcd9Wa{EMmrz)oE4wXZF(6U@@pg9NpRepJjLDbA~{mj-amt+X?
zkw-}}qCBE3FE-DLGo$Vm6y#R5MQY|rMoxmi)~()<fXDXO>1j=!cb;ze^0&D@30JTx
z;V$z0C`h=4d>oG??4Zt_0z>8hrooW$8a7mGpuFmyXg!x9w`>NajXLb8#+c;Lo?6(X
z6{czZe3^_ZqBBFDLN}v3TKfU^jf@Dc(i!uD8_1F^%^u(ya^xkkhCD?$cn^Y?OO>aH
ze9B?v^!zJ@gA~O8MGEWK@F@ymirN&><rJk5MbV?UjvGG3E)|UMSn1;wv25H5YbXZ@
zlDLVIM?h=v2^4~RGbm>hm%x<(IJ#)yHVt$>Kp$MptPQ^qbFll`1#lU6{K`wfIU@|-
zx&U5Zfajy*eRJ8#+IJ)~IpagP@0|calBCZDM?a!3z3vkvXnnD)c&YWh06wv3o&Mo4
Uo_3d7g5M9}d3}a^-i#{$0Irdyi~s-t

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/word/high/HeaderFooterBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/export/word/high/HeaderFooterBuilder.class
deleted file mode 100644
index c71a87bb5a2ce59a8a8e0cbdcecf6f807abc190c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14474
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/word/high/HeaderFooterExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/export/word/high/HeaderFooterExpressionBuilder.class
deleted file mode 100644
index f2efc4ecfa63b0207312b72caea39aae939847a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 801
zcmb7C%SyvQ6g`usjmG+ZD+s!370t$7MZ~JOD0QI}Tqfz*Os$zRNwgdPNmqh`AK*uc
zchU-#nneS-k27b^9qzqf-|wFQ4zXb)j};56HVp08EUYsWjzlQpV}@L*++Z-PvdI}{
zYa-<J<iX?W#`QXcEYzg$b{eh{Iv;>$9EgbFwC2kP$BSZq?<9(MrHUQiOWl)HO(zho
zz`5jZldB6UW3JA7UB#nF$nZ1~9fB(i^PUceSq#smf0R?6({)=SZ2eKKWRj~gjCn7v
zlrtIs$x$1Ep+}$bJBIx+6)eABnqfQh=I`qmjDSkm*D_H)zYx0ZJHrhbY1={DeRPW`
zz+%`Nok3=&7*0mn<4ufVP8WANE=}ReYjZ!wHcVPE{TZOmf<<<MGKV}PpWl50drglg
z$re&@9X7?qJ^@n{f#PY*kkywPBxaJgKVaOxAy?mjq0E3*(3=cw5^pP2+3hn2D*AjD
WbE&e8c`Oing8oIqa)d6WI?F%)quAg8

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/word/high/WordProducer.class b/ureport2-core/target/classes/com/bstek/ureport/export/word/high/WordProducer.class
deleted file mode 100644
index 4cec4f9d6f2099df6dfeb9a3c026f738510c36f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24407
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
Ee~Pyg?f?J)

diff --git a/ureport2-core/target/classes/com/bstek/ureport/export/word/low/WordProducer.class b/ureport2-core/target/classes/com/bstek/ureport/export/word/low/WordProducer.class
deleted file mode 100644
index 7b8fcdaef5fd595e0009045a8366e06d1714663b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmb79yH3ME5S(@V0Aom?qNM|h90eVSCK8neNT5)k&nvj#_|WA{_$?|V3O<03LaZ$c
zT6U$`nOW^f`}O_t3E&iy93yOJ*vT*^r02G^;es$aJem{YnX8#FE^W(K-LhhTr>jPs
zz0w)o%(b_@{x#$9Xjg=j(zvCnR)L>X=lR+Bp!jtdYv*g#xV5?$a^qdy8TMy{{ML2e
z@TKjucmFP@3;m)C#7GF!|K$=U{jq9v`=G9?1)G2aMDlK5BrU0esVFsQAUS>qy@?Sa
X6HLVh_OT&Y3_QUma#4gW!3f0<cRNou

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/ErrorInfo.class b/ureport2-core/target/classes/com/bstek/ureport/expression/ErrorInfo.class
deleted file mode 100644
index 3a8517673c5b5f129a35bc52e696b3ef4ae0e1f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1079
zcma))OK;Oa6ot>&u1!PeBW=nfX=!PR9P=;>cA#!5kSv9VRFu6FOzJkVtFeRlQ7k|r
zLSn%W;71|OjMEenS7I}d>vPZj?j8U7{o^Nqr)X7R<L)w+u&b6mwcK;C@8Ced8pcT^
zAOe9}|0I-e(=5*8GzpT9{@{$FEDHye)H<i($Iu^!$-qC(Wt<G23E0o$B+d^7Zn{CR
zC}?+C;V6C2^i}2edOYey@?F>)YQwZ24!fa@)qNVY@{>3da6A2U<oB{XI`hXeI!|Tp
zN1x6mVF>5HkTR7)@*yRHGl=qn)pXlz!^tl0mK!L53I(q&y4ZBvi<s0fX{M>WixOp2
zr_oW#jOt7-i&u`*vFt}LW7X}-jQO#eV-;20ufoB#Dwfq!!F7Sw|8*^}cKH@>dZ$r8
z7hv~Y?D1`FzPbrRdGll_d%d#)cL#!{Z*X1VZOHEy_f79Rgx8qB@R}2t-lGYuuR3d$
z>lR&sJ5)C4)@0^3Hn4*=M!g~*>!|TYCtX+Qld5d!ld5g9<_5nPm3{6?wd8$+@tFq$
zs+6sRyV|;12&UGYKS7G*L#mart&uN5D>}MQ+ym{fRj6ig_7sl)D{f7_{sytW%z?B@
zL2h#v^B@oYnOFhRCWv<hh?<C+K%;ab=KMq+mVz|PCt}V|#3#s;D?rpEDUfa5`pzGP
CE2!E4

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/ExpressionUtils.class b/ureport2-core/target/classes/com/bstek/ureport/expression/ExpressionUtils.class
deleted file mode 100644
index 3d5715f54ffab20dc861920279252f6db89dbf7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8642
zcmcIpd3;pYb^gxGNbl)sB;*GO1jIHri$K8G7-L()*dQb$BZRCGf-$!7lk|`VMl)h&
zB*06&#*MSD&c3#Zlh|==upxNrrCHoIO`CLc+q8)j(k5N9v}v<BcHHm2H_Ow^LrA~;
z^2fXPo%8Nl?z!ijd+vQ-`|Z=u0@xrA7`PW_YH$y}ubO{V&A-*+2l%0ef3HO~{zJom
z8qo1y8h&KJz>hWj#6TE7)$rd2>hV7serBKnXB6<i8vajl__=|(_=S4=r9%HofxlLx
zUe@p%4X+qjj59i3RsC;O^O}K06d|Y;kpSgOuvS7+RV&q^sYb8GQmIiN3{7ectil;h
z!UkGYU#CmGE^~Bg(B(W`OkL*cGEbNJI=-z-qb>_{S*S~sE{k+otjiKzUZ>0Xx?G^k
zg}N-&<sw}!)@7M4%XJ*5-m*fIl?J+SrdFC|l_skVbSqIU26|M##z3#?*Ba<k{W=5v
zs*e~LQ2iwa_Nx9;12?LEy@8ulf0=<>RKLN%t*XD=z@X|k8W`p}$Q5#>CRZ64ae-D%
z+6)|YflZoRZD7m=HfwT?fpHhOR+B9TGA^)HlXe4>F0f6L4g<$rpi`6U4BX)Y+coJj
zaF-H(y(T*}>8ABN_V)Je@9pd8?Aj|ZyAN8ERwQ91M<UT|I-VS96V$b*l9{ZP%nn$I
z30s$)1*+)oPEzU8Lxg>FJUtN4#IvciU}N`CYAiCC$=Zh^6KQ)qmCi=g06UY3r;?Fz
zE1j_;9YsW*j-qM~OeBZ09Fq~uadnx<#uJg9*0}l_jgKU)EIA6IQ@?JiRD60J3W6e?
zd5LYCDIsiSGIpAC$WWqSs9eaj(;7<++lk1o@irgHgA?(@aHPOJvL!FZ5o(r9vsDeV
z)0};SM|5{QlcjRKWvER)a!Rc7R(1s2X^*w@GTiwN*@;AtHD)Ujf@KvFD%?R?N$c+D
z@9*e~3g+%}DW*D1^`>|-p4}`6Hm@2GgxYBswVv^$-7_&ZXs7$F!2~g8cWTH=3|Q&7
zg7e5wb~MiUubX~yCFj{q|Hx3OIU{zqeadXi=2d0$;jk4INFUd6T!H)wzCnG?n?mRM
z<L+{t53A{?;qQfNDg_U59nr3o^m}o|x}j8ZIIaS)W70|pdYY%#zvS{IN7*%a&>qUR
zc^o5;S#_fzkYZS^oFP-XPQpGwzx1Z1JTpO6IzBSWk9r}h1T8*{&lY)tYUZPf1UU#5
zo8u&<l3NMdn>|y=C&N`f0z4t-nxn*o{uavGM=7F#=`)e;N{&xt$;!6Iloe9xk%)tj
zOm2vzCz9Ftm>t>D)8F0a8Au*g3HzwcwCX2)IFpF<IT^NBWz}@I8cLelZ0eAmEXZp1
zm(`vc8%rhoOCw2G?HGd6R{PAgT$(GBRCRVbol2`LVkecVGs;aRLv?tm$<8PlRS@w}
zr1U-FWArLV8)_BJT0@5ztWIuW)xgSzMGfm2mNKkjG}$GnXS69zio4g947O>b%dwCr
zqn7rs`58v;_;?~dWT_zH#_2BqW$prG#?_X3AkBn(B$YlCVYI35kxG&_l{kY;4}wdk
zSEe$BFkUPl9WHTvU=}LSd52O7W`Rae8f_<r;myf$nHr}i@MGhJB);93;v7y<Ig`z8
zn)GUN10AB{=#V|`R0f*#G3Yl9CGwk$#2LX|d=66KBu&fF(bPnG$nK1*U1na%&78er
zok~?<d;lK|<Gpxy7;nK_!*~bYs!22~{j!^ZR=NCVNh4tykUfIsGYVx26&6`5E4i1)
zl@rBkc#J!iFYk)bRil~5n$OML4O%sRpP;pJyeGEGJ$*`?hUF%?S+HSN9P+Ue#=Dg1
zKOnb+@g}@EEc<0BEW=`l<$#RP>HV1IJ;0mqif$oTP}+jrY@IK3_@(3l7dkV#(8&+2
zVHuTpn0`Zn>-+>3E7l6v)Z|cD5;7K+q@?JiVHuah^whAVB@>pcOoZ{0jD%%Uj<9%e
zRC6lX?N(;gsV(Q0a9h%8>zG@CHIz?+e!YdyRzB@~w(;rU)5+&LKHK?R&u0f8R`aSh
zSLL|MYtqYyp`*e@SgX;sp`4o@3+1!Q6(ttN`|y6j)@i5jx`7h{EG1p*mTa20vnEHw
za!hU$Y?}qMLiJa{jvMeS*lbOu61J869l3Nd9go=Q-;v8UD{FBd@ZmBW!*u4)B|dCs
zvsiAy?ZagIEUc^Q>fRI&cd9Tf9@~oXH5*oac7j{uq^(%`u)1azT19<r+&K#lN(r}~
z^ik#7SupCE@SV-{JNMM6YM)4_?WA*ran9L38ts^cMjm#`A1k<Na(h_rz#}ZLD!Dq5
zUOKII9G<WenZk)AEO#ohD`!Y{9jo1J|EQfT(Z62NUok`aZeAKpCBI9NuRkZbkKnr%
z<)!DOtQ2|A%tZF2vgNkAS5dZ{Q)HLNJohOQpZ%z8RVd6$b-$uodrm>!@k4fDB?N0K
z$J@pD_Efk|;lxu+X?JqNMsS&`PG(+IZaHG9+nd0$+qwDN>8r3uf%4Lx#awCEELEZ`
zcuVN6tev);Tc~C~)dsmsWFlKt>!}^;O7za=9ORim-4%FFfQ3VBC5mOI?VOfZ`i!p}
zu8zU;y(8WI)T#KFo$a7DYNg$?oHK0sS%$eMIj8oW!8qp}>Wpi!hKHw=cJz$1h;WXl
zQ^q<R=H@5l)Hu$4l{&ywF`=c8Y4Qf%taYf@;(;jKmE<|GJz?=8jJGRS`5w8-tKweg
zguBekNu3oZ)wQF86pZ>^Sj>daIgWhgo=Casmc}u}PG%@;M4dDWw=`wfVLXl5$zeLX
z->Q2YWJ=je33@i=qL>c+eEIChNB30gc=@ga{XCZmF7gU@4BzIx9&>NBs_DlQYC#qj
zrs6DUDb$o!@nVEEP8n5*JdV*utxS(|@xd!V`g<tp08<TAyvYgjR)iahSHb)@k8!4p
zzxq=6x@B~b4qX;y1$t_;eA=w%F7+<nQ&qdkoJ;M#6n7Mw*Toce3f@h7KI$HHaZ6y*
z>*8s?%1PU_h)TqQ%PUoxfwy8Q|Fhf+!F~Kq(}er+2EISQzdHf^0pT}#;0O5whX*Wv
zGt@zs<KE_sdplvCd5iEn3G+x+gx^D$r{g005MiDaNLxc356^5rL@2^u*jKGS1$n|@
z{b9D%4sshl!uPN{03XH22-V=@_yiSI#7mqnK<GFEj}sP@XtQ}mKS_!|#2-~s1j{Lo
z<|#f!ickAdgvu%I$WuH_iqGJ)l&`ePB8V#Xi;g3-`ZTHncplX~Yg^Wwh8D!e(EQM&
z{2Fj{t>;+aZq#u>7H~<_d^fn%_#7S~L_T;FpLb@u2#@hCz|nR10v;#r0zOZGf~dg>
zJn3p6R}<Drd0P&8jE1f0&cTSaoI>r+9Kx|Rr%>0ELw#)RDa>gN<<Jm2h4WggnnF!g
zCt>C=H+CHJPGSBDG#*D|Q|KfXoW#P`YW2CPRcq2-zy&!hisi7FluOLloy7S~8k>{2
z;1n)=uBlpCD(K8`J=YI(t{S?QN!MD82eF(kwT@18IbCWiooE;BIDoffA6@DQ-AGxX
z&z%9DqBE*hKa7*0i;%}CzKGMb!eZ>l)5uZIa_q(*;~CC+9sjvKi|1&;UHsAaJpP29
zG=OFJ61iyjGC3`Uyhb6qhOcP&s)iRd{HcaN)9~jSzDA@Y>@V>3{9<}stg(FgAL5w5
z#9!rI>lrGdmi?L*bLnYZ6rhe53wCnVm+>Ne?P)Amet$7vRtPm)+DfktHib@Or9gGf
zLF{?>wQs2y2sxH(bl81}e?vdapO+s&8zW#dV?bGFHOH)?Exv(o@{L0C(V^b{8h=B@
z>TxOl7Jo<O{+{1e47r#WiBWc_N8nY=*YFP-{_$lr<DZBNan!eH_kS*gXYdK)=%In9
za#+QsUVQ?=;u{^Og}5~*Ft7L)Xjt?N*2aS7x@at9MxwDQ^O9(++PpLx)6DhJm~LJc
zjWtx88`x^*<!p6xBikDD3buxMCEHr_Dz;&>m2I8b#<t$v#CDE(HQNSrGu!jbYuK9R
zwQT2_TiDJsx3ZmYwzF+Cx3OJdcCcM&cCu|UuZy0*cDi*AT~zw|)7TNf9tZ9wywd~s
z5Z>j1dkNp*f%^zYJ#ata-5z*=@E#AmmvGDj-$;0$2fm5$%^vs`!uvh&t%NNPJV<!R
z0}m6n3oxDPKn^2Bjk+$y+;AN691aq7$b(AcFh*3;gG%KvPSjx!DxE`ysH_Jyk;5cW
zM?9#bIUFPEHV^9d9PS|MP7mt!Iow6m-7YHF#{9Vb*-v5tlQ-WMt#_wzKjh)pepvjv
z+4<BRyn2Z{x|yT%X{Ut=hsY)C-Nch850LythspCQl-wlrL9F2WcJ4u4n1}0eK6cRM
zyYT{l&A-T0@dN&v{{?Q4YV=7XqOt=0vJtzb69Y1UJ#qkhWfC!Y05{4**e9RH&2k#I
z$k(x7Uc#;NGgyHt3<efrDA0o8z-HKi8!!^shtWWseF}#H$B+ozg|WbcNCrN`{xRa7
zWLnFIb0Es?>|gM02HQPYi|_C)!0{2hq;})LVYItno#0)B>Q@3$c^Qjefyk?v!^9=O
b#+sLzG6MK6=NiEGWRShV@3*2}EY$ozGiW7e

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/ScriptErrorListener.class b/ureport2-core/target/classes/com/bstek/ureport/expression/ScriptErrorListener.class
deleted file mode 100644
index 8b48059cdb38d5cbe45c65460d16fb3d8a46ff51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1526
zcmb_cVNVl55PjQTd$d$Q5DF@26|gPJA)+R>AyI>|Nu$OZ41T*_m$G=hYxcH;`ZxR|
znrMiU_yhb=#@TC;R+_4bx#V_scIVA|v$OmC$JcKFHgG?Q1o9?Ul87LmzzA-dxRpc<
ztD~^6X5zMqb%vPmcKv{1qP%Y(*j7sk*D8xZ6&Ml~QTJ@slAPheZ_CB9<2S5op!i#h
zHZ*;yEPmLOJP3sESzA*2vP8&*O#+G+g(uV|Lo}P)W-uQ6HG&*33y(i*HL6^`va2q6
zCd<BKyW6%Ddfs&!YEKZq_2CICjucH5rq%4Z$0a2m4ceZv4?{OYD_izu-LgI9O6y?5
zk}Xe(2De^v$FF<h9ffpMy0%xho>%v|qY9-`kFTPn@al!3FpBhV9Xh<Jje^#jl)n-%
zWQGQ74pbR`cb9uLN>yn$s=li$6P`{lF{-0W1!Q0)T6gwr`N9u`PFnJGWvSYYpxz(a
z<xerRyfTzYzYK<%{<CQ}PtIp)C=3ZI=JUD<+JCHmxbdve|8N2$b*^+bQXfrbbDb2u
zonAcS{HOj-R{WN9_!FU<cy>T5uIkfEVGQF8Q>XXrp_F!8w`&SXj4~|$-JQ}vcT8-g
za2NL&)`mt6U_*%p-h)SW!250xLpnRC`nsvdPGx8X)NOXH#xR{ddw{t&$k6+fpm&MU
zV?<JEOwlZYbBK~nb)o+Rc{am2Fp)n3%O4}MbA;$;7$3vk=jpGXGhiMD7BERxiXv%0
zrf`8qB7hm%p|Rd04wJ@o{u7L2#CGPVjk(wn;$L7!@LEGgaSEBCz-uAo(@t0yk^tzN
z4b!AChl?SBG%n#X#p~61vW(DLz!iF6weKoPjuYMqL5*>pFgmgq$y&m4m#9TEEh46g
bejp<f(u#-9#U7QhE~O604O-8JyK_GQ!U~d7

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/AvgFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/AvgFunction.class
deleted file mode 100644
index 890dea3a80f6e745b47dad9f26eca8b0407d7e84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3841
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
DJJ1M|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/ColumnFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/ColumnFunction.class
deleted file mode 100644
index a7bff5163ded4ed2f901e5f3e5b3a7fbcc3f5f19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1426
zcmbtU-BQy)7(Giv1EE^^5k;X;6m3x&e~=5ya8qTbGgU5dxKG1UgK5%9H(1}sN6;H|
zyzl{hD94keg@8pJx!K)s=j{3Z&bL2)e)|q!9UBI8EE~9ky9QQp&%k|@#!%L=s^fu<
zhXUD6$8*${K&DjQ6VPh@z7)te98bOu+f5m~v6?P#rW(F&xqDXNM0WpDQ*WKFz(&LN
z+h((?<U2DAWXBJbDSMqjcDs)6nFpa~tLRYk-LUO#_syz+E_>1r73u9#<Ip;?%uqS5
z*>Jk5I)t+sI_^GMJSBTW0c{5Fnl<UV)pEk;T3*ZCX&y>j(cjp<rL2fu;M#eAjK)rw
z1&V)lE-+z-K_ER9c@roMd69~S<+XjnmM(_HwPB32XAAwIGbr|}a}jS2;Yw9K@g5~?
zzC7v03!0m&Th%Q(8sBwVo~76@fsg0Qe>w6YkzKlXnrF2c=}alz*<BSlUW>^XyM7qh
za@&ctI(=4Xl}K4RjKk2emO}-mjz>8>#uFV+a~zXr90Rt8+7wv-A1PB#v3gT#6R7+f
z(_kC~=6`>1Dk1i(B~_A`z%r|FA$p*s!k-bG@)O2n)Z<T}E--nTOr5jVk^zU~$Z|uu
zb3lQX>gg8r5mgkC<!{3w<JXhn&U$m5pk;Cw+(%cxKz!z51UatR_;LYPc+MpNTt%K1
z>xoICqQ~!PjdIVg9b@FVHm4mU^A*}BUS(n$gFs-3bj6rzJ%RVB_z+W=j_LE5!SxuO
z$1HB}eU?$)#2hr-B1aNLguhMvJa0y@z*7N>T%%ytxJQ{}rbeRx(s`_;^2nUzu@s|<
FzW@Xbf;#{J

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/CountFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/CountFunction.class
deleted file mode 100644
index d6a1426cb6a64ee754863938004c0801b109dabb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2278
zcmbtVOK%%h6#h;;_H~?bAEpTy`U;fRNt#UP!!352lq3xpoCNBs5^TzNJawm?jHB_L
zDj*@TK>ZIvLSol#*+9zzl?@AiQpM}s@gw78sEpXmeayMv`ObIGIrsO!e*Oi(CEUv3
zFfNVZGK%VRWeivGuKJV&$^r`+2wW3b6j;h2gKHUF$9rik3#<sN3fv&1797u!i-bgB
z>NY`JX*F!Z;i}`=8^KoH_HUVWmv?g2mSwuPP2W-L?xrU1Ic>t_s@2*u>TPL1FaqD+
zZu!!%ceZ`I-F8}@aX0WRsU|C}z>{m;Rhb~{9oq^dqg#dQee<Dd1k!Phs?(O`7|43y
zxD5vJq`ebsu*KY6W5sse@>B=UHNB>>S-)>vlKtgeM!wM}wrWa~upHwlLcW99VAC#+
zVmFAv$a>xJ8VXPSC9DpOxg0rn098|N30H?kJAjZ@2pvvG_AAW#TOBP4lQAv^<tB_-
zf$!U%RQeK5#+-=g&zaPAzT}&w3SnX}cfQ!}<xku#$7??r*~0W9i@v@uqJ<br!=fp?
zY)zWhgLQK|%x-}-E+WEc&1rh3<h&+)zdud?pUW7&gQCY6L^O`gam_QgnCY=X^lwf2
zj@RU1GPPFVTlSh0mh?b9&Zz>_aTGa$_jR1b2RbVFkY&*E5vn@Yu|X)lw9+HRGI(Kx
z>%$)GRO`Vi)3J$<2@C%XXFrYQVUPcNVG4Yr<0fi^q@@}f;o?g{<J%wMNZ9cr9f~kF
z98j-?a!1?iniXmLrfm6yLwlQ@(&yIBRhV}A78AYf2>WgCB<F{?XSO%EyN1ufXI#Wy
zxERc)em@mWTdJnVJO%)jR|Y$}7hr{ZcGG5V;-TpV_U2t~3WZ8EMY|SdOyUqfYAg@G
za0wncA^H0XuM8fE$K>=+pdWZLf@Azmg`1}^&U3wEfC;?HE5d8YvlSnv29Igpdo=SK
z^qFTEA$*G@JxLTbUL^>nWIp)}8etcA)GSGOj#Md?PyGt9i{ts!bBK}{*Ye^=q(gwu
zi`rut%3yRCqu*%s7?Wz1*+pKNXL{yiee=J+8`qvff5J?(kbQ~61>QmyXE^M$9PByF
zqrh+Y6qYcJ4b0$EoW~u^qKP?pEW=lL2Vdht81YSxYKc$2jyL$R_jq<3CwMl`^?DMg
zSRIbJtB0DMW`UK6kMJgY9SLV=@HR`GgJl2bm{);!C-`3nW2%dBn%NMu0jnyq^d~YT
yaQ+Vz1!l7^aN-4@nB%`A;YH0e$Ii9Q@~Au}a#<C2^wO?GE-lf&v<sot#eV>{R(eJN

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/FormatDateFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/FormatDateFunction.class
deleted file mode 100644
index c553d1bdf176869343376eb1ad36652de0bb7e96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3269
zcmbVOTW}Lq82(PW%}LU<g_Ht8z@R9lP$Gz2(n_%{rNy>fid8_=O|osbB%8R|V2k(5
z_~@Gtonagw9Ptq!EK``#^2ChK&iLZ9k3NetqTks~+N52bYBD)F`|p3g|Nj5y$47U+
z2XGjlM6eU*L%0w|BgR9xDDhGgCh&3-Ucn``T$Z>Z@oEGSTvcygQ_Jh>*c%dh1g%I*
zWFpvzs}k7=+F(dbhA<UDJEkQ}iJ1uEm{!ZR5ON{pB`k@8Kugw`)XO>NobEV=Z3)Ci
zX7uZNGN)Tp$#KUvt*LH-=Kg|Ja&*g?&~s%&AlPGCrgK7|p=0lafYx8glG-|ATE<v8
zpEm4^dOAl+Y^0FUa}&C4s^<z(bEeIbKx!mY$S2b!$GDa(+eWcqJ4s`<Xd9)HS+J6m
zWh>*T&0xXK>&}4g7=slO6_UoRktsVAk?HUhE<0u}IbxQaZXeuq+012=G{P}veHrpJ
zAeZbna=GrkH4ZqNo-r~G<;8MDKDDeJwb2Fod?eLa;9+LTn)Gm#cJ&xU))cb9hSgRG
zMAN2~Rg%;>fq`{P>#I4pR-RHw;Mls+)*u8*S%K}IzRI7;aWh}c8PwG9VnwS$N{Xkq
z%y@1W*ySU$J~9GLnX+vgmZL%;u+!&6O{kcEh4f5)&Mt>c7ON?}xjqZ$iq%YPTjlhg
z&J)!A@M@}$5}w*sM|Z1ZetGAg4fP)NgpRI5=z7tVHqGOXp1C%v7u}+BtGy`krq@X%
zY&Hym@VGf;=?<$;;LFu@)Z=6J`Ze%5Tpwy5hMLIw7NKV8d1|_;qxS7`kBW>J%67&W
zG*#o-vbJj+P<<_mC$U?gZH}L=(b2AKHZe4m%I8z1QWOd75&&!C|28K2HHs1(Iy#Cn
zu1E0}W(AJ?D_%{Ts80-mlj}YBPyHo|IoyciZM+l3yLc~(_c12W^WR|WwNj9@sc*d)
z)f!pb`~(tfLFx-DiVu{qLu>hr*^E(i=feeebo3YUMb3j$RkFbG>bOW;nRG`8Tas}#
zVHrj?p(j+gN;qr<iK1>ZtvLJ=x|7HmddX2q@*zi~I|$vmqPPXNxdh*q7sW^Tn2P$#
zoHXr{QzOVMt;iRMtf<F1urhtUpb8xDv)*S;R;FVehF2ZzkSn$f(^TCl*mVYatvX~b
zzuR0bGS~j<88#L<t(V5w_1)Qjne)qXAL@&8r3p_NYIJkp#OeT*Jc4N@^9CKuTf{I|
z@(Q$f4A++TGE&GXRE-Idv2qb<uXL^2>x#OO1U;V$?5=HVDvWjWz0y3ei&w9mto+CM
zi>W@q|0j4m3-H^(J(~vCr${+Y3Y!F)I`2Sq#sc4=;aivSX|55z1erCm@8K@$v7!Te
z`6SSZedHiaV2-d6l3MmXKrp7=7AY+jNHy+TM36V5U_7`8DKL+_Y8Mh%LO3Pk@;)N-
zI2o5qh@?XC&;puL;dpovQGqYe91k}vqB($+R-tKMVM9Euxx@vuq#AEwQh~J2lTMJ<
z1#C!Zw{Tt&H_l^N5jT3su^QyID)JKA7O<%ne{&Vzd*w;_t1qrSK=VDcUy5zMgDpSA
zwfopQkN7>rFU1@0V4E^At}S8f0v@~V@@-dq^pXbUNgLa_?%`7hB>fhl=UT9z-!5L6
z51<=K^x+wd;2`h9&q62F!V&hSqxclZ@EHU3Ia0Vu&acsf1)RWr^x`L;`WgNB1q1jM
zgZK@n@eo5o!x=YXHyE>S;wd>H^6sasB*Mh%rL=>j-6Xn4+mCN>h`f>rO_cu}f-0hw
zXsg{3o@KIdca*1?8{8eIR*XF*c2h46Eo69}3D-ysK})rY)Lu&UWS!*Bll1~+dANPV
z?I-_1G|5M3kr<FTB{BF2y%MJ-h9rg`VoPAtpGZoa;nVNf@dpAeJMbcp1?V_|QH*g_
gS>45d>VbyXj@#~Q6@#ElI$x8?4a=E)*5x|)H^di-R{#J2

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/FormatNumberFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/FormatNumberFunction.class
deleted file mode 100644
index 8b6b984b97f2490f2319296c4c0ec315c4af59cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3464
zcmbtWTUQfT6#h;aG9e5oLBLpB<E530Fy5<yQU#<^16om9uk9oma4?yq$;6_)*xF}*
zfG=G>bS+=$L!s8STKiJh>VIlizcVw0+^AGnR%Yhxv#;OYXP^DoKfnG4;3yu1u@e_U
z_^1WVxER8$ic77yj5+!ESj8t{(yvISt17OAa6ODx+z8_)K2`Bq7+d7RKvI6CRHVb`
zgsEaaj4mvwxD`f^Tw7s8u^7T_6&V#-f%ddHZ<I351;cU7f-Mk9EE;zVJ!9Al`m9s1
z?1f>0w(*=@bPU^>GcqMpAUI;#mNP2Q)Y~^Fpp56zq;5%AwmDPECe6YnBbgy3lE|fu
z%$!lM<k}}H&Mm7bFp@~+vU;-Un78#(!OZ6hj&3gH3udus<!pVvWTzbYF_|l54aZYE
z=@aRaYA%_nl0ze@UeD!{V`cP&Rdj|MXik=_Oj>6cj=9v3A<Gal`nZ|N4EI$)a6Y+c
zrX1R9&3gz<7>-emQkg|fS_|HGx2J)A-_plOG*edA$WTilJueXTcBLn}zvTr<hESUN
zWe@^eYr|sDDK7wl-7k%iE~iR`f@wQ4D1o;cNK^#PT;`ICG~vf7&|RIpyZN;QPS-g0
zl1zF=WL)~0a(*RFBmJYpql~$2)-h7Ir;WT@AZ}%{5L;%g1>0~~8Ul}NQ~Y`+8zAx8
z_0j2Ss18sd(c8dQMU`)eP2(brWLO!sHpVt>!mCtSUDZ0614U{U(2|y&mbvjtaAMP{
z$13FNmCNJ{oY=IsIt`t*CCAbcI9f|>V8Bc4ntN`&HR=y$xia+)b0X_i;QXtmREjrj
zEsAYqS>)S#D|gGiH$0mw6;kG;B^zqAQ8yft9b3b0>=6)qHN1sg0uYG5dV^Jw(~!sK
z8VX>qKK`GYHUvz=`#7b+!L-2PMk-Qf-tF-h-S$78%jVh9&n)?5R?J$%k6oL0uL0Y=
zU2eo|(@e*Vn754OjRFzm{S`BuSjIGpjzpuR;*N$duq4pq-f8s>SH)co_wc2Lukf|N
zsYX7QZ={MaH#$ffzQKK7ZU0YCb+t<!-wKRvR>xXt*B@(vSiO?!^Pu57X-um`mp9M)
z2;fC3FjTLp;>fID*8T-urNb*_&Kj=T@-@w-Q?%}}s5wMT@ws5K0d@6GRh|ORJWpN7
z$*rmB@-KtR5k*cRJ@qbL=19Qu)tub=EiBMqsld138?C>wx4BN&(0R9}b0v;6{yfA8
zCO8#&D9RuvDuXB=WtAby=F0hD?W~v4V2srbU_Eq7xpr97%^Uy)-sC?bk2&8lj*kKU
z6n?V<@VS?ilccZ*ptXM$qCXP&8BIUAjQjWua}(G{k+=B+G>;YUU_Vy^z33wc)d&ks
z2$A-1;01yaWm&|PNFd%k@DxF2?=iaj2b!Kj4d6LKt7wTUPjJ%T{1JNXX8(Xv$sCLZ
z|3o+%TtPVA993SR?HO9HM6^}3{T@|*L3=#-3|p>5n^&<lu0~bK*|CDiG96OrJ}`!@
zeD-qH2NeSh>;T#^i0v5SO2;uA#2Fmo1brA+afI{nyO_rbHnuqX!Z03S#0B6wTF9fJ
zpHe~YbW_hDzaDVL9-<yqLg2$AzYbETME4=}9&y2Z$PxY+!3yJh9H$nAe%z<EUCh`C
za(WO;$&-|flhO`F{Tq8#467J9){gf`3t*Ig_DmoCoqQ{#-yHY@osY14;5j;{53FF@
z%%GcrAJ97J;lKO@aWZv1LMxfNR?xl7WzQq*<FZG}Y%j}n_%hECUBQlJv5x0)w9(pW
z#yduj$I*ca>>z@B@BtAy%NVDK+K2S-9H|M+U>etP!NqWtcxgoLG-U&n?4bN1B65lq
zJ3;OM|2;m95tY%riAic_tEc4{`8~<A{POsx_$B!#Y1cz82xU*8eZP;`IZ_k!!>jv2
dzGY^bB5%mB0&bZEUDD->T5l@X`i#qU{$Gqjx<LQ{

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/Function.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/Function.class
deleted file mode 100644
index aeef89243b3352ed66b1ae7ffd26359dd11eb640..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 476
zcmcIhF;2rk5ZntUhCn0=9uX+A4V|MjfmD_#{DSj&u`ZnNB6|<{IlO~{2k<DwCLt(-
zv~)MCx!IZ7kI%Pv0Jwv33KuC{DoCj(6PXm4NxsrA8Y5eWx$QX1O=z&}n4U4Vv<@v}
z8Lg{u5j<0Wl+c8V94^SY>}IFuw6F28T#?~S!Fge8uUYgIy#C%eJF=1bbxU1mgU6kA
zrCH;{&-7m4>~@~b|HW?Nbt6u%Cx>AQZmq8+%%}*lHMF!&IOApXhQ;S}Q=@|E-}Vl&
rJbjaK|4YHuw*G^<h6)r6<X!-SM8OFpf=@RHhJsT#lebj5os7N!+h~>b

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/GetFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/GetFunction.class
deleted file mode 100644
index 10b408834cb63fe6530810060b47e849e6b3588c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4093
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/JsonFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/JsonFunction.class
deleted file mode 100644
index 8a054c806fc3edf19714520a5157fea76a7bf35d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3732
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
K^PRV)rvC<e_x}F?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/ListFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/ListFunction.class
deleted file mode 100644
index 254bed90dcff68c32aa1aae0963cb46688239ef5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2211
zcmbtVOLNm!6#lNQ_&T=3BS2C^O9&0b4kT*R)TOo?2!^y2$2<&l%BCaBY9dgij4XG;
zPsy&kF57O(q@C%|ZGRHe*LP(*krNFQrW@UJ&pqcm@1sBe`So`IOL&~Y36vy0$smDJ
z7T54;7G+e_rz-K8#Bv5{TvsnQBvvxW;-<RP(wLRFC2?C~RUlQhT{~D7NEV7u1hksh
zwgisXZP#jaH(Qqf$Y?p_jMqKWaGn^xt?qrM7HrrZfu*|XZR)K~U_IBnzP07~fo^SY
z`BtZ6d#?U%*EIu0)a_2N+P_o;q_u6C-GJa`q5jPH&d|Go?SxX57{pfBcG`N)a|3HT
zh!fbP>yBQt9H&z3;W>u8uHS1tv&?|@(#oe>Mqmgm$KXdi?jf})+Sk6l7md<aSPo<9
zVcmR7ER}^rc%m(E?Z`lf)YHmW1uSslU@DntvzIi1=@=8kc@@Z-UEjCdKqXS(e2hjU
z(d-zN34w{>{&=x9=#jWe#ix2Ws_NV_^SpK-nre(YM@3V3Gl%fP#)~$J5*up<hWUKW
z*a{n6;&X{FI8*|oO?%xn0(QB;_XoT7|2Y>E*>GuM1R|A)ZF$W#HtFf<LiDv6__n*w
zC^Jp3>zmf9tp@z0YM;S$E~u>JFpg6Kr}js4#rKUDN{$)H;SRoJT5`CHdJb!72$bHq
z2O?87Txx;pQ5Ac`JglC>Jv4H-j|T!b-VR8`av1Dk4oy4~SbQT`>{{de9c(Cpg`?pN
zk}q&<Kjq3pZr^>zoxt*q!1K9->^*W~P~dQb4n$aDxnXn~+?U~gf68ff!^?0(>}^Q7
zZuOU1(r9xdo#}UYbUcbg86PsIT%@TKRaVr>$Vca*<~a`6FV}yi_!QGP&fgZBjsLJD
zPc|68r+L$P3Z5f#FCl&=k-!;#Qz3H-6QpxJ0Zif@-e?DBDMe**ooAZ7jo*;?`X!QO
z?aD4Rf$~UxWEUd>J6KaxO5hb_Ih9ZSf%Fc}=2NebF3Y@@m%m_i7nuaU`T<kwIlF^N
z^_(3%=XNosp8x$Zul+<@TIk;#GNj+fC}uE=OAO;ON~CHipn)PDV-77`g@ySrhKKaC
zgfX1MyO4Yx!+SVSY8Dkt;R54j6#WPlHI0j5)El%h!zdN+5^W@D@f&Jgq#p%xFObv2
zDE2X?X_@;fl)6HxtCX6A_BT#S%u6i%g(V67HO{>z><4^I;6o}b;v;@lMdo>`iX_L6
Usd%IHSd7#oxmS;+Q0n9V0DshD761SM

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/MaxFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/MaxFunction.class
deleted file mode 100644
index 072068ea7e88431efa980521321d9d0d1581902f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3392
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
GR{uXJW{&j$

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/MinFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/MinFunction.class
deleted file mode 100644
index a461ce339de1ac58dde864445f312d6e4d357080..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3392
zcmb7GOLG)e6#i~zGI!F`fiRFj3-U5R5+F?gAxuIDNeBcc;gJv!QS6yCNhdSiVWtPe
z!w0%?%SJ0&WwA1)E3~W#E-Z8rOSf8XC>OHz51<9abNf!hJX$Mmy6-)G&Ue0h?s@dj
z&%XT*z+Swspbi5OoWv>dI32+m42s7P$61bH1svyu&Upo|;DUlzaZ$l*c%9=?1R=a3
z#0Ez~K@HAvBo#z45{AifnPZe=j3Lx+*_PYE5NK!|W(amWBPPT0xMiCIxpczJ3>k?O
zNuqHlX{3gYj3xGYVbC43vJ89TNhhr*vaUIy=Q8G`lW}!(YBFPHvzBA)mveT~6^nk$
z?#-{;7`QoQCUY)fCmZ79##KYlxmHS#TUocw2QZPdQX_h|W4q>*uR@xbr}S<!m1=90
zcqzjk)lVkI&7@2ILc}MRav4}3IZs%lJ%(#A)Jfg6;g0EDBs7y&+DMUpz)6gYb9>Z^
zp~5L5d4x{L(B(t5;Ovsr2zkmA5yumjGB$z&xe5wAhMLkaFoYA9JtB#2_VFZx(v{aC
zBy~Yw_+jYrvGHfOfZ@w8ENmo;)+HmBoiZ%KAbIhmyhnyjK6u4f%@9fEG8xl$#oaQj
z_pvCrdxpxZMk+^XRacy{*CrRzc4bMN+nYKlbbCvsK7LB#EzJCK)j!0=0g+Dom*8}%
zXo5}kplc*2`i)7iLOCpsaj)7ZI8q#G**Lu7Pf$Z(s2a3JZNsIqWw=vXhwVNgSUMXY
z<Kmn3Q7E`b-y#m$Mw*zeYAF0V=w>W?luoY<I=M{J?6pM4swrqU&7z1^tbxWcp~8lv
zViH#<I4Uy8s&J8G*!Q1pte}*OZ<3*NsfMx{mDiYxt9Vnz6i#qlQ*j+PIBu$V3vbgE
zs(1(QGPM6cC&e6vgPe+6xIryzsX+hU6Bss@gA^BsiuXiJ18K`<Xerk&$Roc2LHAeM
zco~|P2D30^C{H|$lHN{D-4lD`rq4AqhU-u#U-n!mo79GKZ$<gbu&!L=c>+^g&sx_h
z5oxm0#0guAp6V8|w}=7dFCR0q12o<|n+pVBdz<2HUmR$B)O2N2jurt5_5>Do9a$I*
z^-g9~Hztkbn5h%xv}0#=G12zuQsXQQUYg_F%65@>f?;jG6L@2<d(6lTnpbkBoiy7T
ziPq}!W9Jc6*Lgle8JY@V^1SnfTXHAFw~A0Fjf^?uFlc$hQY{fk#mWviZk}kEVlXV)
zJvO11{)C7e{W=BcO|?$X7ig!`o6)<n=^L;wX;Fc-^bC2zdaR?hDi!b|*3*t*12&Qt
z83#;yFC)?M?Q>AK-$w<*$Eaj?Su9Aq07I-&tGtgO!!+9}R+S775Q>Gg(D&feNNJ%5
z;4!Z8S%hO@Ei8?yv?^(YV`4={F-246=Ks``SybJFGL6v8{O_7_50O|z3;qa2i^PI6
zsMCU4WESc^wN?$@0r#ZyU(et(;jnrdTeZ-AEF(N}Ifq)|m++QP695-rgmFWt)=VQS
zxYbB*EBv^f$#Z*vsGv8CmBb}7H~)vAu*mWkEh2zb$x>ZlsS1|WwbdR=A)WtX=Gkvr
z@GeC-=-t4F*h1?DRHG5gv7LTScVHKGq7}_JMAz0!y98ROL+?h8{)cbkW$Ix2@BwMu
z#sPeU7(T&4e2NZyP8MIG6F=ZEenK~XMGqe02p*xAF&t%K9Aj(H$JXKm+l)BdhJMzJ
zlWaduv4c3x4r7S*V3-}nIWHq-iOp>&lvbN5J8n`&yo7p0h|d9Hy_LQk!X<1Y_MCX0
zrxP?GObk|gUpe7Q+iLPGEh6MsqNv2Elg_(?bRNQ@6E_peBf^#_yVxo^{VvK-%Da3{
zid75wphTwCZtS7F6sx@ylK`TumEuxQaotZ5ZKAj2)JmKr?g3g!+*lsB1#N`ZPWrd7
zqMAL0!f}wJW1cW+d5EKv<1j~;6mxWQ^mxJ!;0d;H9C?B$ef$g2$Ec{-R`Cq$DHu}a
zDRhpbi#m@HohQbja$MkV`f!YBRG^Ot9mffJin`rNZ#pgl(N!X63aj>FLDdEpt2XXw
G_5TC$X^!y#

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction$1.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction$1.class
deleted file mode 100644
index a05f453704d81aed85cd42d31eaaac2e1d4e7b76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmbVM%Wl&^6g}g-h%reh<^2j^XkOryhY(8CO+=+ihAxV_Vl%O)sf%Mr_PEND4`PEv
z1!BPm@KK2CX$n$o36w~gJ9m8UxzCxOzrOzf@Enh;D504y_jHtTU&kFhsKBh?VFiyE
zs>j?n!^jm8gK0bA)EdW9e6W&8%)&@ot~l@lPkLcs?WU*!Ls=ervDs&Mk%JfWStQ~(
z#UCVr^Ve{Dp``@FlyZyVeQPC#9HUH_?R|#gD0Brw-Sz_UHkpn^^p1~xI$5(rhx_|H
z@=|?qSWMGmFm{4KL?fTau^{zjj<bK}Xl_!L6)NV8N91m!WgqclZuvZzSi9pR;mASu
zq`kvXa=GN2X@D7n#mA@AvORASa7i6v7-oT|CyDfYYosFJGK_L?TNI<d7bcM-wmnr9
z)!?%}JxL>=;=K+WKa9O#@<zzR(5+y@KnraHI?fw7hpGVs9RpqTXd<!$^dH4yXe_78
zu&$1l(qMSDf(Pn_m<uP7R4`}J3q@>uF?Ax#I8Hp@rRoJz%yR)#8Z0WW@cltM+X03`
zE1f@`I}Y6iv)`x7@^QskU#?8f<m6<Ky$?HR(j!m?6$4tMk#-IsNo}NuLZiQd3-q-{
zyAkOHlJ!pa1gz6Lf!6to!e<4n)0)x%uh5|NiZZU_A}*0eMv9UVVjY(kgf@zbu-5qk
z*6q=%eM9jRp*6yv@eLJU^A!1quSOoODt|Rxqn$=v*OlcB+*I-wZj&t1%XSxQw9^S)
HB1ymB^4etk

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction$2.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction$2.class
deleted file mode 100644
index 1803ae2834806f308307018cf7d4af3337cf3bf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmbVM%Wl&^6g}f44KXGOrMw>vU}#?8P(UnFbrVr3$fb*-uGmcMX*$KRBR{Gv`5-n(
zR3H|703U_8o~9thmOzP=xpT+op8K5n`Rn@+059;Qf)X0(a$m;^9_YA-hh>;$JSyWc
zL*;~fW)Qj}WH4<fm{_AI79Xr66w@G#Ems^$U&b=<t-Tc0XIP1kWMuXjUgqG%Y#NFv
zO7Vw@@BB5~nQJM*R!X_e@V>beLyl1<%+>)zaS*tIp=L{8yiFz}5x(Oik4{$Yz~SBj
z4`r&)4~uD9493v+ML6(y6bVva<v9Cij^-w1S*Bu6c}VUyn)We2;g-k!v9&ik7EavH
zp0tJxC6~wiSsGx*VE%EFTDC98K98wG3|m>?*+~*h&l;!*cpQW|xNVA2-w%?|5j#><
zMK$=mPfybbsCch^#|t9qk9S3U6u4z<7-*tpK*vP`7f>-^plzUoE=@#sfc~Rc4E4oy
z8P?R%LK+Oum+(Nn5HsN<F%`_2_d*fdGNMjo8AplqT&kWQi&-vULW4!+6`t2`Wjnx7
zXr}Y0bH|~(VD@@+Sw1c~>x-4inVg&qviD(#20a2RpkhF)*VE1cB&m(`P-yfwaEZQF
zX*VFfK(f~EoPxExr_kD8QTVKYHCj^|;0@}uUQ@<3T*ejB$VgE#LagEHoX|#55mwt@
zz&c%8wQneXBD6;MbG}{0*EmD|;j5B|>&jmhH)y93*G*-43%8ZLgS#Y)^s=pEm3BIz
IOC;&{8wn(39{>OV

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/OrderFunction.class
deleted file mode 100644
index 96c94fdc576c0c771500208732965ff49bd45b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5556
zcmbtYiF*`h9e!uCn{P9ja0Cb)&ZPuMvV?^|q1`}QNC0UAK|(2K?PPZn7B;(Kca{c<
z_E5B<^{zJcXsxZNMWs{|0@@OfqScDlD&GDZ*5^TdznR%&j{$jVo;)+(eDgcs-}TMD
z`JW4~0a%59s)*pEiskrdH9m$X1wJ0cDHVQvLcaNA6`sPU<mJ=y^=AY=EATlL8a^-Z
z1r?L<w2Cj{O9IcRm?}4iR7`VZJzI@0<16y=Re`UmxDC%q8P5xRUBzrXU5#qIAn*;9
z(qB|D4=)LPQ^jd~OU1YG9ck0cD#AD;@Ld&)@j?*a6ZpQ0Mw}IRMc&T^@oEs;1%4p#
zLxEuh+Llzx%(N$sY}U*ws9c*!C9F0D6%CEM6!_cIaZ|zM&P2-Gmh0~^Gdqo*BzI~%
z(=j8t%g7|;v%BfH4kjq$j?P%RKhl%6%)^mf#vDjztcW={kTJ8_L^>7e&81?NTy$mP
zW@eN7)T%(3gJvveQF^SQ^N?}Wh~%t9GSZpITCE-;dvb|nJkp*{S>~W8K|gIzM%v9}
zvbE8Xmo!p+k*=OYX3U~Kf84MP1sgnM7ntivk)$rCv}fbEI~{x>WhJ?*U`nao1Tx)o
zNaAHXRBS-7Cy|Ov0Sa#SFv4+ggG)mtTAp5-prFHp$J_9{3{TU2NyaQF9dyKsm;<ST
z1s)2DQCCnM%VjcV%91cEnCHP!5C-NKvmlqG@ycEWRcV<44gmEYoN=>PX5)CS5Q2cs
zLe}0yCTlsYcY3gT<4_j1y5clGHjq!{X(fSN+tfzwt4eo0G?zq8velQdl_i5D+ge6;
z(>f|h%woT!tx}#>(cB6yj;}S{mJvI=)fljgTVTX)W$YX01x5ufu!9L)WF)#1eJR6Y
zp(}X4v~JgW0CcM+w0YTIoPHkC3$o3#=tVqj_Z<cIxyBaOq!WRno$?rzrDfw51-|%-
z;__#1nhb(3-oi_YFY6rP{f2cgvLVseVa5{uMpBZbNaD|084?xtiEb;CNcE9Gz9UIM
z)+lN0dkY7Fz>nD1*%xTz02`<4*tF6pv^KKX+C0GW4u#Voi*t%rs9BSp!R}WaFq|I>
zwwG%9|Kcsp^rwt|X43SA!sv}7p&GFm$4LG1<;xX3)^Kx|ZZK#(Vq8{^9)i82K1e%!
zgA9sqP{w(1C2{Ib=Q1&KQ^KB;c1-d^Zkbf1Ar4c+N~~fnY4|Z-Q_xbLW#(Ya9I$)e
z4ts>QJ2Bpv-)39Miw*6wyW)XR$~5C4>)~{0z{n6r%gkh@qSrN8$gzYqTtb(IF?sn3
zeyU)#m)`M7eZvl;;GSD$bdsrj@M!oMe$KPPP33q;uzrPf>J5R*8h(Laa)RGfNP!nO
zo`VXe*-2oZIM!z}#xZHKhBxsmb~z2d##<VGgDVO`<;sd%zJ}l8iiY3e?f2+ji^PVS
zCQVo*n~8?s<82M^;16sx6B+9q%LM+Y;VS;bmLN&~tl=*>Ay<D@u(sUdTQ7VCE6UQ$
zX#^8V7K$0EP%3SOddyHNC(i*>C+yphPA5$xrQvUQtH^Mts5Sf@|4^{ze=F(FWlgD}
z#}OE^IIWi{Sb0<LyfdiC4ktquEW0&9c|&<-D`zNe5=B9Dj#u-`xr&CGf;r_B6H|>N
zVj?ZJu)+;1ongPUH%n%VoE(Yc?4~@-b41N39C&U^m52NaBO4=W+?2P9K9i@j84X(s
z`>z8LXMo^a=g?J~Z_pEGbOrn0V@ED`xD?1%Y3Pgz&)d_<Bv0`?8uIY!&+-#PL1XDO
zYArZWwX=P)DH1GOR4_3PU0snUc}S(R2aW7Dep}f1*`vvRC>~AY&;$w1E+d(fa2xS>
z3EVE3oN$%qk(?pV+*Nd&Hkmuq>^_CI+eZf(v6<z-+|N%U@@iIk;tZjnsW7y8T{k*!
z=q_<dwzNu(K`ZTKMv49TbRmi67NF~_I4Yg)>Q%6$(1<)k!L)TdK`R#ULwPyaS@=a=
z$va0OuXpe%!n?wIplJlYSGe$DwMzsvU=7!rLx4MR7oQYF(Ml>Z`;H*M?`z;{_zl#A
zM^V9}(sQV}2>+hizz8Z|Zwik<toENnFdCTQe-^=WsEP*kK(sPkF$&ek=~x{Vx)_5t
zgoV1e1T7lWgTttaR_Rq2F=<beUO9rv=P^aEIxFd>4k0e-raE-BQBqCYGlJ<+Rj(Sw
z44PN1SC67j!4MkcYNkRhw?#Ew8-^aO(Q9a{uIe?TnB~I*r?0=Gs~0ibQ8Y&?QmJSZ
za}}JWYknJ!Ug%serL)caksyNkM6;e~HlhW~h-C}mXd~q&0=AVv?Ict&+>Kt`gA~>y
zhYdJ^cAP{9Uc^ScOv<y^j0@Pp<H)@ncH40UJ8Zb0!DPzNu@>tPq@-F(z8h8KnM`Tx
zQ9}uJl-JI{<gk|#H<IoIx?Q@Hl(&f-stk-9G`ZT$JsIh%cptU;?A5)v4;A$0JUXe<
zPoG}JHgqwpEqIAGbunAo2;}=|o1g~ydrZK!X(w%RwBFB^qji_7bu%8IE{AhBIrosW
z1HnmE*BBvzz1OgYSAl)ku>_jHet`o54+?xhzI9#+JY?_kg#m>B4d1```%Moe`G~Dg
zp6RHAX{bETr%LXhVj7C2ml5!v36Ejk5E{dmFfZy~DzAZNX5ldA520H3>w#f}&gcQ%
zFYhE?Ac@c8b`r~L8Sz4wc;T7wFzQJquVqw=T&hK9XibHkIotSK6Np9-yNS(Sdaw^O
zu^)4BfUZBtTzZI6?;%z(A{1xrOyb*1ii3PQj6+Cb0R1@5JbHpFS&+SyG!r4-`xvvi
zm_^z?#-)RM33B);WtPnw;8Tba`nfm2y%bjgiPU&roI;v8rPzA|T*<sRWk<fkj@lxK
zpmGiM0!R4&E`+_#2xRQ_T!AeA$;R_8uQD8~>ADO@Z^gQ>KVRkBn#Zts2;I$>usG_M
zxG#~7;Ii8-8f3T717m0$!X!O#35~;OS~rJyjv+jRS{bnV^C0X^>rT5o&5~!1gxV?6
zsNIW>(u#*!B!ifaV|4jAo8Ke+ZSDk1_Cs|0Q9Ah;i{}ZZ{)ZWmlZ5$68`d^jJ&Vw-
z#ZgLJKpI(Y60Y8HxO&|(lIgddCF7%}J=C{@KFji`<Bp_v3cz`{o9|=+%!B_rji_|e
zor%6rU{KIV)YiSr5^_@eID_#Bt##USGw(7u6}8J`H!5t-PuWI0&AGxca7qv#q>~Qo
zb~@oFPp~Pxlu#)Ws6u|Hxi>j9gyk;2CpE!w@*#-F-FyfVtS&m?BVba-N7x-`G*`1F
L3;*O0;NO1%KQa00

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/ParameterFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/ParameterFunction.class
deleted file mode 100644
index 6c6b1d115ca1d47287c850814bff1ce531e6a10e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2568
zcmbtWOLN;)6#lL)TaM$TZJGqkqjleT8`3r<wi`;*gr+!6X-c4!LS;n_N^Qv_%S_6K
z4Z|PksvD-m0=8w7PGAPghR*Ptpu=}1#gSvdq%fM1?&F;AJnnbS)gRA)`USul+)3jA
zO5He*85M7*a3PI2-jVZ*DrQw&N+X3i74vDN@opNIu^=_BbmKjgQ&?1SRmGBuYXZrV
zX_@YfKzwL;ML?OgR}F!EWz#aQHft5bxuI36T<I&@x>jA$98=DNMaBKxYzR!3b-R|Y
zG+g6ezUdfs+i~;8M%^(Q4b!&rcbk^(%E2|w(Q1ZkIP<|uQ9v~|487^nf<9DU*S^s5
zP1mgE%VxtZM!;5@W_2|`Yg?|d5h+lk|JD4gQLPq-eY~n>t>u?0>xS-1dv<00lICgx
zGZFA1uYI6ZiU!Jat%#&Pp;A>k>0@1dK`a?w2c9DF1orPv11(86qz?Vp{n!PLMA&Rk
zk3hHHbR5HSWj+KBMQDWbMGi1I@~FLYXwRD>T@ZLH0wOwT9pS}mT3s@0=a3h*I@37V
z&aC_OZFU_DiOS$hBQq3V+`alAJ(6e=FN$S*iOBcnY{(miQ}U-?>Xu!{wAPBDm4JlO
zYR|H(>G!DNRgzbXtlRemx|Yo~OLJL90*`iAMCpIU8ll|Imk5CnJtE6Vu~^Xp{X^m1
zAaa59vfXraW8Rb<WU!<BCnOazIEa1~*E3kg4S~t1R-zkquYp|mddsX`tFvRwZ3N2#
z$G00w?p9s)nA<taFjjN6W#qiM>^T$C&<7c;;6s6_C@Zao6)OF977LX2s_36}yLtv6
z;ikZa7sKf66%yxT6}K|@1h+Hz6w{=RjO;Ukgcq>DxqmhC&n=n#XLt1rOzaJ8`xHp;
zwjvkk-I@DsOlg>3k`ugi76b+Yo`=guUPkdXgB@>RXdz6lporKBx$Ae|cJ{Rd`nE~A
zbE60x?hK`^2<SU;TU6!kcAyQ$?^!9=_DL>qGVFX{JHlTa!G2!B?5@1Q<NT8Kd=GGz
z=U4EX7<mHmBL^`I@}2Y+b9jm4j4yzfk>yO_6}(C*DvR$4mg3rj(cjTCx`i0;@bA#`
zGvYV<lqX31DhkSId<)4Ko<c1ovWef2dWimP;we&vWHz~pu7dId#^px(Ax_ARw7=0^
zP_wEB`7L^~s*h4ovdXitfw4_wr2I1^#N%u-t8AiY3%xNsrdx^^$`vo_W9Y?khH#S3
zpW-vb$cHh75&pM~@*iakOBg4MCvb;5>zIU%)3}eb_=-|r;~c)hw3m*%{H>XSir4Tu
z)3ijqLpaRQ3Uiucrd64cAX##Blxs4>4{(eg#Jtf7`Vpt*hUbaGca`3ZAVF*W^k<BC
z<CGj>3_k8efP2(CF<<_Tmi(KPpQQW%lD%Dj;gpKgD$We|{)vpr5T>{lV+g!L8H9iE
a<NQju;(hyMuENKDK6LEy*0C2nsp8*MWyb0N

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/ParameterIsEmptyFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/ParameterIsEmptyFunction.class
deleted file mode 100644
index c308365f15e50a6a1b3ae9703a4cd65e7f2b76fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1476
zcmbtUOHUI~6#i~IblOq`%0sJCM0`xkV|<_}Z5m^R#H5Hx4GVU+!vzPXGj)20z)x}K
z&aH01xNzyh-(-yEb_xznjWKj_ALpL=zVn?&fBgFT4Zsr0X{2#SEqBu}P)MVQxg_S*
zzL3Tu%p~sVxUb^@L!xZEwyZG3jlw2_R`s?8!*I=Z#jBv%5dIt9aLAIac@}pzxo@j`
z*Qm+2cAMc@&GMRNqb<e08Tg{*`O*}JEnl?Tw&$8Vfon;1c+Gv@6jJyv+pEo%JX-5M
zlo)hzD6Bvdk!95O_yIQqX**`kZp%_1^hRJi+h)~sr8w;C&?Fg-Srv{`Duj3rcX!Q=
z#-6Yw@g=vp<O-c(q?eDPu|i~qnSYWq3|fKj3s)*OhJ2qdBGFKyy~du(XGi7vs3y-R
z`KWc8==Gi$%Y8^984vlCM05454ln3hE>=nvl0Q_J+}dB~txh3zJY-1K?Om5ksvpCL
z-WpttuTQWSE}-U8D=~~4(el=%Z@assFJ1Qn-x6!KYTc>7_1&T>K?Z}!WRS%er6EJ(
zGpplK29GhzfDD%LM90$%R-j;oYTK4-V}{Dbnx0|#KLJk1g<7_^cc`JI7pgz^dTP=r
zF%)t_ybHKP6Fbo@aJ2mjTMVOrfS-GwBe+Y$aKN2FZ0s;h8e7q9cRfm&L5lut)GrPi
z2g(|C7~M?TDTx>;o`8L(LkyQ_O>~Sy7^bswB?pXPly({mjFFf6_#-s314eOfe&GbM
z6)mTI$5>7~M*J9BcHkI^_eg4Apnr<1g?zORewKC+UW(B2gg1+c4%bqM*X1H)jMIza
zH!z9I#H&tMkRur>Oyer95z=+ChEXd2De}*gC56~e<aJDIxIxz#<$&QPQH9DEXjj1T
UY*NJ))t!szj-Tni)$zLh8$jBGJpcdz

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/RowFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/RowFunction.class
deleted file mode 100644
index e9bd1eb4f1568b1ca057f5e0d585f4154cbfedcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1393
zcmbtU-BQy)7(Giv10h;KM3CRAXhGYE)EmoigEGTRl^N@BpN6Fd(}YPkP~XN!&>M8T
z@Bw@%$CIQ$#Ny9zv%BBs?D@|3?b&?)@%0;kDxMn9amT=2+%vF*`vxAMG=wP~%Q{wc
zJQT>UyS}S71ahV2T>)(~*pmW<y6ekVQM)O_H+IwG&Uig=Y;V^N-8k-TYU-`q5m>7`
zLECC}lzeAJp*##iWy$VgC_5cD@U8vGcT~K19UO1<)-?fLcBK<3ayzB^fqi6Kk#aq&
z?sinI4`DNMy*+C)@RjWL1+=N$vo@vY)s|B}&-Po^PV+!Iius22Y-Pvn0;3o6QH_%_
z3l#sFTwuhB!ch7u&L%M5=R`&gdm9GF0&|zb*cb|&{I$jJ4^P|t@`Bv;K17**r>Wy=
ztrusv@SNfL%0_L2iG~|)%eNJ;O5nrA-d~NpkFqOYoaWnYDxD~0ueG5<*Ke^HqY*@*
zBe&exrK1^(Rbo$>7>1$ak%=-YIxG{9v8v;Vi8WLOR{z_$%#nCC<1K;8ztNnUUtsq4
z1Lua}qijjVN(2^I^JUP~G&6trEMTTY=}S)D__n~<c>&veO)VMH{ztYK$(?<=u(X}+
za}QBN5qbVh_>A~x$#G_1IgT*0I1A2$E1w}gaWMdsV?NoO!!@qW6oBg}Fk%leMpS(G
zn9(5TLiq#(&$Man1i3HJK5{FU&=>>)i=-<iRMiyTqvAn~<3>VXzyxk4=mI8ji|6xH
xIfZFxxJ`~!M2w#yewI4}nB!_53mjuHWzKOWx$(hRK(>yhOdYwiIu;XD@h7~ib=m*`

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/SumFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/SumFunction.class
deleted file mode 100644
index dc2bb49817f17389048bfb9ada214f6f65780f4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3516
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
Btcw5u

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/CalendarFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/CalendarFunction.class
deleted file mode 100644
index fb09f423d8288e3e03fdb75d2c3deb83c7e62dda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2443
zcmbtW-E$LF6#w1k<ECj^u%(6gxrK^pOR~@wXq&Va`k|GyC@Iy7MK_ym+>-2OHX8+J
zcypZbSzkJ%@}?s%$_oXVQGCG}{}<oY@$20EfK3av%IwVDyZ4^+JHK=8Ip^-re|`5o
zfDx49=)wfYWE?G+Xv2$`62mEu(;U-raLjPb#xNI0D_)A><v8Z?3dfl^I*^ZJ0gGZd
z%ke75YaHhoqB-5r?Ma4Es(+awJZ+XVhCO-R&=wojqGl~A#R{!-=1o<pEGw2SzP-h;
z{jOeTn8>SURW8<T?ULNEw3=zzvUa&<Y4y5p8uD7hP;D_ODYhn0D;3QsDb}2~nq_D&
zHuOr#-(WbL%C9T$DRRTsD{@}1+u8oWf-gsku?lU@D7M0IdS?z*a;qW;DDv6jx~AF!
zcJ@9;fkAj-fyb~nV9ha4(J_nbA_xwziei*K7*gW2<#L$(j~uq!7X%qbca5_RAtn$6
zXL5$7bZ|juh^9u2naZ#);A0@7J<Z2_rRE=XS3q9i=LRMTDf>T}y4nj{F&_g>uxT&Y
zih5~5sX6KCBzb{~#jOq};m<I%7WA^A*p#OX>efWdJr;vUWNEx$HY`<}(?uP1`@#0}
zKO<5qfo}9LbUa9Vaa0_I1eS0<fn~hTaAL<Q3uJh6RxnKMR`F4#k-!^RVHkQCj;ht1
z;y&lp{j^!FHEeD6vbW4I>^mx5C@EJ~r8V8E+fq%jl&WTHmSkvJNm3+{x01Og3BNNU
z9B(qn|DviYhGdwwRMaG+QK@7&E+p_4RvB^+V|u?K1w!R|+#E3B?M05a6L<%7GDT3i
zWOoEy+p)t@4Q_2444K^l`VnZ#4X?iI`UjLy)VJqpENfKq-Klvm2e-5++NHo!Yw1h{
zlhkW&-Ch|uN(I}}jdE682K%>jJWnl|I)2nP#X&Lj1y$W(HZ^M@MU}bFH`~ms^FhA*
zWx>!!Wao{#tr#j9=<zk3%fOc+NM6_MCA~@_UBN1L4E8UFd(laEC0VA6vxVMNUo`Hg
zFPYwq-jRV#up7?y0UD#uVlR?3Pq+ej5>L@r7*FFF0wHDg3qo|u0yplUWn~kgg~5CH
zeDF5H3}4{W!O(3)T5uQ9#q^Kh8_1{cf{%xj;hTt!N0O0y=txE!>F_nQ-$Cn2XM7WF
zKO`fr=6Ez2{mI)%I2+MhXkYjWV}#eSffV6&xOjU6UbAe(l?~wD!rsO7k(+oT{jKAO
zaP*=Rg+qv;kD~HCBpk*I^rVrZUyOdtU;v9aLPe0qDl#bJD5^My_c4U47{-Sr^)Zg)
z6P&~bM)4WO@FjA%jtP8&Nhg47h?Djdp2c$%z7dj;(2EFRcH<xpQLwL4Q2WSwnDE@S
z2+4fpa0!V3d%+j86zS4skFSZ{03F12I)XuB7$O@Wt&nFSLl#^Nnbus*qojF^<|E*L
ylWS3qA&y~=5su>=Cuk0|{(%D=Cx1okPaNbJrTK4&{Z9W-W2D)Fal*(tv)n&6{Gt>9

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/DateFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/DateFunction.class
deleted file mode 100644
index 722f92f005930e8bb0daaeb0ecf7cdf13b813480..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3030
zcmbtWU3U{z6x}zOX42`jh44|sX9@*NLWm+QC9PHIhg1_l3Y7>d(`0CeCX+asK=GgW
z#+$FQmZl54mg1}L{u_0<?@SV=b#PV9!{pAr=bp3AzWbazzyA5-PXI3Av4-PVisPex
z9K**d3K|p?Rb1B)!_ok5;HG?hqT-fDi)Hz^t>F$<q~WJ3?rIoDNyTR>?y0!1;ed4a
zx%~fP02)ei^rd_}(2zhejtLcpid6x%VYsg8*aC^dBjd4=s~YxNZrOD#du>`EHe=bA
zJ1Y<!Ker;F%+)KVz;MB`&Fih&s_EP|R;!#z6zXN8x?(t%eD6#u?z+_!xKb$BYq`~?
zYi{IPj@hU?ZqD3nIA*hH)$QEFmR)w`pklaYZk~_D&J5$L=B8P0xr|UA_wlt{tC}lV
zO?NuP?P|-aR&sN7+ch^s4Qj++&CQwB>h!rlzBg7MnPr#p6oN1Wrb2uNAp2gVX>OsH
z2$37~Aj$#<15oFTs%cjYhf8s}LqZqW7qIY>VX9>xw!mme^qrXr43t}rW7@7vMc_op
zjzFpck!D5Um>*PflUufGjjBn^=3?Ec8Qt7TbP$?cC-B2NPxon~d%|I7uos?Y(zA41
z+(p7nNEUnbCjAXAyGD7VXf!<iv5r_m0{zR@nr*mLp1`x+BKm(JL-6iArx1g{v4kp6
z_dML}R^`fgh>yLH($)9tPFt&cnwP2-nB8*_zf%6Ddd)VU^e~tHD`qK+4k@pLt=LA5
z2YGNjNM5g9Y0LGNQ#KbZ*^~Br>hAQC3$nTCNMTgqz*GLR#bUNnNnN{^uhsI+rj8Rh
zDR9K=fuX_WX4dwQXW?}r>0d=fhlz(e*03%x`H!vcwS7a!dw5@mg-0qjbW~B(VWTcE
zvsZs%=c1#5uUOE#`?|ozFt=s1;q~ELUW=Zq*BWfR3!9y3fsx&QuF7s}Is!-U*c*2J
zNvc9ZQV+d;lIq+mc^wYOt^-#`3yT7m!(#8@HV~Np7dyLcw|kce9O~45@Pd<fTHrwa
z-mEmOuPGnicuRb)nQYgG#+QP6>s=RvUa@v#37p;CU%GPk^wPCst4h35QFoR%0At;@
zq`VVddG~b2Ju#nIfw5o|DZ*})U~0ZQuCly$R!a|k%xE-tHwk3JsPUU~z-8ySiDZX;
z$6b&gzaC%N$KAR=g;9RG9Op+5ZzNf894Q>LD)~Icw=0|%{2xefL8KFr9}s=c*9cDY
zsqr5)RcJcKk?xz~49@aR;7yFvf^NiBL=orQ`ZknO`g=sT(3e-X5i4y$&G%(qAkMq~
z8AdYE7wC`RCA54jos4Z^Ag}nVea~<vooPeQ$C9x&2DwY=*{bQJ>e(ihWM3OY-!Ycr
zVZ49=j?Z9_m<|(BikQyh9KZ51nB`~zSrl*qcag&byzS+2AN^d3(<;pmz6Bhm?Rk#w
zcIH%>NheD=%5uLXX`Mda@;F(ir;E&a5clv7V=0V%3lo?`A1>1}#Wg>|RL}1ee7{+e
zE|8~{j>sRlq+(jdOa||ACPK^+*_(V`@f$t&aeh%0GrwT?8=T0z#PIcO8~a{jzhqb`
zB^8og{1&ITktl8B04YD1IMl{r@;V~W#v5%Uw{Ya=^RHMt<(<|9qfC;E%NW8GMu=;a
zxW+Jzd7_ageu>eC_!;{F<Oz>Z5pxugA`$iYS@d|60-N`^h<FV6T9Ip0ooxFN`5j}-
o_GBm3c`hu_k*~xo|0T)M#8HXUS76MWx*AYlw5PrgJ*#Vf0Wx|pl>h($

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/DayFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/DayFunction.class
deleted file mode 100644
index b0fba5287bd2537100693bb63ad32757a424601a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1374
zcmbtU+iuf95IvhXaq6bG&=y+g6=;)`cDboSq{>T5rAUE36!m@MY=etqN6xxxzk#3N
z6X2yF9{2!03NdTP#Z-|H^u@C~o;hb`_U!)n`RzM^=XhqJfCm;#JT$RkA&X55WmF1S
zG*LCN#gN}~JV(_TvgOJ#gVFFil3}Xlc=AoyYs=uRXuISowR~H+$0Bg_e&{sRJ7>V~
zqGkI%-X19Vo`-?#`+?%}ydTKH!0|nP5_-1Mi;hr|?~99rp`*rN%5!OliU{m->r|Wx
z9xBJ>EoY!=BT(C+<92w%_mn&z8PKEhUEYwcTdTx)uJF42uzf0RMSKOSL1=V_>Faz{
zjU6L1to@aoVcZUbKzd5EF)WYBNL9nYY=+qsXG6Hs>xh7=%67yB1vDAv{~Ys0KN<Dw
zRHm+fZv<Ux<}tHwmcP0>iGAAcRqM4nQH~usT~8=FE{2cSM}IT$5tZHe+ze0jsM6VT
z`c#ip;CNkX#yaxDz?KJ&R_b(0VLMt<MU25J;t{q<#=kX|%)f{oa1)P<c!H-4yZ@(U
zhT1<QCfvzQV3>$Tl=vAouAfPw=jeVUaaucFNn$q2%?in9CTcH|e3R}-R|X{NGvS8v
z@Px!gL8(hIjHqFa9*6=x7@!A&lmUyr<Fw;s8QEO*3)p8`WKg7UK5{N$g4V@20F#)a
z9St8d6s40tkj;~wt8QH)^U_!_3YRc;b91?`$bF(8*$8ZsEU-!ytP#X|1X_<1hoA(3
z5^hCAbC{)FM#Ewrw<*`8s5@AILD_jM;x2NyNB`r(bmkIeE|VvN6<VzlPu$%$S>0W>
Ul-K2?d)rL)mc8n2J&L;j3;i8v{{R30

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/MonthFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/MonthFunction.class
deleted file mode 100644
index 2741eaf46367d47b38ccd3b91633799fa1d1c352..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1386
zcmbtU-A)rh6#j<pcFR&g5KvS=K(Q^t`WIs;=}nb{q{sz^Yqr~=EN*wnc9!5%_zFIP
z-k|Zq2k@bc-|n`!kS0dCnKN_dob#QZZ|3K(?>_*%z;hD?JTPJ4p@9_>IXp5^Lb-rD
z1}X+t1@fD&@2Z+Wu2kL^(CR@;3XC^gU%rhxO&Pwkn;tcjjli+JeLHmHb5E(MBeyHC
z(Qtx})$A(y-iktb5`@Z<XD6ZTcHO|Y4kO=D@up=fY3&5QI@;=~sse^QlTM@v;glN3
z_Ni?}%Jr;<+f~&8ahs9rwX8aW$g_b49TwnOb?JH4avIOG{kFB+JeH0kUV&NIadd$j
zSMivQlSUR;{42P?h!cgO^i_-|Fh9T}lZ}9I1g0{Wb=#AE%MO{9-ig~nlWl>S%dP%!
z(r@=p#y75Da{yqb?<sa%uJz_(8n1cWtkkMCf)4MwZQoWLnZT#3&A(po0hwKUa++^<
znCVn0JJ&rGx_+C*n0rAKI&#ZR*m{X&>oKj07=~HIW2}+Pe|XlPK@sb)3_K~~DV_<u
z`d>y1RR6)XkKTU|0;5Tr`g(ztt8?kII(a31JJz3TOHx`ZZI?-*iKM`U_}hFbZ5fi<
zr?wZ#-9r+LMwzG4v#4T`A4P#52l!Et9Wc3$@MKX6O1<(G;tMxJD00mw$~la3UrY@!
zhH;+wv@k)d*!d%6o^rObdXAwDZC2CIp=k#%^=Vx@_y+wmFLO!2F-jy^EYW>A30zB^
zdx04Slen3H&0-4E3?A!daErbM?{4#?(VJf!?n1{s-lxgMo^$k^r)CHX+}$TuTHzXH
XTw!i9AE%S8uav1TcTwL`VzvAmh+S=#

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/WeekFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/WeekFunction.class
deleted file mode 100644
index 8ed9d5287f7bdda883ae4c8641cddefdf9217d8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1991
zcmbtVU2hvj6g?BKy<5j=oh5Dvv>`2}I0@;Nek3FgX^4~1fYU(Trj#evn@!lp*){7m
zP2b>w2M{lnkf0Q)eL+Y_Nan?<QVHJq9c_LEAkM5m;#QUbHPOu8xpU{-JLldz{^Rf6
z-vFG$2XXXcB96m&L&anq5lqP`qhVUZn;K>`T+lG9;VlhwDzYl(<2Z;34GZ$SD5tmO
zbTN(|ENOU0#k(qU0<mewb%GgzNP2ixK*@S*w!opB<Jy-hTLs&{Vit<j=sC|ai>s#Z
z$aO=h1RpzPfytcZZ5f4fU~d`~-!6H6VA$Iw-!7LO&o$O7t`$gO%?xbgnr&|`HZ&Ol
z)!w$PN<a@*I(NhT)HEuAQ#5i;ImmQ?EmWN1nvwO~z~1g?u*LX`M%FGCGsAVfqUmlJ
zD}@`j70{o?AWVrakbK%7qp|A90>}Q<xj?s7@qOD3q&I=V4ky~85fGL@Uz^XYS+w0X
z)0ZsVBrEggEgCHe^f={3$1ex@3b&>1LxICj@_(z;%)xRSqP*91hcMcbQIANHU@Wv!
zG|%Pq$V_I2q4eYf)7o4%OJR;#Z2|}K&W39SOs&BEr?d2I{yGHv%qdn}bBmGorP~W2
zANY>D!TZJYUd6ZUMMqY3Z+kVKlI54c^B72A8JAe|`}Nq&RRSw`FM;=QnY8SEcW>{9
zdygJ`wlD8~y)QrbvL!#hd$%P&+Wn>_KmOvEmb~}vj{;{pb&_S5!v47&wpP~LDzRY}
zwi{}J{xHt4&g<8llU-u_yx&!K)Aeo+$?_UvEe%a2kjE7{T}@yW=j3&-vF)XSz(gnS
z|DlfsGXLXblgs8Sz?utl-qZ`6e7eY*y&S#`O*<wtvSG84mGsgu+oqR`uy5E%E9)||
z;j6}-m{}^Z)da>Gz-?SLq1#jq`iOso$ZfC46YO$Z3%t5YAk_(Z7038w_wxw{Uuz*t
zi}MRy8T<-<qa!;Izf$PJi=1Pjau7!-C+Y?`ib1XfUcwNqcvuvmK&9^X$Y>2+Q_6sn
zRBKSiqXS9}QRO~V<tHeS@mMN$2YM>1tc^!g(eI%qRVn<;qqq=aBE%V?JjQXF<1EKG
z$0WzJ9;@nVRoANefvO&_>fKd6QGJM>>ko18`VJ21$r^f7(His`p4&m+?>wZ07nwtn
z@^QkyOz8wee}(@iF^X5|Ce5F;QG7(F7MWPb>u~6}i1Y9;0iVt*$b=+ZtY5T20<TO)
zkB7wECh`dqB6SiuLd&m+o@N9|e2!s^AWFZV(9>%qR$j19sl+%%41=0}bpM5;Do%@8
t@h4JZw5$HdkYrBI(CjROttV}aUqO9DPgTS1{glnNr7Y4)+4<0F{2$*X6S)8Y

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/YearFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/date/YearFunction.class
deleted file mode 100644
index fb5b644cb7d27fc697fb5a5f63f6622e8028fd97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1378
zcmbtU-A)rh6#k~W?Utp0AfTXtfMQ#O@h=)})0-+ulPVV&5-+FQp)PKB$##~&Gx!od
zg5IF<!Uyo7jAwScxRNGDx!E&w_MG#bpYP0%pWnU%c#KCjinwjV!W|16HVoXgQAVYR
zMGI96n+%1z>$|GKV3aHS3}!RvN`|Sn>&w?szazspqT`WfrX4uK+ZUm$??a`j-nj#Y
zXKg3w^UgrY_dE*aQ4lIFPmV%47`TDY4<g@D`p^|h^0!iiJ3~#4!ICG^i4-9?<@TXC
z7Ccg}$J_2e)kcKvM6TE6&A?akWTZi#^7nXCdS0!P#PfvT<GY<h=_tZ0QW8Q(XSi|^
zkFs%+$PBB01!ov{qA--c(r66JBRn$MFffN<HiOv|p7gsSq^!(S>Izx380P<M^yyLB
z>{l6AT|j*VUZ(2_w62!FJfFo2y4I_WT7xjh_S~K?6b+2w<Hg=zF8GMdE<HHY7k$cf
zwwxX7o(f&RN5$BCK@>W2$JJb&&T?#9ld6O<*d^S<7BTrZ%hCyyunlhEehClokm2cn
z(wU+551uJ_x(o~xag$O#!^Xv_q?C?VB(<aJjh-Yvo8?x82s9nn7qh-aYtoZMEbCZ!
zk=#8XdXZ6PFNPL1tkNS<q(=kvNDwz*(|4S1oFpTeuYLjhOotpw^ex27B}~w{lo((V
zQ*@)f!ZcZF=MN+cB<HG|XUIJ_7fkaE=9Bzf{wwmI=!X#pn<R-igEb1V9tUkCj>Di7
z0yDT81I=NUZaEzm^SDO77Fk`#0!;EQU=cTv$4&a5B&I!=$a9%AIjqp>7GWjTZIRT~
V88Zc)PPVpkrZ(fewzb%5{TGi3YR>=w

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/AbsFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/AbsFunction.class
deleted file mode 100644
index 7fb216ef1e07f7a16c3f0addb269e018c0b31477..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1403
zcmbtU+foxj5IsW{HY_V3H$?>mFN7eB7X-^tRB0klK_0MppWO^$aI;HoW+^Ox#!t`}
zq<ruL{3y$wT`p@(m8CpnE}iZ^XSz@CkDuSZ16aYDgCgb}*tqB5J{~xDh<OJkEEG|;
zv1sEFL*KdzmEK?|looawtZLMd3`2Dl%C||&lkq#@1!NhiN4^MlMXb#I%xLL-)n<56
z_oEi~+FHKnNh}YeSaW%N7|V8BMIqlyLSLIhOXz+6%4=_)87d66JeGc<3BWJa55$q+
ziB<uxtG2Fm$?7F4Xz*$jYI)q%p+)oqUX?*mS;+DQB5d+)??C#R@QMwgg~`q^+=)kQ
z{46uW>|end2K*$BWvC4r!*rL392+XFfo7P<VAEQ>R?V99RZ9d!ZQ}O|e>gm^@>U1Y
z^)5)ca%Z3hjK8^PLXEEL<&DY)0rl^wW+*guis4gd)vuPk3$rV?%nC(|n2we54c*bP
z3Y+v8XD3QxUv4TR(&3!AmW`TR^uuwngk>At#bZ3N@zg~b&upx?c#c&PzVJxHtN$lq
zhP8hP+@b+E7e5VITAE7@FqAsGaW3LN)iRb2ONX5_*@zOF&s`BDR1ccz8pB}fn$CeC
zKuRptjD7ghUQ45B0FF%H_8!AH`Q!#DbEsgJz9vQbx&Q@`lHkxfKsQc1qrJEM73>Qg
zdf?L9ml~&Vjm~c7fI$q=jo@*eyiD*%+IwjqEiay+=cP4iouF_E>lD48$y`WNIpl;C
ze=be8l7*b5qhO5C&u|#U7{*iYQB2?l#oLtOCMIFw7X6<QG5)v7{|;GtFh!?n%+P8G
aEzxc=6-N3Df&5$Mb8jhJyyb4{HTw%N!gI+0

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/CeilFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/CeilFunction.class
deleted file mode 100644
index f5e383f6b1a04b49117f6287f24f337ab9e7a2d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2554
zcmbtWYf~Fl7=BJ}XIYkB5U8ozrb=rFmbF-+1w<_YMMJSop|rNv&E^mmHoI}N>7f6_
zZ~Y1Sg;Jf-`pFr8k)PD}Y&Nh-b{rfhGiT49eJ{^@drtoN>!)7;T!*J(1Rtq*1s@OM
z7MA2v<XGldQIWwX9G@y!RiWTB6`!M|VhC#-x8-wPE?=m)gS#rqxTj!)W0T`PLuSEp
zEPs(9nV;BXNG-Wl!Em}{IpTJ!UJ>3sqhiy^aLF|dd(-eN`5qpo{2i;waI<8(b-mK`
z#h%{sM8oxbUF<hJ(QI0-qi?qy)0dmN;qT~6!m?MwlX(U%_J!H<$%C0M?HW%Fz2#fB
zUb340e2m#j%d)HblI!?lKUSbl_-%4x+w&7`d$!@!^!3WFFn#IIt?U*J-(XmbF&{zQ
zHdH0iP<i<%BB@WNl4MFICP3ZoMUjTuZf=~|O`iirdY74CIMbUOio|SZf#Fh&i|#}*
z44N&^6OJ!4!*C%+Ba%7l1L>M!tnD@^+%2nC6sA=-Y#DpQrNXmSDbm##-!?kU5m&zW
z{B{SvP*@}fYdrxk#2`MYHED0C>>K9Zn$ZYaH|YK?jt3kMX-3*(#PKD=K-sD}hEHwG
z@T|8Z{~w5$2)e5jBM>P{Y&)kMqfSUi^3ktl-?N+=1+A9dmS>6;OHT0F=;TewrqwWt
zF%6IKm}5)BS9qe~Yf#x|{&k)slhIu{hJ}+Vw&$^1T|)&X!*rYtQ#1k!xf`&{l3Q;O
zXDsiB#|#0j<T|{PYYG~UYOY~;lpbGrIn!`*j_c<tBImShdrF30<q#USQPZ%4CzQls
zkb8PvgN0oUd$2j`8aCi?xEdPxhK9r>E@POD1AGGZ`)`_SM4p}a7*2IlCBwyj5M9m1
z@Or<*ad#2J^wJpJ0)d6&xo61tPDF=fd$LBomugzyQP<J6LL`x_2_mu4{A#pKk2#sX
zw#l-)kB<aKL$?9RhTSc1t8@J!ZP4vO%%u5l6n7zNAT%37=|`?uj=yQxEkds}g<qz7
zkGALYs~z<HDuY$GMb~1eMKKpUB?=(R+EGUGMR^`cbTQB(Dt{{7t#8W|6{9I?3(VsZ
zUHc>SHvmY2gfK?yIeOFS$>^CbJO}%cHVM2+YbH3%AxnF$Er9cQjozpY@CHedGP^^@
z2I#C>m^?sYE|r`~Prg8sA^i-Clc^U-CGZmIxlA_m8#3Rckj=bAW{zk10r;GfRes0N
z&rlu=4?KtZYgReL-~qImbT&1bP9NaZ{cP$0rw?)F5NCfNKdAuQG$8`U!EqTXu25KS
zBZoZwCMcW&W-y6)yn|&-VI9}7h3O!UM}$=;$qTqhx-)c^qqHcr>Ua}xQOp!c7^U2e
zlYJJPT_F#NU?+VfN&7MRnIt?a9+Ic4NRuy6QWK#yJ+wBCcge;z`gR$KzX{R+$27-#
z9M?JCClrihmg5G;P2f)gI7gxhf=^6{4``J&x=K$8Bsn}Rvk<M&Y@|ZTqY5nsQXl>U
DUtYZJ

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ChnFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ChnFunction.class
deleted file mode 100644
index 73a8e11430a18a9e98d8f392b946130c98fc38cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3814
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ChnMoneyFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ChnMoneyFunction.class
deleted file mode 100644
index ef0ffcca4cf4db362f8be9e0b053740647e14dc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3603
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
BUT6RS

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/CosFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/CosFunction.class
deleted file mode 100644
index a3f7d83d15763dbfbe8dfb2e1b4250e950eae8a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1403
zcmbtU+foxj5IvJDY*<!^381K;!3!Y>>jl9wsXR#JDaZpB?~~0C1~<FZW|oTO&-e-Y
zf|L(_fFEVqv&&_Tsj`%Z%%#)a=S=tM{qghLcK~bHu#m%o1rzrzJitQ>kFaQ=jHMhZ
zCYDV+W*DtWU#dDow!E~*U~C3$!7$mBzIYpTTOxeNTOL^o&A{c}9uK9ypBW8xAbSii
zn{Lo`T0JG+J5eZ(f>1f4e-w&dPX@lTANj7*hb~tK&SuctIx|!mOwku^qzJ$*HxKzS
zcOoS{rzv}?IwWf=l3trq_)7GLI&_J?=WGhkt1cz^Jnna#oz|gn72)ODTydS9AwP&m
zY}_O>L+P*J4C8JThQe1GjbVOBM2ZcSRzow)B(QNUUdv8HxU$PVqBiq;g+CmfS9yDY
zXl)2ms@w^v26NtAG@(J)TBTmC6VTYM?D$+!rx-pBR{d(phcLTx%M71)iRn~1-OybX
zO20#ov37$fbj6m`BF(47wW`%*V+@v!6|9<YY&^kJ6VGf^@Z7|jjTcxa;kyB8c>Vt*
z%&_qff!j0y=i;X!i%WB<0fzEmH_k=;r&^}sVHvQKCfh+o^SQ^pi0VNz-C&rAUE?{>
z1W1YHhPLM~?Tt8!2H;o+?(8#6lTT`Z5{D{E^fk%R*9FLelmv^`ak@FQGulTgU%|f6
zAp@J%(bzbLYjm~~2TWj+ZUm3(<fVf@(mq0av9f%E%qwHoI6?Ll#wkWVlQ|owvd9TB
z{z9B?EeSbGN5Lr2Pje_@3e&N75i__!@g`-siCGx9MgJ#6wEu1LzeAP`=IAt!yR>RT
aE41rO*}|wMkbcWz>Mhxex7>@pO1}W$uyh3g

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ExpFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ExpFunction.class
deleted file mode 100644
index 52cddc81cb9ac11b685ef29e0bef4e0bae8852e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1403
zcmbtU+foxj5IvJD*|4mD+!PfQybyx0ULsf~#e)ev1$n^YeX<$C;AS_qnWbX+Gk$`;
zAmxJ};73{Z>;_q5sx0LpbLn*VIn#Z5zyJ994L}K77V=oOVB)@o2Y6`V5mqb|u$o8F
z#F~l647rN*rP^l57FG`#jB3yn3=?(fi#JibA;P!3;gMyk9=O~)<e}8}zR^&}vdi$Y
z?gnkA(N*G|6NRD^gvt@UPAIxv8Tigo<hx2A+FTtwJH5_s-%w^SMNhbqA^^8gKjEj`
ziInu5y6md*kgSbJdQGPq_)7GKI<$$t=TwE~l~<E|9`{?$e&a;AitzGHuDH(5Fgb`v
zY}_O>!_r^D8OGcw427>W8pGm{h!h(tt%hcpOJL(#yq2w+aAli&L~ZW(3cv4MRC#ZJ
zXk`des@w^v2Gh0fH=#z?N^!fqO+cduvgLC{onrVnSoNzVAHwX)Ei-)HCZ;ombVCnR
zDE$^a#ySY1&=tE<i*zz2t_`gw8>6sntYgE3W8(>)ns{cTi039sHeO(pgip0&*!({U
zGi?1s;2sUYh4^X6;?i7dfT1whjSCU~sg{{|SO)B*$z~AId>(QyqI%Fw*BHiQ*LV&z
z0a9Y2rtOoL_F5c818}MX_m3E6$tN{Hi9;Dn^fk%T*9FLelmv^`F}gXlGulUrU%)=o
zAp@J%Tx?vxH9Fgg1I95yH-g7?^3uT{Xdj_{y0~_R%qwHwI79Xv#yLhlkvSWuvd9TB
z{&JkIl!WxtQ81?Hr#Vbx2D7pEH0E%F;!VnM6Z0@|i~diDX#d;fe}^m?EYN8YcWKpx
a)@j$7vQs%tApMq=)LXK@-f}PYTKWk-qjV(z

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/FloorFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/FloorFunction.class
deleted file mode 100644
index 201b47ca9fa3748acd71fda7fa4cb2575c642a5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2559
zcmbtWZBrXn6n<{r?y@XxMWCi?n^sywuxyJJFd)?uP&5?V6iRDr-E5Yyu-T29O$Yra
ze(O)rFO=$x)=$p(i~OWLce8=rWXHjAGIRIt-ShICbDnc<{`~vrUjf{JD`Ny7%Xl51
z4B{4+#8To|=2(%D!KWObNm!L3;d2>Zpe$nuYaF-5b6qT7%D98OGAg(yVS{6n<32-X
z!L&_pks+C%*knj8IW>dfblJ3x+wDfxaPMhVi%y2ij;>jonrn*p;4tOwm@S54S$7(0
zwdEOmYTGrMj_aw$e$zEtEz_~p?Y6CZV$;yP9d*TW9Csx+nrGm~zM;20a-rwTyV_Gt
zZF{Drmd%zoA7i)LHm#bv<k+6EA1lzH04#OMu&nusjy+4W>*{)S*U&xT&#CT~G*4q#
zj4>aA-7!=n(Lj0mC?ugzrjlezWX4Aw^&$yF9XE3)cGKrT65d577|!(Oh9c2BSzx#r
z<06_UhC#jUx`yqE%rKmf(FkRZh#*`ujCI`lmAhruONMSXG)u(Zbg1%dRft5G@m;ga
zj=1v0=QkSoLSc~{tn~!E5QF%n)`Y#Gil^y&Yg*Iiu226hjt3kMsYyD0#PJowK*g-v
znnyflc-G6v{|6!_f@qau1VTlLrE|*G8iaHtAO2eLT+^;o&~n9TySlMr`Yjx3y(z(3
z1)~^K@Cc7NwiJAgCknm+)qUn)J37=F(b6$2oK&&XkWqC7Rp<=UaW-_L=?{^+{(M<-
z8ciA+%lpAG!!<v;Tz9hMS_ZX8E!WgsN|0x`IbE}Jw&UfhM$T?q)|807#$hPfMqR-U
zo=_V7R_<ZD0u#Fm_F!=|6l}oea1=E0Ekk-+j5CJ0ILIfNfDE($L3NELXg5NJQ_*qB
zaG~E+gkTJB^-CNxjHXQQD5I;uw{YD14Ef%!=nmSRyb=FWE%SR~C*3VHD3W!92H9wS
zHB8mxxlCU>12f9yBZ1Mttv_f3hKnofY=1}_bc4`zQamS&yAU=Im<^!xBbQ9u+tjQ!
zp_f{QSE0*~w&(JzUG)7bgEgm3cVnPMF_*d}@*#`bQAYA5aUM!^$=9NB{#3YI-xet<
zg;UfKn8!uB`$y=%0FVR;VT{(Z^rq62(KB6m4)zmm5_p5wjDMIzmi9_V0O#-~y%7!Y
zHc62(yF<nX=&V+lJV2tDO3tJwUm!`$eul-#)C;5%c!_i|lg<2&%nvAJGcS=T@+?09
zFG^YI4-EYR>A~>8bI8ACr9%uJK$%HrQ={q30Z!e|rVeoW5N8hY+K=QX<zt&BM8G&W
zE<?r@3hQ0ukf+}Sg;T%`CNYoqu#73J<2tr5?Z@$mu&N|^9v4V=hR$-77Kv6Bm+%h7
zOpydpirqNbXa3n0@{sU%!bg&{ACsR+!Xx7$dAf=;`2r<15m-|LYvZ^^Hm=jR%Sik~
zkOnxWIo{{E!SMm1U>vg?a~vN6e-XeUi6#g>4MTiHtEkacdI})P;bD=5aD`?=6-pje
JXwjFt`3eeAzl;C?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/Log10Function.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/Log10Function.class
deleted file mode 100644
index 6270f2b356524be27997d2d0377461e7152bc0d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1411
zcmbtU+foxj5IsXSY*<!6Zi)&TybyvgpePohc#z0bkOwT@Cz~M*Zg#27EQRII_zC)g
zln;J@A7$CI8(@v8vXqC+rE|JZchBkl@$=hv0IOJYP{6DM8xI{k!ea+dFz29z`2xx|
z7Hm9a=-*I*(whvq()>PywG}ob!*ERn@@?Fz%jlh``(zodg`V*DMWoEVW3=?4YBQ|Y
zys*XVZ7tvPIFiR<q`5pjj%2&7!hj#dfv3%(CG;V$h0T@a?T)F!V9QhK#hNI*Qte2b
z2p((Y^O|bwN{_hpSosaU6$V<K_5`%30H1G3->=N4@q7_9`ELD4dYbqO4WWgJ&M?x=
zN7;C3WQO8j$r%Q{IErMT4I9Hu506YX)LcW&FqzUO-FU5<Rq3gg@F}&)-+TPw_@d7{
zU5Re=V9GQ+B{gLH&E+#x>AF$gtZWj|z@BObLepC@eCqD{^@8`v?AlLe1)@cnj+e3z
zx~C%*G^rS8FN`BkZmW(=GxAz8dU7!U$HgL+Y;YILSh4ZUMH$a+th#uCmkfE|sFLB;
z{|cF5?H^osXb>(&fQBt;(3KJxO5JaAA>}_cGoFl0mz|W^2xFSlec{K{IhyS%!%zZE
zrokjYdMs6qedNksO}uCfPK@L30mB4gGGmkiDk#!dr9fX9AP3SD99jqI#%X7?=gVKg
zzR;l$F0K8EaT+)1?4|$=VVG`2kDG)t&L3&d(>_*SI78pMHD#S4cMj_u`Ojp|C7~Pw
zA>p4*!mXw*op9ugQTmx2#xRbF1U-gH+#-LQBHYFlEZm|0(?ksZF5&Nyr4Q3|n!$Zq
bO+t&bn@G9Qev?49mbpwVxyxD}B&gyq)&X^e

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/LogFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/LogFunction.class
deleted file mode 100644
index 2e864d6efda821feb922e9ee84b291a56f2a1567..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1403
zcmbtU+foxj5IsW{HY_W|1W;6vc)<{a@q%C(iU)~21$n^YeX<$C;AWTF%u-nXjGv${
zNcrFg_)(TUyIj_oDoc6DTsqx-&UByNA3wi+2e6D)2YK9cVB@}n2YBdU4v!pEFrP=&
z#)6H<3`1)wP<ovqSDD{sur|V$WEg9xK)#JTO&PrtO`j~qM(7EDS47I(&y1GdS6zme
z4KM8QW>?GiJdWgH7-=q#4<p&_sxaVtao}ll=m@>f8)19%%ur*n<+1c)O#oh{aUhNa
zkG1l7Lv?knPu6Cv{1)E`11*pHI&_G>&o`v+*XGlFz6jcUyLlizO?dg1(86SADD>hH
z8!yewQ2r}8!-yA0kqop!W0>g^kzqrnHP8%`DQr@U*Q#BYp6Upns7?M};SY!BRo?0$
zy4D9NQ|=VhfblmMO{mj#t-4-YC!paS)eeNFPBDDyt@_oH_hEMBmRW)55YzEWwxK&Z
zQbC&@<LrcS<jGBCL|Vv*Yssj|#V{Nfi&(P3T|B{48_!%+@!ZC;ix*fS;rn5mVdeiM
z%&__ofm<{H=i;X!OG<O80ftI%H_k=;r&`97Vd=4xCR<@l^SLYhnCd|@U1u0gT$4F4
z1W1XMy0I57?e!#z2H?m9ZtpQnkWXfSQimGK^fk%T*9FLdlmv&?5xQ~O8SR7BuV7#3
zFaVd<p~N_iYjk!~2aIBjZUm3(<Yj_C(mqIgsk(52fmha)b%NX}tWykrCUY)H<&YCF
zOZep^-EtaomX3l^q@UqX!Z;=p?-C|)gW_$<a1&FoaEty=i5UOe<bQ`O1DK}M4DQlu
b2rbfXGUbXxhCuc$bD6i~F5WVmc$I$vyn%D}

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/MathFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/MathFunction.class
deleted file mode 100644
index f847ec5e04583c30fa4a3196640cd40757137aea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3940
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
W@M`%2$M@kYamdy|+U~b#*ZCiy;UV|{

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/MedianFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/MedianFunction.class
deleted file mode 100644
index 4699b7140bb9311f8bbefecbbc6d8ffb8a9b281c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1978
zcmb7FU2_vv7=BK(n@!TC)MBa;qyhqIYr91-NE2#pO0}B8Fl9R93^ym6C0*ETGMf!k
z`3e36xv4YWabdkFqB9QH{w8&N&TdkYG}iIv?0ep?^S;mfv48yi>+b+=;Oh)bSQ(6C
zX&l$^u{y3BxRHU5Pt;LR$IT2r#jO;U4HONO1d=7!cf%EdM1FQhKr1(Ej=<@P>pOQl
zjj9tokX4VIsY=t9-i{1hb?-8@aMx`M6f1VKVO86q^Tg@|POBM&mb2FioOau7`qrb4
zZ-<I#$Z*%%a%!&hH@du{fZ^;pb|>T;cE0jhK9yD{bUmx$w!=}5s~y*?S>>i5I(s7(
z8qC16%8ut1XJdb!^y}8W>SM<a`JPsjp%j>oWl>CPZhhUc-G=m(d{=sp1jMF*-VS9D
z3Z#^Y3P@mbI7B93$H53(7y-m!yaMBPCkPxrQ~?T{A7Rm#0Hg7uXSKHbj0kB;reYr`
z#<#6rLAHjXD~)j9SDE-Fm7I0ws9x*5mgZK9E5u^BAf?fuDb-Wkp|qcD$yU@G25t+a
zx81rgL$-v#{&80)HqC#8HX^S<phqb5;X1l8eA!^6Z|D1^+hO4Pb>^4ZZgv9O*>Ke~
zoEhxmMb)+@PGQ2t3O-}<CN5&t#OGL}!>Fl;8qGu*>&oPgi4A;V;7b#m_=*GBhz3O9
z)`|F>G*kjN|Bo%FvNw(b6N3}Tx<<IFricgN;&35*Q}$+Rqh-SJNz@%qOg6vS59rYx
zCS<K9u-J7s1W(WDFq<PlcU)A-n)}pMv#|6p4mNwQ9(R#_lViE*d0Y$JPTXT!o12Tp
zJ)YqXE^x7$T(m#}1O*d3PxEH+EBMvtUPAm#Vhoc!lM!<UZ;>`*1x(=#Z|nzTsYPS)
z6EtMVdoeeEh_PiYr@cZ#prB`UZ69V%OT2<MhJ&oG@5Aa{UqjDn)TD&uA(G3<T=F;Q
z-{>!4Os0%Oqz-c0FG$m@RY+!&-{Uq(uV7>ityW0ov}~$pP1@+u%2PU*9`Y1h9_bx0
zTrEm*Ejlm3z=xzRV;Wa5gR7+SSj8;vV;(#B2oJFUiAB_jRRc@-jz6a7xQ-wA(^Bv}
zBS5R9rtuD8tCRaKa`f7u&3mL$w1}l?+GM&?g4P98QD<>30{I2r$9aOQcr*BbwKDJ{
zYj-Y+`8kI&$DiOs+`}bONk$I78|$BC<Xq;F{uSz9rECI;zc6DUFRuLwcJwTHW0<4f
fJTr?sV1ZxN0g0)M0;j+J%YF4v9Myjz(pvlnq1x{?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ModeFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/ModeFunction.class
deleted file mode 100644
index e206973d3ecc1173476a2d729f880e2ffbc0c27c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2472
zcmbtWTXPd-7=FHHlWmd>ltUs>4h1Tt#S#!GkkndfKq?KW!6KeF+ikkA*~Da*DKp;b
zjLta2z2k*mbcPFO7<&U$XB_XC@qc*hy$)l2zRhWABaGv8vilw0!}C7xVf)+PKm7vW
zBtDH{2c~1#j@MM2iy?&RIA&0Y<2)|N$LlIC#xRK47~a68IOb54kIO2q#E`(7^6{2D
zd3z8g6<1ZfBM_Oi9Lt>&2xUg+1(ccEf+?_d&T`DlUbSpCuIgo*C)?+0hHlU64NLCZ
zhl;yoH3iPj8MSJ*+;q*GS+8N%YYjJRF4r4ovuV|w?4suwu3S`gcPU$>gA47Gynt#h
zn}+AogOQoLq2JQ8o@?3JIjiaB`<N|zmc5XjsX4B>+*hDV^LBQ|wC((8%bu+}mF$)B
z4byPxFKpC2#}yE>{4MZTAcnG4Dd?^)kZP&;K+o~eG_0y_Q*Cg8_Y#!A&_<XvV6*@U
z?0+U^fw<u{8m8k)kOF)AXas^_VygNw^F%g1o9-3cN5Rv&%u|oDqFyJ^)RTF-UGL<o
z7!Z|#O!n~`NLmYmj5>S1n@UO2<k(bxijFpBYqCFeQgkBVnkd_neqIVSkL8qa3HT?o
zOl`$%_&yRPS2u1_#jiJ2mh8NWYbxGlsjIlI;yr<A$*MTI%fb`*elx14mgX~}>_gH2
zE<nZ6t3<jp6D-e?+pwGpsfv|qUc)diShDA~6$8C;RAySkP9!zFj}Lg;OZ`Q?xkQ%8
zj)o8M5oyuzF+S0tqfA%6;D(ykU|>OosbLWnQmJ7HmWCU+*|8kVh6Wo|De7pbfrY0?
z<^)bZmEC`D{Qs!QxzQOJ0$X}<w;FQaW)M$gNnrP8iB{%YEtu$8B#WGNz5T3fHgvbv
z5J>noWe2pp9@toFoq5xnUmP1&S3lKBxPRZV%ap52dh;@;nLmPA&x+%3o-B~={E9F5
z9W$@n9{K0c=KLD+@do;dMsG=hD~kfjOd(il?S_+6h%-yKoaQC-wv-CAVB6U!!GtO%
zfgS31yIDcT>$p8=9I>g)Y|wkBxoNoW(eRl*hBw;{T4-a#etrjc@Vf|p2U+4s@|of;
z%eUY=JoW%$m5Tv9$7jSp9L6rLwUz+Vc%D0f7qFXBR2F~GSb}G(p$SFg!edA7V;~p#
z8KLVBpybqaWDQ|~++cce4H1EF@ReMt0>5G~7fnYWA#!*9_jL3=qGw}ibyw^mVrz&G
zP;#of)dnb@xQ{Ip+83H=A1Aek*t&+H5UwS)q_To|QkziH(Omd0hTAeqS0o*NgqYI4
zUw6~t9|>CV1Dz)mzz73*kwG6~IENWp2B$EJS1^VGj-Z5>P{BBx{U|;oW1r&~zQl2S
zjT5-T|1`d%^a>_$7pL(9a=3@QPh1^w>WyFz_L9T`*ZVMx7^QD99|sVX)U|1qtAmu4
zxmYEZL!?-)4iig=fA@%IFEK~xVT`(AB3&W25uT**EfJ1GB|gwY$k#mR=e8wvtSfb#
zQZMuV1S0E%6IF3S#Yq*XR7?mJr~S<t6=#9R*u#UzD24|9#O}WcC`ZKs1}88{a#{s6
a&bI^|+P+P)8Z4jbK>38a<um0=z4{O1pMO^X

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/PowFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/PowFunction.class
deleted file mode 100644
index d83741fdf9aff5260d1020f6803d1ac4860d778a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2490
zcmbtWU31%15IxtHeH}$<LugtIrF9A|jzc3_id&N4LgS<aoTlWf6iPsr6-S9Id1R>#
z`~iLgZ~Y1IlBO^N<%t=75l_HgNl9c|p`BqoqmQe-XZP%$-RnR9{`pq`*I>&SK}E((
zxH*Uq@sYUP;+W;A%E)4lV?Kx5GIID>#sWT(@hNKJvMA#YmSo(;XE`i$tZ=L{WM@p<
z^ePPL;`lm)H0v}BhLbhZHtzVXy5X*Bb&FO;YL2d1>zZqd_h?b_w#*L0jhgPX)OyD=
zc2wUr+K%g~#%|j+Ivvxo)lJ{lJ@L@eye;*v^JqR=m}cO{uA%!LInax>ZSA3^`kra2
zHM8SQC!p4S(`u-*j_nz{i3TkS-%@7{%bFe!@hr`5s!R24L-&L~r@md)JdL4}03QoF
z1Zt3Jw0Z83kl0U9X@U}Y38L=yk`q9oo9E;v=BCd<PIwoYU>NSr4KdNfEHI2EFzHSd
z!=UcFu3>v3GYsbvcEmDAG7zpAPKR!Ty4^CHRYNyhnkBfm9jZH95GGx^__lqZjimA=
z=eL{qOsPT+7JCTKBt-n8Xaa9&#nbeiMXenuHxU0C$2!M7j?csH;keH*uwpiC%_9{v
zJnmKG{|h34L3foB3}Qt|l(S@OEsFG1G5&SMb4|NRq~#UIcXeal6b(EaYrILJSp_fS
zl!7ntCC8eA2lz_C2EJw}|7SNJt5}Aa7u^`PV|U#Zd;^l))g%nvXa@siIhZZ8POD8L
zV{SKEW|$;yg@dV5=or)*jY3;<DLJ0u7Ie)n*p64I8wK09tVzMV&Y>%4z@Yjo*c9ZO
z*y1o1EMuEvM}dV_p!7%2OUbbVj^TO|ont2BB8|rb5)3E0ry;}neyA?}Fr4kTI1&)4
zBtYzGW)ep40Hg6A03UTcL$S9P4#sN_9H~y~nBS4!=scnEkZu|@zDA1+ae*F9WBMA7
z$!-N78jMD6gYg>aS{zen`kAiLxj{2Y@tk<vr8qzY8->yzdCs)Gb<OfA`oV_d(>WKt
z5tr&gMS@U7sTeZFYE^uQWw07-qv`xm;4Ezl?$tQ=&|n&4bbyc0fexg>L?_a9l-^Xj
zGrDI=Pr!bnhZIiJH5)7zaE6|h&;YL>Pj3vb;x)3O&FnTL4A9y}X<`qlDJfmfOgu%J
zB7Ka?g!B|r3eS+4%I34bBl`nN`Rp@fr+A+4fluY~xj!)U3v%~I2A)9vEuY)R;2xB6
zCNJ$_Xf*TvK2Gf8<d5V*3Zk0CAU(ecj*F0SiAcPK0*dq-Cn6=3F@b5kjX6wW30H#X
zA5erUS)Ik}w69DY&fz@$TPXyqW5kr=kGP4a3wR^oyFq>~5>K&qiTtE#_r1WAM7~$a
z+XOP?3lv!@Lc1KHT_FFA@F5WXp>PH`-r=~yah2m;j%$qLJqm{7I`9_-c!Nw+c%L>+
f5rMEWm+8)EJv}lkG7zszIaZhSVO?eds}KGKF$1hz

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/RandomFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/RandomFunction.class
deleted file mode 100644
index c923333808449dc3b6a497ea697a3a6311f80ce6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1677
zcmbtU%TgOh6g@4CG<Y-ygTb%FVEi0}?RMe>Vua-fGBz$@R~egqYt)E=(Tr-;<0AQ#
zEK>OdXG2I9S!9`SO1XTyM_@_OCdsBBx9`2@+*kkg@%KLfe1n$`O7KcpK-qzVMF+QW
z$H8522lw!mgRgPlA-!+Muw-M|#&-<G)gTH~l_BpfY%^GEaZ@r()PqRAO4|*YycLa*
zBvbX+7vZ)@0)6iZEwvkT87g%@Zu3T0$$g$CvJ)qY%Y#lLyWJp;_)Z%6N*~%n?eaGw
zYR2vLo~*)P%LD1BiZFbyz9-%bo~j_^^`NUpIc}su*yL+*q~yU!g*HVH@--QTm4(b-
zD54gB-Pn`9B0Q@plwdfQy%|nVgH}!YL0g3MKBnI_I>VV^KE&3~kQwGjL_J83q2#AY
zA|s{QFwBmy=wnONcBE`FunkRbAm872j&r^_#A$Ve)4t?q{&h(F*-1%ibX_f1D^&{j
z^p+C-{-)^kYI<rbXhlL%9T|QeF3A4_8^LriVIvg!@-w=ck!TasX|MlvOC>?nqTrmZ
zI8A)H9_SW6JJ@=6b+5T_aoWZM7b~c^Sj9sdRTqy?vGLf&5}w$2>S7Hw8_!&<<GGC&
z`c5S(CZ?4c9{lI_XITChwwp9R$AiN#J~%7XJ>B333X=wz$W55cer{|AZ@8Gp<MGcC
zm^QA5<TM#Uq_#zv5=aJa21~Ots5KfGV`#*+I5i)K{a#zV-eH*WYW+pZ6sSmEoV2*;
z2!B^{%0@emy4<)h1hS&Nqc4Ge8atw)--u{5EpJ1IIr$lo#Ihw58XbD-8~mQUf_eHA
zOY~6!c`#jfTF2?eX=k(-%D;mBLWdkCXe}Dy9L~_$%@i<+DY{WBVVbnG@t?F8Y3KPR
zYw<Va7=FTJdGQeWmBPisA*>~9#`+P?5ei2reweY2U>{-Z1DRL`W)?P`uM($g1aqBS
z-@ql@!W=x@MA^Vs3F0j2&EOmg8mvb|pU&fgA;)o%>~iMy3w%lb^7Q>*#w_8?ku(cI
x>t7-Ld6L-3{f$ekMBqB+Yb3r-;8{}c(5{n`pE{+v_NRpRr6hlnlAA{B)+hJFwaWki

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/RoundFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/RoundFunction.class
deleted file mode 100644
index 3023e567854791caef128a616d3f609492f7a4fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2410
zcmbtWTXWk)6#mw?RUD<4v}tiEtpfxcr&w(%Zg4`N%>@EZ(#CC?Lb=Gwk}8!YkGx_6
z|Ae>x1b9hXm}$!sGyEc+fU~laShj`<!+2)3TAlNK=f3{quV0=6xCSeallUNy6PO#u
zhxkY>H#lx`%;%BA0>`3;r93ozoX00v&SM0ha(t$qbqy;Vs~l?#xmnw_<s3u0G`Yc$
znfJB?!|}T9iq)Xi6#gBv>Cnk&-Lp(*!}M+S9vx=nL%YLJt6N^nXm+G{WCXrwd%iTp
zZrc}~j_tX|w}ER(wP~61p|S1-?$%OtG{eBfuCM}06jrIeV}55EfwUc?Zg=EN0&X*~
zoh@VDbEVi#6ljqHjxjGBXJ)dC=a}xcvDVxXmQ;LRb7#SnCc|6;e2>{(pe+)Olot<N
zQu+jyCMXq|(CRpgrhvLM(?_NmAkY-MiUh-n{@9QwRyPU^;|Ub;Krswkf$s}fs>m>0
zNYLns92J71W;oNO4KsJs-d+%v-7+2Jd)uSTvt=a`tBmj4`_++@zU27E9iJ`F5y48I
z!?Ot%9~DjEjWncbJz6o_VeN+He~aTb$2xUIw{bWc3_}fj+chQCF~j5jiu`{@BzO?d
zQi4EFQWDEK<C-n9^mM8BYeV|ByG>5#8(!dBV#y9$IM#X<Rkb=saZ1M>+~v5XV*~ee
zY~nsc^<O)>r#0fKW0*avVz(jV>N-Bh7YtXEFf7pyhsb(3U*^45n}){XZgk9WIrOf$
zKUs<$LG7_sY@0p>ND9AbnQqbbWU(oVZs0f-<@*DUFLiu{uXTKbdlbg7mHVn)hlwUb
z)>o5@VLHjWqYOKS>;FM@g@)z6GYrS#lab-#AXKcD7|st$92OG|l>VtjQ$IvFY;%TE
ze*^5#)V>f=sbxC$4^)VBjnGU;Zws1PW2NQZsyrOQ^tC%1<7ImwFc#5<Gc_t^bvvCM
zbm=Z#7Bq-->Gj%O?gfZoBU1(~*KAjAm`*^}YaJmQbkEWDTxogV`hFFR)3tk&u3;bz
zx&UyB*3<N6(38<KTYdueGi_2Bqcs;E7IB95dRG8v@d~{$6mX8DNSWOrupv6zEKltr
zRm-HS*{NqpQ{g?v+*IZnGAX=7ww5d8enaj@lnc3+$klj(?}68}g7!N`euZ{_bm$54
zFACaI4DUg&W(%3IEQuWZiLf)FJrxYo{!MU9Adk0*{cRLcqTeLBP(~F~n8771qJlMC
z3GIGBwizV#D$bK$mF#{E7wF$bkxnntnj^%`$SbuQ$Lpb|n|OnmQsLJL;!2bDZQ?7D
zEqSaGV;NcE1F@tcv`Z1%INl+Q3VoYE>Tfb<h{NEx%yEU|D#yEw;~K|%${zel23{x8
j6sAe(ebi`GIZ+Udp6Su!DgwP3srF<feUOovP-^xcQhJ$o

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/SinFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/SinFunction.class
deleted file mode 100644
index 05bc74e7fb6bb11f6815412bbd69ee96629eee06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1403
zcmbtU+foxj5IsW{HY_W|1W;5^@InZ}ctNlX#e+nif;`0HeX<$C;AWTF%u-nXjGv${
zNcrFg_)(TUyIj_oDoc6DTsqx-&UByNA3wi+2e5)Q2YJjnuyNnP13Yx_2=flgSjeMd
zW6{QAhM{#8D80duD=+LaSes!>GK|$#Am7HFri|W+rcah)J@kaXD<Wm?XGTl!t1iRK
zx)*kMv#aHM9!K&pj5L?Whmq`dRT%KSIPkPNbcEjL4Hayi8LAAnJeFRp3BW7Y55$q+
zu~t5>tFEs0$=ZyS-{PBLpyhF2hYr#A`KI*!>Oz{&7eSlvG!LYw2`}FgTA1t%g<d>j
z<E5DyX8#J#Fyh5gBm-^G7-srJWY|z?4K%}K3Y*m8wQAR-r#iwXYLmZL_`~6OmA89{
zuJ=L8lsg4AVEoNR6KZr_uWVE|2xz#W+JVs2DTYtIRli#DKFqG%GAj@rVme;VHngE5
z6}0IwP9uyXPi`qA(n3aD%SKHuhT*ta!m<tS;t8JGc;=#l=QdVcyud06zpDa<)&G+)
z!`eRtZqopqi=T!pDb1w@7|OlfI2ZAsY8g+4rN>U1Y=tq+=dSQ$st3(<jbSu#P3FK5
zASIS-#$LFz*ODk2fFl#Qv&S$&KA8bZ9jch6uSuT1E<g^XBsjE=(2dj1XdkS61^YsW
z0l2gdCB|u7qqCbjU=(9?BY0dVFBANc_CeZ9mBkYbyt1aO6XZ@|onr7anR7`hhn$e$
z&n4+r(vY)s6pSMM42KfNF_CzeFo_!!Z&QYwn1Y2{^nXgk_}?b~J7gKaG@WK}msUe)
ZiFT7IR~#|~vTvEsyd`(>mV1fU>@OR&bQu5u

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/SqrtFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/SqrtFunction.class
deleted file mode 100644
index b39c4e39564099b07ab17cc777f4c22e3e2bf73e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1407
zcmbtU+foxj5IsW{HY_W*0E!9<UI;-LFDRv<c#yzTkcU{jPc}ms-0b3JmcsI9`~-bL
z$_GEdkFxC94Y0;kS;|A^(&_GVru+2%`1$QSfK{wH$Yb7tje8F6<AH;RSa49pVjd+M
zOEw-c46Lg_=?#WladD5q+6)_#VWg@8`6h1FW%O3meX@*KLr?g7B2wnwF<SaSwHaPk
zy|BgWZ7tvNIFd(Uq`5pfie$U3!hr9`fv3%(CG-KWy^r*E$5Ljn<%#rSO$c7GdMJ(s
zkG1l7Rkd}wN7{O<{083)11(Q_I<$zt&o`y-mlxA~z6hFpw|*!+O?df+(86SA812R*
zHeQ;UVeYTs3`1TVMKaI^jbXM&M1~F3)<82%rLajcUaMwBda5OSqBiw=i9Z~jmwBg)
z=z0&NOubW31ID*5x=^9(dTFD)K|q5w)eMBDRxy0)uKLxI_h5GAmRW&l5z~ocwxKm0
zsh~-ZacW^4d2(ABm5ycAwPNJtVi1mtWvtlXE*|5Fji)Y3cxGeO#dEx%#<WS33~T?X
z;(v?Wp&>ZeKMh(^ol6-o6uTR8uH!!iGm*?omz`wU2xFSjJ>kbx5}NA@!*Jr7jDjIR
zZ!T7hee}{^Nup>5j!oe1KEovWWM(LJC}WPkD0%wA06CDD;LtimH%>dFy}$Go><b<G
z;L<vf7-w*e&Ti^}VT{m?;4wyCCio-m{j?WKOQ-02WldYB$eqDDL;q(o=aN(oIU&KH
zPtvWXA)Ry-jB)xI4h2kLGVv~83fC##rVKYQ4GTBv|CEUFzeWDH$<l`zI?dt^t%lGt
Z?Iu%he83RMzGWfvmfXc#?j~MyzW__}b{zl!

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/StdevpFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/StdevpFunction.class
deleted file mode 100644
index 13df62431d2fdebd8fc8723b52ff03164264fff0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2386
zcmb7GTUQ%Z6#fpmOh|@8DNxc@ZnZUlC8#Zx1hJNYqFhuew$|HZGK7K2rIQ&%e60V#
zwOq?Led?pSmWzw7<>J{le}X^3*FF@#Gf5x`5tlriIcJ}}zx|zk3x7QO^>+X_;fB$T
zJ7IL;4Fz|@@L?u`6lNos!<%w>OUmY@>}|PwM=lF;Sq$DGg8U0(3CmLSuH3yB#`{<a
z;husI6s!sar_8+RObhs8!#w(D3K>J7eZkBdOKvW0*!Q%wMM>vELD#HR%{Jw^BJ?}!
zW=SBqpciuSbjdL`<F0KK3$_zCwu`n=Dw&0Re9g`4j@;xlXFa~+WQ?uiTt$`?P>gLu
zcOClBV+$MFmKJv%(~2*cC8rs1+BL0Ae5R0hjP0fhIljP(&lr}K94_NoT0R?JPHz~x
zBmJe#Y)W%9fu8cUN9!(yhHmCGiz@z%cOQ};$wQ!{kr{FHG6#XdChxDODG<?J+cxr!
z<R#G8#G-~b8Cag%fKzZZ>ibLP4g)0SnI~;4%eCa@cup~a46|#IVo!aBzARR=wAjFX
zs)_TObd`C?r^jcHlPCi=H8P!?W^@{}G}SzeQnhWx(e%wlt>_huf)8273hsNw_dvl%
z0<9}%Hm^A>8-ednBcEAV|G~7$GwZX`M4=`LO^e5$*K%aq6|22nacnc6<#WR;1=rS%
zIa7Abh5AY#lclYq2NzX5#K*+&YQ3TOq{1hRlZsFA86&0QbI>XcT}1|liV>`-$YNcE
zDUTc2RA8ydAumk}DvEfdz*bQLYa&?kx=mp6%s`&ip#r!6hwUO;yxQ9W=jz*;Q{+T2
z?-;h`6l{V1)A)6H61Z|&<0Mh6GEZHWXt`O38tbS!2u=nITPij$2VTfL=FwA4s;5@v
z$FwTzT4{;X#v78XS%2O;)EB|=eDP_SjKElhLqmS6Od7==G`l;PF}F-Pfye*Fety1E
zd8ZLVB{%KZnogdPOu^-tUezp@SRCyf6y;=ivruM<;$q<ofj}&klGpxN%KHH*J+cWP
zPZV}|`SNU19wLLWB|(?h1iGnHZv7gCBnJ6&)$RTC_`s=zi(Gqoj`J({4UFtT{LD=Y
zqFjTXun(8GSIY{xj4M0|JcmAN(OCRVy*A1YM@DzilJNfq-vi$s{E0x+e}I5MA{Y%G
zASm!1F3X)Fa0p*Qi3Xy|E<%aGlcT?+YOBCRFdC5d-9Z9$gm@iJDCZ_aRitn<TtOO@
zy9!by8j(nmgxVX5s=H9T(6*0ueKPdq=uZjP8`?uhg2s*56j6O2=l9Y16W`$X-aU<W
z?uVe@D$e71jN=+6aUD~50keqVK886bMzDiXJjRRo1~>36#_$6J`3tpWyuM~k#?gv?
z3=rorIvD%`MsbH8q%0yMR*9zE4bhiO!6E%!V`Sy-I{o=*eL$aA$?ZITq~`$y$l@#d
zA4QN{*2zHncnE_$#t<Tpeli*0{}<!L>8YR%;U#(~qrFVDS9o^|{%5$P;HH9G3MQUn
z@Q6Oc3T}I{R~1Z_F9j8R)Bv6mCPC8{BndZ#*SN|Wy1}n}fUom{jAU&EP1ID7@3?}d
IJ+0UO0rI6*Jpcdz

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/TanFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/TanFunction.class
deleted file mode 100644
index d7bc733fd2e0186e7389f3e0208cf0247a1e873e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1403
zcmbtU+foxj5IsW{HY_W|a8XoH@InZ}ctNlX#e)Q%f;>RweX<$C;AWTF%u-nXjGv${
zNcrFg_)(TUyIj_oDoc6DTsqx-&UByNA3wi+2e6D)2YJjou<_8rBRqES1al5bn9rkZ
zW5LE#hJiH|D80^*E6vv#tc|cK8AfU<kniGlLq>a|;gh9U3q9f2MWoFA+-T_o)nRyD
z^TIZ7bhLcW<47Kbk>>K`D3YCy3Io0$2c9;Ew$KNBPXt@%h6;l%Pox)X0`N+;Lvbv4
ztd-Aes-r7CvNmGnH~B^wXnE4pp-uFCz9D_TGN0!2MbP3qjYH{a!pk>>7A8AGp&O6b
zcxh&anZJTF40&-B$v_)4hUp#=88%c}1I;jz!X~wNt6Ej*skZQm+Qjb_{%~|r<?Sw_
zYdw%M<xW8j7~i~XLY1y-<@L%s0S)e|Rv<KWis4gt)vuSl2eWIp%nC%Cn2wdQ4c*m|
z3R?6SXE%%^Pi`qA(n3aDOGZsD2I06^#F7o};u)UXc;TXqmo}DNyuu0zUyFcY<^Lqi
zu=)>y+cW?d;-?`?N^_+FhEjJoE=2sNTE>!L>9Uh1n_*1zSr>jx^`M!qG7KlK$s8C0
zq{LFy*b7(oY7#{QaBKp1_8G>>Co@2)Lj^PRHObT01;~Mv1c%lkx^dbW?fvDiU|;Ca
z2bb1?#5jc;baqn*3}b|D1dp5KWr9D_-cS2zdEpd&Z>&k{6uC24XXyV-=3J7>AtxmG
zvq`$;G~_%T1*1qm!(kL-7*D)MF@akYZ&QZbn1qEp^nXgk_}?Y}dt~Xu6rHAVpH@R?
Zk#>_QR~#?|vTvEoyd`(}mIsN~%rD85bNv7S

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/VaraFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/math/VaraFunction.class
deleted file mode 100644
index 6c945ee30515e144093824f9dd49ab529584a0b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2271
zcmbtVT~ixX7=8}<*pMs~C?IJoEp62RmPIYCgow2SG#aQ%McVqc*=)nYX2WcD5qn$z
zfiuo{SH0<t7do8*t22(*-uVyoZ}g)0oJ|5Dr0qE7;_Q3g^S;k{&ij==AOHG0fQ#6O
z<2YvH=);=|uEY_-TM1mnTmo6l%Vk08-j=#|q?D7(yK;FidW8t`7e^k8QneJrH3jc0
z_&^|<u^h{r6$qt9R|LXym7*zdEN?mHl3y;E?sdIjQ`48P7`nZpyO!M7m0@qqstQc!
zjY?T7R6TP;^IdbZ;(D67z3H0Os#S5c+rDFXQYh=*nnnnHp{|(`P|R)9@IBsOr1I<f
zmah4pWovn>>dmx)E%=sQ)aELVXKuGOD3iaf&6&16Gg`y5b*H3VE3BJ_C+{m*rL6Ah
z0)w^VfYengO~WedHci6C;5;Tjl7~P~D>LF4H4XwJ&!j1kFnrfF9Z&KS7;fXy#G4H4
z;M#~+@pRgUtJWO`NaUC$eXGQ^>X*6CGJOoPZ<FHS;rx8H*~rmi3-?T$%bSu_;~}4}
z&F`mB1}rl+J2T7Zv}P&OK8(_|YuVF{jYWMkC>I4EvUC+J2c>si!AAm}%T~$JJr<3?
zy`#uaEvsiRZS&0kT|8k&FOzA1s=2h5J=bzdd~STX;=6{qV99>zZLaePS=cK2F`!}v
z9}^*{^p?_-2CIyciW|7eIH|aWPgH!0&s2PlFI1#JkOB-9MY%O`TR}<18Z7C$&O+H@
za|v92YTTaOj{nVbk=@*AWP$F(y~}}dpvZZqt9un!;Pg>uhms<2>Zrv*Yp|pOb6JnI
z&OF;%G>xu5m?8{IDko=K%-ZKM*vMdD*5Jn+Dr<UmiK8W$hd1f!1e?Pd-ybF+y;u~O
zsB>sZXM;(rI)G*?M~l{$C5P?g6Z~_zdYK(Xh*kZ9=jsM|CW;lG6M03qePVHnb1Kx5
z5ez<=C8{?oUkXH0*{nPcr?R6f7~!AE@!*dk1Xd&lxDIl!@hkX^jO{}FOrZnMag7Gb
zVGL1LYX(T-1a|@_af()S7Jt*Oi@FD6<2&d`hkrxpMraq|bR-#mh=@Qsnv6a~RNy<D
zl#(Lw2SRBj8A&QTh@~U<_x_QlodTDl$%ynHh!UVD#^ZQe>7I@?kmAXB9cf%jb)-Zx
zA(0YkbtslpccAv8>lYj|repW_{*rJ*v0e0}>D+?-6KRKor>4<O`79KiLod!_5-(sH
zFCv4NFwZVr#VA{I40kY&yLcJj-~ztI1iokNWO%-22qw{q=P^u-yXe7bN-FJ>fi58f
zR1cn%&M+4;;tzP|IR;Wn=Xqy{-aqo*5%TKA54?RC5i)SdVU&Sh4OqxKZc!d5lNdSl
zk<Bpw>?epbSVub(WVMDiNwimZHihtGoKWzpg4YyWe1wrb-Vj$X73eN0xLi9FGzifG
qctpq7>Ds|?FqN3$Dof@9zw!a0zFrx{=7O1ODwxoI!DIrfH~s~j?KVaL

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageAvgFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageAvgFunction.class
deleted file mode 100644
index cb9f2e9702ddbaf14560fdce77996420df17e053..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2641
zcmb7GTXWk~5dKbN`}m@?X_}^}Ee(Z06Nf};+NQ+`p^e*sTjv640xefrRvaa=?6Kuc
z;DH&2&hW$!2v5A_wY;P)%rNDtGd%Ju;4d&t!yZYFZ)ypCI6hkKe!JhE-97sK+0VZM
zxCASX9$bs#I%YZ2aY(q4z)j30@GjmHONQeX$L%;`$i^{`1);MjmZd1(=lFnQnIST5
z+NLwZAPo(#GKA8lyuolZYud&_t(Y?^ceI>ElHP1d*Q`~oVv1*97;@IlD#LVEFBR2X
z)iE~JTE!@rDvoMwmn%lKYL;wut!C?v*p#(`p)S#KeXB6%3#S;kv2Exzhn(m`*$r(=
zQ)`ZCsadn?Oa&n4YNnM}(<R$6wgVN4M8Q(ihGk6+dw7;+7u3bvhM_ycU(PJt&>W4S
z-+NuuoON}UgobVwHH%cFQf@<VcB5&vj#?DgO=8C|8xUO+Z!eBKdGdV=M#9p|iwJ>S
zg#;c$PdjslsKD|9y?SU*9r#fZfbdMjbuVcQ=K}Cr^U9FWYn6&&J0g(`X9Fyn5=}g+
z=2vutEW;3XN{&W0{jD|gWw~BA$J@wGCub-VL5Cfj&Q_A1^?W;KK){DZ6VY@pJDR>Z
zua(_erxxS5<2KC-$12B%UUzYP#1LCH3%2G^=`;M;Uc&#;98E>i$!aDjC9UTaz_RIB
z0_#6yYekB*Z>ah0vQshb0`ZP7mueN=m@`G!_qBEFm}m$Y$I#1hSH?YjOge6pwDpkC
z`GjLd#;5p<GAHA6d?7<aj$!hJ)8e@aVYqf!L$B34+f9a!Jcl7;4FwtNFlB6DlZv;j
zZ50?&FLdz2ImU41e;U^(AkCS^(91YRMRQ6tT#ht^UiS`k;<uCn!<kNvMlH~YaS@xQ
z8N;!LC`0qKV31?JrCBv&agF+SDAQabz6RAuh+fcT5j78@?XMS;JG$#ENR_W^)dd>V
z?gev?Ol|j}wfGvNxnMZn#OrMV6d53}lbr-t=&GPANOnq%0nU*0yReCD{Vr%LR6>=s
ze4b&<H)((GXP{k7H)r15GR0*%{v69pJ$vo8IESNjd5fO}It296dYqnA`e*bXPCf+t
zi8fv6qc!3R2XKP+vZsK4oTMj)m!Oaq8MD6-LO02FMxG)nJwn$5X)^Q+q`T5Xgi_&=
z#|Tq}N0i88L>P9E6FbiE1kn^%_-}~q;I_h_AeM?M(LKadF(u|1#g({kloUHMN+p!U
zQ$%+6|5Or>kVwf&SdsT2r^5F`Y<K^U-TfbwuyB4NMBaO%d=K3ZD7cVIXpT4ouhG*W
zeVx2Pq|OteA^NHr#x#;hV+6PGCUxm3HZcYp<EY^RzQzQ;!A0E1WqgN8Hz8#t=$(vH
zI8Eyst!MBu$<p*?bQS}M5>g7UP|jn7zl2xGFBfU@Qz&+W^j7432d`5!UGDBY#Ul~o
z_Y_l-BJIbw6xC^jDJ~G6<l~MW;EwsYgYG$wlh!ICv1jOG92Yny_Q`*O<08i;j>{aA
zzMSI<$5mH40sMng9B=ItHy)r1{7vzt2)heY6!SFRrd8C=DE$i#QtuIw=;q3qYN{OR
LpmJtht#|$f%!$W-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageCountFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageCountFunction.class
deleted file mode 100644
index 8489f8b1039ad675bbd815b80847236467a97606..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2060
zcmbtVNmCO+6#kk_(jgfEqo8p?aScHjS5%0&M3HDvt71{57o7}k935s-lO78_`zN@0
z^QspW50;*+@+VntuO|T$m{Kg~(DVBB>+kKazx;Ur0l-PjrmzV{3P*7)jpI0xCf+Hv
zjB}jkIFka$S#>hOF_}bx;~d8nL!w~2wj?5!8=hm(ir&0n=q=l>xDhN=g@4<uI>gD8
zJ<D|FOy5@f7E_ZC?FPeC+42^QYD0?0M&OIO=SxE@)_u`v*q&=V2wY1lqHflNaf_Cs
z7r1h|#hzr~Vo_LuBsEs9{K$M_8iBMOqii?iWCV6Ku$_6M=($oXMhYyD6OK_7jx#yj
z#B)ryX56ek5|$)=8HbRstXg>4lqSQa2u*EXG%@E%w1uOr>%<^rO$jiZ*)Y~Rgrq`H
z*bIGZV?mL!nqD&uMX2Zu3`5!qd|$XyMS@{4;znDf$oPi+jB>zA3<I6%ep+8ic~m~4
zqtxkHAwNaonO);iA;P4MqA9#h6=_<JXU%$8kR0c!*crMjcFi><l_JB7wFUKmDkJRe
z40?n>TZ|*CQFF}&vUF>%{j?%|+pUp{sfri)mYB9x7Y?lJo-x%fI(pE{aY4sLT;eF|
zxQr_l4IR_Cs$&L}(eXd_Xj^r6=8fUPMlUwoYkgbjxQ6RGhEQfG{2SO>TM~6kjgG(J
z{AJ=Woc^O3>#wiODjFTX$5TlP-;|!uusLLgGp0mCsV0cWpO{V{Za$!-<x1_DZAnmS
zdwydz8$M~TLJq7{LpTXnRM92=&}`hGxff3CyVSI9xaq8()k()|LN>=+rUOvvBQP5J
zB}$A=Z-@F~AfwPrYai_l`ZM~+^KZdk6VZjuv?fC4ATmVjO#y7dR@yQ2V}PXSGCN5B
zB=PQzd`2?%4qdNe<J!nFVhj`UY<w9S!xE+x6=(Q}#6%*S_yoR$UD?D(@Cn|pW%(N<
zm(k5|e_VTs9wm@kLgKl`UjF>huPIbgp@n9RAx-o?+U-X-4w7kykjG(q@p3qeVQPXr
zDj2~WMsWvYq4_iFQ6zu2VLMTI96=U4$U!o@<&vUyVpr(qJ?zFHxutk}u$Q8x6XH-y
zCqmbo7zbJyJIM}4cBr#>_jjZi$Kh}4NzQ#m>MLOl(^(g3W@OnBT2<Uf>967*%cPZi
R?NL9`7WLR_)JH?9v0shLIEMfL

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageFunction.class
deleted file mode 100644
index ccbb72ae343ed6fd66d846fb8e39ca8227b096c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmbV|PfG(a5XIlLyIozY{d4l_O+7RhK}6|A=xI?w={*}`P2DC-HY<KDPl5+OfFDYn
zlnNe20+0E<2{Xg{{CfWYaDs7;F7`4EG7K|}2)zqqO_&n8hevZla_R0hVNe*Wui90q
z{hcf;cE*KMvYJb8B5%wjJer1ZRw%a;WfSz1XuYnT4?@4xUN?<#Ry?#;g;>;bp~Vf$
zY~!30@>|z>rDrBC8U1cfmhxHlk)lU9{pSM0FisJbv<q=vF0~4T$=`<k9GM)T!=Z6D
poFMVzi&!%zv1TAWegnO-(ZLpLYy<n)X6>)*6ghU7h&le+{RVeGXy*U`

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageMaxFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageMaxFunction.class
deleted file mode 100644
index dadd2b7bf8e3f96dd98b92e5192e1d141cd34990..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2826
zcmb7GU2_vv7=BKZ<|Lctt3YuD`TppKun1Tnt);er6x#w85S0%%>5^`{$%f6QQ}xbU
zuDo!D-ZA4vFZ2Ru90W%l9A{wgKlls$1InQFIlC!M(umMZchA22p67ku&$GY%^TW>o
z4q-+^8wNED;dmM+a59Z|a7tZ<B~DAct3hH!!zjiyoWWTQ=kT6}ah#X9kVXO*mH7Q6
zE=hbK@u5JX&nY@Vzd)>`^P)g}$eXYQR*g7Cd#qB(+WvVf>r&D-;^i#&qUAg4xhjkY
zlTKNnZzSgx%xpQZr_G9Qmpnf(?b(uVm&=Y<G_O~Rxj-#SR^B$x@-k}8o~#Oc1*AP|
z=PCh><T^&CtQpI!1deNtIOU+X339gLxD)1(R}AdgrV0hR;F?3W>-Kg=c&=5<n`g39
zb}pd31c_DLKtK%Bc-F}uw*pI`J<=^$!K67zp`CLImP`GZmz`1p2&vUWC0&v{L01I^
zn^3I@LPTnUma0UQdunGCBt?Oy;tEe-bz>L=k_sy#dgO&IEyGVL0?INS&qWaw*wzHE
zKF9*;T*de8VxXcbu(`>Ony3r3&RA}R32m>hnomlLm9w_N!@jP5y5B6_&0|>aS+sk!
z5wi))7e!NSR*VN$ZhF)zh1D+ck;LV&ZLUaMmADploW#chsc|P?v;r2t!0pB&{-5@!
zsf^`b^*0MieR7(3S(A&V9S|>C1u|XNQTuj0@SS3werw}i#n0I%9o6^i8v1pg>H-~W
zu}*^bEOHW8bWFfzbaY%tUdJRHfu85ig#UC}VBkeJMh(5Zk9167nrYGD;+RB1M-iSx
zNyiQNOrwr6*Z_SmXQw_l%7&w(0*_5wDp<1undjm?cL)j`e#y;?<C6&r$5O-8;<#EG
zq{D&jTY<+JwQ@-q4S_Ao&DIr{z^3IIOV!0m6(ZIQMS(R-qG8VHyiLP0oCjyFb0TyM
z*A`t>gH@Mwp3!Vytjq8mSfo!KIcb&0IQ7HRiicOc7(Ue3@v}KE^L7wT%(gl}<+?H$
zcu~m<?DYJ+X_c(pq;1mQf>$h?%BO>7q;Y}g5zjg4lm{uE7T8$r@zC+1Ny{I%Z&d7J
z&hG6btqsd#Rz=VQZ|P_e=&FUO@~%dwA)(}(B5KL<?ei=-qq?zCtCJ_1=9I_0AS8-y
zSi|oH^%sLsP0Q<gKAF4=-dnrAhxnF@7PRx42!-3RfonZdz$-BLB=9OWQj42gOx{;e
z_PF~IlCgVexg#?1?)!+b2U?BR`-lt7;cK;O6?lL|CSfFgft-VDBpyI!q#^GjnMoSS
zXj95aRX3edD{jhYhW2pb4@0|))IDf(NX#$%ZfN(A&ZLd_BWOlC6Q4)B5jWCzq4((P
z^_JU^p>*N9d2}m-E9S7nNZiLt;?d+otXFo4w`z_6Qh~+i7tR^+J9H)<2H<Mw`ffh$
zK?<D=LKlDCIDpr26nim%eYni%x!4bn(it4YXZ$St96h*+!}tP6@FjY23w`(sZ{ZvC
z<3}9BuNcHbezd8;eoEAv(69-waW#W2*v$VlagSmvGp6x=4coDUpK=4Zgq_%hB#}0R
zZzcK6VK@0DR0^u;QL7H>shmD0?=GfDt-8rOMk_y&`xbh&kJ7D_M7Sn#BeeZhv<|#M
zj04m<4K4LIG>L-}hZg7}mv2h+NF0_p5{V^_N`_Vm4*^fHOQQEF+W7J>wEc;emM7Tr
qgiQK~*TQHBM&lT-ssi`&uGq%fR;%#W*59d``iniQzkyKe?SBC)>I6gp

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageMinFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageMinFunction.class
deleted file mode 100644
index d19d516bb212a196012e301b189787d6dbb87fa9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2826
zcmb7GU31h_7=BK7yJwpX0tJc@<olx^LJ+XPwwBrgQfv!YKvX`=Zo@WhHd(US4(gq^
zTzTP)y<^6UUg!nRI0%k9IL^S}fAAOh2b4kUbCNCH-L44TX>#)BJ<t2RpC`Zl^TW>o
z4q{eAJBBn2<5&jAaUz4aaZ+7IBu+`Zqd{U+!x+XjoW>aqXYsCv37nHSpFs*2l=!_g
zE=s&F@qs|9-|?JqKp@fCbwMCG>`&SPD@PsA9<LO0c5u$hxs<ez`gzN}U<HnPt_qXk
zlv5VyAI<wkGgl7n8M6}DB|ivF`$j3S%Vo#+%xe`dAF4&kD%j>3Ud9~nL{-=)AnhA=
zz7o<%zH@ZinzhVI=(y&nQx5x@Am=KMJ82I4UTEKFs!*g0t~qSGZeLf7=UQIDJe`}i
z^C9h}NUY+90%C;5b57xy6<Puvv2M`{r_3P=?YvX8T<RzM+_VZnM6Dhw?ULkix+*Z#
zglbI?Vp5Z|R3)O^Q#<1zDGD@|RCofb8p9xvR#-97!_RGL8Gc$3P?qU<K8~Qk)+TuM
zK^Dm5D?wm;p^B=&rY1XTqAt)nYq=FBw4=UiJ}xa*&YA`f`@09|ezSBpk72!M@$Ruk
z%qA?K7frEQF%eq%nK7#rRlCH85|^U3xh!!-;%eM+5+4b)O*jS53R(ODw;GH1f7+v_
zGM0Na&@3eN$!X$cO)i>tK+>~{WV*Jq_U%L%I9`E%YZHDY$lE6z)%R-~`gO1B0v&6x
zR)Y5&@)DPIOu}Y#bX-G0#}pia-e=B)|8!bl@Od}J4ZXaNbWCH0Y0=^0s6<hR2VbJ3
z<2nMSQAZhUfc_V=Q=c1U!_iTJ&!#OE9Zw+pOuT0fL4iXrxOs7WGC|Q;YM5FaS4)F*
zB(wu7^f{wmS`x-XVDoabb;TvHak<7)b#YQfh&4k|VD*w{gfqHe)3A)@!Rc$92%RIf
zMOW2e)uo-MG&>gSGCBtq=~G8eS><s~{phsf;g$5Fhx$5xI_G7<4&#a0UI(aLR|Z2r
zE_s0+eo!#2l9ivbP5N8(y|Sr%I$*{c=XoCSoRdy@h~gQ64b>ix93P&tf(iS2#rE=c
zUl(buUmmk6f*$%yM~gsrElibnH98FmCEqrpmaM=&$C5Lu8ymH{c%o@edE5^pqS%Vn
z{9aIh2?*7+ysqPu$-CgawflRBZ@Fke2d}9}xDD&M)?)>{41-SsuV4eUxVgpTeFbHY
zdLAO3xQmwCBAe{FhXi||)o8tkq`(}$R;yNl`$%O|M(P*HIk-mZK4exJ@($A3w2_WC
zwHa;IO()fgo3fgrJy`g|(C(n^F0?tM<`;f9w7bY;Ge+_uG$WHu&ZEOf8ksxLd-ZjC
z@)l$yUHEPuJ<8yUIczsl_wW+&Xz~HpDZ9j5IY$7gz>@O|XN}}-I+Kh7a3ykm7oT>c
z4P6XEH-A0YkJoSndoYN-xWwqW*ax4|SscKp{4Dzny|{@(_#B7v1^VzM`tcRs#5Wkg
zk2s27F@y*FXj6gxgs3;6VIyAUY8IQZiT@em9>Er7Oym73wqZLz<pyyPJFpXJBCU_!
zO7fY*F7ivM6jalrR-M#SIekRl-As{M^^kXhR(>M)&Gc$7rCTV8aZTdJX#1*Yop_xX
z`>AybTHD{yBo0U%T%e0wz9G>oaY*8DES5MT8CoSg2t2_~iM}Uj=gYs){wG>m9%J`o
pGU+E?3!@<zjibD(3f#lHVw-4RrNUoZe<y3|FY&bg1|zMv{ss991U>)&

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageNumberFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageNumberFunction.class
deleted file mode 100644
index 429b3448b4e1fe6b3bf7453fd357fbfe7b7aaf30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1454
zcmbtU%Tg0T6g^D>1H%A<5L7TBDiR{0eV{IaxIn2&RS?Tq>^qYt4oqfJlOBwp;9vL&
zx<Si@OBQ~V<?We(Aw(&QEc$leoO|wje*XIY1Hc-dm>5RZ#4X%5aR-Yg?qbPA4vWKB
zHjp=Pk6~!t@f@|mkjO3XG9)+snq-(LJDz+MHmWjsE2=JOrpmr8++7hk`rT0`)jOxf
z@VspM4PI?2dBDR!HvK?x*=`21)pC4~?}eVN^rb24lE0=SX5Q-PiwuTrOFLBL$Ig}a
z#i8J#a$H_^TB_KGyc#-gjc@v%lI^~L24&&$P3gMD<(SVEUY+k$_oc1K-*8PRq1hR(
z^!lS{?3kG$d!ciNQ9BF*=_&1vA>GHKD;kE>*+PD3o)mMtCy@0%OkGutNp&9l<!P;7
z&~rV%QQV*$$0|zL2iv0AY1T-^se3|EgBU*bR{3(y`b2u^79~B=ph%~4-3_d$!13yo
zoLTY1z?NH%p3T|wGqtLR$ifIr11lB^ST(>c+{Xh04=p^xnt{hO?s_B{o?U8w8J_;9
z{mJAr%%8XXGcB~8b*bL??-?>whQC1xKoyz$$KMPV5$P(GyqauB%U)ubj5aOWj1sL<
zT?RD!hr$iz&K?bFuGC%n4uU*o&U-r3ZDe84mq-5+V7do%j?#;hWF!akU%|f6WdIhP
zLy>YGV|2G-0LC#vFWOE_5=t9?q*sz;x^Rq{!Vw0JF|NfC65o*gymEv=EeVl~SjWjZ
zkRjUzr05%{+4C_&hn=`Eg{zUrG^Q~_p0qB7S+c!G_c$7jx=yGYq@jdTn4`-8=1Fyv
c;BjsRk~+7<)R2y$JF}&(%o3-WWg^tVZ!43E*Z=?k

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageRowsFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageRowsFunction.class
deleted file mode 100644
index a41a6a2b9b0630a071f84d3272904391ffbbc0ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1565
zcmbtUSyR(c6#gzv8=8il;sVOzLO~!d2x?1prpiobia6HcJxwn)kS3kv2CKis@yVZ{
zFStDT1N=>n<GD@2QmT$a9_~5!<ecy9_xsPU-vF%Qk%lC$YPg2$8s?GFuz<xBZeU5n
zGFJLwsJN-(7DFOuySB(P#4-yz3`)VPa)zOj?eeE#y~6z$X2l`NXvwooXUFtyd2b69
z@zM?$HcFOPH!6YP`$p*VhUW`|Hyb_=0^4(q-O#m!WEy6T8_(!??!5{&+tMt9%A4E@
z1$nVDr9Jb&G(urJM#&CDwg+@2w4JI^@La*0Jr(MdgJTr9<75{iJjZlv#&%_oTY~)c
zS509`bcW$>e-w=sAv4VW(>X)R3VoluLV9Dk+{2<H8iu5-LD8-9CIc%nOq?w1>&8)O
zx4Ht$^+4{ZapXkiWjr~q{A0T27W3IW<vdUprnSFiHrlOAmhGBr3ThX_`|hfr%~_8~
z&)hP_HR}}Vc&4+VW#QXyjgr&KUg%qV)0UH(?w+s}IZ`?_q*UD2aR;j^?&?^>x{7-`
z?&E=qtd5+#Z|KP5Aw#_3(~L4?&oJ2x>;Gwev=a<dr!9Za5p8Xa3tA$EX)4H{R7rtq
zGx?X_3_1bHdbLNA9swH4>C+}B8c44JnH8eJKdLsvSf<$S&hPbQ7(BVq^uz@A8*0-?
zOWs<{B5iVw`?PuorW5k*UD}IdtWJ$AX3<YCoBU#+z9U7aPB()nBN|`)1on}bJ`B*A
zXbGn<NW2~?U<ku>qW~~UTGIF}(KykW<wNuxBDSWam3K%eYsykuIfU{BafZ)Gd>|dA
zg*!;@NuNTQC7ihy{%VBL#+QG`Fiw6Xm&OG7klZ<(C)*^^3%E#VlO&BIlloJne~Ba%
p_YaKFdqR94rb#+Oo}yHjiAvPis44^MOmw~@(b#dKb1khazW{V)qwN3y

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageSumFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageSumFunction.class
deleted file mode 100644
index d5f2f938d41e0a59db4203a825742a82d1175993..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2843
zcmb7GZF3V<6n<`#=5992TfyRr@+M$kpo>u6(pqW@Xtfk1Pz43uY?pM~BpZ?qqBDGT
z#u-2Qr5|+s#wTZRhT%m=2ZtG);Xn8b{0EF$pS!!INg5FHVRP@<bDndabI&<<AN~9D
zZvY1IxsDAO(=m=?632BUa3X_u@NNbZcuzgvmzb0|sUwXk9j9<w#|Jp0BZsp}`<%pd
z1{yw8;*T_(m$)GDu|R6rD|^9+K%%F2S|B;@&$t3>CcUydRWIe;>RCHqq@-)ockJS{
zUG>yH7AAvPuO=`&>G&lpUkluMt6p_0el@V%Yn7^7t9gFex?C?ifm&4Tf@_`TBUdk-
zh=oG}(!J(7^?**Cp2<1;s%_N+uV_trwP2_Xa=z{rXRL9*9JtroDwIf}XpOtY;!tmd
zSG3Co>r{Tubpqut?-h>Ofi2J-y)N0otTjfV>v$!*NR@=2pHrN}Xqv6HBI7zvb^>E<
zqHEwC#W6!qv2VplSw?wLA<$J);R&p5WiFs8tSHdK&+TaizNP|Do=Mz^k|waN4PJ9z
z1u{;(T6N2TN~FN%HWm$u7U&H8z@}n%bD?}uSt^$GEewbIMo7Qi3AfK-GqcG0WGiNy
zD4!QiMYAdw*v|Y(yAl>SJ5Az~uv0EdT$1=SYBGt>1kyRLP__fsyTA{vb^AXZ(NGyH
zS&g(yN%P^fVcBpNZHqoxwo8n3Lr>$|Tu}AO1@hK&e!c3rCp^{a8(La)Ky`tEm(VT2
z|2!P(gq_jSI7(+m;-Uc;mzg;O1<V@oz+O7|%n|X_gb0j2uVK{RD|^hqJc>Lr10@`l
zC>!umk+@=@ikg7{bxyDsbJBch%E6q0tEjM>E46w_Ap1<bXAVSxLoaB&G)g(JmZ#@L
z;8yLx=agE#ER4p$mX-KT<t6ayN{!|E;;af08^)r*x@FM>2Xn!tV|mps*4<N=ITLy&
z8p|%$P{WTec<X51lW4n_3N*X}mRL|#&f2vpPW<qux<J!%xM?ov<r!aagJ^ViH36y&
z5KIgFsP+YR_|<}CS8Qk2wMe_<mur@yw%>|0&hakd9Vflo7{&7fo8o2<`H#=q)tq~!
z?v@>QsFz`FT$#EU!3g~2J4T?d5hjj1PEt!-G2VndGb1n%o3y@vs+sQ9ru-m`8{4p+
zpAhPofKbiM=SJ=<{tNzh_T7Q_iHi=r%x5YTZimUW5h>smY~qgPf!C--<BmN9Gbnq|
z{|B_hU3A?11&Q;CJ4j}e{rAwxPUti{?;$0yfbZ2x3fza5O_{0RkzT;GnYxd3R+{oQ
z^sHuTkx|-A$42|qibh%8)E_SXW$L$)xeH?fsT+%bn)+R=%4W=@nYoSC+2oDIM>jC2
zpw}#5x0$+!wX`JoLu^(aXt{0y>rJW5G@5C#*(Ec1lQfbc^)q3fc5(LxzovSbw?4dy
zejLGWjA9Qzy9VGeZ#C>?)9=G|?8jI9M*A8E@GTDFI~>A~IE-7g_!YzC`&O97FPW<A
zMBI!m$PnRmY~`uw#GJr(?j(`Numd~!opvkM(}=b;)RT<i8|-3CDV6Z}Fx0At7U~2a
zFxEaEj9T?G)&wKJ$#}Pr$pEEWDTzE-^bn!#jnR6z7vut5fR_FT>m>F|3@(zEE^$EO
zpu{1G!;x6xh-6-sa1i(#J0*q|(FNI7m38tMdml5hVd8f%8v-LZ%BQNoJ^WYEC%U@S
T5j0lcSVQ$Co>bpxsP*=L^d<#&

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageTotalFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/page/PageTotalFunction.class
deleted file mode 100644
index 3a4056de6393e3bec3855dc8269e09e3ba36b293..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1273
zcmbtT%Wl&^6g?9sv74r}4JEuv(^4KuD0qX!B2hMhN|6FZO4a??nVKn%9XaDF{0*M~
z8$c}h06q$F$4)CZjf7CVnETMVPoMky&(B`~UgDsHB6dosVYh@mJhZTH;*p8R48^t#
zr0Osj^~MQ9z8ek&!+Ku^;$1v)M0Cs@pFEX*=yLyrM^f7}XI_1f6NXOT4M(;!QR1T=
zM`9dC$`;dcBqkFX2KH$jxJoNy?g{%nJ;$Nq{^88sVlc&2xUr%#ZoPlT&$%5d>Dzrd
zQLP2Joml!qyBh{dOcw%1G=y(=h3~f-X+EC^o_*w;30F})YseMX*%>zG>rppunweqm
zpT!wg-8hOwpma5codpq@ZWyXp_xNdivCFq}jkFhJ$}BZas^_rZT(0^xneAq$)u9<z
z2GR?-qW{70d48+QC123l(!V4h@DX*oRnPvgfr@0{(J-Y!7)P!+l$wgwYZQ8+Ia7uS
z%fyp1o}zA|QAQKb7z&zoMAG&$9A$X*pWzqmW~g0{ys|BZHBYGIB=lg^DxG4FVKX^|
zgt$Fox+fx{<~jFcadb*csQ0p)nju<r-37XJ{TU!UEP7YSvPm+Mh30p#ucYKqqPLhh
zx3NlkIR%hhBa7h%)(NG99kTKyt%GmK{eba>bR!dAOX8a;W)@FqY+y6VX`zCfluP@z
waEoHAq^I>X>NcV7kSB+`q}{`PdUf6BBz4n9C9g|nTi(yKY+SayouD541!`be^8f$<

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/IndexOfFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/IndexOfFunction.class
deleted file mode 100644
index 1dc0a804bcc53ba42f19144b71ec461cb4da2f3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3269
zcmbtWTXPd-7=E@neCc*M)s`BLiy*cMC0eCGQVLR9skBsSsUm`I(rvmW*^QeG7CfJr
zamG8YyyL=4FYqP>nNhrQ#{c5I&Ukvh-Ly^8ARV2iyWf8Me$V^9&wJWm{`&q0059N{
zik&#8Vh1KVFp2Z>G9~bez^f{vxF9esFr%U!=VG`h@3T_)wHRKP50_NL@P>-Za<v0*
zs<?uyD&E4|Dhy;*<S-Y5DMjaF$O|k8SPG&;mTh^%3PQbovkJl^&YY=W%Y<c{=PSjm
z>CPD00(UwmoSadZHC#(R*EYl6f>l;9JdtyXschLZuca!kS#n%2WiFLmvs|_uJ2hXi
zbDmt3J=e1Hsd0PGT$-96t8Hf#2y@BIRXnQ6^-e4r*Ns%gvkIvRtL$Z3U}q~<VJ<b|
z*q*u6QlLmD3aJsZP{{NJcm;!sr?QJ?&Xf9_?BW^2GahSt05nI@+Tqbvx8!+3g$O0t
z@vUyu5|bPRYL2z=qK=_DHR}|_q;|=Kg00Qm(34!if`WZ5R5TK$pd(jtUDNg?GYa;!
zI8nzOlR@&^=-jj)Li(+GhMPCN8DAn&<`X5AaRu8O6Xix}C0SZUaw8lJC5EYQvdQ<M
z7RGNBP2z2u_Ke)MNu%VavR@600@nlz0>z-}1Z)NE(^lR#Jf^jRJI%@Y|BPtiL1VyL
z2-L-=WoD~B0)3O=$n>^A*a%6PJ_d65zn+!>lK^4cD3Z0V-g-;d5@_0~xH)solHH}N
zsV5wk<)mR3c584@5?Ivm4qOdo(67ONZ8wiBCIv$qJs5O~##+=+!F2@#tuS(C$?tF%
z{N^{}6ie)8qf51I1wCu+At2ziY+<I$I$CLi`ehC8VoAeGIICdS6}@D*<j*r*J!jau
z?Ra|D)a^>4a9G0)oR#d{WQuAygHh(JhWGHkzy}&W#76=jYxo483Vf#Fb5PIzE4p8#
zddVqU(pFve72PW9mVMnQSaW(>mj-;no?^)c?aV)pugCOt=3gtS9yt~QVpix-u(@#%
zDA>CmuAyGY+Ioq#f?@w`jzYs$5OX%kS_#QnrQkqw%{NSx)oc!zt((ka4pAn4h>cM}
zckg(8;s@~TJc4h7snA#%s{&D@R5I;31^qSM{#dE0s)uYyB_hW>C)kq8>n765QO@@u
zwo{Dl_7)Q3()w*{ERA!*=4F-&rbxvMjx~5ylc4gR_1s_N5a;KC<~gUW{24Q66%CG^
zM7`pg(>1S(hPRMflO<}GZ%orZJ+*9aR+`jAQX^a)Z?$^MU?0DYcJg}*2!jcO-MsGM
zQ;K(m_ef$H%6D9}VK1*ye{(N%uC+jb5Kr-mC4~c&;$h`3!P>cZJCUrSEge?Uk>q`Z
z*aE-7Ofq~Q;Wj)(Bpr=Me?s(YoQg*uBAOO)QH4my;<2A`@Bw0%9-#fwGStqFDzrou
zn|SNo%u5wpma+B6c&v(T=}2fW8lXq-peGqwMHh*<SVreyG#-vex}#M*aSvU0X;#>G
zWf)ty-VZ^uRXmL@9Hd*%pqGCs^kEPQWRS#F^uxrnSio~|F~D~6JZ|BLPeBPClpW;h
zgTxu+TAq*b-6#<fr0YXI$(4|F)TolHBo6uX-6r~B(kAy()DoiPSJX5>D^+|+T?2?v
zcamSkM~F8_Nu5%GhNG(*j@C3Jag4afDV0R%ZyMh&kQT@Y3<;bN81{cB1x^XP2>gcV
zAJ7$?=7Bbh@Soi?h$4Qa31RN%lYWqfl8n*hAx7wY|Hk6ee-GVNZ2$IAq3mHOnIKQr
z!bw#@WcK*J9OpI7B+FnMhR}@@^z0-~(Q2KN3Ce2ZL^9t-iGcZ#G<TKdyw5!6BX@&j
zl{-gk{A@<spEwo}@jG<|6pZmLCl0T&3i^3hcn@{PW#ZJ=z?g4F02^AZfpK5z<$nOV
C^l(f7

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/LengthFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/LengthFunction.class
deleted file mode 100644
index 38dc288bd570cb3c0af18a78e72dbb1ddc33071c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1355
zcmbtU(Q?v26g>-pK#H2uTCLVvw6;KPS7-Vp$P3yTX3#$1^gV<vO$`YXHXZyMKS5ur
z<AWdIM>*b2C<cZZ$KfS+_vY@s=bn3ZfBpXP6TmTE8qiTPki`=NPqAy@8TNA6*HP9{
zVaV1U&yfv=bh&cIpf&xTV7SwEJn=ppbVcyN>bm49wtd@j&#b^v`-xMN7tV;`b=&p_
zygQQOBM$>H^aIJoco>M$$niaX9(uM^i;)Z*ug}}U>&uIiiMPg}i?OgnNmcA}`_j6y
zcqkp0x1Eu!ElAxB9k<7uz9+?aVZeZTaCuX>ZmkmMb1kZS+PxIEq<XoYB`uYm!JMy0
zXzVyML+PKz8CL8t2!tn9HHPg4ClY9gUxit*8MPU~>O`y%tc_WUKMikaem4iQzMx8i
z@3^4qk-wcz;SFu;)kdvBh4LMz?^%*Y#qfEa@#T^)K(_R_G|w6k()Dt3m{Zn_jvofL
zIB}Fp*JibKq*yK>hkOB59O!snz&;Lj92LOvg4FLuT4bm#q2T{L9Yep-KS?NJDE2b!
z&JScp!_&6Sc>zT?xW%yg_eYCvNM8gb=_|_(#pyX|tlUbnIEkpCL=S{c4+fA1T@d8y
zYtW99Wn?qeZ(v_(k-`dnvypQP1zH#40NlcD+R@tqlcLn&G1&}RvwCoi)GKXMyGHsu
zv@hgKM|lj20Cv<973DgP<0rZ3Bvw(3@|#%0dK7KqE;i`AP9X2$J~V7nju?fCe?ajM
k$&<nstsY^Uz6#ADS=CCqm{9<djqD{FNlzPj97XN?0UCO1vj6}9

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/LowerFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/LowerFunction.class
deleted file mode 100644
index 7aff53a43c87073d8f40e8171b67813fbd77c3f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmbtT!EVz)5Pcgvaq1>Cgi<K9rGZkCRIrzxnkbh*PX-P}y*tiQwm5cVuOa*mp8%I4
zao_{^D8%eKjnXJm1-*E7$1`u<yqW#|=jSf~hd6Li!mf)V8ZI8=Nf~<%o;uiPD0O8d
zRgb}HwoV!BemoQmYo3h6n`|@?$vb}#lBe#)fghgwiPZP0(^em3%Fy+Kc*F;(5+8Y%
zh;f`KE+*qdq^XP}{yvKWr4Ok}WOT;8__Iikr_K(8BPJrq6cq`Y-nswD=b4fr_hhO%
zOOOYd42QfQM@meV28^hMkoQFxc3L@J=u_FZgL4rms#hNR%Gc-&wZ(eGCdiQ)8rK$Q
zSPily5s}i>7<QIq%&{SPHD@iRY17a;F`^KyjjIZO8DFaWdV%CMa_0qgkNnka2ruc{
zZTC7oDztJU&mv#Zq!_*~Dt<HYCH>!cTz2G-i0OKBewZ`W+><y<0&y&-OFFk&FSN)N
zI4D=}3{3~E3fkCaD293i8IJycZ5cZMl$`UuTzc9YBTMdO*jt>!mBpR)T3g&2!cnn#
zPJKTWXwU;M(Srvp&?2Ku-xa!XvW#r8{R8Yf9SU&iTQbfqtkSuX2av7Ojo}v7C`u=1
zWQ%00?Sl&xj_ghQ0@gQjSO&zU-@q<aYZ#!zJa`I3X{h100k5KtJ0`k{b=;+VhbU~|
w9&FqvjGTgw-=z2l<SF1Gowl$|UrpsXS>1<Kw>5$JF81fTux4HCn5aj80rFm300000

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/ReplaceFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/ReplaceFunction.class
deleted file mode 100644
index 2f23effe8764759a300f51e17145a8fd92a74999..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3153
zcmbtWU2_vv7=BKZbkl8Uq4E{QvU~_7p^2hENlOJvD`;AjLKUIvX0wzn+ugX?Fx6}C
z`~i+vaLbK@H|-!ZidW9~Q~U>9`0<?GZJMN8+ku&6KhAkSpZ9s+vw!~c%dY_5!vhsr
zT<OJCe5l|f1!WaUTuEbE-e*+o$F(#*mM@>ENZ`6$nU&%<6x>uWr=lO9rtz7ITT)^_
zK38!YchZ=bI$xymrGl>%=mOnimSg$j0*Rp$a{|c;w`vOXmo3MfX)IMt?}lEnxiV08
z4c(s8Jxjhvi%I{URTmg98}3rEQuodK#fE3rT+c6>%Qere*Dcp6-fcLBFCXf@XE_VS
z>t@Z?4Rb159u-i`Wz%T*bYl#a7xf2vvEf^Gv24}-(HPs6hGkca6RzW%%drAWOu{Zs
zn6^E7BD81gbbPI{Xd1rs=T;Uk>ps)pBJ|Kum7<aIWHT+PPg4n+lIR3cw|hxTJ(+{R
z&d#hDgAv9raA?aE1$vE!=b4T#a}pSg(P+t;Wt7OYhcz33&xloD_ZCe5Mj+A4a>-(Z
zZ)sVz5SWn|7cDhy0cHavd)uk<O>K=X(;X;`y`+z^-1z7?Gl}EIc4CzJ0y}1X-MBxk
z*8(yJ{ZLV0D5xqh!!}ZISD<IsT5xoq#1?qeNzYeHAtwJ<=C&GGU~V1>P#%hLu^ouo
z`ld;pYcFd~BHr4GO^ZoKUm~u%hhlftS-0VFQdn{V?e3Tx1=(^LypA^%R5Dn=J%Lkk
zgUB#z!T6y*C)0$xRO6_bT#l9n_O17B7}q5^Urdj!vNof%+Zk9`%-}L61@_Ntj%ijk
z|DI=>T21$ugKv8ELI(FSDMPX|Sb~#*i<-chxS*QTannu`7~8I5IM~`7F@vwc6b{U<
z2dEjkqdBgxRZPuk*mi;Z&fp?0k?<MRLBbrF*XoiwTFtFn5;aW@G0m!Lmh(Wjt*Tbi
zBoqw}uxNB_73UV?pKbiVX?CiIC0Z+tKwtZLA#iY`xwfVvCL1NzrzeMXCm-6DLaaGr
z>(;kqC6CRkJVo_d&2*{)!_j~UPJ)Q#8>t-;j6*2xyP=f8o;Xz=$-PlS%d=D9Xy*iq
z@2dnSyfk^W)p-~?y(-)d$9#L^H3ihDwio4TGZGV6%XznHmUPqxM`XP<qEL4Y4jkf_
zN|ql$;75v(oz3e3z7=^Fyr*)j5I^&w3vcq;9V`xFkk6S=00*J*jfW}@Q;N#sCmK_^
z_Bj6(T`bi@9D9but!GHyT19H0dj(2v1!>*}dU#oZx{BW4a`_cxN=Z>liBfky`4l_4
z@Em<5C9C|7{vUB6t2{@4DV?R_&Qedd=a0?J?pimSrHg@5DxX?6n9C}wc&*f(O=eSB
zMzi|~gG~krme9xN!wmljhVd3Z43D9N<Cww_W^e*Gk;5J2q2naJLjm98ZTx_D@DQg0
zQ0`LmCeBd%DAJTH(#A3LNH8Lx<kN9lljuIC#T-GCPkCBQ&|iao3ykJ0JZcw^qJNiO
z3Iu-&27R4^f_JI2H_|*#EfMXV=H40Z<&hZv7jsY*oK-NQ;GBYzg3-0#n1b^P#(@_!
z`#u%AaDjhLCSD~0{$dD8-mCcl{BwC?KYfzO&kS!5_hG{RWV5pGVSQNcy;14uCxm~H
z;e!b<YVvCYyKoMB2*3!&aGv2x-sLEpAq*1YE=rsXAWq0wn-Et6m_z_m$Wys;nlMRl
v`q1^a#6%+Sg4V+PC%DVQhF6*YFz>QNiGh8R9j)}AXrX_iN&l%p>Vy9Pu-I8H

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/StringFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/StringFunction.class
deleted file mode 100644
index 41a683a039f2ce1eaa07bb6d6308f2fd25fd15e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2497
zcmbtWO;;Ob6n@@hk_jQC6$&<5>og)wpve?UDUuLdzA7~VDM+O)>Li)sK$yvyOgz<v
zE7xvZ)s0KHx(TNrN9zX9@pRXXKf=9w{Jif>J_&HB-Q@kc_qose-sj%Q&;LC59>6Ga
ze)J*Li8pas#1#=!eh5hUFwMsqKYB6i!yI2+^}~&~xaGWvYa-tEBZ#yQ86Orn$W;-G
ze)QlS5lbSji&$pxCN*8NQVi}$bd^DvHu5UNv9zYE3+3&sYOW~R0_}9Cjhs?gRZNYq
ztDA!Lkyc`uOy`VkIa{*SExBx}MZ>gY^={ErOC`<F<vV3PXYonNGBtfeUbct1>TZIe
zGh5aQd1srUKa$>5K33$ir4{6~R<aUNXQQChoyo~ppraYZQW&NVkH1Y<D#&><l^3&{
zYR=-IvvqzPgYX27$8daaaC#XdyU8EGW@VFbV8}_NBZouk89B7Y_i=)p8Rdjtu3Vr=
zb4=%XI8koMFn;8KZK3*FbNNZJmd~C&mro9+C}3vq?*EL;(Kue>Is6&AmMtZ>l~Ibe
z25lv;h<Mi#yshd*hK^-zLsu*kBZIP6Ps!(qpW0uH{$-<V=F~Zjmr75oz~fvu0h~lg
z#7Y3GxWO>8U%}+mqFpA}?FyPUwu@y;oxNM#W_Yn7KqtZ!FB{cl@Yjk-x)s2CSPS4L
zZZU+{C0$kXk|J@*NX8whWS5>)R7_=CwNx`6z-^GvNvsF(K0aU=+mBhjl$%PaRaFd^
zkLq|(4F>QbNZ0M8b-NEWk!Cox-dIXGMVEBLlCr9#mkWhBL-N_Uv|fet$dXDA#W=jD
zQ5$LG%DFE?{Ahr+R5Ao@jCvbv0d)jG&7h=xN|K}IJx_f@DHc^d&k(ChzPV$zH_@tm
zcuUbq4h$zE?M8I!vy57}-u-~-v*F%Qsa^F(=9>W;U6M{`?55RSi%`E6;kSmZdI@Lf
z!`25<J$(dSG*bQ0?@P3jX=F5d26w=|vyWe<U$4D+8mDL;a18JYPSZ-jtB?qUoLx6)
zB?2ruw2Q#deYhCD!oWkg*B(Mx+kvOsTY)%Ofscmn4*IFUzk|*nSZ2t59|0F0qiZ4d
zBZBwvS?n=_6GBL+;MjyG<k>|q<gp=zuMfsN-oOlb9LNc8$otd59xpU`5WDWoH`pQu
zJ@;^h81y&{PH+ZC1o1c^2VT30;<<0_2jmZYlkx$2$S$10dAx=Z^kWjQV+I4bhO<~g
z1PY?~97Fg5=kO(Bs8F^Zk@YTy@q|2{;sSo5KQ(`1j4@nd0>;@{OxQ`gjSj*w2|Y|n
zTEZ5^=!b`};uK|o68r=gDNck=pH}xgJeAcn^I4QUsJ-Gh3=#_$@%xpS#OQxf+~)4C
z;>v{U*q<kR$7-0YM#yRu9bMsniL_V51rehnE{Yfvaf#+Y_%95L82=r<zmX8}2F?F~
QFHCpfI!zE-(w<HJ2QrhaApigX

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/SubstringFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/SubstringFunction.class
deleted file mode 100644
index d9c500a8af4cbf1a085747b884c29b232dd8c1e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2986
zcmbtWU3b(}6y0~eGM$F6N~uMGAPCbbB~qY3TPwD-T5SO-6cG?JnJ`VsBx5Fn#ed=(
z4?g;!FH@1V6rWtn|KbnuL6-X_={PfuuBxl6H+RlG_ndvs+2<s`zWm`w0O#<efP<JX
zU>FMpyodMuv4{`k@}YtyDPET1s|v0a(1+^^K2mU_02T9jtjOn0sdOukRr%v~0sZ*6
zfIIl4fV;St$9*aOG>-=gK2u-_<fd)c4rT<>#gSEk%$!%T1okZ1u64CpD_j0eqwG*J
zu;iJBvugOZ{2dE3!J6F=xV&U~HND&jtVep&x9XlB=+;Kvw;B!GbM=Q!*9_#Q5%{)S
z)mNHSmAi%bU`jx-HY~Fl(2-eOS~ngWdNZ&ceaUVFQwi3~P1~vHbDkSm8;J@vhT-UQ
zmg7u~MD`qmuCJBXEi<6Myu^3K2$+G33HCeCN0us7)#uwW$(z!O6ibW(dwWqcCNsh(
za5TY1cL)OgX4CgAH;|YG4kz5`h>3-gk;}4#$qIv836n}#*+yXaJQRy8tL0V%4s=)V
zNqwt=Ny*(w@YAIkI$G`tdO891POV9MyH*0je6(!TLw+eJ3-qnnRo4heD}krI)cAk?
z62NvBB|)L12Fbh%EnN556;s88`#Z_T)ClXQc;)qopEEl)6R~?6OVc#f&6KzeI7Jkg
z0yF;=sbql!n{kaA>$AVunUgjh3oBmJH?0L*&XEJ#y8pCfu!`64x{3-cR$awIR28hL
zuu)a9jz<C$|2Sg)wn<f7#3dCEz@D1ksfnaKs;I#g7*DccTJ><g-3UkDoL8%JlFe_#
zVu7LF9-Wor%kl*ZTO&}rtHMKF#k-glICfuaSezaet#0^CZD9GDX}Fr}1zOqC+@|B4
zR`EGzW!iiN4HW^J3LdNY0#$)S_qDp$uq7x>jwsD;Xtw*<aO{dUsYy>8?5xJt93}&j
z!rJ)&C)xj<fv)k-;n|y@E>TntPROvgB3cO??;QqRgT76^oMXAwU@d&Vk*T{wPwjUL
zsoSu>BrVfbivx48xY)_yxJ^jf;$qi9+q%MQQI~dezkM@j)a&5{9*g02PU=oyk;#}C
z^3@V}TagYXUFExaXnW3Y@ukVpqXyorUA<zNcFiF1OPvN{XtD2_5v=Kd>C*B3Fhf0Z
z;<4Re)o_~3RaYq8<~pL=3I#{`L2{5EH$VnLwmH{B{H60L_{^3zA->}#g~MEPq3{Tf
zaIZ!R&}anQzky@a;$=}p8hOfYmquGiO=i*)+2KqJ>51IvGh|rSuQ4>5d4_BXFOZv5
zO2f(~l!<I~ntRIA?6%X~aAq(&m}?>bElp=aI4Ag-1-eym9Q*Jl@t?p+{^=OOC6q9a
zQ7mIDgnN&=Ckg8~^%S0L?FcgtLGI*z8TV}zX(JWxO0<&Zo$EM7TNxB+^E7>A>2m>Z
zahJmxYHHMqJdC$J$X#UjEbX4-z8|TV&=s5);t(b%NZ|tiISHfe;WxU-P+lGV8GT=2
zdh`YQmQS@%xH|R=PCQ5do##;RY+~2I?iTixTG-3Sz&<W53~b_+pT@q&{uTzm`8(AE
zRApg?Vs*NTvUxbfdWP#bi+h&Qox>o`6WRq_COld65_MI|Cox61`xyH)-e%l{+s<M&
z%&`b_5|Kno#^d;RBlQO^Dwt95&hPXUrQkA8IbFF*_Koo=tB@XeRTjIGdovx}OUEt+
J=0dG2e*#ncCY1mH

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/TrimFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/TrimFunction.class
deleted file mode 100644
index c0a11fc47b62efed7fc5b2baab1f391aca65e75d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1270
zcmbtTO_S0<5Pd@eVYA?}xUR157s@JN>0I`rP+ZVGp&r=UdkEt?Ye=YMV&T8>C+KCZ
z^575fM_KkHEET9+)XVftr~CEm*PUO#fBXb+ijIvEj%^gtu<;O&%4k|RvGACo)RVqc
zeFme|zF;s1!9*}@4W%#M#?!F~&z-SHp87Cw9q+;krG77*rurZwhVIY}rhFVJ@sY=&
zm<6HYVm=E+6v@En?_=Lp`Vy&7`j`AXl+&|?ughSGxo~4eHQd(l%K7B*SV@l$Wu)?e
z$FcM#d=U6b%yR>#)Pctb!t=WA6wh<0>bvoka23@nPaNfFbcWh`J!0dg$PA5~u2zdP
zY`Sq63Sa4J42L-x88)P@=B%|$+DvGT5>1HK?yA6_XE!3hStHrYsghAUEvS3sua`4;
zMbBQR-|bVOjgh?c9Yup;__D6}|AFT)TU9J4AR|!jxJ=)f64RYl_UlqLdlbZ>E6$|e
z(e3PJJ=YpnV4+;W6SOR}D`?_C4}tcN;l)4iEG_(B<)&nBHlCIy(IoXUG}lM4vbD=b
zYwIh62K~+@`n>@Iw6`eJxj`>ZmXR%XzJq<EO93{WrNp_9O}bao0J2qjG2FryMd{?2
zY>{lW^Yj{pm*$>%4dW|0j0D7{&%hB?J5GR3)8GXVrJ;uH1iXqmZYR-I?BEXNTSQ?O
wcVXflVWbpv{2s;MCr<$n=(djoIyIGNWOW}#-P8oKU7TdPFqT~$CQ(O!04%dq$^ZZW

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/UpperFunction.class b/ureport2-core/target/classes/com/bstek/ureport/expression/function/string/UpperFunction.class
deleted file mode 100644
index dffae73b9b10e73dce8ab12e427356b8213d5f78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmbtT!EzEo5PicgEZKlTjL~QkgT@G?bT2stiVK<(>H*DtSjISU*`;=8E&LllK`*h&
zgCF2WS@z5l3Mi^ln#=S|Z};ohuX}(0`S}aLF^*gmu<s&|nv2JHQpACSrw$Go3T+um
z)nTyejWY(j8w~}+Mo)&~O*$Hg_#Gbv<f--|p9g0=mij$)+UlcB7}`BQ8hL|6iBDb{
zi*XbyPfW(KND>)^-iI{wmA)h@mf^YgemoZO>D1X`aKuFTsiGo&y?4Psb1zjg@Om;)
ztrf_FR0cz@8-+?tRtAiyg~02IAZRr*yns{Lw}T7eE2>u<a>X?|LuI)hvGFrxhT65o
z8P@$Yjzy?+HHN(v8FOq%Ud>sHY1%Zj`bHF@wY8}5m+_U#ua`((BX?F%_vpQv4dEp{
z+s#g^LxtA*@;u~<CdKe|S@D~Jujv2A<FZ3OBBq=5`C-mfbNf*m`{GoZC0$sp7h2>J
z9284<hPs1B2~F%W<Ws$Y3@87;whXO*O3wIREj{gxktOpo94t>^VR2`@R+hJha8zV^
z?(#&SMn8Cget5tFEi#I9uF=aQ%gE-NKfu1zB?p(zf^qI(o$jS9fNYsw47adBQ93y#
zn<rat9$g}LVsG1*u)dMQG9WH}2KK31%>W%|!BZegLj|`Dco|jPG0|mg;x6SoL}3f}
vVB<bvWE6D#HpM?6PYw_1wu4<dHI?UNbstvM)&%CeIGpRknsu>fq8|MP6r@`Z

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/Condition.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/Condition.class
deleted file mode 100644
index 7fd832b92afef7a99b7e44e5f197345933546973..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 268
zcmaivy$ZrW5QJxAOw>Yr3<dETyOaSd!NSfiKdW54<ih15c{U3lz=skqMH&@smVudB
zzIndx4**+CLxdqFgy1ZdWkWE_eWpv1HkPlVHC$_BMX7UEB4(wcKW>rS5}}gnA`WT6
znf;YdTd8sp>&kLxqt%HpJL=YCypxIvbLZsJN?mRGZ-n(X5O=lVrg52pZRijdp9}$k
S;JLj3`GgVtUSaI6hu{s>NKzXB

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/Expression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/Expression.class
deleted file mode 100644
index 57bbaf2a26d6d3cd41e0ababb5a6526f71fe2a03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 513
zcmd5(F-`+P3>=4$B>_YV9sx+;hVBqe2o(~=y<qRoiZ*O+qrE+J;v+~rg@On0C=?SR
zQX~x>g(c5eBag?QU+*6Pu5oNIGB`9iA{gnUY?BaP&mPLK;G#+L#BG#ih=~`W63-Ly
zKKt{uXq~Tk66z#f%FcJ_rCUa68W-xHMU_pKr@!o-!i+G?-K@4rJrUmir^}m*TQxe$
zLmNxEcV3;IZ0@+4+h<F-+|G9^fsKeT{+6+~^^6~jxs-`;x~5#<T%xnyz1YIbfI#SJ
W?df}|Pv~P`(LhlTM!SP`H(UWYps1<<

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/Op$1.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/Op$1.class
deleted file mode 100644
index 08e23fd8dc661d5a413dd7cdb5797997f46b5a07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1053
zcma)5+iuf95IviuaT44#ltN3n73yA6pzej1ODiN)QdE&9NU6$0U)VUS#*J$m+bKLE
z!3Q8AzJX^zLI|OL03U^zaf=)w9wK|snKPc5-JM<k`u*b=z#Xg?a2Z$fDB^0KtZOVM
zG+bwKgJF`vV3=Z<W|(1^WhiTy({M{*!Dzg)BdfhFeZ%q&jb<3Bj?oR2?*);eUi*Ox
zL)&wWL$9SAqwWi&_O=9a>y~4?cJxpnJzL%t$ZSx6z);n8Rjqs2RKbpHI^-FydX{u{
zWni;Dbq+QnX?1AQSkt-%3JtFtSZdSeB(3hxAIKv~1uL%Qc%kj?Z>y;7wKUw;F%MHm
z31@XIU{S{smIcN+-gKn9Z`Qm<*J^Lt%4t=CzzcM07=^7ctTNnXxW{mx;Q_-M76oRg
z2WH#@^Rx$M(gQQ@fm!zriqyAUR|Ol63_}$Pl#<!&%>!jc0#kj}638A&r^_|wX3Klk
zzLM4i@=pRKqn);LY1MsaX<pE>UFpQ9M#nf*dD)dt*i$Q4r2{`HTRi!gII<@Wn!M&k
zf9=#3tzdv0%$cg)QKbpGmP2$+MQMyri7n(XjB~^zB$kjS3;6gQ;`nFbD^g$hO@Bis
zQ~!j_(^zIn4kS_|nN4Jlq?X7$$y_1}BuhQfXIS@y>#Td?2U+Li{LjeKGlEeJU<{L(
zCZ3@ywnDs$M|ezJ!80_7ckluhaSJ{|;s|f>miQgs;{$OT=V_bSc(cp6Kz548C=C<C
k&o!#Q{U4~Y?;oI27vuDCTq4fUKMdTYQJ~^QVw7@!0J>!AasU7T

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/Op.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/Op.class
deleted file mode 100644
index 72d4eb34db1e55e5efb6a4d16e5c99ddb4de39a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2576
zcma)7TUQfT6#fQ6atI^F5mCfT)TkjUk$R~>K#+o^Mq>@qMyYiOBaDQZm`sq`i}rrM
zJ+=@2fIg+T7If)q>vMlVe@<7wbCQ%$d0?{6?EUSt=j?s<`S!_Q|2+Kzz-j#03?DK<
z+`!EMh69)i;uPMJuUkR9joSjIl+)5JD=;IaC2&W|S%EnzZGpQ|&I{zETo7=ibOrJP
z_oP}7C`#!CPzqo%h`qQkuq5R>^7SByJ$Sd73B4Dj+xr3^2s{*cBr|y+a8_Dx37iw?
z73dS_7f1*U2n-6G58%T9KGL9%JC0Qt$(hBXRn*XYv0$0r#GK`5IGW753-RfqXU)e;
z1uO3sytuWLFIdH*?K<%VcgD)aQ~7=kTSxDe%v`bVTalz!WtrB><eI@>F)-K_*Q@Cb
z<BZrugOt9cJ#T3UL?(xm*GJPDqBl34i+|C~mE=}p(XP#Z<s0E{xRIpoSXW95(^g@^
zoX*J{)N-ji8v3KjyXK-9&za6_Jna>1XSTm<(`gw=H*4l5&4Ml0tuF3!%mv0UUR+p%
zKVdtzH>ja~gSg{eldO_AXUii?+p~`8@q{!qM&(3P-YgV}8r-~wEoslp&R;h3)tJI_
zE6HnUi*{`kStPQ#YV6*+`BA5|kl5sY2T6)x+AS5b)|jozn96s{>ggDgEi<g+V|=3F
z@TM51V+^0_xP)W?pXvA<6B@KZ9be!}9cS?}cRDzr<DAk4sP#)tOX%oTrUXrWN;^O;
zp)}jkF(5U+<9cD6qzg!envOwf_vOez9p|Nfa-%e}R^F3+a7}f_Rax@UrK(ZG&i`}e
zLdnj}SOvL_l!lh;&b;H^54-trpN_BawT?6<<m5LxzQuPszQ+$tg876sh;SuIs{XLd
zi%RQS0C_TO*Nu{Vp<5$8<VQB=I^@Ut^G{9RwXz-$?o2)5)XmUeM}z;Ezdk;{3$0md
z4D+!~n3~^G_k)HV^-EU+cHN+Zna^9!jD{2S4jY83n5wm8%ykRa{MiC0BkB9Lmz^W;
zBdkkA-C~jIEf!h3#Ukn!i=@~n4L8S00=F<@J7!L`()dshuh3Jx^n*hkl4t-WX{IE(
zr6if9BuS?v`K2V;r6k#;B$)(+cFP9fiheZX0!E<W6{3Tb@(C_OTS3EfG?s}pjPmVQ
zbGzt2hKp7I(`ZoEpy7-ChNkE6N&kj*{;$%aSG+Ke*VH^)h+Z;c4;uLc0<mLzR^k6u
zP1lE8`#gZlGId;0J}D-0wU&r>gawkRKaQ;+a4BYp6*T{Zz%qj6n9))LI>DA2XeHQM
z10jNKHDC~IuYop#9W~HSu#@0t=rLng&Dufh?i%PUKf|8PGwjW*VxO^p1!1NXUcrG?
z9Q>0RHmc%WLmTx@H1WT)m4BiJ_7UypFN`P-;5d)s3=Z+)i12t0v*bsR!cjJ76jSKJ
zZNyN(F)Y&aAx`iXi({=)kMX)H^fkuN5j1r5Y-^Oq!1m@_mi~G5@TQh=h&e{Of1#02
zibK}2nd3Bvta%^D0LKu=2*()5I7iYDWuv8RY%Lqx%Ep$mvAt{@E*nS6#?f+Y6;Vlt
z%8t9yLj4r4y)*JM<F0yHiGF51z}x0LPj#4Ck1)GYyuou_+s#z<+^f4uG}ImlTxYhG
z-TX}k$mi)Z_%cRU<0@iL5LDopPXS$l<4p>L6gc5mz)+w&pg^kvaiKt)0w+TizjlRs
zLKVjjg<c9(JUc_pzcX?pDVNUpmZ7IJP0I+SGyY{5=?tmZn$C!2w52m4n%XI7>!6^q
nGyMdb<bI{qf;<_Z154P&>Q(qY$*RcKdXx2IgVIx;4MO5ypcghd

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/Operator$1.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/Operator$1.class
deleted file mode 100644
index 130145f91955aa2607016c21201465ba8248a3bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 889
zcmb7C+invv5IxRqldvJ7+(OHxz(Ny3y9GgCKuA^EN>!5vDNr8z<ZP_Qt+S52y8*t4
zXFx&-p?m-zg&40|<%O3>_RJh>ZpSl!{{ET)c!A9_>bO-x8OtTIRxG^j;En}%t+;2!
zsulMgJaFJKY<c~UG7d&vKJfxQ_6AWb&b-8ki8iq(K23~>BB?`ftcOB*y@@b9)`lT-
zyw6a49Vi*f_zgq0(L7?vwaJa4+L56+OvVFY-tmE=m!*ylxH{rST73Rk>Bl@cqtYp+
zP8rI5otQxENgGtTD7SISr<~I6hJn(N3{Scu9_gWjM=l;?&4r7Kiw2r5o}k6BZ2f)3
z!xR5d_mg0>CxsgB8l#Pir`B!ViVZ7#G#S>3yPtCR&$;_^?taSMzi7sL#^COUp)hU5
zqew&ywRyeX;8X-LLu-MI423CIiOsaxXdZVK2z^CAzdalhg9W1;ZH6-BDxDmSvalnk
z($22fO;ju=>NA=BWDpx}=~UZ#JW*mS!kEXj54BZVvrDvgtX8+bZ!HvY8CB9XLNjE^
z0^a`woBb|-N9LP7*&oQ|dS8$`NMV6sehwXig*hw|bmp)`u$aQH$fJa7xJkN>hqMEE
ztl>FclHS5Lc1Z8yE&8OhxI%3d(q>v%B0EF(D%};7KRA@7`yWAJ*HhOUR0POT8Bie*
LYg$s$s1^SK_|?=K

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/Operator.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/Operator.class
deleted file mode 100644
index 34ce945c2dfff9e8d97b3ce94ff50a65a1ac20ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2319
zcmb7FTUXmg5dP$wWFd1=62dKnfRkVYHl!g<ff5`-T3Qp*IM6yKZDd<90$Flo8Peze
zivET6#dXeso^smexj(9>vuhcfggzi0X?J!<GvCa7v-;=XKmG!67l&a4@TH7(d?jL5
z#Md%zA<bSJ5}wG|#8am6jf7`x%t(07#w`ikZ2VTjcWlgxcp)Mu;}Uixykz6|?Dc~T
z6|cg$4NWGsyoiE?BHPg=yp}PHR}x}ui`-2~n3gajAt9n9Vpo8&ZdtmsYHHQ0UKQX^
z6^jC9(gnMm%vW7~KUs71itV^b{cXk3t5w6cl4ZN7o5{_J?r5&<EDDe^wY=+S1(&89
zHPbaJ=8pnGkBkGOs0-*>waXP#FYA`8xnw|q7~M{#x7IQO61fZd3LR)>jX|BAj9v8G
zz$zgpJZZzypVZ2E-FdF%O<EDT(aqNaQj_UD?LbSKnpH|>T*t6Vi?ItrRMU1rGq*Lz
zVAees0ZS{BC-r0Vl&K}dGTdbW{pWaJk8KMGxVr|$9L^XeOLM6vRH{j~5v*uVl_Z~C
z5fI6^T48@ft9U*o*KUR&;PPbbJkQcn!SsAT=-6MgYUQO1MZHWkkTZ78Dd>+4meNRz
z9|@LE1xd#JSp^361Wa9kUkc{2uV4Y>L6{O@Dk#HJ5JQ|6W)w{ENnF7+pClE`@X1XD
z2{xHM&sjmQFe)aWadtmtNnCsDEeg2$AqO7T46~>^3<i~{Z_C=Z?87nJYk{!^1vV-Q
z9%7ZLyiwqws=!4}z<Ar%x@qbq%}hC^8f%6Qhw29w7shhT<N-zaQb2dx1gi`+=y@Ui
zPk%<|h$RKnwx}p)S+JSk(+e)8b-t5!{47}PAj4@FoJB$3^|n`9JPYY>YMMz@z0zsZ
z^AvkQT-PcU-C~DKr@}ctnoC~d$=Ml$Eq&^Md(q6H;TCp@_EAbplpkAB@7RjAkF6*_
zwxTUsQp@Dlsq<~8Xjq!b`-$W;s9LZ;N=6IS${d}mx9FG;tqd|k0yGjI`ABr+Be9W>
zL`I-@h;;({0%6SI4g`Ec(m0Lmk{b|?;Cl~$og{&NA54?&4Uqmk?s@um;p3~a8i@an
z;Clp^zVD3wr?jFpwQwJw@qOwd(qbOx;HMi9<5MHY2>r&lJKeQE7qP^k<8!XFOh6u-
z0y&`sFnBw0RXl?9GsFhM^|&gxgf0@4mJlJKyCw9H(AyIF>L*aMC%BY7#%1-&5&Glw
z9O3FQ2L2}dejZu^T{Isi1S5#x8u~GcAza4<#^?ulgAzMVdJ}{+iWC*59m5V*cnVVV
zy@+5$p^Jc1!_u4O<5w?`TmysTdMNP=Ez-sISb#x#qV(LRhb3c%o>^6_tKD@~sjG5b
z?WGWgPeT}KhHy<CZN+iD9mgnP01;)H%p~c)L*<w!SNG|?NT}Pmb6)NlZV91jAG>Jw
z2+JPup9na+N>qxhI_5vdjduuhVLZTvE-p+2xe(z(G{l7-F5DEk&?o&#7W`DdOg7L!
zS0)>5&@Uw$YM>{RrMmWI-a%kQY4TDgCIN$#=m9EElN@V!Olv-Tfk_%=(q#EUuk;@V
C<QV+`

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/UnitType.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/UnitType.class
deleted file mode 100644
index cbf53dfd2b9e778495227b836ef7652b610aa0e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1074
zcmb7CO>fgc5PcgvvEw>P8z9h7C?5slgvPB@PKipZsz{)S9^6K%I5}nsF8+vYr-FY4
zsYDS7)H6Q{G3y$d3NBeoUd_(idGp@R&tG4E0NB7<5i(XZJitQ*3kn`-(9sY-Lq$oW
zq#+PZ6&10!6g*}qSZ*-%IKyhs34L=AC;Xi`j`%2y5|h6lMLdq(Ffje_HTTSez)ki)
zjChAZ?S+n=P>MlW>2LQAb}feXs~M{lj%{zuV}`YcG3#A<hk9bD^xS~I9Qy+v?b`z(
zMM;b9y<ymH^p5Of+w|;UXj(}`T06#!Emnn4uWv`LsGd>Cf$bAh_22SjY1bv2HW_OF
zVSjG)8RX=xOPY(8I}GfE+-8s(BB6F2FT4D7s`PF!_PaB+y-6>mS>ZTx_%l~{Qu_0B
zZDELxc`+diI#$tUXwC5SI%+U=+{BWO63RL%C^M8VY!=Nj<Q*>zi1%v4m=dx#IO0x1
zy*-(>X2-MRxHAR&`%;&ycDB}OZgm=VX=_oC1GE!AFkcsnC?lhYDz1Q-DY{3ySlR^a
zGjeB;K2pSRjsAr+S0j84*E9SEa_Om7m78CXKZ7jrxl8yPbfTZ5u!wq^CpQQs7}p`u
z2Pn<f(kTj`()2Xl#dQU@MC-VnVwR!e4wkb<UXT#6+TS1_Ru$<K>IsTzpvh@4m;X*F
iX+l$UC{HkFoq!3pb8#BA1CmuIak-4)F4-Z(-2V+yvH0Tv

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/BaseCondition.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/BaseCondition.class
deleted file mode 100644
index 4afffe8d933498cd7745a1be37ffbc398297b604..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5155
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/BothExpressionCondition.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/BothExpressionCondition.class
deleted file mode 100644
index d8b0262c277791b41e071bed4f70c70637b41229..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2297
zcmcIl+fvg|6kUg2LQ4=qsa6ri3%2DF1r%&+9R-=u>F5kHyr=20O=*)(a_Zo-FaCkQ
zp^oV2gCF2WIquWMhC-0?;7f8Yd#}CD+Uq30e*gFhU<HqoNMIp>MQ8~O<BojX9l;Wo
zlQde9(|Zc;D_CWSinndfP%ImEORKno?`j=~w{1sge6Q_r*EMZRYuQ!a)C}9InnKRk
z|BkjPyTEX!$zO}7y?6#~5WFCPAkteMOPDRbW4dOg$sb#mEp%DTWyqCnr$*(gysmd#
zt)UycF0s(P7_L31*|VBuJCe(oW7g_@Wa35BGDV3YlF9DSk=F@`;>xDQUvyd(?riH+
zkzt~28+vm`cT73=7o(zX5{1n{4ipIV#1{47cs;p@-UtcZ?g(Bc#TedYLU28`*Lky9
zIAOP;ztOd(Zq>Axl?FFNSbU{pHmkB@g71k!wtOUq6fvk4!}PzaN$wrT;g*opNKL!a
zkfMbEDx`!g$1oFu+0Te!SUPP(7dpdQNVweX^I?@jwLo2&Ny4W3yGO?KI~XR)AehBm
ziC|T~Ut7{u3`&g)X?liICOZh(z!N<e_?Kqf<wCk3I0?g2m>-Ui4KfPS&=UmIr5CI-
zBwyJb$Kac$boSISeq5BjQ!$PS1#2oEU_?byK2(e<$g3!zsNx|?D$Zh*VdGR^iDQZ~
z<WC2qyS%5}X_I@2Uel6+mJAC6&^Rcm!uPmASC`>KSepjFwnyvsUx|T?6@CjQ>DD>A
zallmG#VUs}4#e=k@L`xCUkuF9FC;<#nh1uZUuZNWEd%-!&^S)-vF;j~=FpnlBfHV_
z97W_QkI`GreFMvV#?U?@pSqdn>6xTm;0mIc#-xn$Vv)iHngJJ)_Ho`*Oq^Cyxi5&$
z&8MT^5sM-p%cWyq5&uX#5d?^{#O`(%vE*g-5L38>%iSs|OwmZzPZ5J@%9o?7xJH%6
zppXLB5yK5ym8`s#o3sMl3T367$ZDQY7XA|}hFLnXr@2ONsd<dFib!dOy3)wT0Lur2
zj`^}MWRUffOB5|diRb3_5k1_hRT5yWi;(i7dcwwid(gi;97{QjRUoY5F<73h80Na{
G=l=j-WL1X%

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/CellExpressionCondition.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/CellExpressionCondition.class
deleted file mode 100644
index fd167b8b9a9c5fc00a3b72c2ac1628999a791979..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3695
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
Fz`yT(;2Hn`

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/ConditionType.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/ConditionType.class
deleted file mode 100644
index 8d96cd1baaaf311f6c5766b38ff303e5f8cd65a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1270
zcmbtT|4-9E6#v}Ttz9V$3JgK~hM*fL6&-3EB4)wFWC4@nlEt68a?WDcE?r0DztWM2
z(P;SDKg#&-m~KRVa&2<&-o4M=`@GM)`}ynZ4**3x&OpJkjuqTdF{9$Hj&ZDt!O}3H
zQ_vEKdm1K%UDGfn?0pT>!ah(@WYAhs*y2%q#IR9u!=_bl$Nat3iFhlFVvB!hMZDei
z!oX^V``owOFxdBE;g|o+_KsS-#Gv=F42sKrpFwpyQN)9oW{cJ5mDk%g!_zmz<w+kp
zeuuXip5+Te9;KA2CWdUq3;0f_S?AH7Q}<~_l{t3bGQ7%H4xB^B@|~bz*>U6rjZ$H_
z0?bP2I)2rOJdv!IQ3;$TB{u)f#*p6d0x#ZV$X!6@WuZ!P$L~B+Bx8Gxz=^4O49UC*
zXdABI+q^Sy^mfo`4%O~W(QrHLL@s~f3B}BF*I`v?W*{f7<&1%KJY;zC|F_G)JRTXi
zfdvB-FbzzKVM+|sFd4@BEfSS6q+CA?h}BfSFi`bw{eZhMF<&3lvFtnTc4+|ix69{G
zEp4sQs~M-Km)e>YGyt;1L|P&vE%5=y=S1m*RFJ_X%z|N#yalr2)4O1wkvK*2BY6y$
zX-vylj_~ui(!&>#kgK|>EPp}j6pFwn&f%}pigAX*HC&f*(uq(a;~J9m1M2e1{0Y*Z
zWOy)Lf4hpCf;tu@W(gW@VW~%?MTLlO?;DhwsU}aL9U~(hU6Ia+bc~dAMx`^BmQGgv
vPMeZlx|}toixIn)>SENcrMt-5$6$ifnFKnK2FX?=@e(~Aw~?o{1PZ?a$*MAh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/CurrentValueExpressionCondition.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/CurrentValueExpressionCondition.class
deleted file mode 100644
index e6a760b43473845d1c06073761661b8491f398f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2257
zcmb7F+iuf95IvhXahnDTg&GR9P|77qFQ%nHX+k6jAc3MHm8$QKv!qTFJF?fPJoCaI
z@Ed?A2p;$VJ_<2w2PbK)k}A^f&U$CgnX@yS-+zAo0<exp8H{0R9Lrc4hYDQ|cP6lk
zwG6H9s#sTXk3kXdI-H?YHJ!Fz^90}5eV2C}SLpnp<8sfl99wTYb>7lV$F5sK+LeE+
z9r7+ROuANMPdtkp81zvB_8ch2%(ia}tIc;U&#JZfW7~FwA<;aBLe+5_gkR@-hVSW3
z!`%0Xh7q3O`b)B2G;GI}WYQ(ewnUjBnal4|h81!nidD<zTYkI7-5rDCGfY(-(`fA)
zt|jg6rXuz%0^AyfexDw`>vCJ{8ZDpql8RI!QWK<a#}~ZH-w1~HxtRE&$Q9md760?K
zX}mS`mSH#aSG6WLMcnzCZ?)?3q69w>#e8+hhm<i1i(&3~G|4?oPf{aQomx|h7ZXq=
zMI;=<d`!$iMhw}mB-^rf7{+A1JvD^Euo2@ezYbJmosQ}~v85;JtPNf&m1p;2<1`v2
zW~or7uxf(~S?dhtTz(XGeYJ6<SEf8Jf|PsQ8P?(oVu)VPqbMtTibxGbS{;pFUnqvm
zYsYs@{@jvnaiem4F|Wvr&tej1RNT+v0Ww*P%V7dp6&qPR#AX&nlo(DZ)bY3sn<sjs
zo){jFI`E{<kz;u2YPSOzmPg>w)0PT{A8?cUp5bHM6_4KY!?=U}G*VT@_slf4tZSHk
z?|0aS)i}mOMHv?}=DEQ<{q2m=UsHm9R4>7bN(Kz4Xq~3{ba$rGBI_(!n{<}ZoGp9@
zD||uX5XsMECon~0hGt+E3g&Q5o(j+6Jf_J4G+gM$*`YZ_JBj5_atypBBCrs6u7_VE
z&jc=FCitGfC0a?G1TNzWlEG@05EWWojSxPNou(bF@D<A9(v0#0DFvIU!c6KL(h@b<
z$2mvslMj%~p;v^gMaWu&tVPHgWh;><Ny}@bXbRUUvdlZ&S)d*2VBDlp>Zj8zvrG}I
z<k8eu`b0~02{7Ek?XGi~QkIFQ3yX(Pj>^7DP-{U1Ej$&akd`k&0Gy*FhlwahiLA#G
KDG+o5i+=%lC1hX#

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/Join.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/Join.class
deleted file mode 100644
index ff06ed85e377ed8fccdde0afb951adc45cb286a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1608
zcmbVM+fvg|6kVqYO&Y?*C`G(hL~JWiQN#;~T&xHdai+>l_31Rk8c36xrpg1q;0Nee
zAkKgzqw?%WIqnmRZPgb^r^z{cud~<QYwzU8&oAEqjNwTPGDbCA!*vCx6^v<!<A%76
ztLW8m6Sq{{7N9#S`czDa<)nhU3Z^u4;hu_V@thI2Sq+_-(+DxH;68)I-BpI`Inyg=
ziq*hc&(wUY;`u?w+Nk(ewQ75ArtGa+PR8`yRXY&-MbCC87$Tm}pbV_c<ep{o3}Y{j
z6eaqGJ2k7yFrG{uErL8p`7w0mY}a~RD;F*QDK9!?QNqy6FB#^Oxi$WVXB_U9GWo!_
z-O@zrNa-3m&*aVu_ie#ZCz4%WCO+eD5{Brc?b^W<L;N2(ETmQ#<lvP}^~dsd$>jm*
zPi;vGM_YyaRocmGBsfDyKH%p160g)*)k)K-$Idn}XWd$P@(8s}QA@SFSMyElfi2{V
zi9U}A-E^E1lXqH277rLk|9e_=Brvbz5(X7K)Ukj?8lS;I9lbb7tIbUvePY$$=+c7Y
zSS9Yv_@!Fea)a!KX;sAZG4wV-2d$i~+0Lrvi})#q&S&nr>%C0~(GqtOIvydXV+oIi
zf0_J^<3cKu*>pUY>OGN6HOaVKT(iu8G`Z2-w>gJbs}oJI-^0`zmCkiHEC(Q(1?zQ<
zJJjo*=9qP+)N=yxO2ray<Zv_K9~>=(6PX%#ha|0K)X)Awc^GkJdXzo|ar(|k(|w{D
z06nP{K=&!pbn>(zhBG(|hI6#*r>D5IZLl3g_91Q2j^RArqoFTO_yjK0@neXDR?U#p
zpV77tS>Pir_<pkJ2Pj;`K<KAYA(UVog+xC<Nnbg$i|EJD-AvawuHdpr9mx=rqD0ca
z6M094iqz-RhOz_o1N5{Jqs4nD+t9YsM*E>vKeTpi?V+=<hpxgdx{YHyFw*qj!SP+3
z_)ejuu!=Y-1k%hPz2c-)lC&BkPa~~)TnVchB3u-*Asv&TVi>8qMvIi1xJLFM7Ys$(
wMb9T_;ig><Hyv$X$t6*u`GUMnUxH6yLWl$1HBt)HJ;5KT7e9gw*&?|53u-cXY5)KL

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/PropertyExpressionCondition.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/condition/PropertyExpressionCondition.class
deleted file mode 100644
index b987b3ff566ef4decd680450758f6fad6e3836bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2871
zcmb7G+jiSj5Zx!f$Z^yf(#CaY>5T%m(^S1tik+G^Zc7{7w8Uv(@g~a$TZt_h>6n!+
z9(mypSo}p{(Q<j<1NbOb=SZ?-$09f{x|}n!XU{$}BmML5Uw;F*iLbIy@$o!v<CA$T
zpdv5TEY@%*iyA)7;x6vVwe<zmaX(8>4-`C9@EJo=yclqXwT5B$wU#URo;Gy&z;=Yj
z_XiGlUDLL-zTM_M&9JSuDdc;7^t4UhRR*=kzY)(Id%zv>f?=_-tAD3!J>BYPP2reU
zhisO&hL$k<e8+UnR*&DaEL-Rj&1EPzY^Ou`ZQj*~uC}WidoG31eH*TA(A(pVWjiuh
z&M`Y(@gQW!pv}TQav+TKnrWG$#*iqMc1VRfg(l>NY4Ocrzr~$xojA%&Y(wwu=#DAh
zgT<uinnZeImZ*_tBY7eop^8Lkf%G2?1#gg$3_lcOu>C`*^Ios|Kf96oPg}d(5OMac
zq1kK8gA{yUR7+zg7Wj}V2E}4Hdw4X-edsvc5|SDzYPWVLOCSVPNDUc|;X(}NBqN4n
zO+j_=L>~mQtARvY^7t7tvOe$YLT9)ggC=(;s<%z1S|q;oB;E6q2TbK0M2pjG7R<GB
zjbN1y7qT}PYQ@ql?4mjet0L&FoXdr*ic$SAEEUI2E9fs-#fxO=i4$eXa6PV+rV@!f
zsuC$j^e1DUq%@+k3Y&V745va~n=R$Bm<-vbJ#-BI(3D+wew1ru5~^}VvQV*vyn;t6
z9^<%*WAc*2TM9N*e2#{KCn`4aRKYV9Utmkc37k~WRI!ccDt7QC!=ob&yh8{vRE`9-
zuDd+U=BUo0qhDN^K{#_S$qA|tbfe2@koNmDSG@szBbdO?h1sK_l{MW>TddP)-eWjD
zUP$$>?lk$gLv9(oTKbyd)O1<_$O4`END=D3ag@=(nW~lX@(BmRnduPGl=HjD@9@d;
z3;kE8{SPT^0_6MLpef7nQ(Rj_vE#b`@ZHJjHB-;WPoyOpkdAJQec*fv8gY!LvW>%x
zkscT5CqSj2hXm$i`_R*z>>x0_P0wk%FM4a#I0x1;^iJJJ*HdIsAwNcUwfs9+`B%)n
zLgE+Cvq0A@?E>eJ#Ca@BE8iCH;55AfXYg)-^F3LnXr)m84aq-{`Wfn~|CoNc@*2uZ
z+DkxU9;Z9-Az>G(t;-(nP2V@fE#NFgmAncR`JBh1KsjIZd<%FFmx$B*9ws|Mw+})h
zKhj2;R`L`*vvPSk`6uR+sHDovsn^IxH2l=Al4#dF3N_y=q>v9O<U<PikU~D7kb^?0
z6p4O`VoG`Zl`^d`tl)AWk4ATyPKsD1B#Ajs3wch!tubv=0Re_pTnU_OWG&AjU0!*G
z<iXRaP^hYhkoT>^6w*OO&<_@_#$ja+V%;IE+J9jAmBdJ{>jBnyQptl!-HlD^2L0{&
Sg*Wb;Ip|!Eb^gfH?baLjLiFVT

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/BindDataListExpressionData.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/BindDataListExpressionData.class
deleted file mode 100644
index 144717c8b4e9a634175ecf5e6b93025ff1aa5709..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1108
zcmb7D%Wl&^6g}f4n7F15Z3$3lLt&Ey32!P`B&tLytSnd*MQrWF3R4_A@&mz+PXdXD
z#DWjtqY!6oCp1nMW?|30*LTi2_u=1ve*OY*g!={>xYI-(cMZPwbsXsE=(s0P_hp<2
zwCr=|y<??`^evl_fk5+2P6H=NBTwL{^m%BH!<psAiTBQ8!aR%;%T1*}u})+#Idu|e
za7>6RLm9~ASYW4H0vPm0<bD=T2)<>@z<Zg_TrYa<xIQD>b~twYkrPSf7r}b+R>lIS
zmr#2j=8+f2G7PL4A$@B?1xqQap6APqOq@V_mEz-kLGz?6wNkCB9DV8~3Z449y>h(*
zkJo~gkOg)Z7kwv~TCd!5Z>;9?DW|v?tlXN_b_`2mE9p}6HO|5`8hbCK8d_&D`t^Q4
zQp;sx1BWJbTs5(a8v-ZmJM_PU<l<&~d!Y$zbXDBdE(p}Ry%7%igEYY1<)bOJJe&NB
zG#IGS-hfH_8Y6FbYCMhp4~YK5Z_vKbt6`JxO`gC$u?~2<gDraPJR2=sr^kB*`ZjHo
z$a%zA^6k)KqY5^Qp2}(Tze4*=L(7PiOyEIAkb^V|f?RaF^^_ntnWZHE1Nn|x8D#Gg
O5Ur^F7H(&hdw&5HFBpLU

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ExpressionData.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ExpressionData.class
deleted file mode 100644
index 72f7fe5f82785827dd970bfa710042487ed50278..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmZXPJqp4=5QX2wpEc1!&_g7R+lYmVm0AfF<^pT7gv6K)n^ioUg$M9Z;zmJGi-CC`
z@9}2tkLwM<7(E7$p-W(iG)rLwVdw{&Oq>PJMUn9BK9iA|5!_vx6vCXeB((e>3@!8L
z;q>3T_(ue9r%pPO>om9d!Rk_KSyibj>dsMJN0>zF$oG|z2X0$Rr45%KA3v&C<~+7`
h{+%ZDf6r|b2#$RapeCV#rqwO09JKAcH-^rOxKG_uN3H+>

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/NoneExpressionData.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/NoneExpressionData.class
deleted file mode 100644
index c4ec4ef9871195bbf59cec0a13e500c69e4a6a6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 629
zcmbVJyG{Z@6g_u&tRM;^Vl3^z7^g87x}ot=ZLq*ln#?W}99(wE?qK{ZtxPQZ06)rj
z2Z@R_#O9p)IQNzN{_*+-;26y^a;Ur5cF}OLLnwMW)}}+qwc33`{yZ5dLe<x?>Q2Xj
zN^fKkais1ip^W-6)z+T}^X5)x1kVqXu?RAw?!`1!lO#1lJx)@UWjcw)m|I3-AdM8=
zBvzN-nF|h`5!|6N)+97qZGR*mq=;lZ6xYE>g@y&Co*u^1aBITtvS8)ui<7<OP8}Xr
z?j_SSR9D(wy}P{dkzKHY0*Zvw|KClh{k@cMvTDD@ORx`z-^$<PA3Myv9HYygU?%3m
z!3*elmR@7DX`qP`W93VLGS=B6_BR-9@gcL-IrL-^Kb3pGDxG<ygUy+$irS2~J^>)i
BqXhr}

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ObjectExpressionData.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ObjectExpressionData.class
deleted file mode 100644
index f8833f5b1cdc7c6ba88fb5d22ce6e38ab735b094..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 731
zcmbtS%TB^T6g{^*3bhI%AYfd$15E73xRJ0?Sv9)Aur!&L2^LFB+G6}HO*AGh`~W}7
zcw2}Gc0=MMo%=fX%$eKy`u_L?aEb#BS=5Tipsr$HMMFiCkR6Li5Gv+WJPN}V-o&`E
zrqYhi3HhGmIZ>ZbYp2Vd5jS7>V@W8Pjwi1dGfM`y!g4uNF@0OOBM~@pyh>)HdnY9H
zP1~OtRv5_#V-d)?A4G<Hng=or9p5u%Oz9f2s+Ewd-`XW7S(ZAHQS1_`?M_-4p*VCV
zo`{&7aF+&beE#~$y);vw)o4S15!iCz#P@D4XSd#X5|36#0WBSQsD$2s20$qP{Z)js
zO&Qmf5i;%02uJ)TvLNL6Q(}qyUKI8VDDtjxG~ifat99Q&-QzbXF9~Lg_Z{vA8qCmS
zd<!~9^(7kHT#c8OuoAPCP+oBwY>8{R?kkjMb`->P`6PLm(CACRiblb1f~sIIvDF_g
Cleh^0

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ObjectListExpressionData.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/data/ObjectListExpressionData.class
deleted file mode 100644
index 5b91d0bb2e1442b0e1d961dde86dce6a58abcc8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 970
zcmbtS%Wl&^6g}f4n7F15eT32nrL2-5F&o6DQN?>@!J;T)hbHMLOmXbUo*?)uka$Qe
z_y9f%aVB<4V?e6J!ZY_Z=bU?efBgLR9l%}O3edoI6LstaJa&ED@UiFPra(P5xfN(d
zC+e+|GizcQF>)Z#JTl`%*;%Fq)+*_K?~oOj`X({<km*h(f6yHe`cZn!w=0oJ^t0Jy
zsIwPp7&EdOr6Uy&RA!uC2J7~<$ps!pqjVyNxz%qZsi$dXrG7Wfbe@|ukrP73@>p3V
zpAS#;$U3o4&hn3$ps@BL!TaecNxLf4HR81TV{P4IitBW%%?ND#5iBOKej1NeGA<R7
z|5br-K6v4_7Mtl;v^ZKf`rs&?Wh4F6xOwjWYZQ0fPYtnz{SZDbhgipk!2SQ7FxO?i
zE$8|ZxOY+1#Rdgxo$dhpT+0TyQv5upm3Nc7>mfjm_7XzcR~UK8+v6SdzC!eFe}?yw
zUJc7Umw5wQ#M<WT9jwr67u9ItDm}g{(N}4QL@px18Q&T$j;Umm^juA&_X*wy8s419
q$prT11O-T=Bq&6;TMr0wja5$aZ;&sjRY5lY0^*guZ{qr#a_bjHrQ_8A

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/BaseExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/BaseExpression.class
deleted file mode 100644
index bee749e8cecea8fb5e291e204185c0013febd983..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3162
zcmd5;U2has7=F%ncF%rHp%hykL_QR>-vbB*c1wY_fUTt{r9}{x+1;T`+3v2hvxFwz
zm~dyJF{x4c16-<!LaK@Jj>H?i@F(~yjDpXZ8FstfjkZ^srnBd~=lweG^StlO&yT<V
z5x`;GN@5G9l4!^464ObvVJe05m`ULR-cXM>B`zir$7~9hFsIJu6V$#e@s`9DiK_w~
z729>J!o2NPoKkUaaza2%3AB%wiWSc)dh=GHYDbSOm%sXb`Lk03ntiA23Up2{TDL8;
zU=<h4S<iKf3mJjfh*NaDQGvFe-g&Bym-4p2)@i3`&s3MPwtLCS7AWbQF69`~Vqoq=
zq2}FmDgwu*bEPFSTk-5$X4SRJCD$`mNV}r)GneSH;0w$#t74z2oiMz#@7TGj#{i%A
zwD1y`j@yMoX49wHs#D0Dtchpe@iM(F?3;4TTb^as^PAw7Ichn^7ueOp!<zgAQn{+@
z+C@*L%bVqb$O3y?7&a!y7%KDzE7>~B?nZ!?%TGaSRk@Aae57xbmru+(3q{K#tOED`
zpAZF!vffK&pGm13PQkNX1p~?X$>x)81g8ahP30rY@{UKcXM!H9dQQQdb}EW@e$&+j
zY&kYYwcxR7*~@LE>|$eUUdS%mIgh2^N(Kd9FNOwj1-)|18PM!E=~?cA9nvpRGZq-y
z+!e^=x+hjpEBF!jt&2Dk?EP^P=Bx;Fph>NHIIL+KWzs(DS-D&1t+GE>B;J;|#wqAe
zymutt75L>p1#zTB{Ti;Y9^`*D;CQImo|-fQT|H|G8O~)jiY2iOG@j`R12m5A<ZP+x
z=IpbMn$O!CN9&McosMVmoQ{6%=6Rilr(M@tRxDzrb-ah`EVm8|Ssgj#1$O=uU^;Bv
zASOB%a8rkaMIBw}78q`}YHAZDSoaPflk0D#fJOp?8}Ow{6TDyqw$v{dbVp}hFv(G1
zc_kKlceB@qP8S$x)@Zszt<?qMPR)1sQ;7UVe;SkAmN%`+3|~P03zq$^75z;kq_vh$
z5%V#pm{)HePK5@i>SlBp3#OZZyZN42L)tZ*3!}Fnc|&<Jy=q)pc`~GdvY~nJRc$Z7
zQ?`JE3lZ!<2extD$*-OWwnI}a;W|bcS;?otoylLp-)P@Mh;Mw=9ibAi8_#pC2MXAU
z7r5JoU6e<BV~<XwN~5oTVDJGVY0c2S=Dv-=fh4tn{Yc<t-_PMdH}s?Y?!jK)w~iON
zQrbFR!amw3_`jca8eZ|Gd=2`N9!h#CiJ(u@RA13P-1B4rgF$BESH^0m-pb%3#F*3%
zXuI+dS~_ZItB4AuV@7NhF@Z1fzFJ9vpAb(=Z8&bo2S}t7M&c0?ZNu^V$QX&hCTS!?
zn;x~IO*%E$Z%89Gu!>|9!+Mu~FEonXfAU*b{2uuGg%LI6DpC<#zW?MSBdRK-`4yTW
zEMV3e^Ol670|)p#h(r84j#n|t&(#SG<2sI_h-0WwdK+mhV+0@Y^h2D)U7W_p7{jL+
z_p4k+in=Kb(UVR~gFX*(e+bw3Z}PkLIOgd4Fe_?u_8ej5rK(g7mz5eWD?S<umlbAl
zlnAKRG1_X(^)5XrOcg?Vcoz6g({G@ascB`XH9~0`arqavNt}=veT+VdlY*N+DaL63
zABe~&%sD1;iYF4MCB}T+6SNIb9w*)tIK!tR?<mn$*~R+$zk^<9Z@|2BjQW~ilkPyP
kcEgz83X1q=aW3>#Z-j55D~MDF1>FKnwP*xE=SpkxZ!w5Tvj6}9

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/BooleanExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/BooleanExpression.class
deleted file mode 100644
index 447f3a6f1d20f4bfb2f68ec5d2f73d2cb2cc408d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1193
zcmd5*+iuf95IvJPF%9mWhI`V`0!fhY3qnGP`anu0Py~pENIY(wRdI3b$X-|d69hj2
zNT5m}@d11dUx1k1l%}W_$|En{J##s8c0BXr*Vpd=?x9{n5$kg(pl0Jn33+VT*tBtz
zu$0Ky7eQafi64b8A8!-r31Pkyg^3cO>Wd(ig?Ar*zNmJ4&k2PCZ6K_6_r-y50}<}I
z52GlMB5V<gZ9nwY7NK0v@HhGds}l`5eX;9@@@YC6$hap40b5qOk;gg&t6_X>wA5=q
zA+)+)G;#-tl5gBJmg6W^t~?yaGSQ;l5mN@n@JGs{6DNzZIeDBauJN{>K{Uzk$RNln
z^Kb7U^@E|yy;AZ}wHg`hXJihA67E#rHbd5Ed0d}R$zV98fN<VR<5-4D%QY`El?k<s
z#J|N6=63zPP$+I7;r;*FiFR{~n^D@0(%6$bzMhNn@pMgFc2`fHg9Y4j;9#E6o?$vn
z+n){grKhG$y7`*uHsQex9Qt3LoiM`vnR7)Vr_~Ahx?YL3)4MW}*lP4q<8>|a`sQ#2
zHqL>6pg|?J@UzXGSo|V;mKg1@J;!IMc?4?S`GVXh6SK_U1zvfe0t;1US;q>a@+2Co
zxWI_>3@fic){IYc_BhYt)A@${tLA6qj$nOcoP%a9axAc6*qW2L6E+7Iamn}{T;`ir
T=I~3dGUGMFaGkvsbF2OaJD5)%

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CellPositionExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CellPositionExpression.class
deleted file mode 100644
index 2a95ec567b39418cdb926e24bda1a718e4293a0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4397
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CurrentCellDataExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CurrentCellDataExpression.class
deleted file mode 100644
index 0ec536058cb8d5a6c12953126995368bf4da4f3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1910
zcmd5--EJF27(HXJz4dxis<cUPDJi9CV>>iU`3c1_p^e+pfZKvXBK30ZjM7avyVmX)
zwY&%tPf;WwluBH1!38hC8}JmU;>_6iCvm0pj+@z?Z@)R`%zS6Q{qx1IzXA9FUpR1a
z)xmpszsTu_HdY*1xT+@~6;Q-A2OpzmW7R<cbsL}9SQ9vv$|Uf^ZJDG&9Bpmf6cC>a
zOf}*tReq$l{je)@54Q?`&;9<@3xN}zB<{#WJrS60?)l&NUg$@=-lj@|Xm?d0Uk{={
z5jb0}YztV8ct;An)(j$fue;xp$=7}>WMsM-w@K@hob!IrQV)YvpwVo{`(7(m@{!j~
zWG7CPCm(kbnQD#RJ|ROB@EYADk&$Z1Fudt2|JERhN^F93x{6%il_vo9Q1r^xSN_`S
z2H}p!BU19QTCGf2e?;yM<#|JWS}iqNZSo7uPe2&aCs1q;H)?ifm<29OSU4_Dz-<N5
zj^=9ysbax<RqLuC^mK$OvT<u~yqx!2d$O%RSz5Qi?0B`FbpET@!XdQ!h$s3WYlNBF
zRDS!>UB6=rZR1mc!e+1=`HJ-w`2PP{pn6qnFQ!s`IWYZ9d1Qxu*K4CYn{hX3%iDoA
z_xwwJxvZ~@i!+$9aoxoYtn)BjG{AdTJBI6xjqb&f9Ji8-Te$6F8mDc1=Hd=E1nS3y
z>(%Kn;2E$D+&Bh?w))F2qQJ^=G1mQbWLp9!O?w#_Rp8uFq~R@Lp?0NO?|YqgE>{kD
zQ`<QWzGZ#bn|MH3<_pY}H~NXDkqw+bca&_4cZTgr^9&7fZPXC`)e|f-5*kp9d8r?*
zY~uo(wacEK!C6e<B-lR9>=YxcFyFI`(Lx+&IrI1weCDbL5I>mIIgWV~JdfA;?)DN;
zA|&`%cmwAMrWgN3Fq_Z%($C1$tdjKyrb^Z`WO*x5d=Bfu0dh}ER`wb48Psy6T=hrT
zzu-hI{~Uz}rThV$rv_7Vo+T@=!0{60UB;UzV-Xepl&VI@ogP<T2U(dhZ?x5Mo^Khg
z1aI*Ovcy=y+qg)zi^N(WVvaZtQ7`e^A~W@_dRb*=RTwEC^N+q-RU1p3X7CPEu3(v?
n-s~D9nj&9a`U&>%s2mf$LV{%@bGDZ?keN5<u20!BsPFy@`9uV?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CurrentCellValueExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/CurrentCellValueExpression.class
deleted file mode 100644
index 1bb4f00be0973292f37dc44f4bd9778017097504..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1201
zcmd6m&u-H|5XQf8oR|iemeTU4DQyF##6iLr;F73^CLn<#IJ89KxOP^li(^Oj8ubBq
z2PB>XE>wWT1Mn<J+&Cg;or<(dK;gz^cV~9yx3k~Qe*O9B3xIoY$|zyo!bTaJsFq>i
zhJ~9Jwg`)<Oac*hWs(MQ^!#y~Ku-wstvE`Rh*VdEnJoVJ{(AfVx5`ICsTo9p+94Eb
zPM2V|;+`Zdbb?4e%?6%K_JtR+XQ>nWj1>%L`^0IggCHfeJAOQHy;RAUZkEVloG4cw
z4HKE_8r%UR!`$JvvLum_YRQmMT*$-UQ4NB{lwqd$us5|S#1TfPHvW0n%Yv}yvIa^X
zsfIHpf1=)=P{JM8*JhJzG<`mwus(%wsy@Pbe|*#YX8Fm4>XgK@#S!NAf_@|vD@l0!
ze=5<e@30u<y*NvJ`6$p0vhnA)y?ZEL2^%)%3C$T=C71r0cPM>z_5m#1vayZZnpGq0
z&cM>|`j@sNJeU=-E7DW_N?4mr9Jc_!d0#5sG=$}v)6ojJp@{nK=w7VeN^R2XbWuf-
zKQ};Fg@toG&#`4d|8mkA@_2zgF3-esv3?ACpNA~)SjwFhEb`hO1>ho<*fMbm%M8)U
z`zWx@5uahaxbp#pW0>#QHZW#v=8XC%?u4P4E4Z9<ZCv4%p((hEYfN0t2^HR5%U9Qb
E0h>Er5C8xG

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ExpressionBlock.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ExpressionBlock.class
deleted file mode 100644
index 78b2afeca9dff0f13bee341a32044640a6daa2db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2512
zcmd5;OLH4V5dOw`tSu>yUonV>!6YPl*jZwe*p`gImK|_V?35jR;I@*doQ>BjvAd$o
zFQMSZDOae1qRfHflmkD4KfsA=sz~@|C3|IQsgiO^xx6#o)ARM$-7`J<^Z9ST1Naa-
z2_&#Gf)NywC}K5<k5E#dk2QRfL>y~sZCyiI!-l|^D;?9Y_NC*Rb^D7gs>D5kOXa%l
zdWP-o8&*@so_#g)L;A_z4S`X4(r~1!j4P(=5uoze_}b8$o@wbyQxq84GY@UUYdTV3
zt!sI;QmY^9Ro9b8It?0i$I}By{kVQ0Eq(LcN3le_F-H>24zvRLfG`5_Rns=Tl0YPr
z-4}?K=}F*n#kA#i^SCOVhep++W};HBF&_rALb<JsdXG$3V5J|gDw>W6)~$N&h(TzK
zyV3OM;oD3IOe^rRw5;O5tJS7y9q6o>Cr`X$He`QKh7SzS=pea4ksPDSjzf(!1ZF~j
zI%o<cYfZ<Iwx?M80r~_4W<xe!<VYWifxvQzX`f`LFBa;X##yn#64(#sYEB)tOM9MC
zJGyT){L*XK)Nohe`&YAOEz0AE(%U@0GOcSlk;!)5JjPb;QNGM|9Cv%&O=h~isY|xe
ztsUH*f|+D|yFD%77K0hAmk^26dyy8xiraHyf(#cGsl;Br>D1(1Q#FmLV9~$tH&ste
zVH&TcFotmrpQi8`ws@3MxQEYEsNlZ9{6O?m*v3o>Q@A3q)W=R0K*tsLc?sO<cjvm{
z${?!#HimQ+Hq_vK*z%-fcy+dz(LmWcufyi~+Vq7}dbUTk&_{;5%@*hP@GsdzY+sl<
zv$qWUP~WLOmNoSXY4SwY*l;n+_b$P=F@iUcL<+p)l!h?Me-?-GgfCB0W_CG`Q^(rz
z`#L3^qu?0J{R;7uZ<=l!0dEr&J}3?FCf=eHrFMp3YV$voG>*HX5Y7FJp{H0>!zm&H
zg;+Xvim1SMm{GHsz#oVg;^}yPZvGTn6ou%M7k|-y_$kKK5a`p<AAL`X$$J>)_bLOt
z#z5ak9@nvi8z>-)HRP~^IiF>Tf#u2d9R?X!oZ5WV>|Lfw1-VPKS#npitHg`&Z-<!I
z8OIH3Rr*?*3^iG5E+g_Uu4u?<$UnoisdhH!XgH6X?KA{AWblgl5P}@)AvtW7L~Z*3
zx7r{NI4WlGT>cjfsY*nAl!UKcVEz|<r0JH`d35o1na}vE0*_&m*ex#$oGtRFQ+K(U
o@NTNNL#PVe#+~-&QYXdX;IOnPE|cQQ|4>vXPo1+RKRL_)0ZkT{X#fBK

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/FunctionExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/FunctionExpression.class
deleted file mode 100644
index 448920101a3b72b82fe0d6e1e9763cfdd29ef5c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4789
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/IntegerExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/IntegerExpression.class
deleted file mode 100644
index ca7f53226704a73505601e94d9ea071a4190058a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1193
zcmd5*%Wl&^6g@X_Vrtw6Ee-Fqp*)fx@CG5FR9%o#sVIU)+elrom^h>0;@FWruDV6y
zACUM8kU*6{;sf|7#GOfLifW-O*?8vM$GK;&@BR7f+YbPbQFl<r>I_P#*|_bXh&3B`
zY}_R*q%sLa*p*2d#L?dNCV^fMX4`R;DiNu!2s2rFKeAsx+;`p)N{8A&Sn3>zL*a!Y
z8hG20k^`Bv2<7!43e*OnQqS=>x&*5o_c?vO6GZZ5Htfk{SM)-*EOug_bqH3&_{3<b
zH$h5hb^Lhf^-?9@dRZbzaiTnVG)iQuMSDZ042|KBl;@{T7G-ntC{tYHLp_IRoZXgT
zm{;cC-d+}jeUE#k<dJGMa@fzw><cBliM~yStkLqhKB1b!a7F>)qMs#+jFgsZUS=v2
zYB`C2izCeJ1cOK@ZXn^~|JjN4<_0&z*@?5nms^3Ji^|D#O<MLyPo9f8+;ib#masm>
zbeOik>K#a5O_+4^HPL;-(<wOgzdS!-geTMHJ`<^&R3{YcdL@?6?#ftVtI<V`*R{;+
zTflYLxB&iv203iuXPY~*_<8m$Fxp~!flsG-3~E03io$0TbBVumyz)R57FL*L6^o22
z<7h15G9%72ti1kMHa^X{%Xt=`?spXTn_o~khV_YY0h+bUvA~*PYmVbi*<4(~RpWPY
Wjc;0+%P+aXj5iI#E%sK;ZRI!N<4!aH

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/JoinExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/JoinExpression.class
deleted file mode 100644
index 1fb513875f3c788ec20b4032262a83aff6426c6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4675
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
QD7wU}QYr2oce&I51{-1&n*aa+

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/NullExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/NullExpression.class
deleted file mode 100644
index 328e94696d83ce7a21af492dd223c6f04be8bed3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1053
zcmd5*%}x|S5dLa*_J?JWKYtJu*n|VS2j*goVF?EpO*EU03A%~Lp4kpG^v-O0dJJ!3
z;!|j1LV}48;8PH89()C3O+$dyJ;2RFcU4!{_tn?c-9LVxd<XCZ^(u;ZT*h)0UT#;)
zSS8G)(kP*O(xfVh-@V!)&}+g}JBd>(V%rlslf|#$uhX@&#!o_NOU24=6AJ5%9>H%X
zeMy+^s91KhK`6~z5o(Uib&`l_1(WmoBIw(Fl@gwHqGS++sg;L8X5=t2Hjqa{Bhy?%
zFknjU0zo&^`o-l=i%@3dFtc3X<N6qub7)&?-MaN|m?_;4_}o?=*;Zo={vVBfVMTDI
zZ-<wx(T})3VR;P0HGPE1C^JUJHka#8<|-5FV}PUL2ot+%FBX=&NBH!Ac4Di!&CRIp
zCYg!kOO-#0`O*8_I1nF14U?!5HgE7GT)VqTEJs^TczOeHetCbrr&|D@i}YGm)Zz1I
z0tkyJq0F|zD-RPq_+nAxd5R+eTVh*m9)rHPlsi0^TyP1~?B}VRfEmoP<&T4TCdt8X
z*!pZM-{8GJM&UF29<K1K4&OY_xxjNa?&6-~tl&O-Ue16ASU>>}9m68;E;;YfAGd2T
AN&o-=

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/NumberExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/NumberExpression.class
deleted file mode 100644
index 2695469f4f2e81e036b72cc222f67902567343b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1321
zcmd5+OHUI~6#i}>3>_<Ar64|#;;Svn_#npEh6SxnFpVtGCc3+wUdrHfrkS}zaPQuw
ziN8YQ1EPsPz<=b%c<voSMY^avyO=rmJihz&n{&>OUthliSiy>kaV%zF;EI8(Ca&SS
zi5n=INTOt*Y+#9DDindk-IfSK$M>GC*BRJjhSN3Q3nlkti@T9X&%S<>K6v%<CqsHy
zIT&V|JA9X0JubJcHK$t_w$tNog<-7fc#d3Um@5uXDYY0<HNQh3lTF7HPoiF11W$R}
zB~PyD+r)+wCpsTGQ*zr086Gxmzh|{WDPCGpAo_kFEwR@RM5w4+J%V(#!-^pv9mR;2
zLACuz(iLxuLvZ5ansD99KS$e<<8~|(Oo}~ODGjMV!Lq|8w+8&`bR>=`o9<_rAA;})
zKZa9w6a>PPimv`=`eug0kiz5S7&4nq*W;4(V|e#}Dp4)3k{ITu9|g8(II1o3e}B<s
z)qPn^;bs;Sm}IDq&>LFyjrNYP<#Fu|+{$7ZmVw(@+`(N1e2?M52$<^Ap6EA*`=gew
z@lXuNFeHm=KBk8a7iqHP`aB*<o!Ouf(wQ#zx>iF4sUP%&Zfp@su~CX=a1bYD^M`|}
zov|F1QVRuI6yvlw5;%_xOi-WcQ<gj=v9@Vn;0#4_bZU@4L2t9X4_03KjKl|>bC#YH
zv|@k-qzE;GMNHFaCeB8lEcG)rDy<vL;vB^k<_oGz(L47I$>-%yNPI!+0O@^<y(e!1
r3VVzyK+8;FmgDRr%pB&3y^7~>fh@%@hl{vGxbtKuaG9bD+A918`oVBR

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ParenExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ParenExpression.class
deleted file mode 100644
index adeef796f4284b58145532b1be2ee6722380e4fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 914
zcmb_a-A)rh6#h<WY5GUYj}<F~5)*<-*c+oUZ6L8?VzU7fp!d@{fx+!gGdoN49efEM
zfh(gIK7cpAhi||Q;Y`I^_No$YcE0oXoo~-MKd-+30Pq6Kc}$^}#p5iN2$e`0C4!DL
zk<#JO`?myY6G|-|MplHjBZ63F=yGlQ+ppi}gz2UVmE9sdS@%!Hnebw(0?${GZ6xid
z9YVULKS)B^SE1aE`(0@cMK@s2oUeP_R&aB+Z=7j+q9Vd;zo+|NH?s1h7aKXy#(MJ8
zz{tpH^!iL03?1ISFf!a3g&KsM9!MjsHq28=Dk2pA@o+-*wusMzze2VXmCZ>M?cH>4
zY_X2^T^O7=?~RD$*e^M<+<`g{h2>cgz9i@VzuN9km|JlEK*y#h-zm4$g~UEK-Gvm9
zL!R*Jjyom1oV2p7)z~p$6)C=SfKWpk8GfhPN+HXLXNo-I0(&H9xxDPN=Nn%^7YwIR
z<gZHrR=BK=5~KQ`G|ZsP78js`S*CJmj!_EpjH|;c7h4#`9<Z;<u@oM%Z*hnoT?6gs
B3xxmx

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/RelativeCellExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/RelativeCellExpression.class
deleted file mode 100644
index 02ce45067151e97f6217033d2adb9e81090d4d06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2851
zcmd5;U2_vv7=BKg>?WHnE%XCJ5h#K-rDaQ1kffAC3tB7%TUsoBZqub*y4}Rh1`3M*
zfD31I7#T0TQHB{W&~d1>GwPKWdgYZ@I(prIz=-&qP1>|gbl}d(<eanbdEe*#es_QR
z``hmTJcsu+Y{$tMTJWNVmoON|DZH#=NX2Ol3WlRNBloj%c|}76Csm9{rco8=G;G3{
z1|8#)az2h%F(H==^5QkQysqL64b2#q3~#D<OG5&0t1wke3e@K<&o-TL%gftYcWiJ#
zK%5e&?a#V--*o+P(<xYyYuE3zoEq!u6Ht0=*Y<k_n%aggnU_t&G2Lln)c0(6I-MLB
z2=`~FEP=Wq+qH%ZbCZ^L&YW~e*)o*PP?1S>d@d2g{*0X$=o`vp=Zwj`Z_OG7&&p*z
z->~L$o|TtY8FPem0)jDOIi_!4w)!o{IkC!-7Kmm@88+tvO%;~WqkJJJanG95G*zIc
zEqOserQTe@r_jx|DmD}qOI_*5zMU-C&XmD8`qsRkPF9hx@NmlXO{47903Yd@$O!DH
zBEH5rhTXCAKGRuDO2M}sV~7-rYrg4CTfTIHY%)p$@l3(<EVo2t5CS6wTC1p8?+0be
zc+6ZlZ(n2d#GpX)`UGFitt5HR2BUh`RL+^nOIF5D_tMa=3bx9kSmU!4sU7vr%<O41
z7nGBV3_C)_lt66Mo_0;2wIp!s|C!mIcIkmOnk{%4>!dAPq@{Xw@0aDQV>h1Ckwm)+
zOUFe_(_I~hF(c4j87ON$W959=JR?Cn^%v{>#0ptp>&7NIE(_N3q#|2DA9H8j?3G=z
zV0P)agjpR9<^+1GDcjJhK_M4YyS|)txX21@uf!;4R!0u+NGoVc9zOG_qks+_mnHcM
z=5<`fHGzh}fuPind7gPy*1L{(@gC<%C4Tj0E7~X}H`=)y*9CeX0Y?J=%UBXfJt{!n
z@(tOdWitdel^v88a)g!%gTCdNe%50iD^-lK{n?xK7cD<Cb8fZ$Ny<EaFRbtXHLbfc
z^f$CEi<+~Q^MEVg2a1`?SuR_$v)T)z0<Khq1d00Dq6UG+wqymPRKu|*UqpjzZ%YG(
zqn)>Mf^HOFWmxwHD^aDzQF}GE%`1w7DqD#;RjV^*ewcHe1JDgNh1y24R|Ixaq%tGL
z>LvqaV{#g2ox+?eu=_u_i#*a#bBgh+YA#=44W+o2XMS=Vt^AtU&aVrBZFmwpxbNgs
z2)j_jGbahxJ*4!K7UHh7?^}TQGT_<ERST$l`LXddf8ggsz=dbf#wYU2K|~CJeds7*
z$zAX+RP%*gA#s#|k_<5P;%x~dj85z)7p(|I5T-_8xudiFYlOZ*O)8uSFCr{(Fwzvc
zh1MlRCYGQ~EI{27y@!}&<8}|)0^;8{MZ%vVu>^f05w2N8Z3sVL(>>HJp#H8%DH3Wk
zdr?iOi`XLYF%HO6gOF^gXo7%^9sGZWI(cs5x#@FgiD*i>4dwR3pA*WDs1M+k66z9~
zY0FkZmavIZ!rm!QCG1#2P0+}?MLZG0`P&bFTS8(Yp)O$CUAh|%LNts9o;wj|I2vK_
z<E#sZZ~#ZpjZuCcj^lZbzk|3z>IZlMA0maDNaGXq;0_b`6^`N;^x=0L!=E@Fg!&@G
zSzyWyVnumd8=PX~Jxt_os6_n;&+=B0VP8$_GWB%@X<DY%t{~~l)P0C$6UQIa-c73;
z@hfpsERHm#WoZ;~dx%@)Izp~q-gO}M0Ebi@6)g`CSJ9{9*k9=6;Xai62yK3V&AcV`
RK4Wp55+U?c|3Gj$@eg`;3>5$X

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/StringExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/StringExpression.class
deleted file mode 100644
index 23d04d5cb0199cc32c6751e61714082ff733381b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1187
zcmd5*O>fgc5Pg%l2{rBqf$&Y*K!L<a_);N6q8^%32^7I0B@z;sjk5|ajvd)+)L#M;
zzXGJ9N+5CJ#)aR(pFqrRs)i~#gd3OLotb@a-p<ba`2FP@fKAkF6tKRC1yqZ;X(NwY
zMQjvto3NV7BoJX&CTS2yFP`iW=qX{T6-TKOk?M*tlMCD54}bmKeD#iCDS4m>rS`sf
zE4)xd1Fxf!AR06Xg=P>1YKu^=O^54U2DjqAB&@W9NIuJkJ(=u@UdWzOJN8+GU@2@L
zJ1zA(NC}VHemwMgsgiHJERmx)QJy>)B{J2Dy&+SE#&Im<@kxv&6&X9q6sLG!o53>%
zw`3SL{yEyqg0Sy#opePS^%?jnm3^UvH_^AlCTp~O&QGY!VE9WP;jEt}iHww%YhGqD
z6RI<Sr^OK#JHa3lit9)C@PAgK>27f`>`t5|zT6FTTa?GGHL2Kr-E|I@amRs!B|>wK
z-Y`{v-rJYHnlS0wYofb^hjVb~ubk>H!h?CC+ai^d<b-@p&%>!X87pkmyQuP@7I<)T
zxQZgqfWOaJHhcKh=1i=8g(ItM?Xo||yX_u<+<Tvq`(*B%<8_&b9jL&<8ndjU#MZ^}
zZJfsiwistvxe-w|G0nNhIE#1ZEAlVhL*$NNePlZa&065hz=mOS$M;Uy99+U>6L)Zh
VPg<G7FS*8y*A2rBj#kWR?GN*BPE`N^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/VariableAssignExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/VariableAssignExpression.class
deleted file mode 100644
index ff22a747172f27175efe4da2df3f0ebdbd52b39b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3709
zcmd5<+jA3D82_C#$!?QPfeM8Mk&9x}mJ&d&X(`Yav{0^vV)433mo_C$Lb9m^l#8O`
z{qo}AgQMdE55DNAWvVj_yf};u<CEj?pXiLJzq6Y(Nwb{^Z$9Mg*>k?{_x--h`S#@3
ze}1|NU=uzKU>Q!<V=0~s;(5HF;KcyEcuB#_0r+7khy|d+2qKPQIhYDg1)yO>!Ds*t
zI4KtsL5$(F9FlTvTt!Mg({jkj;f%D94Il?gL0-Xx!2Fz<O&G~RGn-4KQ^)&y1;jpq
zP)|CQvy7BAXe9Hd&mY`*Z}X+!?+U0B2IXT(Q=qYb%$P7DNh3898L+a6)JTUwz?{rv
z&71@ii1f$P<B?d-GEYbHSu>N)T9MLzWIR1=CL?=h6sYd+Or#Q4mq1;(Wl+G|LlJ>_
z{fU%$Fh3qMv&V|I({Zvca49T$t<gkIpt}~Ul18MczngqVQWZoLGSB2K8viWpg6B~0
zF_X!Thu)3l6UpHS18kX-R!57AepQTy4a+DCR4-o{EHNz5RkQk`*q9l&N=_C)YKoR^
z-vQ`P<f=i`SRyqn0R>jO5OO^3F36C%Cr0X?TueZ(Dxz)~9y3cRRhpId1bSUi-J?{r
zGB-~LalT_XZzYluxk7v1IP)p+n2W8ld<z8Q`E1rqSu*_stQ0$w0;^mUE0awd(kFp!
zE~4)KR3)q~9UH4Wd`@EMKvRFksW_W43nydKEN44i%+E?v7xCO`yB3z6tx`KQU>Wh#
z2aJqOLcuEvCfUdooMqEeaE>iZpniZS&#>4X1U~<No;1gs;E2g)SnPcZ!!1>XOP7PW
za-l`xY8lzpLWC-%RbT_b9=1`2XsH}yqg(8%a#hmkkVFCl>3lYB?oG&czP#w&>~6SD
zws{R}@T7*v@q~i&8eT=aKxYl4%Q{ENxa<@fUc&`}T@Qy*eX1qSMK=9fapvw1EKCiT
za9P9actc=iHDcuv(Qrk2uz2=Yu+YFXyotA1<{I9{RSoapf`)f-nQeQmhWGHk96r$S
zA&zKRh1Ci^((o}psVyWjvvYpF1h!Ojuc`$bqT9%srM%RpXs5KKB$LT|L@5eRI}&KH
zmu4C)dsb<o&oZ-ymCg#Z*Fd#ojP2H(G~@P%S>Z8qj8~q<nReJ%Jft%mctpLq#5q<w
z?-zX>2_dj3+*f{@XY^J3$n*ZgPf=oqa8m_p(Gemmqeku^Kj}93Nm@$TFaD&N8nH%s
zw=psqGsO>IyIWtVY88btB5;L#fn7Oa=kisOSFN<OB(S17x=s-nt{-e!yyX;6zCg1J
zwK8T!<Abc&rM$8Nb$mXG<=|(NZyv1RkJW6?*(~_<bC11)V>90(d<s5&tv4XPv&F&%
zAyBb}bIlPzE86(x#agrzl**nk--2Ab-}(bQZEM@7QRhX}E22K#dmG+sSg3n%!5j7K
z{wesPzU%l(ZukouerH3G8&~CqdJUJPhU#q8M-^R}Mu4gN5=(WZZW=)kZb6Hxx;llB
z)I0n$8isCQ9+xOOUm#kq*H2@Cz%{hXS);Hu0#f6VFA&t##)VT@bV67405PV}bmIEI
zzscRjr0x3!p>}$+ME6ZW7vI_r%YdAM&as)7_AnMOEIPxnk^yOEI5sjM+p!M27|s1y
zkE7UtA+8SNDV*WIiAik6d2C^O+KR8S4c}1udvxF?I&m92aEF@rup57%#}4=vgov#W
zF~V$Zw`c1)JHy!q;;KYhM(m9U5VMySHgoMLCTL?T<%W=^6{*M66w)SVQQDNbzE8Uy
zOrf0ZKo@JK0e7*JEWGsX4w-brM=n4Ur5v<gqB&A~D7BY+ZBQSeRl(B=o>}q$TNU&v
z*!KVn6zo^f|2NhsIPe!jf5P8@gH-U~5X~RP5ssCm$9T&~dl*}%K0yoBr6=g)KtZ{S
z($WKeYuk@lQYzelz1m0q`)ma1fy8u*SI*>VkTrh{$6bhcW)tamB{GN;ZbUq@i5w!4
Q!*dXk$59e_)^>g9KSWmd;{X5v

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/VariableExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/VariableExpression.class
deleted file mode 100644
index 6ced3e4bb773fdd203ad1397a7523f8dc202c43c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1344
zcmd5+%Wl&^6g`u;HF47iA*F;z+dx~Al-4XN7ERPeQ!0TXSOg*=v2oH-aB%F%9;1E<
zNPGoIg-Rf?VaJB=;3p8rPDmRii?TzOJihnNIdgm;^W*oIZvb|1-++!gDNJL{z&bW`
z+%=$~prfdxB(M-j-?p5F^aI;-pFcVf5RV0BtDYMu%T*1_3FXxO_mf{gcV4~~(3Ct@
z0-0LJdSjW6<+jbb@@=<W7MQNsuC4Y277OFyVuRqScO(VoYql$&gx#j}pIJ?Zo=nYa
zQG`V)v<FU2y|M#=O0DH}&1RtFYcup^&-0Zjk9)ohBE@Exluqn0|KcAGqZFkR-3t{D
zc~_Xg)Q4B4<COn7+6-;y$YiFXoRo_b@MAiUEM=Kz`VMGPqt@d20?QK^&gm1FX@$No
zT@}fV|13UPAU^>(Do!BjH9Mnqd)n;Cmg4cLy4`jy#pDXS|38ydDeY0HQTIZ>B@gYW
zXO_mxy&W}W8uQppV-|Bd?xnGXZT8RwS|~0}KPRIFiU>`C-3xF;^`6j%0uL?<-nRmI
zc09{ghz4h696nNCwnkfWR{QfKurX->&&}kp^dplx@D>}$^S;n|e<W}nmyiNeA6ql@
zFtPDB=NJo&T&8tMe}bz~I)x~0enR47yeGr=9Flx5^U_%%(<-jey4v53EEZ`I7qfB@
z7+GR0;_MJN#WlNCIzi$ylDpbhXfJZwDW*QqpFqTJ#7t{k*JI|LK4!?A#Wm!pl05vE
ZT)aDr8@Ne!gU_vjvWRb$`|>gK?LXBhdEo#6

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/cell/CellObjectExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/cell/CellObjectExpression.class
deleted file mode 100644
index b632905e1fdfe7bd34217e9a31d6bdaa4e19e4a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1881
zcmd5-O>+}R5Pc)dUbJ2e<zPGJGmatXBlad>K4k=0#)L$1s5rPPxsBFSV(rzgYIl?(
z=lp@(D7bOr2vjA8B31bT{1$#g$eWeQwj#O8xn&QtJu^MsuX|qiy!-p@UjP<Rv*DnS
z!zhY2O8DHy9Olj7+V}!r+PHv=HuWx9xNIYbD;BO=xF&EkQL!(BbrmOm6h64OEFiuX
zI9!dwM9WaG%b=}>C!S@0`}M}n5rIRkIBKa_{~|D6+mt^`H;`e&UDL52Hp&7ci+<?q
ziois^f4i_QkgY}=O5jM%57lbBSy%B7vL0|{ycT%`A_<4{?qXIy^b>(<&5N3DJ<)2*
zZO5t=#oASmTCqwDYPU&~LAv02DhS*vhwti}%F}mtl!(oukycyN*W>&EgB>g8Z23R$
z*4uut;WBAjJ<{dEfb)HDH>8&CF1}?>iE${ZZ}z6P69~7mCN_c71B~y1E->n~<5-2-
zM3M%bf)bb+aIhCQ?|n^6Z|hsx>gGSU<~KsAnR9`s|Ief?7As7Sy%x1&Pp$ZdO4EY~
zFmKrE;25qu7{^Bz$_^HB!$QTuP26&D8%q|d4wiAp!is~txMkrh2lv2&SUdm$(;NLa
z@65d#uipsVK7b8Fll@67aQUD%mSm!K*+pXIP4%7ZKfcQylBJ>as%$ca$MS{#`V~0S
zf4+x80%Lw+vVTAFSe$BOpGNQ#I}d$*pO*5HDIOII6zFt62R*91@N)-J6v(CcI<>Gc
zh`~Mh%blRx+7H~CpRkmfwAm<bxUwa^hsvebCR^j)uJ?e->`}I#tVVi??QlzAsvlif
zZIof(-|3-O_jbu{rT6E3?^W!ygPsQ4T`jC*hHrqwHz9-LIE*o{)uywfTp{gKnb(U6
z?o4vF!u1UQcJVbtvGfNruTq^Uj$;_&_$jiO<(qL9A9FU@(Z)3Go6k<IvOD1fPIAxK
ze8F?W{8#2m+ZftL_9>3cZDV*&Y-8m4hxf(bk$D5_38qRN@zC|`pUC|<oqY}arIAWT
zpoJkA9LF)j@jN5Tb6#YOCG*JP66RA(3-neZl2bTM9Q3<`u7Wf8gpr!H8A>M73L~1O
W<+GHB`JX(6a}+c9jEd(|DgO_*0vX)^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/cell/CellValueExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/cell/CellValueExpression.class
deleted file mode 100644
index a75ff1326e303ece933eb1ed63b5b7eb4b7647af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1571
zcmd5+TTc@~6#k|yU0KRiKvV>|X<IDo1@Y2K44{doBB9y@-lp40UD)n6yR(MG=-)8m
z5BT7VzLZ20Urqci{s#5Twh?PfQr~>onKNh4`OY`zGT(lD`T}4Xt2%Vd>6piYj!U?#
zmZXjp(i#?(`ihP?G8&dN7z{(c@GNc@h38wY^Zd~U1AENSzwSD|<c=(II}knFU*GTU
zY`uEJ5YJhTC07}u$yAXcw(gb%!(iTW#AZ+}3GW#%*`yiCyC%VM0;h9R8Ivz8pJ6R;
zx>cj(OR;YRo~XH=G{iy86TaeLR0+}!6^1En+gPV1r19XlO_o6;j9MTm)Z1hSyatGJ
z&HnS>QefF-gEAn+fy|~l__whwbIFZkej9WojxoibVX6bdAN&~l%)s-6BNg57W?^K8
znGTMv<fu{w$<6&Iyw=QdZ^5cKTvA>c4*$>0<kG8@9KGNMo+%z$s$C{J6nSZnzvKxF
zVOYb}1g_z_h8qcL@tX;(;FgBl3EaV5hFllz6c*@dX-}B4wM+?QkyBCbG2HJ0NR|G?
zzGPVG7GjP2;+P4;WV_>Wk5E%ogxus+O4VpGl~<WDZ0=Nyg7hq>Lg}1t_it$xh5^f0
zS>AF@8Z=R67)!PTrFQ8}pjg}CSgxr_5FSH{f}Rwh#gv#VbY;lU8}e)P{BoyGZQ-A7
za1Eqo8+ps8xuoYuWkt=}-&tuCnz*!Fv8hcJF@s)uB>{$W=tF|`emX@kKp)*7!?cc&
z#-N?i-jhB8`xu&>rZpZaCoxL0awY?eVVw3D&R~K-l=Evu=?u(e7VC)A5k16UrjA&K
z)zS0r=l9Qu@6aFZ2&X=fSriI-fOZhSKFku-d>A6#fN6#xK%6DsD(oE2lN1T1Nn9Y`
UDUxHP8OJn95nLp@nNXVj1=g0w{r~^~

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/dataset/DatasetExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/dataset/DatasetExpression.class
deleted file mode 100644
index 42b0560bc36626566f9018bf6359d527d322c0ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6419
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
R0pbPPQ#A54L#zeg_z!2D8*2an

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/el/ElUnit$1.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/el/ElUnit$1.class
deleted file mode 100644
index 4fd70f2ca564205c79ecac3051545fc9a0fab3bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 948
zcmb7?TTc@~6vzKVOSfGXsdz*1g0gb4!ctUTG$sT}LZo0)!3UnE+X)OzcbeJRs-MVb
zH8IARegHp|@ytrn7awdgbI$oq=G=15uirlg0G?sP$8F43;A5^r)*Xj;J=}9}--&rA
z9ysyP!-9uL44Yx=y|nRJllQ_{cf)pS#YLDI(bL9;;zQ4fG?h9DySgJ(c-Rw$TWuJ|
zPWBkeFJmPWX<soEmRF7$ire&!VQOC{;vnm`g?Y={ie9Gob<EW<H`4Lt<7CV7_<~aB
zOqDYDEuEQI>`Lb}(NISeeeIn0IR$MbvC^qbPMgA>>5hj*4@&`-u@WG_WPr!01$cs0
zhFRwlDW0502fCHTXS-6UPQw^&0<5`jkrV4q)KO!2O3g=k^U-DV(Xja_Z$5vBgo^%F
z71kMoy(AH4Tk$j%DMNLb^{{;|V#`n;IW9x(KYWIRDD}C@T=w<lm6QDuTwl=8wmKb#
z)e*fsZ8|dHDjzy+!PK_y_LS&~#Bxi!!cf|ged!jV+{~1fJ@t{yR@SzL$F@388#+N7
z%c?VOZq7m(S1?7oN;E)$Ea2!n*x;xC6=PrADSSh*c=!p$*EyC5$A{<<mWEg+^oCd=
zEa&(c<EY>|ZjqkB0v1UxVFS-eZ(<8Oq#JmH7U=@6QW>SZm=M!skI}tGcMkqLkD@gH
ZA;|4U{`Dp$0g99c2<iG1$R~|z`43~e=$8Nh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/el/ElUnit.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/el/ElUnit.class
deleted file mode 100644
index 97a44f8255951b35cbc8ec85a492536a1f3ee0be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2611
zcmb7GTXWM^5dP$wY*~;?AqkY0KwauMBuYpLgj|3aQ&LO}F-e<pX=Pj3B97#dWyoXy
zMql^=eM&o!bjnN%ul+-P>vUIAYFkk{CNti%UhjVU?VjB;`RkwG{{ZkMbO|F^OdyOU
z5!WR;ZzOOEH`%f*A&XnA<s{t3S1j(ZSYh!si@PH7BJN4(!(tq(d=^;TXYoM7ajbEC
zk;Ow1>moJ;$Sa1SS=qYUY-&vbk-GNG7BHB9uD(!}x@uIFLg~3yw&w*zExlT!A46tC
zz(l@mZY!mxt!*hSOKX^xt!O(9OKUcD(@?g}idI(&4b4(*)1u&*q3zfO3XHR|Zs-Iw
z(+dWJDuk7*a}Xmf=%g$O2&c!WfJl~73Fyn~hPK+;E@{?7wNxj|VBRdN^$pe1`MYO~
z*fpKX6p4JJWs}#5^jJ`>$BMRE-nyqYyg0F{*?FfmV)H;dnLZrJjN;_G=C&$M&Yl`2
zE7z}3!Vha*lt4IgD*Zu$OeH}{SG~q32<AXfdUp37F84<1&`l&gL>FbYCwe{*CMgxo
zmQ~hn>wIfT_ns$t{$zZHl#EYsM!<9rJ?qAnF@}tcZ}6>*PjObnri}0KNXExFBjT})
zCwMC3dlo;iP+64lRKTU6TxG3c^JK3%vz~S5C%5C71q`=0rf6HbQC)87^@?T*7+5#9
z4D;ov>21U4H5p}8SZFeyp~`jEWQ^jhjB_|IpudgfZXfMR5GUWdb=RMo7BHJCzSQk<
zjRrYI04Zl*Q{KL&*x%jPl(Vm?gMFnPf3zZCyoa3a5Ye<Mx}nyc#iZ!-hof7zUT-Ql
zE#0oIvr4XNr6S;Jz$OLk)?pI?P!^IE{RPSG7H4m^O7u#ojfQ3r_CzPPdo%N$E8lfl
z^t^QWdvD+W`NwV3h48;6UM>M$@5BLv4Z7(tJ@-HqAs$K6LOkluN%QKQG!o89Q$eQ;
zfj5HW=k!gXQ=l`N*@y6p<92~$%rTzE7o>9lCrCTt0xtwvIQVZwoZnt$UL*7#;h!*&
zVf7utdx*S2=vTshjo2Q<$)Cyp34L5F5OH9FK6CWR(dPj<#yR*mBzD`n)S)Lkbh$%6
zw)+;xH{YUfb07VK1A7>BlYX>^6Z<&%C!vSIRb4=W<T*%G$q2RJ7Fq67U5}}v8ZN@d
zB!0wHN7b*qs>dlV0dZtJ$$wPD#s8Yn?jRMgOMW3Im)pUa4y<+uCn%5G!6otzQA{i|
z{s!@O|0TydOI^R>APl))9vi+NzHGiaC6GwSPh>8T$W$<qke|o`5m`Kf2u~XmnZ_lO
z-7`gZ?<aCSkjM=E;}X!3n4icp5y>7wgvXtUTn;2M<R_8~Br+RJWXMnC4iQ;7f(Y*$
z6S;z`B>f#3_7k}qNMsJzyx^`G8TJ!dB_f3*i15PGD~x$(Di?5?PKhk1=tO_~Ust*y
A%>V!Z

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ElseExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ElseExpression.class
deleted file mode 100644
index b8b4e49bfdc1f02f6a1373b898422dd5c9aaad2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1467
zcmd5+O>fgc5Pg$43HhR>rRA#>0)-|H;0pqwgdjC75-8#l2xrGxiW|p{>@~_iLE_Ab
z6G(hW9QXnJD8zUZ>V*0bZd`VEW@p~Kc{}#cU*CTKxQluL8C=gp!%hJ=a5IP99IAxX
zK=`)l^n@SSp8Mj-K7pPR%5BdLr0L3@>4YM4^x^&RWeZ(GK}^QJ2%=!ZgO25mjD8@+
z&<K4o_Izo?_r}N@2uC@LgX63{$FqhFLbhqUwrmm7)mo3BwK<ru(y?9fEFATP|J>|5
z>{;u07V|TiCEGKnCSThD;nC9d?N`DHgmJ)2OodtGxPfsfxz5{a0@$>Jws4%rKi~F4
z+Zh<FqZAX_s3qi|kZNE`b55##HkqSlaecye0>T_WLeUC+U$`=&t2$Ga36+GzMRJ6E
z*FJPj$&W~Q_kSwU)LSe@`B2FC1qqGnQp!eB&nf$72+P4DS~IEj6VH?g77cNs>xI50
z9^292t}hPTog?#&Swb17ODLk0L#+fI8-$0;enW{fOt`mf{+>BM{Dk|<CdPUz-FUXd
zL|FXQpu+!?4F6wJxQHxrAe>TGo;}<opEdSz&%Ca%W$;eCXY_BNPbzek*Q|1G;S8Tk
z(*Uetoh=P#vB6+ba+fWQ_oDt8srs$kUy=UEW(qMxMM3D(uo(m=U=!yQY!T=Al!`!b
zfjOsfNg-_U?PYB9y2z3X{as=wfhFMzuFjHM3?CK9>h&*3#XT03cbDa=Dum5x)G^7d
M5-gIZq9|Sa4P|<e-v9sr

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ElseIfExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ElseIfExpression.class
deleted file mode 100644
index 20e96f58da00a69b82bf6e36641c63545dfa9d6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2160
zcmd5-T~pIQ6g^wgR{8;mf+C6{ifvj5DuPTAm9G)(_=57llWDqOBqU6-W$Lf+(HVb%
z4?gIO;*1ae0RNMYH`_vJ3|bzX@gdpV-M#0Yd+y%N_n%+C0hq*03P}_?kw7tpF^v0P
zS_%`mnZ&ImZZq_F+%<J;ox7gt*w0oL8Q3aAcEPbdq1$3zw`x58<KF74<p=Lx(}LmH
zRa4O3vgrwiM`gp=(JG$c+gi=#yN)X~Uf*@O=i_NRPL*47LNhnH<#BE4aFId;NF|0;
z;Kwl2Hf{hoZ#l*`0VQTl+Z1yQ9l88EgR(#*7`n@*&7ahED%^dlS1g+8EjtFKu9E;{
zHzyVG!t@v(wjKW<FG_A@Gay4ek|fP;O;Dsaxd^z1HVfRcN+({e)J&_Yk%EHPMJXTQ
zABfp3LRA;~5%m|zB#w$f@fn695RUL;NE<cR<+kwY%FJYBhT#auR&orTYvz`%3pySQ
zZ~spvX4N?oqwDZ+drNyd<@x*{v)zylC|Wv!;c-;d-|Fd4{H>|{<DcE)A~==|rCeLb
zMZyPu2fdZ`TG3|P=Nbm{$)(nunrrZ7)9=T=rBDxzzts2i3{ImrgKqRBF`2;~3}lc+
zR}xbhOye%Y{gd86p(qSf?IO(U9uLxBm~PiGaFRk&2k|;L<lV5`F2=z{6McbFEA!*e
zY->wK^z4yl|MO~o1H<$eNz(tN0~c@#ouD$36+@aHs*L=ma?zNeHL4!H&yc0j$Y_kK
zU%)=fZD*UCfQ#s(?@VI@`f-jd1?Mq9puY1OSqhD5^%G)+;@CbqK9Cth05KvV)W)_Z
z1UV4PK?$3tAcN%L&t1Y0@xLq)uF&c*uF^XkNEs^>_Yr>|3N(7+Knx?e)(kL56nqj1
zweT5AphHT|<`IV~@%tOQ4iia8aeWD|W3-7CNJ^@N^(aP2%5Vd@C?c^i5sipU97Dvf
Lu1_Q{g;9S26o*jD

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ExpressionCondition.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ExpressionCondition.class
deleted file mode 100644
index 34a924024eba1de516bc1baa5c1e5c3800584613..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4421
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
B)D!>!

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ExpressionConditionList.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/ExpressionConditionList.class
deleted file mode 100644
index 0e07b29823f2ddfaa8c187b41b9a3581e31ce45e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2217
zcmb_d-*4Mg6#j1P#7*k9v|Ty^W3*ctY1-9vKMHF~fpqQKlC2U&1tB5fq^7uY<KWoS
zfL9Rw2dF#%*$Xdy0K|sI1L6&dzX+je@LfB#+ALB7Oi`}yJ@@$g&i&3g*MB_x<yQcg
zP|lzam(tL2Sq`(kco8qj;fjX23{og+m`|ezFK0L`$k{6zUe)lLK&I-}wrt;aYYl-X
z$~)#Q(+GUqG0JwsFAAhL?CqNA2c9Lc*|t4juDZKMrQusQ4La0a&o`{wb<b)vh-d7&
zTb2_V4Eue{X;{Wmyt#P5T3jGWa>unL|I&XUh!0?_5hcV+&D%BGUl2H(Z$m7$uO~JI
z)I~-rFi^H@){S7dVtH?x6^E9gvRgHsP1CdGx@A=T4{XM|@)!=^(s<-3%}4bEs;}F_
ze@u$EiO?15BQl4|S+`6_;JthYF)D%WY#B_nZ{7Bb9UP+iShO7HnB9qYScfscz|{_5
z|GMr3QY_TK@dX6&Rat@p7rTLuLy0Pm05<=t0vdPZX$8hQ;2af%lvN&G;B*JqL(&NJ
zRs+woYQ9uTpl`!Bt2eKk^{^b-;OuQ$w=JJi$DKTspJ+=m+wAQ}j9q13N_$)fXExlx
zt6IypY@1UZ`dpU!w7gw(oIpuOKL&IRVL-#8j;mPGv5ad1rT>4U=y(RF1!lTHI+{ow
zD;U?YiZvatV_aal3y5RHk;mq}8eXf8S=%<&D?3(|CM7TXr~l}E%bIA|A5%f@vYZqq
zRUn&RZRPS10JEu>wJjF0^<iK-ypOW2yW+5uY@CGaVT@meK7J|^{84x?qHs0HHFFTJ
zhoNwO0$JKe=n?R#@HtTU8KN+G7m32uT_``$q~IjSA*dXm<v5BoY5H*nPtr0Py@ni~
z;)(z*S~-)12|P{f2%pj3AZeq$VcMeLPSM6pa%3pNAx95=nuVW`xDS<5eT$QFq1;C@
zf!~mtoH~CG+P*TYX4Tm14(f8ARS&%8lDTB$Ihzu5TIfm$0^Y$eU6t6iXHLs$zay1R
z?dP-~k-mq_9x~a~S4b+MrT4(HhorjysVctv`wMlSK}O<~!h?)c`R6Fj^SFRKN|-<y
z1*~Hd?_vtOn1%;~O3&akdVJ2$`IoqiJ^FuxE1{Tg@Zcr9MVUvD<lEPYc7|W|b*$km
z#-Z{52|3P%$!Nx+H;IuCg>90x5Q^O-Z-MbmG0GgYu?I+qhgi{YUTB!s2LHt1UnCI>
p=>@(Zi@@MYW+y3i{GO9UnEF&`oDU<^BZn4ql)f3-E`;6}{{e|cNofE8

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/IfExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/ifelse/IfExpression.class
deleted file mode 100644
index 2896dc2abd6b79803a558405d869651afe8be326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3959
zcmd5<TXWk)7(JWXR_n;Qw=`TDLZRf+)KJ=l#!1>-X%hEB(;8YXt?a0&62%U-+zAhz
z;V<ySgg?M*n1OZ*GYn6C;0N%;4`CPvIJ>efOHmkw=>rduSG)V2J>U5*tNilU4?h7o
zhjJ2K$R0r_t|W04*W~DW67S=N9IdqCCT_JNhY#fALk+i+NaBuss0|+_@iA^__#}yT
ze5&EDhI;}X6|-y^cFrtUtWxpT;+%k35=hOKiWSEwIyu9xn(^O%`=Wp2h2Af@P$(5w
zEr)xvR>cvxoGp|#)A@>HZltSabE{N#(&qM7*{n#s^k!+*wADn~x^LPQGd<r}<PjcH
zMj+|g30#Pb>jBQ#rNRb*I^{u&_q~M*{miZ#4~=xyvFx;D&TU6lthJ)ykhQ={V0j|)
z@pZQXM`osYLYpMw(Ga-!Utm1|LMA4xqUB5p92ywR3B+b8ut0m(Dw<cTn|ZT*)5zPL
z>B^Q046DK5^1U`0a~@dKV)CFYnzbYcjUnHvIy~j8fe<J+=Ch`4XAZoYuUhtMnwjC4
z+fHUM#NKS=Pc6At4aaE8syV(&otS}Dn+YoJ$joX)M_@V%s63^Su?=H4sfivd&^v(>
zAy7@;3$zxh<+53Hq!>y!<(EKzh@szgR@#bV6gI9HTPk=O41urzpK?zO$z*3IaeO5$
zupGvBPXK*dH=^r<%E(;rSle^J(m<pXiE;wl1|66W6zt5wJ@6qY;ypFs<}zX#b`J!a
zj@o?8U$~!d)r&V5-2Oazl+-mvUFRFR3uF!;s%KYkzA5Q!6WT;{1wAttOp@!A<b0B{
zf)7BjsXcq}%+{V7ZXhOIgx+&e+}bnwJfvq^S}9e_1#`iY4ZE|M$r;H($7?vL<2ZUX
z<aHFVs^dkxq`}m2A457`#w!}ubUc8?_Ml@O8#-)k@}4>9r5tE+I*KUicoqE`wge_3
zz^OKTEx&FSn!+!ev2^1zW>o|Xv#IMg%ONlt)q2M8-?&{~G#4GSY&fN|z(Q2CdiFH(
z+1HhL510=PHuigAIqvW0Aq~Ijrug^OL0(~FQ7L;_u8N4aj=60X)NS47Y2kjn9kv>h
z9P{OPT`Cre_Q0rI<z=kCI7lQ`R4+aC{kBnDOS^IB?zTexqpmW)zci6O57EUhtCVIk
zsx<Xz2HMHdT4QbYWH5(*epGky!#mER>qZX*j`FPq$N0yZRAZK-`eh|@{e&9#ah-+3
zaguW^VLo5yTbjRuzwx0b5Z|h;Z}6E=lYKbFvF>ibn;76*41*XV7>z|Q-x8dAH1r)>
zo}o|vj0~TCj6<Wbqp=;daUwQ+dgL+UyBsE-AtQgDLK7H|^~Rp!u)q#Z$<YykpOGAo
z_r{e$>kjnVP~ZLL?_X(`dZqwVYQ1guN3`D-PtdVT0*4?;pCwh0rbeROq<Ne~Phy16
zGgzjlIlP6t+?D6QEf&th!I*MzicWN+1H(8?hnA`82rc5$v6|Czl%};*>Ji@Ns6~y=
z;vJrSj^j4OPyUHc4d(~{Kuc#$^-)@k;axtZ)>E{Sc8Q_k@6qCkom8{qJTasA$XLn{
zxPr@(jI4~)1&r6Qytq+wDM5>pz>V8vNZi=#FcC&16(n+rM5gy4B2!2bnN-e5r>^tl
zhEoZN<p#rbYL-}Y`(U~0d65=wh9!7)^by-l*h?HuV}?(Enlht;?k<G7JIjMZbdLqy
uT_nY&eJILGlJ3r9A%sXONF*Cd<UL%bLP0MQLE~#7#;z2LJbOunc=;cjVnt2>

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellConditionExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellConditionExpression.class
deleted file mode 100644
index ab56db02866c71e3e0567229b22adaa63d3478bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3191
zcmd5;OH&+G6#ni^L&MNK5+2EDDj}LgW_V1ZBrz}{Admn~NC+>9@zKmQ&@gn9?j9?#
zTxz+ZSY%=8%7s;Ku}VRt%5ts0!JpwKi|BWIhGB*o5z0-fpy%Fu&iU>+-#Pc(`}>Pu
zeg)7CH-yu;RgF{Vm!E+U-oapqqoEoM<F<-BA*dLUlhGQC;a&MjsJI(~hH<%kPsRNZ
z>M^0>ft*i<Z~{{*rbB4Lh=iI^F{|P|fd<!bOg%kgIId}1)1yNIVoacR(6(Gpx4aoW
zoiQp@cWL6UXP^BcP@S}`l<84dpevEIS7Y<8XRO3Bj<IGtUd(v1<`}NTimloyBON19
zR=-!EGHzO?*C#O8mRQz5(PL@dT8vG4j%h9S9uF)sBcKd&2Z8#8X&K|0)p^62(&y7$
zIhnANj7eu?oaYu5Z^?88hL5t3j3VY5UTn}vr}GgE=VN0mRY{7*^;Lhnl3)Z>a<i84
zDE_Lg%$7NFh*2)^!=>{XGo6yedd3s4H&O<@Bnv6s(_{Po4{^#ELZ0p{8lDVN;A|P3
z0zXK1+H^fuOg42H&rHV>Tp^Akxe%yHW*o<`a(E=bcTnJb8RX&^XuIzUlhjh2z^7|_
zNxX1i^LRlW-J4%Fl3s5g9lBhiR$8eAu}PEKNl#C%+|}3oa#1m-;vvg@(p<E3kJT;k
z&C8j`cvQOIkSn+Q`l2E8NfJYocE(8>w@rB@&d9|wmE0vuS3@h_*Kii+G`xW}6^}H0
zfDbi%gpbLD1|9PPjeeE;c^_~b{i#g8v`lJ9!60247O<#c2`2YDjBpLhFg2`zMblrZ
zSiX9*>6M!n*RgbARUm#moP!t^Yzed`&~sFvaoaKu!aRn<?sfzO8RKCc=4gHtq3ru2
zP`95e$rxMW{=%qdIJ#%k(dII3ST@#Er2$OyxU;4j77Q=BG?i}~TuL7QSQH=rf+L)}
z3L*!NFYCKz!A#TdTxoCo?>$Q+lwAJH&2`Y7GX5#9`6-WCuq`s`f5~E%nJ2oXt<YpI
z0SrrB(%o@(ao>jhMzQ=!)1JP6LFO78wb`s?>!!AzN*%~wPAfu`##~<ad$i1Ikk-;>
zH0Mh(c2O<tVbQA2&v-#wv5(JvL96}GtDul5|9ZiBzE@83WfZ_G2=iayReyE{ifmaN
z2f5ZtJ%QIao1kWpzctbJZHQ>cPYC?r8@$eMoiDnC3O2eB+Hiqutyy(k#3jyXD4QU`
z<VbE1;6@Qd`Ac{)McXRMHrhL*KO*=ulpZDOj{{+43l%*|SlK}(bNL;HccIR0qpGJu
zu2u6;SB5Kh5EA$r=j5nH;5TSJYPce-ZlQJubpgzN|M#D}sGkd0Y@=aw5A0incX47a
ztOR#(G9ay}zm3MtT{Llv=1sb!K!(^ww}B3RJIPlULyU2B83|m$9Nxquyv0V{jmNl(
zFLB+cV1zHq1ZvSvJC)iu_}|4q8D^fA4dQh8v}_QqgLFvg6(R<?*XKm-q6ghvZJ{iS
zag`WZ*)__pQ`QXS1+J-h+yA@q92cLXx)nVX1<*_Qc%JD8Ii}a6?H!$4Xn84lj-whk
zS)qL_j$7ofpO5hY%<|3t5QDrJhhXys{sr#jc^=F2++M)*dY<R?JkRTSp4W3cSC{ad
U#gIH_Wko!9AHwrZpYgtb0DF{ZX8-^I

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinate.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinate.class
deleted file mode 100644
index f852a65f667c01732064453bbe034f36467b1e76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1661
zcmbu8TTc^F5Xb+g-CkKJl$#1vP>{AjR}e2;?1Lmm5`q^93A}CF6I|TxHoIG*-^m9}
z1QJdB0DdUr%(k|$T^<O1m~%R3&dhJ-fA-JcpT7aDqMSxQN-3z&*gR&l%w{ElCuzh{
zVzZjWQ(m93d7i+F1l9zSRcV^LdR+=+cTV(ET{Cs-Slja)!#due^M>sjo?%-8Vp|~L
z$W!UK6fKSf2CBC0)C^1a<o=fiIX8Ezc3rEup8TXW9oeuQPm`Y;j&xm0q1El0G<}EW
zN>AIma+`|9Hx0}1$^!56y)3s$T{sX>wy3&5X2-DPZnIvI&c0qT{l4w0ZXW24!T;M%
z#rtTuH*Sb#*=>p%>N}R+R%gH?`9g176hyP=291Wa&iI__T}O*(zCdd5&8|<$Z*ySE
za6kMPiNZ*xG=+6sO8$tWhM4Ti`~}LycPsspp51ylRCCX6I#v1F;0X_Nd);a!erGDi
zu&!bN85JWKRWXPm6<G`mj0fN0tEOSrq@!X3oAmPN+6G>#SU^r-{YJ!BI0Oc}mEKlP
zWYrU(k<obKdZQt&n!r++96c(w0ZH*m65-lo%+N>KPv5M92zO4q2>0!;)VjaYFlbFd
z(16Ct-l2bo6c?p6Q@nsEE}S7!Ts%YcyMN&>*({|5Cdp3G)f^?ik9*{qZe7C!o$)W@
zmlghw3q`2F6vem7XteTKtoQ?wZ?uVklgEAMjGs_#1+)_iDl<(UW-L>5grj}FE?V06
z&LW06Kf_ons)H17BMF+$gLbaVAj;PO$b2ZsL(KMoOq@Xpf)oj4;TjN@f+sMCM<F1w
zAV?_`WFGl2kXR68nLt*q0pYj6AO#ddK%zluRzpGP^JrgwLnCKhbH5Njyg-8GJx4N|
ZB13!S9O-lP1+%VQ%9`s4zUZs5^bbqVL*oDd

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinateExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinateExpression.class
deleted file mode 100644
index 8f65335a5f2f12500243fcb61fcbf12ec130dacc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9305
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinateSet.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellCoordinateSet.class
deleted file mode 100644
index b699d39f0198d88e98fcf26ee05e6048e95f6f48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 894
zcmbtSO;5r=5Pe%f1n~<Mzhk@sCho->ejG?VHGTv`yq3Db#nO^?G5W7G(U^Gf2l%6m
zuLVuOn;g2c^JezFndy9fy?+2Wz*Zh<tmcryS{CbBYzWM|%Jb?$5Z-9tF)9*RushDZ
zBl|{s($<lw3FI2O&1gSV0%v34L)#6yvK1M1Cz;R-LL=2fFH}*a17CK78|5W{jFge}
z5w+Se$)^srug$T*QhAKJR%r^P>ttY^w)WLozuQvbmDBQw6z#xuyrvWC*dKyvbF10I
z$pl3;RNQiDl>M>yqi{K1<%9!>dn~q<8J!G!D3&YZ^ANcB15PL}kZ%P2&{d~89%^Z{
z49;Rd-i88l*eoD}DS@N^|8LT9zmoOx9KS8kTOH*RN|h^3>~byBTvGun7NX74voOt%
zD~LSp43TSEi#A_<gQ)Jk!g{8cLV@QTEwD+RExy>sEWOeoo3VL%d^coY;JrZR0W$ro
qx5!%&OG7nDFV4wSUtm4)VkJUxdB9F0Fd)ec1qMYgGrp2!m%ahZvFT6%

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellExpression.class
deleted file mode 100644
index 470a378d75250c83e7f698b5e8cabe67e80f7794..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4957
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellName.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellName.class
deleted file mode 100644
index 19b5fb379060f23de14e1c4663ce73c3fcaf1bf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 664
zcmbVJOG^VW5dN~;hpnsCT3essv8`Y(#f##lC=^N+Dg}?*8ftXAtJ$>ZfAXMU5j^+<
z{88d078UDBmYvK@=6fW0dw+QaP{U>xNt7~3V8w*hG}h8sXGnzpKrrN+m;T7-fgkpH
zTPqp%_ZU*)aL^Tsfi<Yum!Z@L48`*FY@^a4s(N%zRJo=MMav>j{cd2%qn;mhd?igi
zX(sfAj2U*Dy=cI@u@+Z+sKj-oG#9tmO2n~@LOvkMz&3a+G_Q*wXpvzum+lK~Qiejg
zGVO>VV+JM%aLW}sLbe?ZRZkpAW2$7hPJF2jztncj9eBuM!$S&b4>QOx)c#|TVd48i
zkGq$mry0ma2U~ReNqQ28J`%AR>CozeEMk_TN7WhayR_!2&tTQ<F`Vkg81AD5%u&n}
z5pY9M5j@5`H2oj}3quYIR1txdVKy^D4hbw0`csC}YW9-VCpZt3I56ZX+Z<U!?{i>6
Y$gqS0b&SWKVE6tP`0h{evYje^0LeFj@c;k-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellPairExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CellPairExpression.class
deleted file mode 100644
index d3efa5a51593e391be9d53e131e464b336fa67cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4748
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CoordinateType.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/CoordinateType.class
deleted file mode 100644
index 1aaa15cb017a7e48c1055c275c89aab23126756f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1172
zcmbtTU2hUW6g|T(ENr*XQbmi^`cajo%G#v92-X@>6Afuis3eU~!*;~2%P!duqW?;1
zVvR=AXMdFO&X!n+KFLfnlRNj!J@?!@^Yho&9{@J-AO{s|I&R~RhD8l`br`6~#mr(}
zC#NY9)hr5fU)OMtAsYynN6t_%G+MUbx4K~@-dS-V27VA(;{6~HVd(gt)%OpDn;cl7
zh^(gX2ZxTwBeDNsAnFu}cSGNeBZ{Q0b)L3f?X(#lzn(2<X2{)GgbYtA=8U1#CJA6D
zv>Z?D#{I4c_IcNp*(Mx&Zx~)yT1R}yEth*es~rW7*Q=Ye2`ILFo4XwzIFfA4sCv9l
z#Kpha7%~mVbD}MV(m#@UZgv>d=&eH)$+evxm7hArpj4zI+pyj7<=u(UJ6_zMskd9y
zUA^tcfi0dnvSLfq&9BL#8CZ~yZqdMf)EFN9|64Lpf@R<eRt(G|Z=irYL;k!oQV>Jh
zc72bMxll1D#O`&EgdI`B4=2mlba@!oCt!b?I~}#Yy+J?2pzow?FH3TOcH##X%2FVC
zROC>^5{Q|so3zWJkH9`7bqeJpSqv9x%_P1O;Y+wQ#&05(oa#lj`UUAzs1l!=!e6En
z;|zsmloLNygHV!j0}4$*tFEt{AoD44Ptu)V*Kk#)j%x{K6<J)z>Nt@XBt(wdH>d|i
xO*ujK7`epI)x?-fe<znRqL+4{jxg6g29s=O;&e&}B&$r~Qe%c2R1PWT)^Bt*AHo0t

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/FromToExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/FromToExpression.class
deleted file mode 100644
index 49946e663af8914f03679dc722f6737ce314816f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2875
zcmd5;O?MMj7=CV&W|Co`9}r3ru^?!glnx@a(3T2qskXLMDHH>uPLgSul4RoKrWU^!
zuKWWY-MVn&LeG&F?KysIUHTtf_!n4+&z+=A(nb!l@+5OV-h1D#=lz)Z{qLWC25=gm
z>Ntp*D0=X!8fMjYPUq^fhIt)f%;<OxukXSYENHl@L&r4@i#iNk*YO5YI&R>mhBr0b
z($R^T2;Nfj+iG|x0!z(l9UaJM$ZD_!I?A@^SouZUD?4uS+VrG=m=V}L;TFr%D#}GG
zU$NW%_;WxH59c2U>{;^M!ll)cXO|U&z}eZ1TQJjQY2Ps`o?UW1Y1&)oX2H$cd7og8
zTV=b>IU-<4x4st$k2*z1jtP|GPb%|C`T7<GLK8GqpncXU+LtSZwC!EB(s@$4X59=C
zvWOG+HDXBKcFF={kFBw6OLL0YU2X807-&SVRFPEkMJunX@J-nH{74H;k3LOToP5?~
zAf>%3NBUau?}$^@l9pMI$t1V5Q8;|2iBN`i2pn!9slgI~U73pK*+r?$_C5415IE9;
zvDrw0h{`XeSK+>FtypH>D(1}j^s=3iv?VOv>S;(_6bML{hUJ~IWG+`3D$>cDv!w9)
z{^r=-Ep5i{__n*F4a%lzZ_f5c#wcL-g0wPs=B$z*cfV?uG~_hg)<9UI3r?<RNhZF)
zSO3odjwX~J9T~T{VtaBb?^?2oU@YF?a}D4=hB@e_mx*cC4}!knR=kWo<)})CZBO6<
z6(Ix9V%b11ju<$qhC4_an8YQ4y?zA!fL!!E>#mB5hP;6Sip0-=i;}>F$LJu+npzep
zA<a3eEO=L7^uNj3F2h4vgEUaViiY<Ltm3Y~sa7&Gc1g1NnOFRFH&LzNORF`qKzBWH
z7o_JDbK|NMZBL+c!YcL_UD;a;NAFDo@8bhCe8^<G)hpdzr<#5P20p^a%C%1(&ox!e
zW~(+MFxbkA%^v>mJzC(<PR4qv3p}&)xT&C-cXcSLDaKbwJt<TunQ(E{e>Hp6&iI|M
zv(8g1MV_vx7t#C@OFBN?*O0iI#Y!<&Hp?7smDM+xiZyz@JNQa-cC8xr#T%t=^_%XU
z9$sUAVe9AHYuw3A+8L){vCSn~>8;vXu;gvCewWp_&-ZW}oz0J-_g}a^CM?CURVvv<
zdUc{vdNrrm(d#%hr5P18-QTS3N8FD{w<?0RH33o6wGG!z3l?#NUnd9o@e<_t6b?b)
zY3>3z%!eJpU$ZIrHw1I}7;hZsF2(a8=k~-pL?U?)fkgj31i$wgp5xes5Xa{^#t}sy
z_8`F>DAZ>owU0Xr@YM)^r4$9okwB6&)rd3P={!p%en24Ee_{=x;Skrs+PW>#6Iw^x
zU^vm!re<ve;nX^`;Ychz7>z|^+Sl0M6NyFdBl07n0bKtqD!zI6*9P=dPh=gtzN7FE
zl)*<4;W)r=F%t)Hk_NuO-zkjZMND&^#~I&&B^q>wX!YX+9aBhbx{@NdNqiLTBv%1{
zrDOytb&hgQQ`Z4pB>!o&(eZN_q?E9)Ylth28sj)idIZDdHYlx186jnqlw$}yB)hKR
zyoNFV|B{9a{0pJsB9%X2M8|nEfC)Zq<F$x=PTdOnq2zBczQo?-uQ1lId#?XJ_N<}(
z+YNN2Hqc4*y1MqRVPA3$v9A4Gtf6}y2Yw-I&<Cm-*>f~@n9&<SH_mTGww-29(K+S%
X&=xR5c$qYIL0^XG=JFLT1DO5?W_%DP

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/SimpleValueSetExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/SimpleValueSetExpression.class
deleted file mode 100644
index aaa16d50cc0809fc736cf6a9f7eb73ba1f2e7ee1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1202
zcmd6m&2G~`5Xb-HxG^>E2Z8e4k3fOMNce(~P@*14hy;q@kTw$HfY#2cxHxuXuTkHm
z60g7oq@qe7@c=vq4}utPP(#&#!i|f)GqdyC|IW;Q`|<fJfcv;(ql}Gt%%N)GhK&+#
zTG+I3i?E!@G!#)^rdgQ8J5SmKdP-PmC2^)itokC#<=o-H!}spXSKkR|vv4?yq;?Z3
z-97PEc#(*Az32X(3{-<qZiaEFwg@Y=)8TrbV78KhBrJ8qSU$^#zD&1;AF-#>O#;>;
zSP|R5oThpmW`s^RNQR!DDf!0BQ#ndf<;nd~DziekH)Ld_9bP7t*PE#9N%i=6AIr0t
zGs+bocTk(c9D`aiiW>hM_46<qcw9Oq_f?}lCI6J-fl$Jm=xejd8qI*uC#+2&{HBk)
z5#(tqV^zr2H`6B*s#6kAiX+VT!rfRXt|j5!|5=HqyT!$@dr6)KvJ(~~vihga-YX{2
z!6I%uaIipV&M+^!`s2Yp*@FVKL}<^zC|dg0nIk-y74t}Baw3FKs@40b^1ChbJ2r3?
z7S4cMr!AX3d{e!qLN7;_+3K+0;J@u2f!w>FV0_ej&hdAV-#)Mo6B|saqQch2@ot>Q
z1-3X(Q+WunqGJVfoAXTmJ6}+G;U2;`g86}M0|m9rCj*<B=8pFr(;QsFWgT~Lg;#|#
Shi`I?iPtq@m7{BVwf++@4pmbC

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/WholeCellExpression.class b/ureport2-core/target/classes/com/bstek/ureport/expression/model/expr/set/WholeCellExpression.class
deleted file mode 100644
index e96159c41d654ffb151d6f797c826e0d06a893b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3187
zcmd5;+iw(A9RAMUW-o(nDJ?A5aJ4Nh3kay)TA(dxu@t0G<f1scJG4`#yX(v>6huW)
z@owUak%Ywf!b=}8(KbsH<C7--E&c(%2!3aFyW8EJMtC!s%$&>b@}2K@IrHbEhra^Y
zhi{@-hgTz5i;*afV^qFQL~#<Y$<e7O#&9}@GZ<HJR>A90L~$;L2+qfF0T<=#4FzvT
z(S%FV$XhXJNJ)XTd}S2q@_RXoHcTj(jA9K81yc&H2sGQeWoYKOZrMgIduDh@KpYcT
zF__ERj+S-CHM5`xhc3<BT)5XVBM?dFvKhmntiZ03bZ$D4vK{?OqG0LyoaH3+nY^Xj
z(pF+Rm(k4x4VC1R0--)5YdHM^Z5<<1+Ep!KYT1dzm}42)iDc)vKwywM0!<@ERv#@)
zr*!MImNL1rawL}~N{v`KFE0k1Ny8R6{3I|Wu7s^SiL;YAQy<h#^GF3Lk%iM-8P%p;
zR}Ij}hh50a^PSWth*iMf(Rp4#;ra6ghf3ddcz`GqK+DOe-c1z@Gb71!^cg4F>7n1i
zbVhTuMD<idoJ!6aj)LhhtOV@OrKTjA)f1jbP3dWeaw09T(ZkJ>Lohy)CV^PGU|D+B
zku<t2xF`iSd+665L?9?lFlx;u5Cz9D6C;K#Ap}f*1=?$4eLcSz@7;AOeID+X!0o5W
zZ4D|7N0(wN#vCnu<+zr2Gs`VAlO?5Kni)T4Ok_2O2`+H={~6}KE_n!*>0PNdfjwSW
z8<M7?;MQMsELX77`cXsH+!~Kk*(K>yu@&1?bYZ80tco1+D&B^rz*ga)pyDd7DVR}l
z9XAxbqv9ss6?n#Fz7lVN*6PAx%hImPERd$(Q}I4-DKJ%hfF2be;<mv0##U1ewTh2$
zTg7H<QSh;fPjE-Yr}#|8=lDXPuTiyu2Df%fwNP6@68x7E)mH+Cp3aawPrb3N_*&rL
z6WEamm+Myoy-#C7R%sOn%fHI|u%la=le1Wk?xNd|OEd^<YIIUl%nYevOXDYVX|{Yl
zvrJ!S-)WxEom1`wF(CVzPKTWxUQMm!phlFLy?r?(HG(WvSH0Ag_Iag$4gO?ZZ*VIh
zQb8)P#S>yF?Mj}BZDS+0r4nqGv?w9jY%c;Wv{~h!OS1daEU-&cLtw|!JF?uS%eqU#
zM0MUpygI{1C6?_qJ{Dt4No7*AM|q#H)n?t#szu3KiwXhA>qDTs@pLjXy>ED4HkS>P
zFa#_w_NxW^U-w~sGJ46^#!_C#el1g<gNwXzH((n#*wx6^uuRlpPcCbIOcs^NZfiLh
zmG;GCVZT|+A2-0q?|N(ilfj*B;tG2a#{sUfSMt4`vwp7o_ziXKoQL?ymEFO2)Lq?%
zAf=w=yuBoa4s>!xdD&`dgW*6=*;cnZr*Ho(C47)}LR<s2qz%;_`^q)~*o6e8h(g?>
zpC~0}d%AvxZw~&uXzH0mphwIhc>nQV9Eawh$ju_cKKzDAZ(sq@bMuJx2IGMuR5qYc
zJXFLAf$uRON6!e#HT5cSWe&}~VJf%$j&<_0vpXK{DPm<12O@2ey9nKX{6{<(4;Rtu
z!`b_fAI5`4tYUb6K<fh9&c%cNBHDeJ$La?QSi|`|;tz;7;GVIcf4LwJF*325XX?go
z?8hFQ#$NshKZg|mr!B5r!vWmDi@X?maR*6!i$46w2uN-&@^9Een3{Vyx<HoqQZq~&
zyQ#e&ie#t4{wyu+ciEi9^Bl<t&f*2y_S5?<+D{Uj^w`Hy5HE3GMzFNkU)ejzy+hpF
zz&N!(!VU$8-Dlt*Boz!Q82TIPS{$K>4@c?nWxT?7UE=(LmiojQpy9z~5=W+?Oq^lY
H>al+Txbkvh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/ExpressionErrorListener.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/ExpressionErrorListener.class
deleted file mode 100644
index d55f41f6735faed9877caadbc147f9ccd4c9e692..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1657
zcmb_c+fGwK6kXE`y;wl1;$1;SO9c-q-YBBfU?eGOtkD?b!?cWbv^}Spb4tLk(nM>b
ziLWNU`ai}srxj?>YK$+l_w3o1wb!1Ruirm@1~7|a8oM!*!Z6M!a3PH-W)irVMjSIq
z%vyQLE|-(IV&zrqaV?2CE3YO{NMK$d;#UL?lwQg;>C~lLbIO6yZmrmQ{#==Yz`(qA
zb+8~1%}qWMh~4s5mB4UGyXtPMQBmfhtkh}Amb|L0Kaxh<eb*QZUT9xnzEt%ZPQ?$@
zE2m{t(=&mi)|*E8zV=+FDUGk3rA@<<F`g-Dy1OBSUH*m}$o0@H(8`rOQ*)#n)Qz(?
z>zI}s=!SA0sH#_U^=pP~>*ikNrK$#n<>hU*PKSlQX#xUUTCb|6RSLHAwAm~mFy1%V
zVjxEzDRfs!W_hDg@#>bNEt<Q)$Y`BZ3W#N%S6@hT-}ALCy6jqx$$P`E^@euwGls`!
z`y%OWLtwObN*m3elbYz8h7HZ<^9yWhupG$hs}<SoPB>N8HCG0ls=&q{Cle;wNy2}a
z&Tvfy;RRXYrIIzG*_)f(R%w&7blGc}s=BT1r9JYSOLxxBDT6)Oo52XO<ZWwk+uw)4
z{+$Q9zN!p|^E89&Sg^|t^7d>@`(xT&lXbm1m%&X;+ml5;z`?Y@+`m5%fz!Wy4@K##
zo|nY8ESpW<NP+3xPHJ|tRcwW=aOyq&-J9FbKN)x(ngpi)vQ+rpV4R=XZhmg0#S%{~
zN}Y4yx{o`DQc%Y8A0XaRiC~oLKxjOK{nRrZ2OPjb?gS3uFuiQ>HzrF^7W3~A`GTSR
zCq$ooK<qst*76B)?gp}nHj-0qq_Sx$2jg7Y*wsenv31H0TFq9Dg_TG7u>xbvJ5IPK
zaRsNah=~x%oldnb64u2L91YPGaSX?a%G$;l84a}))MBA_l38rtA~T(4cW0<~`m#B4
z%rQv|smUTwC4#dwO<|g=ZL~ybSsLjy8W(S@(#Fu6Fv>DE6xKXLggK;`WQ)0xF5Yg1
L6f>P;Km^VYy)>;!

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/ExpressionVisitor.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/ExpressionVisitor.class
deleted file mode 100644
index 91afb56ce2724d95b5d28bb7cea189b893b83072..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21504
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
P?&PoFd=1W*ljnZ{kSjAe

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/BaseExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/BaseExpressionBuilder.class
deleted file mode 100644
index 49debc82320791e0b4bbcb2712949c1cfa4946ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8615
zcmbta33wCN5&p-Py|P#iJ76LpiIYOYB@|LZz}N(A6fm)642Be%OUR2YkR?@;14-{T
zZF;14(u6im(=)wGddQ^oNRQAvz3(=?@4HQ}q)qzIYIh}DvMZ;+x9@58&Hw(HotgLE
zE}wh!LmvgOP7(ne!FT{;IBDQsZ9f#iDSSA9dVEBGe$>FnX5l^+e;l6(z>iO=_)`Jg
zkJEbjw1LkAFc+Uy@#hSDK7cRaivhIY0hN5oz?TDP#khg582D-cL5%zHHEqAHmv89h
zn*p4u0MEp?^z!Xl_zu213*W={_3{G)KMde7eiXou@e{rGQv*K>V1<(UIewwyUmEz8
zfnNu(My(0qHwJziz*-%#2EPm7_xOYM{-~Ef>E+Kl>MsiWSN-{rUjAm_?*{%6K&OIq
z;Gf##=uREop`$zTkb!?0csPKFj@gDs0{FMi646;A_>an{7g4>4>TOfKi0VCR;IRM(
zRBx9+dsG<^;ZIc=P?Z5y*`+E2c*rkxeyOLE#n&Va(&!gMTfbkLv<>)WmbRu}W@|gg
zFLSk>=a*(fS`0bEkokhfjzlVv-z=zKzG9!i*PR}+1ao^6DJwcQdeF)a#ttSaY3WVJ
zW66E7Y(jrKLSKF)krQ<F#?zzWgSotQBs`Y2GU;qSY#qyFtz0gVPK7hEY|aWF97`mJ
ztZcX|ma`(>&90(!lVG7eY)@h|leG55l4DkPI+eGM<qcWD*(>D&vnQ3Zvfas8E@zR&
z(dAWW4CRvH-8Q3L$|765F0F*yw4#c3nGvJ(OVYM#k_DvhQ=aOg!?EjP;bbf|9Nv@9
zCQ`$^XI@uki=ea0EVXkK%-)la#gFvGGR_m2YrB=M8cO8p>zpC2g67h1$BBX)X5gI)
z_1c^hcUjmT@<8Z>*(o~669_u0c%j1AQ^T3wt?v9W!8{L{o#La|RAquG+&o#Cbelc=
zoQGJA^8Z3~wFx=jgLDvk6FG*=ykf|V<rB%UN;tCNa5|A<I5&A345EBGL%rfN78vPF
zPin}b>Cz);otT-|XWZ=Un*{!NOmNt4+DvA%c9NMR5bSvT=w&zrwu@1#Aqx#T(~uy`
zxnPc649ZNt{_%vbOTMPmj=TP?h~E0RM%jEVS{@?@T5xIYkyZ_WZoRAu!gR@y&W|Wk
zvABAK2xO|3LyQ6BOIn8*Vt#E@K@hHGrV=(Go3e@F5l4GT_gFS-rSfiZE=Hs0i0xIt
zr%I4%fH-Ni3X+=UEGNZE9QPhqIjs`;a>tyxE1S+(+5GjM&|}?QWv(e$PX$88JFB2f
z!`MZt&UQ(+l}tusqxLFU$#^Dyo(71lXBc=&t2$#N?$+H|I>2-8|4|~!aO~P+*ae|K
zBN$lTo6Zi0W2t;H8@_H`I6IcgCq}JsK5JRwK`T3&NX3#-uGY0JTKyS%qA{IO4MEM=
z+@bABk7eW5WeMFKEvmY!S)=;_6Qf9(vPc#SHcq=wD&JzH(@86qD!JQ~C32P_XPa`4
zv=LIyHRZe+LH2NI9JaD0NJE}r$WjGdrhw<0a)B&1WVtCTWTh#qWVK*Jt%QsFof5br
zhD=$b6l(@4Za7OIhJ;PIP}VBgMW#Ga!PeKxC^}Xiu7V4zDaNggZkx)th>>HCkXzEp
z`#EQ~Dp;~NbtIKO+Lp7ot8Mlkug%GVHdEHg#d=w9$|Z7^iJN7EDH~-2*Emz!g)3gr
zln&`MWwTsr$d;;sF+~-cTo6pW2CwDHY06gVGNoI#3D#AbIt5zUN^D5Pl*?qhDLZsm
z(OENwKCj8F1lub0t*L8xSM^2Bl%29+CiXa7bQ5UG<q|Ta*OWeqn$j=3Oc~Ia+^xMm
zve?8uc%LbQve%S-5)wozDNo_H@+GIz^qDON<yfWA_fXXZR|vM&%*|a~JOp-%o8ldn
z7}Gow7pE$xC&>Xro@~mMGxXau3(`zOW{Ty=l&kn?<!U9i*vZnkyI1g1w7rdc=gp>E
zBi9-dGv%PfDd;d|NIP|#nVOc}>tOGY-Rop;*zTRn-iY>^9emwf#PaEETf1P(v`)5H
zvFVS(JQS45PXEEfR-Bu-jv1hq9++3IHdU%m5!saoV?le(+Fs1LCm-(QZDYIxPF1vN
zqEOdW50yvk5?W8b=yV>3y88QjBU___mCIMux;dcQu$3RQ5AO4+R`R)bbZ;)nx{B*D
zmF!aAe@Jk_@=Bd@7)OP>i`Mdyu2^5T7(LO!$o9x?!TGgqX&7=PPR@e<znM4#Co^%y
z%A|46;O?I2_6f09^aJlDt<-RS#C}7>g`p`o#y36sc0(=e=_$9_bKQb+lO3r&Pjqiz
zmm0jVGN$(O5X@r>&$?ZS;cZqtF&aziBQ0}tF&((Ev%N4H%a4RhV`*Q|89e!p{bnn=
zx3`zp#4;HxH6#d?1G^N<<|>Lx@24h=pGc(ajZbO3Kc6l_FlycS^3s4@eR|I4@hsuR
zaqEO(ZhUj7F%ru~?MUTIx&u_z*C{-ay5sHn9ZKB8R=T!&vh!)@th@r3W!Tzk2knXk
z^%OR#YwMXwf(6Sb#Dd3XZ6%)yytrGT!@48kOAxzI3bt2$NHYdhAJWt!_WGJEoXE&F
z)2FnHNWJ#adiAtKBHnh#iR`(yQ6;gU`|+Ar0-<TmG))PWgo2A|GP0y$8|Wv{Zawfb
zWZiCQ2-n4azL{>|9X*FJF{d@Zc$(qyN+ZOym9$`Ux6Km)BeznydXz3z28=h|!_ZiN
z#yQLLCAGUnaqe=NoC)qEZDLnBs7%3Wk}kQ>Kz#=84JN5>Q25e}H?*e*dR8CnDPu9M
zauW)qTTPhS%PQSsd2tkWeab4lJ!{4CgCiEbc|jFlR#8&t_3|A`QE6_(W>N+-rzj~6
zX)FpjSu~w5_I>B_lgJSWlKei@z?NrQUeo*)W-BUPIS#ppojPQAZM20K<0<T$#R147
z$6r3=af}iw%R>IDr|gbZ1=O8J%PG|FXV-TU4dZA$!LD%{3s1qXQsZ7U2~Hv~j#+xk
zJdN|TvBiC>eX9$Y?Hej!PTwia-M@Mq^K?|R4bY+h%?`jB<Cw3v7M#YcQ)t~kj)f;q
z;mrM~5M+N*%i;o-@b*~+oIQ?nK1P1^woU6XoBc~*U<1EhZNyn<=f|W?{MCUjeg%qR
zGp@j;xEfn%>sDM(>9hH%M}5#nj4mvo>;`&>7CYY1-c#{3`s3-88fa);v~1BFy5$*E
zEjsB2ss?!TC^@zD@p5id+I`aAP`|!$^}RTcdn+SI=R84h9J{r*RQPRfS-U^z`!rfs
z2L0nWzugz~wKv?2u=BGi=nFO#a6!-)TF`heme)~ZMFA^Mf)lL1u~C9e?Y_Godq=S0
z1gG}d_IF_(`#lVRog{QQz0pfaAI_lVYtfJO{6@8zpQs|(L+K#@?q%5QW3XI7AMEFI
zKVbXfN;L8QQalIGWp6FLbt9h7Z-_L}^U6`&gcr~O4V1hPFQU%^#Cb7$^_=%GZl<n}
zvk&7X>@|?X5MGLxG45VYoK}u6YQDnLd=)j-$E)Cb42$76aEpOk4ZPa^cbkFR#K7&~
zhr1O9jz5f54^y>HkJ-iNP=7WjBuPoG`Zz+zky~{iLJYMvjG1th!FQqhxZd&Q+5#?W
zZwLh&3V33$;Uw0zH->_Z1za5T`O1eFp`cN~dR{rEfJ;IviL_xH8w+R;Y1fX~0yc$C
zaN3UJSkGxYIBh4V-K^7Isx$dQL0<t|c(q}++Av)<Ot-DM?Km!{<~C|ZsCk)cZZBYm
zquFEY@1*eZ67gQrx8eG1xTp=+Z^P|6jy}TeBHRGsb}QT-o2mmiXanx0cwY(d3K#H6
zHXs#g=7G?J<a=^O@)d)xz%R4FRZNkqSx~OQd|Zn~h+!oT;zGokmP1TIi-C2B;Wvyc
zF~YwIer!I>usXtgN-|J1gi^SL#pg8)={GSP-^&2IhlS}R!}B8?eLt?l1Jw9Bi_~|S
zu0LhM{+cQJ7bfYWcsfhnGZ-h&6cf*q`FOURgXhRHJXcoXMp=jFNjsh|-MC5m@d6oO
zxN7p>$M7`C;SSu%h?-BfH{<mT$3?W~E{^fhiaxx7Gd0kTEqEiDHBzz?Z>G#3?={qY
zD|KIt^Qn6`b#Gz$(Yrpf?&jUM^X~mDMmOUfy!!wyvhjT6UmV9T!c5FN@GjJmcPGca
z8}(%Gj3akvoJP2thU~qEsVR0+X&EmvKEYWvl}z{^!O@M6Ao>VXzfNDQ6mtdt;s`Bs
zH?6XRqUFj0t~w6meYpCBBe}+vT<c0=uH>LAiMx^^S7N!6L#|}lm5fXXqeMj*mDli>
zVh(FX3tqvx{7P1$Tj+*cS-);$wZ0uY7##bU_6P7fhR~f1oV)DDs8xj~xz1tl{rCV4
zR#*7Z*wU<jIOc==U55gL2-wZKHHHTnR89Op3=iU2Y?rZp9@`acU&%Ja_H}GK*uI7B
ZHnwkLyNm5R*{)^#Ubg?ngR&n@{{<!eI+6eY

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/BooleanExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/BooleanExpressionBuilder.class
deleted file mode 100644
index a8c3f27e46b533858be1af78e8e750faa1b8dfeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1435
zcmbVMTTc@~6#k|cR<>J#il``xg3tmoUMh)!7;S@z$wG}FQQxLztP9)SW_FkGk9_e#
zU&Kq|qYwTl<JpUJBZ$>(GH2(^Ip6u_d?)k$$LFsAs#wx-3RiTLFj>G=T+=Y6V;a|W
z<S?UQRzq1sg<)XDaxDKoL$+MmV#w9qZOJfXT8>-~I!&oIMbjov$#h%7-V(|R_lYy-
zzqUMvRkP)Gc+>OcE)SIKy2|HrzpJF@S+2voLV1!m1Iyl)iq~A%mcm&*Jg>zE%MAG_
zM#DTq;Tf^2yN)mSeFo#P<49Gvh384C*DW7YaND!_)2Q~7u%3$7=@ia#<(RY-&kkMP
zj)?P`@MMo6Q7Z&#K1;^{^--VN8{em7?ub3XZQ-=}hOaEAO(irh=!UIhxc9&Jd&yAT
z@I`BPO>`59^bI#qE&0d_MV$Ck^A|%t26Pk*EZ~NQMFSi+iOPw}raSh#tQu|^xQ#m@
zYL%gWB2a%L!Z6(HTcf!nThy$Te*o@Dnhc$WyA0K%2!9uo^r|%)=IX<BhPiUZbXA)R
z$F~*Vt8x`MzSWW3S5op#sXCS;>~$J1l6j`TNWyPRe={2YQNr(C{BU4KdcH(gO4<{4
zARDh3X3Ix&(lAL1F&axp{&I(pLAl??&;z5<bHgx5Z%>vi4HB&e?KoLRHa~X&_MUz+
zDAGC*ImdCD{*5>QLl~wV!wAmO8YVv{uq@fJ`47l^LY86e3vw?OJ|cgBfp>Hgqv>RU
z2`YOzLY$1V5=6?U?;K(3gnAwqD4Jm$7n3R`*)YEtR`~`k_XfG_TXJMmRHq`~u{iJ$
fxR?N6qUby_g$E(h1Z^_JWR$E<*d@&23<iG!M^cJh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CellObjectExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CellObjectExpressionBuilder.class
deleted file mode 100644
index 70136a6d85bcc386e73cf49de485fc486ddcf7d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1940
zcmbVNT~8B16g|`KGElan2uSe@P_cZjD54-DP&Jw$8c`E{+m;C~EN!#9HTa8s@j+iO
z(Zoj{{87d;yG^N3u=Qo`&dj~%o_pua?62S7e*&1nqZCq@N}&gK3g>Yng&|B!+)Tm5
zExj_Wzh)$EOUz2#5olX*i*C3mkj#$05ioM44JFXE>K4^nWhbxvS5DsJO8081;COEw
z-_`T#q7lA#1A!;2h0>0l4??wVSA112`Jt_L%f1Q%w^X#tjvpvHUva$+<=Z*sdC&7(
zst`V^xva!{_XNzyO=3=<^EHX(O2ts^h62{pVo~`y&j|v>l;v!LoEw2>zl_qq&?)_R
zyjq8IZ?r*J9n~FH??v406(>*!3`woCQqO0$0Z<e9+2=yID=|+z-HBR#E#TF~kyd-z
zFO`)ae$;2Q<$Q2#&na%&>!I%!H@PqMeop7)r0Yf1xt4dn`8p2863)=A6Ua5dXx!8S
zOKzwDf~D6(r?CCZDM#XBizF5z(lV%&wWb8-{`b`138dCb6~CY!yIReIC#Y~rH_?KH
zw1xXvv~URzEG%JJVEIIy*NNxYIyLT!g&bA{9-oNT^sNy%eQ@mY%@SB>0sBDZ)q5!M
zP+;aL!oT(1N?4tY1@1PT?T`xpsy-Gyb*cML&}^gYeoPg0bSTD!RzeR^Vz}H?;j8G~
z>LJj<@zic*Z}#Y_et%`4qIXds+iXYp#CP!3=YzsuK$4cq<#>uSn^w@8W8WaY@*{yR
zj&0H61)S!$6+7Szx;Ya#i*p=x@OOf>(N2x;A@NMCP3$2#Z)A*pbYzS@7;8UZzMcGr
zws|vSa#QZ1J!5`hL^8@UjCOtx@_#b~iD8nu!W>u8j}gwUV;tFt!D5`H%7FRkks${Y
zqZq(Na+dVIgv-QD6Kjw-1`#Y`U8C0svz&tXjehz`WF_MS#)u!+u}YhuPg>Wp4{3aY
zk^Eev88>4xqS6;T)~KYbRCEdxiOwaBG{H#%ljx%zAg3POMK6!wJnaSAA=+Vd`~lde
BB7y(_

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CellPositionExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CellPositionExpressionBuilder.class
deleted file mode 100644
index a0e4dde7563e11e069c99bbb6367fd4228fbb9bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1687
zcmbVNTTc@~6#k~&veIq=%f$;`01->MjF*ZM2q82YH3f+viN0-@Nm<zLHnY2gf8>h~
z`T|iCAARsg8P9B+vW69l51lh}X3qD0=j@s3&tG4^11MuLi%YnZMFEpK?q+cfQ#ss2
zF^e>&b(D0>=$K{bS+-p}SYb#Pr*{~%inl8m`m44pHo`_t$ZfOckf%`fEYsOBrLER&
zrxxtlKEtc3<u!QC55xfvrD%FG;Nqw$h40&*%bTY31+Rs+vnwR82*=s<d^@16XPrZ9
zt=%PtOmtAkJVWj+Nvn8nAdUhC<E85gS#eC?7ev}DCa~`M4u2B~*i@vlHBQEGmZlTJ
zVqzPVzZ0qFYo;$w6_T`E7}v9q0MrFPRoV)UbZ~~jcr7}4u5^!^5Kl5Sl@7yd0#0(G
zahN|6*8Q-lz9z%s|5p1wLw+kTt%G&5+3uR`mKRD(JhxR}O(c`I`(b|HJTwhtkuz`~
z4;WU??X=j(ONKS@5RY_}4Lrtz!hOQ<;#|lJG%v$|lFJ>_t@GElePL1ImM?&QTKjhT
zI-W9=&m#Q0%@T?K5*9C2rwa`$c2B99ib?mTdqCBeiie>@NS>^7(+wQS56fJJZeTYA
z52O%$TgZm(n$8AYLyDQ|?j(a=7r}P)ObikJ>1Wsqr0v!TX}EaSs~)^!x7Ecsbb3-5
zdg*;llclDl(V!J4%gAO*Ct#mxl0u%wp2#_hKAIb?1L(&9tr#w2m_`-6M_?M+t24()
zt$#!M-Rv>6FUT;Qpl4(56YaI|`sgHZ8ySpYgybmPQY*HNODME+g^)8Cr1>aCj?nK0
zZbp)CQFM#7N;XCDdByqzy7mED`Xf2gG3iqgg#w_19g2LLVvM{Qq;jhYX`B`*Okjv?
Sfo28Fk%C_O+nK|4^!^6tWaei8

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CurrentCellDataExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CurrentCellDataExpressionBuilder.class
deleted file mode 100644
index 3f9216809eeb431302873eb6ddc73ad3774573fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1812
zcmbVNT~E|d5IuL>rLfx-L_h@<L6GIMejtKu6j(JeE=UAP^sQTNuu$6Owl(;ReDOhF
zmP8XDeeg#arynlMQgAVw-08iYIp@sW>FlrH-+lm?MJb04jO1_$qY7^4AcdQLjO9?o
zc(|QVFsWcl!8Ai#$+S)XF@sbb-(rx<&NgT0te7@m3-+sAZ0c2uPP!|Op<7$JFvERv
zDEseCk72c9IQv@F^ZA|@2<|$<*Z6@exaXOUt+~4JxK<5JYnuzL90<W}zsxP`sqX8~
z>V7M+!y-dA@>QTQ<lm6GvSa)Fz-Lfj*ftksOZPlZylydtc-ynI*O7+xkXOX(NCVE|
zcuH7<-hC>86(yjp=pH{(NYe5_qn^1GpceQU6eCVa!5xOarjpdtU2Yvd9fAbQVPXvB
z6sYu+n~;uWuXuqQ-Y&z!|Cat8Lt(?$jlEUfO}Z$z;RM3q&&{yUMo;BW`eSBS|DdbL
zLsfAX_ZXJXY`%ueJQZ2ReLPSwr{W>zRV?5U!^<;K&)3onU7={r((N7XRdtseRKe0Y
z2#zixDS`sJ+S!u`|872pCoP9H6|CNuoyPHRnA)qD_D!9lCLNX%YIlX>a^ZiZ0kobx
z)=5j}p=gRG?D>|nZi=Okb%*<#(fsKl4M#V*;S1B=A?&=z{l8HRy~UG0;b<+kssKZ1
zrwPuGqj4^grCz7CKs${rBb%K#1p7)48C;;XEjk=PCq0L*<bW<*Buj%EeYA$bHhIfr
z`zLG2tbT{|_7L*g^i&Pm8ro`5roYhJ7_mF@93-5Z6gz|~7>>{<VuS>puyC2)(a1(G
zuHqU+7wC5#HzMJK6diL{$Yuz=5OV*7B7cG`eWnAcA%U@oqAzx=Qxp=4A@a^5lV1vv
ch9jl7h&9w8(SO|xdZ=jqWCzF=$<CtV4-#b&$N&HU

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CurrentCellValueExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/CurrentCellValueExpressionBuilder.class
deleted file mode 100644
index a5267989d004b53ae0399e8112be0bf167f69621..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1352
zcmbVMO>fgc5Pj<;b?Z0~0<_RV`DiE(NbIFTLXA)r0}@gwh(aZ}ZJZUjb!=;Gqy8f<
z9N<DFkT`PSM<K?J6`9s)1DBcI)tfhO-;Vaz?{7Z<Y@lOc4l6pY7|^g{poyzGR&`v{
zah+kV>-ui|kfCCAb{VR6Fq8~u`>rpylhHt`S7PANNvj_?!rK+fP51d>HGc0#4BLGt
z81X?A%YB|G83rom@*q?)irm2Gp-_?JgT(cQQgJ&`O8T)aJ!10``FH~CjS-s+wG6D|
zCPV!-$+H7LmIpC|`PBENvON(+k{X9rN#|kY@t2v17inWPj_m@^W~ZdAAb3O`c-akj
zPecWUB(0tl_1rHZnxQ{~9wlMw6T^f5y~A6E#!f7p{bwS~-^17m66MGzZu(;Dr#gLa
zPkaz2=CQ!gJMjq%j!b7Yv4(Yq5=#o+{^Kw(G*gk>6aG8?e6S}SvaEZe*1tO(8!sKV
z88(hHoc?U2#W^y(IxL2zqn1p@^^sLJX;V5)VWF9`W>w3uH7m3|r5$ddM*js(D19Ck
z$}}Am4cc+ajB@SHA=npMXsA<6!N4+1isl%A2F}oq{t=v~m=<>ltx=x;4(-h$DxYax
ztY6LQ7sr^qp3t~}i^RaNh^3sVPdR03-2IB`Pw3T;s8&AFL8TyPtw7h9&^2<pON6dL
bt8b-Dmop{HXi;v_zDX9Gqf56b-@?Kla~Xvu

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/DatasetExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/DatasetExpressionBuilder.class
deleted file mode 100644
index 3d927ae754a8b74eab0df5d1b4469af497c44e97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3326
zcmbVPYg-#d6n=*!EQAG0Ev2Ycsk8(NEGU$6DVA$N!$mHwwceIwNVg=LbhAOIm;M~T
z_(8v<RiDR?eDF7^kMHb;aLK|G%!i#hXXd=~o-=3WO#b@!_dfv);bj!pFd0P$KGJYM
zijWd|Fr|9asyEYsSznw};(Qbjl(>LJHRWTa`y`6EKV?aY%TcspMUAd1@zW^Qu&%@n
z4VxMs3e-+mw&hL=gks$k!!y~W6ljiHwp=b`wxqLRZl$TY9M2}q^h49Jlw4AV-KSPw
zU@o4>W{j=8D|d{7BXe2DHRN8-k@>upwT+zV<fXAyu+mBC7_+8p=A}DV9-sCH#swnY
z91WidG;EU9OxAYgo-3d)+O~9N(q=v{xn3?7uwXKuHrBkgSJirs|Lr`6Gu|Cwc8q6+
zuBScX#xyA&F(kG6MAlAPF5MBBs0OAy-@~FOzBQp53ddc$6986)D*_r<P|?xwSfHsC
zRj%VlY_xjVlcppXRxuHn34jQWR?^?n%B>|>OF0nv5;+Z@Q%%8-$e}tou4jaz!dh)n
z)?t1vd-)rSXPuN`+HTr0c83h7V7pdE8m=Ryu_2v|Wt(X=lV*+Uu9?_bGIL%|Gnzbm
zq^RKuW1KJKR5lBY{@;|NuhI2v!AZz@OP!<ZXXStYGjrF}(T+EDe1R_orp`T7$CCBT
z@ay;rU+ee=#N9%IF6l@rK_aE$sRm2OGwkR{BcsDcPQ!B@j+&8&tD}Hj9p7S4$G)<D
zp=N)l<9qzT>^PTQbw^&{{smA@p2^a!q2Wh?p-Pl9^5)oWATUz3*~ud!Fjlo?MWPDa
zsxCE|eWi^R7>@;AU1#`sk}NY^OG$UbyGO4ON2QsOHtm$L?mCv8QWHw|u|R9Aa$J>#
z=wedx2yI)E7efzGs`G)^O~fuSS~fF00QF`n<;axjvVUpnuwS|x1nynL)zju&Z?x*I
zIc+R35MV2}Ree-tY}ZT|q*1oo*w4`e&C{-I3(N<FF5n7Ho{LBibVjVaiokH-&2v78
z+OoQwlg&xT-DfplEp^LLp14SqPg#@V-GD#^m)}#itbX+FP|3VXl*@p?<V8qT94yjm
z_TCRiBLXi1gBMKo$c{Z#MXP%+Bn~~ODD-M0%b)^-L0l>dYT001ZDM3)ZFX)=;6^~e
zk5XVo6+Z6D#WT>eWaR2dwS>|YMDtkE`X-88EPzyCX!)XT<I`6CLJ+FN@%t7fgRNj2
z>3Ie5D?2rKo8MYb*@5fq>;441gLf$jyoXMHX)FdgyOz4$+eOqY{ejTqR|qfn^%fB+
zqE@xqZ>SR}qFxEnA{t&pFQSn`(*c^4vZ;vXA}+DlG8S$RAE2eDJzT`)u}EJ#QQqLd
zm9a>BgacG~aIeu?#MQoExN^v2JBeoYI}yQ6G~yOo(S;j`VF2A2;iG#Ry?mngVF~@%
zq{~k*2ooP*8y~{Ou;=9h_#US>H)$VHK9&4cy)I%g6Y!jPz4W;e7SZ~-`U1ZOk;24l
zCE5^Y4b!>}p?@%~;f{upzi~~&UGF<em@$m|;p5)~K`@|Eh3^1b_$P!zKU3j*<?q3m
z$L^{>vCOHl#7V6cK~2Mbg)~8-2KVqj+a9Vr@Q7ikXa5myvmIbN$o2u-ZMJc?S=9dr
DB>(FV

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/ExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/ExpressionBuilder.class
deleted file mode 100644
index c1a13ea22b4ff4b67ea7dd95b377cba669fbc333..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 516
zcmbVJJxc>Y5PcJqthq#ujlaMmHg1zfVwGS(5ERA6Ztrf8i<{kJcTe)$Ec^lfDDn0L
z4V<9Z%nbAK-n^N&_m@`yQydD61ojBMv?_Eia6lN|n<6Z%3A_n}(WNo$7Fv1Fo={G%
zGP{<k5Bwx6$E9^a=3dL&CcIJ3v-`BiTR5|mAI5l7I`+P>My_qnTE>K&E6*2Sl^H?!
zs*E&*v;UGm5RyAvxr~>EX2Q`o!940_ce+x~ig4Z*x3y&%)yd{k>|_grFpelvEAuF?
y(-mhyU`&{{L4Us(Ve;3pK7r7w{|R)ugdGT=_PZFw43fqU(XV|{cXqLl9tI!brlY_B

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/FunctionExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/FunctionExpressionBuilder.class
deleted file mode 100644
index 1ee2e224a3016e0dc8abb03e24196d2eb90a9800..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3313
zcmbtX*>@9F82{a5lA9*eQkEidM_E$ZGAN}&ScH~Vf}t#35M1gcotA-Q5@#kzaY4`V
z!N0>7UVPA(B65z$Cmww9@6iYGcaupnw5g=n_RQVB@AvKBz5U~#Uw;EIif@wGiT9Ft
z4d*0sNkrA+5YDUF`)Za?;X-3Mt(F%hE+vstRAacD!WGP@&#c6J5?Ap-64!8D?R=;Z
zK9cxY;uC@R3EQ##Qv%V<;Jkn~QCYMEw&ZQcny!@#mOE<}O5E9&uN2MFyy@C%9c*g;
z4cil#$`>nTqu}}0Eu-dI)r#vI)}5+rd7fQyjH>B+mQkqLrA5m%rfN>n=k{caV7zg1
zTp(5_l2{N(%~7q1isM^%d;vY@IF>t6GCj|tz-p$0#6_=UT&WAcqy)N+@179O@xcyk
zAw|oyy;RrS7&kqutszxQ*}he7>66NZS7RMuH_#@;N6<te5F>E314fss30pwqh^FZC
zwnu;U=Wm*~O{3=9B}45{mL4*IE=<+J{@sKHVSh4fivAsmPnj{zxVC(h?O@RcURlFS
zZ8c?!z=;kRoxRe8m~5pLQFbi_$;MnT%a+d+YGjmz$<rp!+Eamv4sxHN`&tl+-}!XS
ztW=wIbAC;Dx;Jx8UY??qb6tRKpnEtQ6;$txZx(M|Fst?YuD6H<Mwk7E4wEPdNUv5^
z^(}Dhd28^xKys#1bBorLtvbuA%`mh>7j%S!Dv5QxfL%I@SQN<qXP*g`?|Mib7M64@
z<Ax3!HzjWAD5*smj==VIxtwubb4AsRjtZ(YTE}N_b$IY4Y67F{b$GUSC2s5Z94wU;
z9e44CjxX_*j<0b~;Ou(9P>NT(Yn}q9Hv#i>76snkjA@}Jz}B^1@&+DhhNaab&TN`>
zZJ7!5wPV+4eu<@^>e)Xsomzf(+OZzwvgOa#FQ6R+s>>;v&ayG%ySB5e2t3PIX)7?0
zS%0oB)MReaa(sKqwn%h<C>3|vFde_-8n;Icx5l%wW%#aT8MBsKwjHxH&1;C*`?{lS
zC^60UCa|?>dCN-zlh5OV7Jm>as-vm<gYST*Bf@u!=Gk{Co=*r~Ls2?S`6Czh*u}z4
ztEjG_Ot%pi7+y~rDvWlwnBy(S8?BFW)#kkI*?xuIKHAap5JaQ4+CTv(wd_#j&*tN`
zTSp9a)y+LsLX7|CsS-68*(;w)$iV%B?7e+K$~GQn^xO6zbK3zOoX2hq@cF5Jq7bSB
z^PA?%;3zo84m^PPnUe@!<Tqa5+>Mtw*Bb<Q8Lx1~{*E{JCA0XR)Jg7rJG6?(g-3{9
zdjM^EWOx;^Rm9aOA0i>JiXP6BSuL$S#@r*MNT+9GX>Ap~*?2ns7}@BU9FXbwL-Yy!
zfT47JfUH|0_#OS(#4p&IPOM^EwkI7+_dLY*2(Er7#r-FLj-)AR$H-4qLaQr2j(*Pf
zAcno@#XefSpXz4#JBSe+;8S`CCozn1t}f#s7U%(+uWgU(6&%Jr9H|?<M8g)a18)*1
zL5d`?_M-=re90>;Nu(U{hA8PI(S|vTD^~<=QnL}_^9{_a!NA*eRWE!>7-a-9e7hgP
zQR;k*JUe;TK+Cq!juY(!&-NnvghCS%CnZivyen~9;*7*N{}{NxariGX@r8r4ji?~c
zF+$c}6_v-3+I?uzAGr|?g*IEaQb{IZOXuD|XC*m?Nb0mgn&cvaDW(wUN{#=(%;9yq
TqMzd)j)yqD#c_<|JLvfr?(EVC

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/IntegerExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/IntegerExpressionBuilder.class
deleted file mode 100644
index 552f4e95183d05a66b3e28ad5a44e44b92abe24f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1471
zcmbVMTTc@~6#k|cR<>Kgf>lv&iqHZwUMj{wjG?KfNdZGEiM~zCSQoat&Fn7nk9_e#
zU&Kq|qYwTjV?4WCXcG{tFLQS0ocX@*Ty}o^`tl7x0S|PX!<3E;rc=0%8#-oiQ^Tx|
zB<3{aG~_kRGYqVnw&^`$i0AU#42hz%BN>J&rY$%8R$Z!^s9SWBsW=T`Z3|@v`_5s)
zdu_T5rAotT@w)5DJ?<;nc9h5EL0d`JH65F`g>ogY`=+%c6))SKY)Vx+_OC^b6^3LO
zqhXOD^_)}{9g02h7>u%QOI5Ul>q_El=T0HqaV@?Taz6|BRJ6|Y;H>0Nxz?kzMX6h%
zaK0v7*;Po=Qhu+V<x_zA;HM1th2>K<M=HBwUvNv<&7*=4NxJHZ#@@PUhvn69i$Qb!
zc2G}-hyR=OO9s8__^KhFm_aAU|I~q{K$8I-DFaL38g3i7gS(`|z&#X5!kKOEDc=c(
z0QEjY@l1gJ=7eFmTf5Eru53_oR{sIG+t<$IX;@|`oJ9D0M;R`3wRDoEo|QLhrKhDW
zhWT8+;;1GUwr456U*O8OJ+mdbr=;XHsamEjtPPqw>i%qhk%ZrrUM>7DMhU+wpz0~p
zZW59fPTA%whPm8HfA5u!X1bH@jXXLIUW8n~g~2p5dUF^C=>dw9r9q<ApdBa6$R_6x
z!9LJO3~5>i!ox9~r*9()zz~LMM}@^jT7%1P2rN!^lC3X%MC?0;1M?YihEGVWe?{`e
z;voj!Q%F37%^*SF<3ut+S|*VtWdX%h1k<4)K=NE7k{HEa#uc(-6h#^QL{`I9@?0ZN
zB%%_=0qIDBmUxRq{M|8Sl*w#JlO-SuJf=x^XaevgVyVXg;{<JDq+pb+PS_bNU<8A|
E0Yf>D)Bpeg

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/NullExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/NullExpressionBuilder.class
deleted file mode 100644
index 4e6829312c6c9921774398de960e7e8ac9d512e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1162
zcmbVLO>fgc5Pj<;b?ev=3KU2wAEltANbDu5gc_kL5lBcTAo?M}ZSAaz+l_6l?W+HX
z3kSGR2_%jj_)&;)Vzov@C2*PXj^Dg_J2U&^=a+8)I(T4V4$CHPS}?F|p@9_>w@lnN
zafe~98-zjngrU-E?=e*S(NHp6bc0Y1vXLkCj_?#k7Tw4fYES4OKNrDj`YuQqdafUh
zxR<2zkY`%Pkxschj<rmZAPRXbbRxNz1!^cYA7n~BJ^k66L^l~~V}OZOhWai^>PKNJ
zk5dNwc^FFFS0YIy6^mO_stpsxUylpF%8TiVT`Tcywx^_(M2_g*YOI>~L?X`=lC*kO
z*0V8%XomU>W|GBuZx|l`?;YMUINPc44_}D5n1Qt&W!jg|f_zHNsoi~aAdZBMc`Pt&
zoI9#g7k+25aSv+@TjyraFldHGE`}=+?(>)4f%K^z-G5*`8%(h}ChjwI{$%+3NNC#!
zyROTy-fFv%-sd7rmF7nsuCp)=Mv|vmO1>lYC<uib(1y@5v}P@ZyQtC2qq);FtdOVv
zleOr?$ush`^%Jm9^kJY*HU|Su*ktVq01htDiC!cwlg*R6gf_^}e}(bp1eK5UUCv(_
z=Pyk#MLwZ%1y_lIVF}j?CYOB9<UIV0>UWsc_o!ArP@qzhvs$8aPU)P2?mD4sFzQ=5
T(~Yr`CKkzC#ND74T*AUHIuJff

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/NumberExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/NumberExpressionBuilder.class
deleted file mode 100644
index d22f47fd21383d053f56acab871dfd95725692fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1452
zcmbVMTTc@~6#k|cR<>I~L=Xinir4}&UMkT*j45DZQqXXV`Zg_-vapwCc9!sueDOhF
z#7p9%5B@0Q+1-XVP!P=~b7p4G`Mz(?IWxb0fBONTj5!k*aMQ#93OS79mWkV#FmT62
z7Lx|<8YmhlG4w3ho~@rTq>H63hRmYBEgAZ%wkKCZw<gtws5!JVQ1$D=*%Hc*)~(Hq
z-mwFQrE1-Gc`eX#kB3S&eWkfPXet>5w(s$#P=VyN&~~<^;tA^V(eFyKKhKbjT?|Y!
z<TgpvqVH*Wpc$-}o+s6!BZ5E@U9;GQZ#!`KT1@>qqEpE@(Sb8x>Jru=)1{L;v2I=w
zfov-zX}Pdd&s-OvbMVs%_k|NuGKZ?WVqb7q=pA0M8%wfoyTTzJBM6&O`WT-6?;+nY
z<kz*R@2!Ytt4!v)AF8^1VMm1=J*5D%kt7Qyau#NA&%mq&j{624Sa^s>3{TE1a!2-#
z6GWh8hRT`o=V}s${y1@t@EZJ8ZCBPQQw#rq+b(LW?F>9-D4#_5dpYUqtZuGUme&}j
zilwTr8eDkVQGCD5Rp@Ekm0T++`G!=k?Fna<`in|Dc|K3-g@)7{asLkze*4_(TG?KM
zkcLmn-qf~3H^kC@yR9O99pOpZ=rWwrf+H>G<INep4#ks<-4jJGjzRAaLoYo>X|mK-
zG+MOcWEt7))FId>nxv4Yu_xXf!$q1~i39r3Pb-E?xI$wT{D#2NWQV3dBlQ(&hA+sh
zd`I@}%prO{(w_v)BnuP>c|1leBvCCyil=XwF!LnvDn`hg;To>DSgK^B_<Y3j6GrAe
tGU*Srk?xQ>83PX`jz_@x7Vs!}XOYT1kC4V_k-`lOk~Il?08_Y(-ai{Xko^Dv

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/RelativeCellExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/RelativeCellExpressionBuilder.class
deleted file mode 100644
index 9bf5c78e356505c9adb32e4663dfb61e79954cee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1687
zcmbVNTTc@~6#k~&veIq=%f$;`01->MjF*ZM2q82YH3f|ziM~zCq%3TAo7r8$Kk~%~
zeSxTnk3RULjAz=WtYN|8L+8w#ne%<$IeTXM>-V=G0E$>l;}Y(qk;9~kyJ=j*R0j8u
zPa}zG69p49CT1CWmTlJ#Rv41`>1_t1<n2g?{<7`Ljj&#kYD-ic^5n{1RXE#1*?Qe}
z8o{pZGrTHSy*jV>f!ybzk_}G<Tpl)*^nKfNc|#~)@=9nsJ5uqt(h-4uAWPD5o^=kb
zwRV>nQq6-V<{2{YNLtBr19=!QST9{ys*)poUlM5}AH%xiJ4B!bywRkpHBLrwmZoFE
zB4X>5ztdFD*Mu)m6q2+|7}c{71JngSRk|7+n&1qB(OPu!T<IP+CZ1#(Ivs}97@YV-
zqcDFZZ2DnC7n5P}f2;k0A-frf>i)WDw7Vv~>4mB)pWC{xCgRE4{V=~L4upj?G8XRR
z0mI6<ofi3c@vs&i;*p7>g~wRXxK9{foC|q@=4BYra=9bi8h>5clT|9*@&(XOYTr)Z
z#8ZaiX@q~bSuF7xVbM}`y3kUQdrHlekGnVB1M0TaH=dzDNS>;3;RcT42Su(zH?ZrH
z2TDr5B~{&ag|k7|kYc8~JIP?yWU$qICWZ+A<TGpr%64mnG@L)})em02+v;K*COxSP
zz4X2&$x>6&Xwiz3Wn@!@W3VqYNgzvOPt!SyKAKyt1L(&9tr#w2m_{AEOJD}st20MP
ztba%H{p=BpuShW*qi198GwrqT`sgHZ8!3!ogyd-4LMyh7ODME+g^*Jir1>aCj?nK0
zZZ;*~qUaWDnQVgMvzqlMOyeVr<R@|@Bhsgu6dHgIb||uKiZSx0kjSiRq;Xm#Fo7Ym
SIhy4#M+$oBZ)XnI(fbEc%jInV

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/SetExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/SetExpressionBuilder.class
deleted file mode 100644
index 594916eb610738a8c56f983a32b4f9edee22be12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10269
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
Bd&~d;

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/StringExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/StringExpressionBuilder.class
deleted file mode 100644
index b8ee4583375ee02611cb7d057e338919ecc3d35c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1541
zcmbVMTTc@~6#k~&va)Rzxp@J(C}3L(<E0|E7z19?q*OyIiN0;yNm<zLHnY2gf8>h~
z`T|iCAARsg8P8rq8)&earswRQJ@b9vIdf)y{r>g?KmnT?260!z2<{~@hj|SPxbK^c
zimZkK<WwxG$g5al7}zu{!+pjO&t&%)lx@2q7_OBJOO(A<O~|TVGbu7$vg^9Jr%S_s
zkAjN3Z#WDuN_D%%YmO@pxhF;2mM#~^Z7Cebur1!!r6YLFGt7pNyy8m3YQ8-CycNbb
z7!pB>3eJ#xN20cE%N55iL#k+5LT;P7;|QW_XL|589Fy+`)Ng${8QQrnoQ-UcWnD5`
zRJj@G=3BZWItocz((Bf<(gUaue(G*m&v5BLKhn9WTg|8)M4>rnjbT{t!O&ak`F0YL
z>UeE`4;a?|w^JV&(iK;)AMWVwXs@-3?a8`$W%$!Dd7d`f#bv*+6p~1#@Bj~0JWAm)
z3M!tYu!5&4tYVE}_0n<a+K2NjKJq%l)}`zF8aIZa&K|s}9f&%$Yx5s)JL3_Ru7X-$
zxQOug!JtD}sqPlbuNiWgY{`~Qu3N4t`B8yO&vK2H;I0&cSA}dDmTs15Qi*J#zf2m4
zrf{plNg5^mPTgU938||WVT>f1!fLwv!M#vq7<4>3-~P#E7|#@oJz>T&7s35YCDU(L
zFpDd6chO;>i!4r_28nE%-Z*(iK9M^G`$7*fTqQdY1SfEfp8Zrxz!0vJrz;ENWc|e+
z6#4<PizkSEMVw(LujEglD2)>&cD`faef|_`dFeAHg}}qXf+<omO)xWLX9JR42o#YJ
zByQj)(P-pv;Wn+FrvC&c1O0a}6-g+Oj}dy>m+%v+@)1h>69wX3b<778<6+_%MLMFG
brtAb_$>%=O486pNeT=+D*dtiRC<gxkj8mq1

diff --git a/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/VariableExpressionBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/expression/parse/builder/VariableExpressionBuilder.class
deleted file mode 100644
index 7dfbcdd642e3f8f801e8f1d1ec57ef6ca421bb54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1617
zcmbVMT~8B16g|@q7Pec!3W%s6f>_GO_)!t0F$R=`q@WQb(YI+kmWAzZGrJ}HBVT;b
z7l@kp=z~AXcz3t74J}xG*tt7*=ALuz+&lB@_qQJavRKj4i%A_R+|e<G=>+a#M#DWF
zailfOYRG7qW9Z45w&^`%h^A-v7-H*ANiq!NO<Qi)Dg~)_MZqFZD(@79wI`J6&+E>Z
zw{N-(8~LJB;RV-|hrFg_)lnXo$5ka=*K}-N70Q*oP&2KPRQwF$Wn;ryxU$L+4>oC7
zU`V_rS?iAN$zzYf*tBh_)-B<>k_fBm4vZz&;%@@-*FK>N$LSWF)!7bVEkY}lyA>$s
zYr>UHg(NLeYt^&V0jLXpI^Qs#RQ^C532q6y%y&Fx+GV29j)d|#8FC%qJL_yeO&`du
zRsA9`to-jmy=O@7c%pc?C93se>pM<O73GHMx5IclalMR-er5)ABn&L#zJ><|9^#RP
ztbxZ^Vt9IKv$WKpox+EG!tml!gf82SVX#?)SA_#vr1Q%C19G!H>X~a;X2`Z9{Jk+4
zda3ro&7!+^mUpB3bLmcvdjagZXljS$t|gs|WzaWE()P>`rlhXSkPJtaxv)J;@uMtP
zHCn4k?kOqxu2dD%7S=XhA|jpXZYMQsS$ey{B_AUEW=R^?VmRII^`EMAw`pM#8a;*#
zee^O$$x?69XwZz4Wn|--Q?M`e6G4*3p1?VVe)>1U4H&>6%^0p=m_|Q%pTJ^dN9Rru
zIYIO*Vhmf~5q~#-ik|I-&$Jfe_0vw^7GaNL1QP*nCXB7)5(=$cBjhBB8^v{s9HDOv
zHv-8wDLQ1$lZ_Bs(r5h%E%p(y=qGYSTcl3~6g~iLY)~ZY6yxNLBa(RTBTdjGg4-A(
Ro1(uI=5dvdYKkmJ-yh0n$)W%N

diff --git a/ureport2-core/target/classes/com/bstek/ureport/image/ChartImageProcessor.class b/ureport2-core/target/classes/com/bstek/ureport/image/ChartImageProcessor.class
deleted file mode 100644
index e722783950e3b2656abb91c0e104fdc09f43946f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 628
zcmb7B%TB^T6g^WO1w=tqWZ}k*0gZNJ+(6inn3yzZf?+=`lQIY`nNIyKU75J>1N<oC
zotDHPvT$?G+{c-F=FaEW`v-t)v?|Eq(8iICrj28UVo!!r_Zf2S&X^%Th$e!e=E_hE
zlZ7YLBlqT%X}FQk=VPv<iC4+Ip30cv()FW-<HcG$If)X>NNGndcp#j?lq-E_jt?sG
zMI1+}%TNkLmSpI(-5G!8&YXvVbMMWBue+TrB_ro9Tqb&?mEa4K<tJQo<77j@P#(!3
z<eH{43^yCL8eI3*+f?>xaAg!F$``lNETZ+to34zbDhenvT>N7f4E5h{VL01%!MazR
z!lJ*Vwa~{}#5A4IrpO^?#D()Wu-CL)A~a>7g)(6^Yd{4%6fuf-361!M*dn&ri$VM-
YPf}$wtFDx$V-K}dQ&0Q%(Mb8=8_gS=OaK4?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/image/ImageProcessor.class b/ureport2-core/target/classes/com/bstek/ureport/image/ImageProcessor.class
deleted file mode 100644
index 2a8d7f9de3bd90a0d6ea545a661c9123cdbd6e71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 296
zcmZ`!I|{-;6rATT8Z87n4<Je7HdaO~g@B-tTwoKHC2F#=*?2e$58$E1jj1$PJa{wA
zn>X`(-5&r}m^g49j0r<2Oqg>i2)?&J@f&9sUPyLGP9imd-%y!iVR5ZYWVGOUKo~`t
zEV!w(y_<V+{8#90;&t10+olL^q$-_?U3Rgivrnj_R;egUrI&Rw!Xi~UOG+co%)Y)V
mZCF-^XWweV^tZ`?K<L=+0QCr6^epaM)WN_`vpE=kn9&=!2T_Co

diff --git a/ureport2-core/target/classes/com/bstek/ureport/image/ImageType.class b/ureport2-core/target/classes/com/bstek/ureport/image/ImageType.class
deleted file mode 100644
index 7e22ef963ba04023a5af1c460fe0fb7c64401130..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1107
zcma)4?{Csz5Pn`Lv~=BIj4?Oy$2K;B=_(4&1hUL5Te5_>4@DB<r&23)mO@Hd)W1qu
z;*3VK&;C)yd*6|bMH6Y0yWHJ#_dfUI*Y9sX0hI7O1_=cfTX-mANyZ};32bwrE0|X)
zsB^?)1q)mk6{NU+qF|Bhr!q<mk&o{kug$PtvwB^<H3;l?`p~!gJwMQ$uGzNrBQEP7
z`gVoT!bRHZn0`Qd;F^ODgPd)=sJ%Kc7_zUYDil36-Jv~T*v#dp%aHbaZ)}Em&GGD)
z!*0v=>t@R(k1R?Zzh&6T)lSS)Q+G|Tts8+)jaBkf(Mi^NmgzQ3-{CdKg(c7IQvKxL
zMH!-1$8&;RhV(z)Jjyp1q@d$ae=);pduBi*WeDeZK&e{pIJrDg`oJ4@t5cBOr8THV
zZ|Gb0p~L&1yIRmT?_NWiAH$M{GM+K4{&%e!GT70uiZu=MNNQN%BE`ibl2reCrko>R
zzT5NY;Z!a^!T-2*Vp{=`D^E^jpYCH&nSfob<!05&UXe~RL3bV5Tjn$X(!@k)A|o{M
z0TL^`LqbZ3;TD#`utL@vY5u7rurCN*ApD6ehT9~gB9<n626x8z5<<eOCZ)nxL@pq4
zeCP)LE_t*|6z<`^h|`=1#a}EUOg|tOwle34eiq@$=dRObtaIwf3d{x+Y+_?fq)(0T
zul^lUGbxA9p`0Nm3{?`wj4-r_FlL1@7ZpZa{y|CM5uI668ezt0Mn;%5n$Z#B#u*sr
YbU6Z*NQ1^!qTz+cJRTrNz7X<%06Z=3OaK4?

diff --git a/ureport2-core/target/classes/com/bstek/ureport/image/StaticImageProcessor.class b/ureport2-core/target/classes/com/bstek/ureport/image/StaticImageProcessor.class
deleted file mode 100644
index ca1a2e743e35d561130c3136744832352b966173..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2929
zcmb7G+jA3D82_C#&8EpxXo0o?tWhfVzFY(`tyQR8Dy1NWA|T3kyG^&<X5(f9#rq8v
z6@7MecyOG-N1V}?%8c;lj1Rv1ulNA|&Th7Cn$(f$ba&5pzVCOw%kTS6{(SJ;?*N{`
zHwiqB;RKFjqz<h(k-$m3lEf*DCUF{P<YP?1*(Bn4Rlzw0=MzX`IF1YQ{hEASOdx^R
zrN$cyE=d4Aj`27Qi8>L7nZzWrNld{~FfEm56xa!#M*Ud@IR%bDjqPLwwhT|}mvyb^
zS++(&*2-nIVZKebPaxKB<t%T2y6qif0?|Qd!W39PY~{?6;_SHTp4P{0N*ae9L$}9t
z*OKd!FzQWN1%cjS!<p5_3!XWn6<ss$xSnRs>RD48^>oiNhUE82*D=gO!I6i?v!>?@
z1v=UT?`)l3je0Jf>+1+amZJ^j@<oqQQ=gS)dDppYO_;90&MHTSyQQ<kQ+*3sC#_{L
zfz4~25ixg_ZJszZXP9}<a&m-d)bn}UG8mJS8+3A>Ip;}N95<^K^3wH5SD!VnIPQ#Q
z1l!ty3Jc;i_}Lk8yhC$V!8@sYQ!>GRl~(3KAY#rfdE@V_^d_434eNa{rq>UY<!B0!
z{CW>Mwrv_E_cwaF8)iP#m+EDey_yfJd$cM}|D$GpfB~-~5saDRdfq3Ff;{Q3;7wB7
zXREEiC5>0H;l%hfU0;(8b)!}`r+Xxvz{rZ^mCUNR=_g7Hc@eO&e}!d<e$wH@s8e(e
z^ROkkpQ=XVURf>`+tH?=pu$5@#S?f^!DSU!Fvl2GT*X_AQpMYNN5#8%kF8SKDgQ-V
z74PE%f!&o>W=Kozl;3cJ&MaHST;hj7^J+dFELyhTJWXeEg<@W|Y1&UoS`sOpQSl)@
zQt>f9kzrj^(TOgBjmt1g;3_`FX99|!%Jc<+^u=_}@zSQGb9b>|rYFovy=Z&syk*D=
z^{V(B*97(&wq7X6<1&>Y1?BOdJw)sA(R!!zS+YaLb$p@VOBG+?M(C6r5X=23o&H*2
z!?M3YJq5bgI;&b;%Mb!C3G7%4!OsADDIk-;CjazRt;gnG77ux*t9uS-Sns3F4S|+r
zl=3+)P{+PLVmsryEwHV<G(f9Q{N~D7&hTpB;AmJq94Kok11lRRace1*rZTNCMD~#~
zr58s0G0FSoJnxsBzt|M&`$MhNvD7Znk~6Q`wLtqAC$O2D5a_9<P|?dJ%F~g!=Y(`9
zKfKiRYaGcdaWk`0ImOwOjN#ELDD!becXPZbcpVY;lv(h{j6kMpIMv}@QzP?3TY|Rz
zA3cG3S>Ba*U~^c7ikr4&r8`S)-`6q55!cEeH|%)+N94fcFP<8Ha}M(P6jvF_1>b7t
z0z~H>M1Doh&s;~agU<xtpk0)fPfM*p7wzcaO30ZL;E2Dd6Q}H_JBS_^Bi)OrWuBs`
z=pteQ-(tJ`QUvZJo~cdMb}gbVLUCQHcH|afw;ul8^9Ne*B6036lIIqnHm;jTeHZ`d
zv3>y??)A{3A>t$6&P4BEW2UzA7u1B>n@ZY^n*)=1G&MG7VyW6xY!NLHEFvXvJEO=G
zQpy6h-eY8EF%AQbxPkBRJ+?3c8S~4OfVq*Y7^7}uv>M~x&1m<c8~f3Ne)Q6M7cNn1
zU=K|Gj-2N1b?hVBexf~xo6N1u*(9^rh6Y;ppq3UjwAF}ylk%O!;8ltN;_Tt>4QwUS
zUY=`WkXX-Bk2x*nTYl~5E*ld+@&sAC7=Az>k!$EvP@iD$dF~BRvJbHbs8{fUf)^DW
z*zpe{t;ZA`d`Kik!JvYd!p(yU4si*g;P8e6jP^)STY47ZA5hoXbsyX2@z`xH0)oV-
WA_=lgj=GYw5ghfkhL}*Pee7TT3ML)^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/image/ZxingImageProcessor.class b/ureport2-core/target/classes/com/bstek/ureport/image/ZxingImageProcessor.class
deleted file mode 100644
index 24da3157405c2b1b5ea338e6a3ae3400147a83e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 885
zcmb7C&r2IY6#m{OaZQ@mXj|)#w$MvS6rDq*7ey$AfDl?Cl0$Ek&2&5Yu_K#V@z2sr
z3m(L?f0Xpi?jDk66?%E!n>X`)@7LTv+}r{<z`GhMc;jQEhB7vNZ28#s@s_Z3q$6#Q
z38iMMM<{<a14UTr=tzA_CVds3$^MulYaJ8FaZkqDo%3MX{?b#zUMDaU(Vtp15=pGi
zO>Bjp$WVzNmpTehoO>FZKuxD6J|rxM%BDd=yIH^;sGqJVZ6a|Y$4M^JbM9fQGn5xn
zXd_Od^Tc*-tmK3>%L8d8LHws2q1DV3$1)1V_x?}?_R%EOt_~w<xktiikyem98^inr
zjtbsA)$%d7SL>Q24pdvaU2GJLb>EGp4j;?BkHvL7p<l-ftPpk=Nm=m)$q0>f3o|n#
ze0)q`zI%M&A6NnZJpPy^MlP9cl~00^7%Mw}K-cVesIgs2gIjpUem#4@_?%DVN@wfH
zpBX(ykFK1ZVZKk9>)CD2bT1lM1vS2~##*lNiK9-Vy0d!+?>9>SO3fBg&80lNOcTDs
I>lD}j0?`-b7XSbN

diff --git a/ureport2-core/target/classes/com/bstek/ureport/image/image-not-exist.jpg b/ureport2-core/target/classes/com/bstek/ureport/image/image-not-exist.jpg
deleted file mode 100644
index 0b15792f56f92d524e5b37dd9acd7cad6c17cdc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2134
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
C%=+a3

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/Cell.class b/ureport2-core/target/classes/com/bstek/ureport/model/Cell.class
deleted file mode 100644
index 444640d311c9efcf74ef492a5e76c470ab486abe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28330
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/Column.class b/ureport2-core/target/classes/com/bstek/ureport/model/Column.class
deleted file mode 100644
index 03a39fbfba08faeab925ed5dceea93b2924ba607..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1515
zcma)5YflqV5IuMMF3UqJ^#LLRN*}@s@(_zn43S9ENFoH4Pxi6GVjra4ivA}*Xd)6d
z@dx;$jAwRBQ<hfzvNLn<%sFRf?*9Js;}?JhtVR*VOawm6hG0Z#?@KTz-h3Y(U_rt~
z`7DL7tPnV|O7^~j+EDQCTP2h3uELOQRu0!{<z}V&yjdxjb%jvT2^+l39pvBVjizmt
zjhxl6GYXL{Yp<HOn|0RDd#+b=#ahKEG;H&o!GyzF-8L$<l36xff=reG!Bwkj*;$2H
z!c(3}?oiqq3ls)(R@HO`ZRZPRo?On=iuv+RzHUj}I`rH77IltaM63`$TmJFz6k^dU
z<3G9(p^>V2<hG?Skw{*wz{jz&u|3mv%TCAbOC-6HFwbAQ8wxktu0OFMTtTbx%-I-o
zxw8-x+}NMkmHQZrx6kb{#<cUN(XCpuUNqM&8ET&^WmeX#;|d<?7{Vomv41a8QipZ)
zLDw;fsSs9lJVHiCKL&IRLRT2=g&>PnU?bE$aQ1nzGpkxMKWx5L7;deloUiT~n}q|j
zXlIfexXt$*<qzP8CiL_)A$2Ty9m@{D_u}|5MCem3^Wr>tMXS+9QzuZV^f9zAjC{Dt
z?*J_@LF`FZP2n1&xSNgZxWR~ZG9Mz2(AR0*lUSQ?l-^B@@hfaEh$w9FpYXj-eT8-c
ze=bcY@D0KAXWnQX%+o|nP;0V-Io@K{$$X0%_|syXQ*iN@SuYy;1v~W}Ar1aFpW3iN
z=W@n@bH(<z;P_<QAO^DpBp|xH#d96Sfp#%>&JyV`O9j$lFg0?FfXveEDC(RpB7mii
zZi4MO2A%B*@g3Z4VRZ@#dxflY6*A3%brBNw3VBQ+*&agV`G}BY*NH^DLY{OLlIlK@
Vh*!u{3R&+VMBc9mNjp=#_ZR($|7HLH

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/Image.class b/ureport2-core/target/classes/com/bstek/ureport/model/Image.class
deleted file mode 100644
index d656d4905f74137a6862d1588d45e0a8a4ad60df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1017
zcmaKpU2hUW6o%i~4=A{`6=`b`O1}eJ(~Sx7M&pGVBMDKHHh4YI$+DG?W?A&sALNB5
z5)&`{0sbiCI|FGeUA;Ny%<R19dC%EjzkmD$(7<6HS#0HyK~;xs9d>ls&0;T$eSv&O
zj@6^a3z<lPLhD?9kU?J#!{8)|qha`1z`2k~Pr&^co#`x^0-2tQ!d}ASNi>X-rve+b
zo6=^p-lqKd=u8Q$w4$MUJsEUVd@4JA-V|D+uI#sE9O?7?(n)&JSfJYKjs`(zoT&G~
zBvu!rI0**q(+`>h87jJ}rvU$DVL4REvuk4(YxSE?1+skh*37!Z>fLNyyH@AGIbOV)
z&zwIQP2#S48R;SN#?P@{n}^#t@UVoOhg<MGEbEX*PN4GNX#`fU*8Zk*uDaYTxozz5
zPi6Td9ay?AD@!*tnFy0fVa`Ahzrwi6Q=jh~=A!={!athA^2<}$eq{>ht5MxyT!+h8
z=F19uZc$&wU2LPkTYskKxyTbc8NM);CR?V`Y}=66=HyTOqPv!^$PcD)HQDypoWJ-b
zx&~)-uuJ|P`TOJ@U=xSNLu1zI(nIOeL&<DGdnoBu(}S+G8;3sDu`zcOFl*1Q{|(j`
z78dm2dRaitK)l(5IYi)Is@Po=AEk;n>0<T=u9NN03*_Te@%>b>vnYO;DlQvD<qzWW
BmW}`b

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/Line.class b/ureport2-core/target/classes/com/bstek/ureport/model/Line.class
deleted file mode 100644
index a963848ac9bb2915a930b5a9bb1afd5ef959f177..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1163
zcma)5ZEMp|6n<`-^v%q5sn(axxy?<pOpU1DHVRVkQ&FK~;Kww(cA052(i@@wO2IKu
z@CW###B*-ytZ9p*aC>skInVQ)CnrCDeft66C7c?{*ec^e4FzmfQNlJKJ7qj9<B`B}
zkd9P5Xv-+-s&OO*oK6rAyxvI3k6xO{vp7-SvHTDYLlwqD@3L}VzznEuBv9|1`k#C+
zRbk|H!jYm>wHx+_z9ImDXSwvj9EL%BEF%rR-=g-?0rRy4iq7tlfYGKjiS2|#`6eCo
zWOC^DSghTN13x<QlaQY$mxekCN!9v78ipYfyDwEcKfdei&golVfIXUnuy<t#d9(_P
z$ZWKUddA4-GnZGeufn=A(1w%8WY*@tzKzfRc=sY-{$DnRt99cv3FPaL-$|A2eaeGa
zxQ=Ck#^0e{C5b=g6|qpmH47C~1=eO4E?Wl%qV3Y{kw5HvZ+oXQP{t;0aGBP-KtDpz
z5y3&g((w{Ziiw-fI^DETqzI_H7ZC1u6y9H;cn;%>u3n*&zYbs(2JXS8$ja)`zzup5
zxQXTj%cFnBGTpB*KT}Wu1C;dT##FO;*?bGPC(SJ_nX28rbC`MhZIZpC5t>>~X@bD$
zJSG$0!ClJnP}4$;ybx!Okj$G^0$HOeGmv-Fg0vq+Jx=DwV-oaafuPLqbrO<!RU!|U
P2s>lBPtgYD3fTM&#e?|R

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/Report.class b/ureport2-core/target/classes/com/bstek/ureport/model/Report.class
deleted file mode 100644
index eceb245fea6eeb82939228bf408823d64dfbe6e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9757
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/ReportCell.class b/ureport2-core/target/classes/com/bstek/ureport/model/ReportCell.class
deleted file mode 100644
index d7cca88ba1e924efdcf172d5e1b71802c1fcff21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 663
zcmah{%}xR_82pOJ!h(W`|0X6L6pXPKZyFDxCMHA^Ht}BAx+!#9vUE{j&4Ul%Lm9vA
zZjcDk({$UJ>GYfZ{CfWYfOFV)VAp{?0+oQ9HkZ;fZ;}%@X|_6j9n#*|@F9&OKGKn)
zK7STU7@-xNaxVxtsC{4|${HveunD7*sepPW5-LD~i-fLz@kUG$SZcQJ)2+6a=~f{<
zCvdRv+EDvkQZzuTQj$~4I7FwzKiDZJ3wOf|`yKAFH{gAPgd#dVF&Sh0(}jjJubw14
zYS~$q+gE&)PvH1JX-Y&@8SlFm%1=YpQD-L>8zE^&jFU(uPXvk?96N!dIl|@4h_hE*
zp~&@g9QFB~NcyXGZDUDGXNf%yYrf8Gu2Uv~+E00@bAbSX9R4Z*ZXUaXJOJV{6f8PW
nv{=f}g|hvwz>39Hs9LPSn#DS-TWr7v`fj3Y4z_T$ZC5+rVm7mr

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/Resource.class b/ureport2-core/target/classes/com/bstek/ureport/model/Resource.class
deleted file mode 100644
index 9b756df8b43ae9d3e5a1d078a6047c3c9659cb45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 859
zcmah{U2hUW6g>kATNX+yw#90#^n(i2xG%nGOr)lX5jC-f#Pq=o>jbuCcgZrC@UJw{
z)M#RS_D31dEFhR_%<j(Yy>rh!_ntdHet!7|;2s(dmT)r%8`}<Up<-jh#*Tvwc5Uq0
z*cV8jtFb_-btd0Qw=cu4d!l1M?A{m1KJY_dKNMK6T|Tb21+1g!trA#i`Js9~3OXu&
zB|Ck3O0CF~{kDvKV^5uy?)gK3-If;xZfB^~xjTy0Ad0mcFi+oosfN)g_7thDfz&-_
z?kYX=K9*Vvlxy`#Eq>%a2?rz1YLyHKar{7bRdcKrNm8dxfxJHtU=#nqWy$f>Xs|X*
z{ih1fNmA6YZyH;kRdd(qRX`rq0&;L{929UHHG!=}NLFVmc@)QTyileA)CDU4Q$S#K
zK93ijGv#Scs%A8=UdDRT>#5)B9T`g?$F^q3gTKvhVWg8dYM7~=HtTKd@WL$d0#QfP
z9RJe%&!fO~nbtA=Deg|=0-|yF38@dXQYdmQG8Wi|#ru{+1uL{RCec{M6<Wlh#82?K
zinVFZH^dp_X5%ALpOO9!i*M^IGOrIWkbQRNJr5Tt_DHplGO7thWdfd36j|&#X?b6W
mDdQSfflXYWlDXUk^JNU#JaIO0){}&$R|ZTI3fxHOw|)UUzqn@r

diff --git a/ureport2-core/target/classes/com/bstek/ureport/model/Row.class b/ureport2-core/target/classes/com/bstek/ureport/model/Row.class
deleted file mode 100644
index 059e99784502d36d8aaf269ca2344a757a5e0f01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3114
zcmai#ZBrXn6vzJ?!iIzm&_L@0rL9&mB(`ahQZ0xI7KsgoHb`5lmQAuG3wfGkDWWsJ
zs9(en&=++^=%_P(06&!D|7<qNvTWqdIrrYZ=iJ|UxOe~g_s_op%%B#*c{~Ush=(Gw
zA#6mbzmdtNj2?-2EYl}4+LF;z8GS3_I}zUx;u*H(gDxT`A}^vK!U$nUfm$-mV#!jV
zq!mOOhF)HA7Su-V;GS`)AePzHpX;fzUM;4wR>Q0o=M+ROqf&oZJGj4J$r%j=!JJ+#
zD7c!**D9%8(=zr_`wgRBYgnm*v13+E%dAyXi`+!xa9uAN>1x6Ff#aQ8V_h%OD;c(&
zZ;J%kqtlXEFsMk<R4~%w*tg7bDq}V+ag;TSRo&uA3R0fW^FAn*TEQr%h&{JJYjs|@
z78H!eJ+^aGn>==jyA=#)%&O4}b3@OSxf09N@_KnwZ<sQ77K2vFB;>^Zo~q!&N!!DE
z+kV>1a2CHHs#W8F(I~hapE~2<J|>X~D;gFJ?7EK8#;3C3W_QbZ2g+T0Iah1BX&1jQ
zKE>`4-|glRC+%@Co^IQ)(CxZw+~JyrXe`~K;C<gvPB&4A4q6tIai7?|27)kXHkZ5I
zMr!t(aJUwO@hxYkz&U-`W_6|`WZgK~{v-6_S&B-IT=yxOwe<Yns$O>*CQ1|cchzjJ
z*zGQXwMLO_ZNHH>mQCrp0oLuh)Jww$C~9~UZ)muR_Y{nuzH^;Mm(6hv7i9At%xTDo
zxQGc2pW_P+Z{ckXw=k=r1XIH<_ChFYsGzFhk{Dga6%Fr*7?<h0xT4@<uLI?(C}3il
z>=@%;+HYF5%92qoXRSjCB5_u6J9~LQV@$*;56Lr%-E|-kLw19Ao(u&cQ=XkQzI-Qo
zdo8zX<gK}>G(!#Y<pm-LNY*$CNUCkkWZ9aTur<?YYbMIp%$2Q~E?YBMwq}*U#<s_k
z^sY!z=y!@MI(2}0IPn@vB5;I2B6)<q-?-F=1Z9jsK$3C-VSI=oT;mLcv(312jWars
zW}xfq9Bb6AmC4S*DUNR7CZ!zvg5Je`_AdmVBz{NVYxHN59H_?#i4GiNKy>&R5z&Lk
z(2|K`M2|6)d_~KEO?L?)j&Jb9n;641JL@A-%#i99<*bWz)*;nsH%(?f_uM<<@CcnS
z_sdaT_o}^k$9B^Ss^4*=NY^^X3xttiR7u^Sq^<=gH3SyWkI!5nYA0o?w7-4uZG7zb
zx=kAai4vqQ@dt(j2yVaZxNHF}x`3h`pieqZ+|j6B<GU{7ZZy1{r=l4@g6fTCh0&yY
zL?itwX`J^38S#Q-d_g|-2O05#tP|ux4-mN!0<yrwxBAVUk+8SE8@?cXpB&>8^$mML
z9ueem4-mPb0<wrDACPn2j6C%P`4V?efv_~^ydcjAvfTqjo(2I~_63P~LGr#JU-^T?
zydXt_lzM>3+aw?>zCAMP1=;fjN&EN6s28M0ka`agc|--|>ki1ObM<1pdV#>N7@$^P
z%0#GIui+3i(8K^NMDg537jy36J$tVbrEC7{DCN29b`T2}@M8W*%%6H-%G)oPtG<OB
i^XBVk7g6_e-}f)vm>1*)L4N50B0m!WSz|Z>tp5kKTmk|B

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/BuildUtils.class b/ureport2-core/target/classes/com/bstek/ureport/parser/BuildUtils.class
deleted file mode 100644
index 6931db7cfdcd31687d27091b2c189d2826f13ca0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 855
zcmb7C%Wl&^6g}5=;>M&+TVACxG<_hoMPMPZD@BL^Ql$VAfv)jmXs31U$Z_Cr*s@{6
z1|$}I0N;cVXX3UXkqVf_%)MvsIrlO1?Z=m|0PbMTLk)`_+VIVG)x|XzOM?1co$2zP
zz+T_j6*%2IQG!-aXX@$bC{o3XFiMHc_wqPQcf&#({}^=2eLWOh@5T915DiOp7>o)v
z$cr)<gvC%5!Gn=blb5AVhg*WV$av55x0UjvED_vZpFmF3Yg3iZv!JWe^x>(ywX?Cq
zB4dJroBzcWG>VhV0-=mczdr~w!F0b2<HIN6;JB}<&~BdoR%jzWaml1zF};31Dq{6m
zn;Er!b$ja|d=oZNhwGx##4=WzSjCE9^&dthm^Jhu4YR%AS#+S{QgGu>;+bO-czdek
zpsOPJv~1TvY{@{Z$KiJ{%Le}dT<%l!0-nONw)q+Ik%ol^_xc!IfJeJo1>hVl@OBzA
zL=0Io+U9w2^AoIX{~a2>le~xHZ@2wdA9!Jp#b(Aqi_G7~9Q?6pry`<-S;kR<H}jOO
v(LYbi!UdvJu)d=u_xY5Jn3UH3TiPW`b|}7lM%qiKX)jMmD_CF|7OwmRk|4J&

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/Parser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/Parser.class
deleted file mode 100644
index cd1bffcc480256c40f12ce461b6b54c8db201dd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 274
zcmZusF%E)25S&E>1q(|%OSSPDD=~Ijk!S)RIPgM5;K*_KI13-(ql~9?YO%@AWM*gf
z@x0vutT1xnx$p`7nyW?-X7f<0jGbh;%Gs_ErKohU2y=ertl(9~4oNOj9T0}mIjgvC
zm2pk}y5iW#=9_r^Yv2A-1TT`UO2z(Mn3MkTT}Un8$%JVtOO`ZRT$l;0rPAzESg}q<
e7=KrE2n5S~36M?b!8W*WkOjv~x49U6nBfcJGe~#<

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/ReportParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/ReportParser.class
deleted file mode 100644
index 65d18deaa3ffda747c7bb6424e07190f77ba2554..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7764
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
QRDbSDPyI2i^x#kaAL(v(L;wH)

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/SlashBuilder.class b/ureport2-core/target/classes/com/bstek/ureport/parser/SlashBuilder.class
deleted file mode 100644
index d9409d4bf07c99480212900b9bbb0ed3c121fbbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9146
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
A<^TWy

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/CellParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/CellParser.class
deleted file mode 100644
index 210a533e2861b05903018b05bf4387fc9eabe254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6746
zcmb7J33yc175>i<=DobUkT_v++z5&ok{L$<Q4&NUfJ6f*VG-2UN%9CoCNtBSiGa0r
z>t^@XZfG~V(S=%VbpX>=?V_#STf1*|-}lyTF8$AaZ<0we1o|bp%em*Cd+xdC{P*0K
z$DVoMlK_^;H4gGPXyL;SLO589=izP}AF*(cgD?)(;a+^y#>Xt&=fJ^18~0l%IjGm>
zAq$5cG-~sRg$EooX>-KF#~sYp<|izC(m_<44_bK0!718&*utkA%+=<nEquno>AL=B
z9n4qKBX!t>N44`g8=rUZ7`~vz7nSlQ8(-G?D>lBW_1A2CUF&byc-+A^@h$Cq+s1da
z{;rMN9efYp*Uk@Y{LsOV@MA5WP|8ni+@$qSZTw8@pWFC_*1xpyD;vLd@EiQr#_zQL
zy%vAa;*Sp2;7`i-XI1krb@(g(R)@diA6h(V;hzo-_%93pR-XS@_^;MaS$NvQGY+<^
zLH~+pEuk&vi)azjVwxp2mP~h$qzNR<S}dj8w$y6Jad55FaY?axBH~(7Uxz`NVM&86
zjShySjtk2PmP9OR5?HxpzTo8xf`;zh$?KAd;bJPCSf9*w2x@y$1DRxTIPVEA89%z*
z@1~QPfkaO+pUMn$boXV461|0@H<;jzTsB`!__7n1n<bXFuIN}nso~|ROscp-Fs)_b
zRzXc?wx9AFx>Ff%!|+hAm*1T1O_LJo&h{nKTa)>e_5)%~aaW4EwjO=4)KD&+==9QQ
ze^o9x-KZg0)zY2K4<!1tLrZoi)}*~5FH`JTSVdC5w^LP2Wiv+5>d`KR*+awWVk+k=
zXbe_q18&FLo68I8hx6$*Y<YzO#Rw8rmQhZBJTXKYq!VKkRO{=K>0z3o+EyzRG+c?T
z%F9W$ecX6Yai6N!Qf0}CiE1Ll$!XI(ozPUpJQQiHw>nu&>XD4?cw_Hwudk?+v%S0N
zM--t3r3F+6LHyXuk29>5&+h5TC21?GFPrvTVVWqJ>8Ck&rqbzEwDjPn>>i%Kl}=>_
zx8%9Z3~lkKlS5w7xN&2JqjskXs^RRuY^L9w=jHiq&dV3~brroKikUs$#rEaOZnk2A
zkmXZvhQ2$dgK_e;|DS-)Y6==b^*zO8-yq}B1OUO$l9`swvSc>HmncGfFb8BjKyX%d
zAFpz3VKa@cI<Ly!{IMW#X~Fr&;?dwH)ChVfyT~!;R$-Xns1=@~5aRS?hx2{j+LXF&
zgL*POfGBph?$gB{>=m3~_H58>U9zx?7IaYn{nITdM0oKazRo);Y#Ai+<EzI^F*f#B
zvSf}cCrVUMml{eAj7nQ_Jkq*!Mujjz;}{l{^;&j3lEx5YoVfaahHJqqmSrtH9$6aV
zoHI^PT_H`|mBk#_=6ZC-cp=yC<^Aw~3E81D#tZ4&mCTQB=(sfL)EVQ1I0{Yif{%~!
zsg0suW$@8I@BnGzj0_)Y1m{jIU>qovh0Ga+qIfRAqIim6Bxs*n+89EV6;KQ-i*1`c
z`KS>@gwAjauAC$%yK;)0N(d+7T5_5zbEVmpd2+fdXUKfgiOH^<sm<E7x3d^m`?<0}
z=h($;F6f_S`s9rl2-lXhxUx`MU1`&aHf0;SD>0dGNnBSs+m(cz!`M|^kM}CD$2q@X
z$+<eb$d$#i#Fg`8sVnEJl!(H7yqL@n(5v^PGX1L91!i3{!t2(RW!jHTHpN(QRa~)K
znCI{c2+e;!5!ID;A+E>^Tv;w1u3V@lSRog=a<Qy*WtDWgvRc*<cwJd5mk@njS*IFy
z$)$vvNoj?PcjG<0f+y=zaV*#ArR`tcu3RSFf(29Zk9wpl>tzEogDJVkxgRh0F*sbA
z&nNfk)#%Dbxm>VlN;zYWS8;c`a)oSirALd+vPDqE0lmF_Ud|*@n@l#irra0I8M}}C
z<Z;z-D&6n#G79S^o3C<Zt88=SO4&}$uW2@xYR+Vf&BlBl-DihvC(z5Ou3RNo3+7JV
z10$7JLU4z<c%dH1Ig{BYs%b*1Lf6JEnZZnUPjispG`Fj$8>^meu;PRal;}RTT|a9Y
zNAfK|d>K0-JskS{7=f{#PZqP9SdI~Sr7=Wv!(_dnrOLHCaaHEJlSo`PS!Dj+J6!Z{
zBsyWGtRT0qoEeaqgz>i6KqL{&sy2nWy?+Or1i33y^ak{VEpwO~cbZ&fOrI(X1ydN8
zb}HioIrrPLu#33Cr8~3f;h~KGWFV%sbm?ot<p5K}GIbWa-2^TkDsxlyEnnf8q;JmV
zCX(lCASZLlzFl5|o-&lp6cVca;^2)FV1|<_Y{(W(Ix0B1a_@TO^mxx3_A-55$HE=V
zRD6B>bXGgm+V7k(*%d3Wffu_;e3w;9AGOhOOr_Ooxm;OJ%Q0R9K3|8Lu;S2GWwU8d
zQ*x%2Qyx{o$VJ^=e~!6#&2iBRjnst6T4e@b)3QSstK-P}(HB({dx~3|4bE>fFz?$?
zsV3id3cLi0g>9+guA}%J*R#D$f4~w>dzk^{tt|}majGv>=KU>QT~%GW!Gti4G5T=p
zth)2b2jGp)srHyte+#xyDST12Q<+MVn#>N6h?iHSCD?^YbA#88&3qyNi`nDG%OJv2
zvUVj48@#>xTFaPfW|`9j>*(9grryCx#;fUC;jt#HgNJB25=U<=UJ%EaKFVr*a9Xmz
zf5PzwI%!ay5LlDpJNoQv3eIWF5~@U$oK-I{8qa1b5$r9--A_K!qil|sR5F*Nhw+VD
z)j1|cN^rTU*|}r@K;!H^3aL!0{5B(pyc58<Y=Vkd3`m&Ak4bq52Kg7#cMj`eezgnX
zI@GYuClSkifV7xC@a5J+kk%1|wjaW@`%%++A8I1gM-XP;Is$tdwi#0G2pp2?DoE}K
z>PebWL24L5BS|MzkRl^!B57s?Y1Rm4lQgG-bm9o2B%M@2I(Y=AkaTJV>9i5dC8@cB
zG;ai_lXQkpy4URWdX`K1#SvJ{T`occmhh9|dHh+5bvPea;R0l^3^$`4Z$JkQU^yPZ
zh4>Oy;Q5^8(nholZomszi(d4;)oRvLUIWb;AHjUCdgl6ATV%lzoE1U|Eo?6|?Zap-
zp{;}%De-ZXvq?z={O7QJZqQ!T7FleX8{&ttWItxaSo=cGYl|#3L+v%u8Z+1s(}q8K
zep}=Me{_0ux*2t2+E`XXdt0Q#9|}jqW+)!h#_|#_EMY}k<RX96idto{Z1`d?rfw_E
za0#p0BAo$eENYdoI^bU%wIXXvxMV*TvbC;+uKk!BwWcf2r8WH}T-I(!?ZfD9uZ=}(
zOIR=MwzSu_9RZWpBiP8djuUl`fT`zxyh~eGkW?3~dl;MUK={D3zlhd7giY;kYt%i2
zp7#1^{lnP2A5GEvhp@SQMl3p`ge?cquk@_}eQQA9b^zT<zj8n3MeRpHU)|0F+o3Ay
z{40;(su0MvK)J5okJF;H6<oE^TIISr;CgmP)P4lqhF!unW;4%;mGIn0v0wz(ZXZFC
zqI)BKCG?Z*v5M?uQNq9>?0PVE51pt6>Xg5v(*Y}CV-;qi6AQ4KuDFKfT3n7x__=o-
zu0<Ea_cDfUH{EYNZo@|0&e1z@1>S=m+>On2wk`M+w&IJ}hR1Owo}f$r9#`W@T!W|Z
z9I3%`<wSk}K8s(1&ql8-fhXr<r?g{0c3_wEA|)O_2d9yiBEJRSfQ;OVtlWm2yn&yE
z??hhiLO~AlL&?1umIs((KgO>qU&lWAHm;W^aD)5-FO)ws1O5kYlK<kCkl@ykjTeR5
z@DdY5B}Ay-Ox(mUv#3cuZeh!&K4IL77onCbhVf!@&)|Atyc92ED@~r;@N&4+Yad>L
zSE8O8-;P(YRi}X$1f{lKO+Mmx=uEr@uO-B7m&frs&Ywn&599T0)!=rygR^hOblfdB
zGT3kCN>9=jZ)D42{UqLmH&d&2{0(nmtCqe9{x2dFjNLIhb|=T)%CSq)_%sGByv@Sf
zpTeo8Jjs+DrtD$)3?dfZVSe9fc<y={3oN|L!d-J_HO%@K-2WitB&ajrhd#961JrgJ
z<zJ+5%OFW<kn9fOAq=jMJ%YLzY3UH|8Ntw~$7SecK5N<CvJX;(?`#p)poyAj#yK?K
zTpCQ#t=V6uY)D)b7_td5ych4IQfdOlK%a7e6y3NDc?xqayuWd!zM=xP&*5l@qv2Kp
fUQS&-WL!PWap2qvJPijchJqXE1Nflf{?PvbPK=jX

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/CellStyleParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/CellStyleParser.class
deleted file mode 100644
index 23d62489f18ab42717003ccf94bb365178f877eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5789
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
ClL-d^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/ColumnParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/ColumnParser.class
deleted file mode 100644
index a2f7864899a24c3d504e510b388839678c5957db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1635
zcmb7E>r&G|6#ll9CWLUS;uQo$p{0eO7B7Gx7cXc5wSpu6(spSBY0^oz`YgVM{;8-l
zK7bG5lc?j_BqLxej(^VCoIU5;@7(hB=cg|KGT71(M_R$8h6vIsraEC@TEjJ5m*R#r
zXH<-6n88gAw{TmEJJLL>VpQrm4Skqba96>Cf<=bdyyaM8fuSvt+-8WbxJAy;leHYa
zQLp5=_rlEEWQk|pf@yD?o+ZCSV^ox_8bdl;a4SZ>CiuQl_juLygi$rU8utvVQnig0
z*REHbr@m#5q20e@SWRSIuVfV6N@mZvZ}SRw#9XokR*~;Yl9ua)P^-TU1gG#Il;Knh
zJW8zK+6=~j<3`JtEJZxKXTCNK+jL4sPI#76k}15gilWTWl@n%Rf8DJ51)<I;xW_Qw
zI<Z5X&HNrO2*T;eStZ95R5XU-k%vNu7M#Pn2F09j;c!y17U)SW=hnRfe_+Y3_8o1_
zlq9I*H2N7Pn>%^}FriYBCmnxa6fEgj#)^Vf9ry7-$3r~Qv4+PAp6JM8UBQOD+0^kA
z&vZOTPR9#8)^QO73=_>yhe<aL6GQKxMP(TJYkW|&V?jYjsSr(*$k1&H>UX{___k@+
zsaj)+BP|MNA=zvqv_n>Fj^HKk(U`uLAe+1XcpTohfC)pWSE}WR@NHVpHQLJ>7eUK{
z<)np8tjWC{mHf@BStxUZ@~^l~?dZsE3CpHM)vVfvE0$@N_Zj+IWwUdP{IcuX+;sj;
zIdmk-dOnCbq)m_t(SGD_Q#7$7>8fOSDOU(1^goJ&c9;HeZKP@XNS>iDgES-EKJfwU
zJsl!AOETsg2XKzgdf<TbxIkY_&JRf${EficNpF2d<kbhXt*2A*=ts0iaDZ3?N&{*t
z-r*ZICJ&&!MR%HXX9IczU8#7te>EFDAN4PL(((`l_N3ntaGOtN3>|bHf{J0HFoIEB
z#stY3T*V^BX!6IAL((Uk2?&K`i5doRiRh|WCxl^2Zxq)F<1%3{QW6p?iYtWQhsY1i
uD7dO%>^lZY_AXJb<6*AT6dED7*hH#<UP<n6m5POrN09Knl0;T|r+xwYp_&%}

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/ConditionPagingParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/ConditionPagingParser.class
deleted file mode 100644
index 6aabab7f0afd90dcd5cac94f1d705afed2b35954..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1488
zcmb7E>rN9<5dKctc9&&ETD*Z^L2fNAEJ*P}5k#U1Nd*#26Mt^oLtWhNHrrEP#n;e3
z1vT*jd?@3b?S>*<NJx`&na+IQ%r~>=&)=WF0Tl37$1vtp%<G6@PQ&C77Ld`A#iF$2
zG^BOpu_TveX)$%&!HSAi70*<xF(fu^*A`n01DR}@LD}_coZ)WCcKLq0QQ`hatKyI)
zRr0EqQ?`6t-b14zKHDvZ^-|Sqn3a~`U(B}8o1QPsrscP|Z`zHfWA1ux%@(%j9$IzV
ztse$|6&d1z6T@z%<oR{8<~0f@<~xTsxGRd;2+$fome~^0RZK!tc{h?_Gy;w)Z3gTN
z%eO_=nqDhll`@=Ir<UnhZrwZ*K2<}^ibHBKEJT;l3pl8p@T#DI!6UowT7tA<s9r)0
z9U}4z<?Kqg8R2k)G+V@|A9-!R%HP|vm*bHQS(b?!7(tRD-`~*d2~-petmC<g7Y1J9
zm4OWuRcy-3YXe)@Ht+^J1|H%O!&*OdSlsoq!Z31GMTYdXKwXs>l6_OfFl-5GTcs^{
z*>c(>#(d^d1HzVO`%MhFe!feZgrj{iDC((%KR9OCi6poM7`1Px#l_(T_DbgF0r)?c
zqWrFtJ^l7v!Ry=)=Cx;ys62Eedd+r4C>K2wd-SbQKJtm6+0X1{%b2EDWf=5s(5o~+
zI}H)7DY}`oGuq>eXJFsy5W^^~iNH94dvrFs4!Dm8bYpT%XqCZV$vaN_>Mz7TonhcZ
zE~WfHJcj-J(m4_xsJWCD7&esrm~xK64)hL&^4}<^OEgYYKpGmRD5q(R;VEY5XJR%W
zFLVh)a-t%SaiZ7g4SkFWLP=8OB%V-RGgM=mPRhs*B{>x)xk5fM;z%s!Ixu?7{Us(s
OmKfzB^OKp#efA&UUxp?C

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/ConditionParameterItemParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/ConditionParameterItemParser.class
deleted file mode 100644
index 49f482b8cead3e172583dffdd77666f0bdeb96fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6938
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/DatasourceParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/DatasourceParser.class
deleted file mode 100644
index 5c52fbcfe2dd9e3c6e3ca9d3859383304c6f77ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6233
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/HeaderFooterParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/HeaderFooterParser.class
deleted file mode 100644
index fe2c36706d6347cc5f52ea3bcc94146e93af4705..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3392
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/LinkParameterParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/LinkParameterParser.class
deleted file mode 100644
index e7374f2483608ca1f455017e0d7171fe3b9d4989..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1988
zcmb7ET~`}b6x}yWG9ej0N=t3j+Aj+s2_2!dDj-S`q#B?KjkbQ?gex6LCUG*UT`vDf
z{R3UT)fZ}XtuB4>!Jpx~f1pdP`%Z?hGPss6Gv}Ur&c6HXbMF29pPwEBn1D)Q5aT8;
zrx3$<5))~paYZk#YU|ZBUc>8YOkzrZrcJz|-7`tNnZjF`)r)I7dM<^xF|VzK6i(nB
z6N@IUn|N0sG3~gHKO@kU9VrPIbM<v4&{uR^wcM(emA59#ReA=B^@^;Pr03{$=rsI0
zPE+7=u~M(u<)*K;?3Sk*b<ejO(rYTuc502PO|Y#S(vvmiD~|>@rUc?ah`?;NSob#U
z^?Ge$)1I%YnsWWAkqF3j^`++O)ZK%K#4^;qh9_W0Wa%B%Z0f8UYpdGxyACFHDP7$0
z2nO7%mp66coAR!-tJ2-DSIV2J;xo-;n&#Q5Le>Nd5l8<A;ht4rR<@R8BT$kZHt`-?
zA}}1SMg)iMRcFJMJ_Q$$he<~8347A%z;r~wk%VVhb85BT@+xY<(Tbgl=;<X*(!z5%
zC6GHj5l4ZudoD-ALJ><Ama$^t2HrREfrVA9Q5Oq0QL^wMJ`y-~XjClR!fp29uB^6{
ziH|LOf=?}chT9fC$BKzBEJ&0sRIqO0C7cl$J4`N==BRNM=zq2Y0%wkd=_t(E36fgA
zQ?;*i^rc_tkoHR7_ndOeS0znZU?{t<d#l`YH#q-$=Y=j#T~qnXluBSQDuvfK8O|jy
z<v=#X2#zm0O+B~0dxW%y3C=FBlLr!Z`08Q5Bb&?W9;5k2P-?>s7AJP%pSc<vJ0uSV
z>{hW)$&QbYkou}6t0aA(uJE?$BTa&?1*aydL8x2du>Sil``$IbN&Si47xZ|~Eif0Q
zV#KxBhZ^yO4D2x44?Uj!pEx5Woa56x2!WG)`@8t(MdCNZmCe84Kc0I8@dJ$*p653a
zI8WmR+Eyn3FXA*;LJvB>OcoajX43cV&xqZ6gs!DRe!yrW9>X>g`8G^}Hj)C%qiu8x
z+{YS?l)$8sF@AgcXU6yy>F<zu@br(2@e9(E@l3o8iv!lPjo$mXP|)i>LA3tR`Vq$_
z6NOA-8v_q?;`fDzJija8d=)*k&mtL=dmdxBfEm1uSqxzj!@T8LlraJqIrzxqYmDL>
zTncKOVZ|=GnSGAdB4s(x>^LzNh;R{xt};|WTSMICh!ba+s4=2~q8fkWtcje7{9oEA
rJi(PGi1p7>veAxYc!j|+1}Ad)Z5-F+j}kl)9v34;9c43D|Hu9Xi|7gV

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/PaperParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/PaperParser.class
deleted file mode 100644
index b99bb38be5e747dcf234f2b5c8580b8025bdbcd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4121
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
NtEY7YN4@cF{|63ukdXiY

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/RowParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/RowParser.class
deleted file mode 100644
index 10df88e1c7686d9242d2b2967126afc2d0ccf7c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1645
zcmah}=~5Fx5dJ0!*|4t4;fWWBVlG?{@B$C;M8lydRr+re#;}m=rZy9O7T-eu;8o=V
z_zJ#?T7I*;C1@6{t(uwc>HfO=>z@7k^V1gq6L@T*A0-226DgE(7~h4nuuYu9dA(fF
z>WeuHo3x$O!lfKenz)QBTDWSW57!J#8JIS3T_8K{dak-5kj@uY1Twe%RVlEy;(BtS
z)2zzisZ(uGGf?qsPGiLhTrJ1Sj9PQs0)<M=Z`#$ik{fm>kS#w@cFPIcGO*odt6@L!
zUoVB?lt52-AuyA#_(9!X^_vsx_T7eTN>5EC0j<iHIz!j@G|rvh60r;!`3VdrfU%^&
ze=Sf>$nGDY*){3b*Oab!-FfBM4ack7%PMfaIzwivj<+hXds#WPjd`aP62WE|Acbd=
zYubWYtgg$NB24eHTlXAAvILxMabkmnjAK3{9;Xuwb}Z=z<C)8TC#cDLu5RU?-~BkN
zQ?oFLeFDYq9_|E5JTg1(h4W$HriELWF)(Z4Httxsi+dLC<AH%W3lH(gLPZPn`g*~_
zB9<%+;RyNa4jGsE=hz7J{mr4ki5;CIj{b0p`X|ueHFKoHQS5HDqvVRy=#ZbW{I-t7
zoiB8&h_;p0oTp@62As)P8f5WhI1O9(2{5q>yOVQ0702c)oD;CxQn5+V1LV-<=k(hg
z)yX?8r?w_-7T@%}_V(#~rrZV}qv^I6d^O9l-4NKHRLTp^9|Jsy=X|7_$Zd_E4d?xG
z63)MeP&=|VgOMT(()!;>Q-u|b@DJ4wzCZr%(%d<nT=!G5xeM++#rF{Jcu3&@*KDXf
zhJ!p?kpT|jFeRbqjH`D3Mz9|4Pd+2{{5{h1<<darBYIN!fb1rWP2@@gy`f@Z`~%E4
z*i+^nUF|9jSmD*R%;8LUX_fV1_a?305;YxWGKOBBhmm6uLpX_1enp(ZB*t(PXZR@c
zSfWN}IuT_PXUe>A6vvorj!)(|PO!F77CcO(G<^q&Hi8UwAUUZYm^5(8!0GQ8;@UUE
iaAR?y=jfWES+-c(#9p1;PBdlX;3=l2t@0>@d+`^MDx(Mh

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/CheckboxParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/CheckboxParser.class
deleted file mode 100644
index 1c7e575d03891fa5877de5823a67a819767b55f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2965
zcmbVO-E$LF6#v~c$%b@+QlK^pBA=$TAxQa<7Av%ZRMHkHErOq$WZQ0=WW#2I)NfH#
z6u%Wmo$<9VKHy8RGBWz2GmfJ#j?cdP5BR`<zq`9>(l(umPG<I=J@?#m&-tC-Ih$W@
zeRl)EZhRKTHVh~j48w<k5QZAjisSO-(GX6AF^rS)F(NgiA)J!yV<DWD>zNQ9590|u
zDPNva@N^i>7?2L0X@rJkBT`7qhpu2us>eg<3}XU@g2^z}Nm~t5QliU@T(i<uE(9}-
zt;j1ltH4rF5C|SHa)#X_&=74K74Y|&X<cAt!pP}^#cWcyPHM>vHO&b#rDaAn%aHG$
z(r-@~^szsYGPChy!PckZMN7|{mL1P)RzbJoMmC>`7j(@^O^lgVHr_X(r>2tT`Qy%Z
zw?M!#6c~vnOlv%zHnY1Y<A*bPR?pepZ8aRH^)VT-VdiT2?a$?lcAuHen>p!#Y3VZh
z)is<mcQY^j2<)u;o+0Oi^lK(3B`TBJIW3;ia^vx#<fNXGS1P<xhA$9GdFcuqtow>G
zM2k{U+;9nalY4E^HZt*qQIMCm%&*UMzFec;1-1w34#dl~hu)VD+gfUBK+8LYC#x0M
z3W^Si#+Y%Tn3q)-SR1WEWZ1Th+<14}8S*NpWgQk(@bY#A?yX(=isc-#%Z82doMw|_
z0+*^T@(gNZwge52kc%z_>xW~Bx=47!!)DP+=|>EQYh^?Cf*mps6;ZSa^epa^|3YVh
z6-gtPjxi~sY3r7Xb9h$8c}#Q5V@J%$W!St5o>TEWUQqEOUQ+QgUSY3gw4|O<@v5}<
z+vJFf3(i?*BbGM{PGc!}O`d&S#YMcq=5Z?FknNCVY15K%D&E9fB!P-cc$-X6@s7Oa
zGTs$fwWyI*yodJ{e4ye(d?c`=UKm^ks`yx*3Y^n2MMnGyrd523D@@st-5x79nTj}e
z3hZ0#eF+xKFBIEqA>{-*>vmS56a%XuCc)yIs3`hbH_bLJT4^>LBw4ieQJI;*wpz_o
zMf16iX)5S;FPT7wxkOl^@i@>|RdVVz&5W*b+$j!{Lu_2OUS+@Bu2m}U2q~^6-P2yE
z{93T9WgKpe3jGf2NUP`>`5g&yCn4D;hl6gPB-aG?EC#bS{hgD?JvIs)s~P40a>h(#
z&<if;iq;q%b%fUKr0R`(&gJH4n+sm`WDXf~6>pihUuFVhQYN&*pnjfA@#manP1$n6
zr)6BX2c1be-=M;bh2`W|PCr}JGK_BCZ1zT`tYU+fPP-NJiW{z!mEG@wUrDKL6dU<3
zVjIXG{@3wy<#gk7JKy451=qm#YY^X1@S&a0prhP?4$7))fEaf0O~|h0lZVCkXh4X%
zKd-}g`WhMrI@+84vk3T5LXfiJ$loGV!m<*=)HHg#D&^&#yn^yd&$6k6RoBr>XR8O>
zXR$_L7Hb8%{1N(X5%?TqQo4hxKqT<f?Y|>|AJO^+f-|@OiUfW@YgaH5oJEASy|aY7
zoQ<EaV;vo??^0qBMs&9iry@!uI2X$X=j|RZnvFBJuXMyp*wk^AnfV<wPGAk?P0V#O
zr7eVVD|YeOLqG=z<_O^|5|InEzDS%d6R9tW(^t3;Gqk*lPTb(1%wMqwzhf`{z&;1r
zqflsjkXE~h_zb;v(u(65r)aqs0g0`LyOj3Pj+Mu6xF7pjsS$n}y3oxk9H6DFldE}v
znjUJ_!+#4&1rI7XsNm2|Y*NsB6RisR{&9-<5DvSgq!S;1fYRQ)nZSKbv6>0pPP{Fy
u$y`JVj^JU4rbEp2sOM;>=P0<ny@V|i!)ia(j0$>weCT(q9>FnZP5cY#GAc9x

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/DatetimeInputParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/DatetimeInputParser.class
deleted file mode 100644
index 455d714a670bd8711b402a38d47139db114a7be0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1881
zcmbtU>r&G|6#ll9CX~osL{S7pXrT}k@In#gE>dp7FeCrA?E=AEYML_R1Na=ifIsvP
z-e!CNAIkA;k^!V)hLOok_MGg=x8FJEJNx_3k6!@Bv6Vy{G75&1h#{k5q#im(rSm|=
zL%EKr7?<mWibqL2#uMp0RWT{otcs~5o?$wPRy<emLcxrJS%$=vVH@5wLrp5Z!w{cy
zih`jrXV_w`V&#Rq&GROGX~{VSZtif`kbd|v?j0CqhUr|vvGjb|6L0m3D@u;*=_T%#
zg{vD@$<)h&yM=>2$F=l%?g`JZ#IjwgcpH99mZ8><X4p*S9Cu$YI@b81zF-PV*j_dr
zfnF4QlD6U4=fQp8ImaqFw)~kv5djWEYXmq$9dQqW8K$myRJl@;$unF}<qr7~*G+Ek
z>sy{{*!$V^E|u5jmS4=OU50_^<WD2l^M|4!Q>xoC_HFJ_sTn?;IVcQ>NaBKSEK*B?
zCR{1=Y2uXJaw={?EE-ZQ9T9CFk%?$%#|?(bYQ0>xqYMps!!8a}MpQ~qxC-Vp%ws{r
zB9=%>CeI5~!%OMJz4s-dVOiP@{>E_0Df_xn@Jho9avD~#Mq?n=$vqA0eykzoIb00I
zs$fIICSGf}gDz4@HTw(d8&L*^rt=+T7`rs$X~!6vt7e6=<Q}OlU-85aH!IYN{wO7$
z(M%{#qE!~&ELE2D5ES+T71Jf5QfN+=nWl@(Z7MRuM0F0)J@x<G2-`piN0R9J9>Yo`
z)&GJeLCSp29W|MX7>!Gi%*vawj__plIgR(376$br0f~1NZqjA=&*+B}nchVY-Mej|
zZMx0lw9*{VyMsKPRz_>>;8(COWW;cj-U<I>CvK6g1p(;9ZSt6uA-(0#A5lXOu>2FT
zH(yb+ni*<|e@AT$$4HQ^gtkg{U1%rCuJ`S4(2jA9+=g(gG4q+g0s>u7$nJuQyTrVk
zo*rb-i!AP834K1X?%?o{7}22EZlb1QhN623iBWW4NH$A;j4+j<mZoDge>yoT$Tj6d
twg(|6kP7ajAFOGHvK|P5Mnj;);LtHzPAON{ED_?wkn&GUW6)oR{sJeD_)Y)-

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/FormParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/FormParser.class
deleted file mode 100644
index eda9879ac86f39937785ee3258ff0d36a2d71edb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 324
zcmZ`#IS#@=3><SUr=X#xg@!GlB8ZX-0a8-YEzuGJxwP5vI0_!XqYz6{fP_-`knI_d
z{e0aY0Osg1v>7@KT>?w9B#D(K49A;`xCtJJ$m6zFe&kt`1EFR6UL<s;Bw@RB7C%$F
z<3+mKTK$(cZXEJss^yg%;Aa6(gi592`#dZi$68s0wjF26m1{pR?EQ7D!lFO@NFmHh
yY5Xt=cq)Z*&nJW8UnpVly`xY_7?lzg`x*p7#aPvRh-!oy>L#n8k$Z+_9$Rm#@m|~j

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/FormParserUtils.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/FormParserUtils.class
deleted file mode 100644
index e6312142efc3bb39d99f696853d8b161fbee88ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2679
zcmbVOTXPd-7=FGq$(JU}p$95aQ4Rv3rQLF_Z9z+D0SN^x2SHIc$+q2gvm16d9K4Vj
ze}Xg2Ab+5Dj)w~-I^*Dt&iDuX1zvmasP*}F)24@r*v#ZRzVGv%-*12U`@0_i97QdS
zZsaA-q!B|tgA~Ryn84W#&f&Zo-jTSVjtlMR!o>_GaaQ6|1{yA_;fln&ieV~)tGJfI
zb=;76PvWM;Edg0IJm2(ufu6#gao5mmfo1D?*S5`4V7bnSK>L(6;}}8BGX*ZTBpNN0
z+=^cG19M&{S=IFdJ;K$kO4ZhV)9^~O)2>(1CpcUVMUI>zc5>8mtl*SDTkgPhfq336
zQ_7Zt<(QMTO40PL8bzBYodvgK*w+ouQv1eXJeakp`0z%gU!$2m6-b173hd1lTyI7%
zyOpDJ`nYXYOeYvQu)^Ac<p)aP$S#3n8<9$YHdEQt)j}H0cZ^DCY#0gKaAx$Wz_Xkg
z@@awL&6q*tJHoidIpvln<)z{rLq<wT2}*t9*;HC!>v}VKR{Qfob;+kg8!>CNSH*IC
zjhI$hQ8uSlz?oPplOpd{s;;9vu5dO@1x9K9qEQXQEb+d?2VuHikhsmv7P$2y!P=<!
zZN3?dRjamDGL)Wq*9pw~^x~07s9#k9nf4f|d#*RHm!f-pJ<Ev7=uV>r)L<C>|A8cs
z9=~5Qt4bkX;zNPdXvuDrPI}6%c_nkgQi;{wEU+-e2ULP+cp0xS>6!&T=6S{gmC_nM
z!pHQn1_MPpT0;qC4JM`qI@VQ$h8fIi=)p@87G1J|vez(&c@4W@3mjU{{~rmWp#n$3
z)lkJ92~UF$#%5?eP*kVS=|7=+SR89Bh-N9fUpzWv_YBn<H#fbj9Lvx*56%asX9TXd
zN?cUh0=ZV=il*WC`e`*TN1jn{ls3CwXRbweN?FT-dRE;pDWKZJtl>|F8O@%{7a;D0
zo9-q0u<bOP346|D*p*fjEcd1Erj^ZCgHrrjRlNfO+j1+KRD(^)-T#~-Uado$Q7*5+
zY3QeL23ooA->Z^=qDi4+FHK)%;}h7uQp3D$`2MQS&rYPeQqxWz@FBQs*fo=Z*uLbr
zwJ#@gyo*maHRnIAiiY!czUeV!5$Bpk$?;X5=$r-TMDJ6GuS1d@9FyVUF1*II77^fe
z?BuSU;JXP#X7MH3xCfqmkJ!zpXe;#A5f`W<!T0)L9Z7*N@F^EkV6y+G#ozmXMCu8W
z3yZ(?KSOFbo{iVh&UZ8+hLhhQT}Or+nUxLJy=q0?XV8XI*;F=B$EFw|)7jK;azWwz
znoa(!=0|<mqypO<Bk`6xw#IN{Vew(#SJW;JWzhsWIPT@w%09e-{WLs>!|25j`Y?ur
zID>waF~I895nvGac>4*C;2}SRKErW5!U;SkwerY0NYZv;50O$lyG`7ElrzTfoc+X2
z5bX*M@HWZ+9ZKn=r|2ij*~dAB&nazye$~0#$-4+`kT((MAUPwdL!>%Ps?(5vp<CjJ
z#L+*oL*m#XgP4*y9-Z+ZT%V8_A_<WD12MVC6o^GM#E4ShO(G6sB#I%<bB^(@qpwq|
zqa()XbqaiobTb*$=N~YNtvDH)-xD!35`wI}J4w(}q*B@S7FB<HIm34FMEw$?0V=|H
OL>ab+mt(w);q*Vjn#*(m

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/GridParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/GridParser.class
deleted file mode 100644
index aa570f60092c4f68fef7788de6e390ffbe8af587..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3030
zcmbtW+jA3T6#s3TWJ9{#LaB|S+@Yl{K`FNuP^c6tp;Q7zP}EJbO}8YwVRysLTNSS;
zig$~6dti8R9DNB?W*qfFN1q&haU36f_aE>9#oxEtHrrB|I8J81{q~&mopZk5`JJ=*
z@t-fh0?>|6B3O<-8TUs}gT65K)S(ec@v=9JeG&9yzgQj+k^^En7{-I*`A`^#B6t{&
zh~-fsQDvkeh@wxpNY^0)tqudoie*rSF2qA&v`26lIT`r~<_X&jj4({`Qi$LPEU~kN
zKPQaN2$rEJ<EV^dGLB0KZPX3j*({;9skvW5pv%l?5@sfJL+dT(Q<}9`P30(wCd{;&
z>sKvZynDicGpO4V)+EwqKAy52?QpzkX$8}A;sw>RH7l;?3%R(hsaAS$z_jx5?UtVD
zb5)%Zg07K-L{q}Fvhj?WZy$<p%V~Mda5|f(aGKEuM7FwVO!nDj<_o4F&haLiNO;Z^
zKB-HaISFg4_T6RX{H`OsXgLnAJu5M!9#!K-N6*C*y6uKGQ$qqPSCLbVY<zcWNJ|Tq
z%&f%4h;f!6NLW{O5&|@T76D#@@f#+V<V0btEZZg}wz29+l_;B;@{a%E#|N8mH9hI5
z>BGC!g3BCshl~?4PP#1A365PX2---P+vEc;=~%jv?QA|s&<r*2(y#)pr<JgLYW`F#
z$BQs6sb>w<AxR|+`vQ3eQ{Z$19(R+>Wgb@#?!+<*R3b^UXr;AoT@ZF=r8icJ)D<*i
z1)GbMo77uXv;hHgNC*Xw;c*2|;7JK}_MmyJEoE96&64qyf?+(Z;2E4!@GPEF@H|dQ
zP|Er?GR(9TydVya$&Tq6hhyhOaq=Yvr}46aS8#@{<|6I(!4}I>Pl#qv@G4$okrkZ9
z>#VebH$<d2@s@<y*LAysxABgQcNM&c5ee<p-r3)t3eJhM0b4)Gd%uq}GR`Ylg%1>b
zh>sL}ES6QcQ^M-&-QS?hm6EXCC-dpQII8eP!i)-B0x8amilE2QEY&eBTB#1%pDH?9
zznUwOAIqld3?GNb+d;N9XD^F?gJ$BCpIy1iR@2OBs=*dKD#Gj@aNDV(A8SEhAnyqI
zOJ=yIy$tyYVW&=K_#~;e)nytB(sWRKSrpy&OJ~rkY{43e`}%U~F&r(cQO3r;X(pZ_
zGYRX4Q^}%-@QwT5FK8>$=n-jzy)n%B8EtAVyZ2A<us&Xah6(zy$}pHbsM@{SaWTpb
z_fbD)Icel)HK*4dTN4e&E9Ik9S;p_NcBH6^={{i)dh<!ZTdQXH@enmmlIRlFS54*$
z2lw%l#SlwxGB^F0)G=7spq|TE8i_K;D@w&e;3^VgC2cI^AB^RY(8Pa30X{jzxVG>u
z&Zop@aK$A^UvN`{R<0peI3I1?D`f+$q%pW>yK?1W>37s(8fCv-LCt|nsNL1t5)F(Z
zSc4Km+{^C%GQuTHD<RTaLfr@!QlWT8)48AF8O<zVRtdAOAWBzrdRs<OFJTmOC3FO0
z^x7a{1Ua$0g`!|A_}#TXW5I9Gcn+b9*ZznFzeZz6C>9z;j5NBngxg%j_g65F4sY*}
z+hWY;jvDNb$+1v${)Dg#Vxh}e*b%0R$u7Eh?QCmX35#1l=j{S6BK?@l{UU_181+~}
zK$jAoW!OMqcM{MfA+?FhFs)A!tJ6elgjk)&UATbN_>6x;zr`B-fVKDu>+lQK<5!**
z2=AfS)99w<Y9fDuUfO9X(^jVSI%;hkqWuO01=?OE#IA!U*gyCgo!H3QCHZyO#1pmH
zOv?sJ%0BL<O<8vjbz7)gfZ$c^l(F@1)XV6Saqm?ulCkY78fA3<#kdl-V@J8t^j^as
zAh$%95ZO<;^%G^2dkqneCgbVJ=)rxEW^Ex1J3U9MJV&7wEhQ`!@cRAu2^aGG)F9zn
K?Lx2n-2E@b!7=9m

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/RadioInputParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/RadioInputParser.class
deleted file mode 100644
index 3ec210ebfa0b9870611648cc7fad2f92a9c89b48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2953
zcmbVO-E$LF6#s3SWJ9_@DNq{)kxyIN5Ttxa1C<s*Drt)?6v59;vTe5{yJ53I>bEHP
zh2M&!&iL9FAMhnu85w=i8OPBV$7kRD2Yg__-@UtS(l*RwoXqS!d+xdCp7T4ub2h);
z`u+xho%lS8Ef`QS7)1aB5ezk=701NOV-XBTF@odbaYATDBRDD6$0Il;*3%I@5yg{u
zO1wO+;+ZI#F(4c~+Xx-$Mr4o`4@1S6P>)B@6~zQh6_Zh{5w<$c2#GFpV$BOzRs?nw
zn^914R)wRYs35%0v`n{0K|@>nsDj`@J8LLdo-!?Cu#`_5&T&1Rqoz4!XY|~t?wI1;
zR|ee)lRlEEjGa%Ui>`4dQF4re?YN18?i39tVde|DMA6Wl%*2@O<P*bs*0lSrLdiWQ
z4U!5%(p154TgrCE6InaIb24!#XXFjbO}5u?oi)Zp%%*MC_I%LJ7i>$MW>$s>eq{~M
zOx-RBCknRLeaVnKA^h6uNdd~Feojy1bZa~@l%6y);!2fQirAT%BeGSnzi$5(c&d|7
zy+Da{lXqdsHFJrSSrpf`%rDGTVYWDZ3vBn*9fhA|54|rParMlZ0lgqAPCBb_Rg@%q
z#+YldR1oD>u)3`ZixJl`t?^|0X%foP^O8Olr2Jh4_t&m?#c~eQB_rmzrMo1Tf=g8w
z`35yIy956YlY}1g>W8CNQ3N*85xeAMjKij&*y@Uv=YN|>Lqi+d*&vJiqizx_Se7=e
zY@7)ZN!M^RoWpY(&SQ#OJ~QH`m1D=McwWN`cu~Vkcv-_Mc$Fl~>1iXU;Wc3&bjc45
z7vx#F5ii(9*-I*37iZtla1oc-GO`MiXuXc3PYJeZcoT1t02<!LJ7j@|cf~cA@t%Se
zi+WeX`}jb`hZ;V@#|pO9i-E^J4WEcpp>uk!#E3t|l!ni6MM0w}rbk@1mWBkjE7-f(
z^&QH;ut@Bvg=|yMRkynen^=kpU;--+hl-+~Wz${Tp_T5kH_|277!`>r*ix%+su(`k
zEKNnj?IRJ$E{_Ly=s6DY6_uR&Y&&P@oN=lIa)>?4uB+_Nc50Q%KSF|QY45ZjD!&kH
zXc323qGG=!9a+_OT6{Yq+(`+tiMe37$4NB>yB334oBHzPF`tYIj@FFwe>r0&BIpGd
zbhp)*8g+!0l&ShNo+G)rt=$8!dMHQCxr(>U+n;3uV^Syd;-GP!ObJ?YSv709;CnJ|
zxPx+t&NrwqV_`Y@X*152^c<s`H<tZrDXQ3@XR}_#{NhF{Wo7gG;8#*=AH{n9bJzm%
zhyQPaTshhJ+{(8ESA}b6>oq9fQV5`f&#+XkLnmd;Ge8{M_@;=y<&%e%AJBjZb$?w)
z;M6rV40Luh2WJoppo}nORm$HXQpS=pqSQ3{yBg)CzPya`a^JG4j1||>OlK<xJ7%y-
z!3<U_=nlr{w?)Ah7!%T6RE1)ppKt#Y3;l%FFA<);{dX+%BU-z|vG5FHtnJ-p+#@%B
zxsEk-xVBr3#~9JQ0i2AfvG80h>*U*gel+W+Z(r$*m$9MqDl-d8G={N?@&@L*k<unY
zxfwh7>>;271oH&pED@0lw7y83E)%J*h||}20MoR*iZ0yXAIsmc3x8lY{=^=M>=CH6
zJwU4+M0}cFyJ*GfjFYt7jgY|B$6ZK!XvfOqcRYx_tkem98M={V7533m)XCHAr>2LR
zwFurqTE#;u4yfq8i47|HZlYDi!GC2DAI2fClynl{4^TUrHxjsSC{{BeDdTPNOy(j|
qaTt$4Y3gOJM|?-yeMjM~9c6417*_kKW>nbs6F|STdK5?Hn)(kJjU`|J

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/ResetButtonParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/ResetButtonParser.class
deleted file mode 100644
index 7890511a19c17c4535cbb20b58713e9e5ef5d45a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1522
zcmbtUTTc@~6#iyuyGvOGid02KP=S^f76oq<t3c$bUSbJ}yzQ2uEbgW5#e~Fn|BMg%
z0#OrxfIrH3W_QEIZ4->yWagaNbG~!?W`6zt{u96w*76v{jEqtq5@r;X2QZ6@P^t>%
z#6GV;6Z?XKyLsHhVjdT<B;&q}2QnTq<W@|_4C)MhrScX-X5HQ441*2R;V(nm;NGTg
zSaecoxGmk<(mhk?$zdkgGku1YM$5G|!w>j7E%bQD^#ZM<dp`Fx)9zTB&vmc0x9fVg
z_J;dBSPO%|bzVmnHHK_t%g`(}T(7O|xc1V%_T1t&cY<2E3-%7*6-k?}(*t_lwL7jO
z+!<sZBQcD0fv38Sz+tHWcNjnHh{730OO1W~gRWV+)7F}SXFBa#d7E16=yue|)L({~
z?xmktzB2ZCOO(^!G~13IP@5S(oeGo~bSb09BsORq@d&z&?;l!Rr>yc#H}qP3!xU60
zriMH(3Q;kP0+A)nmGcK9vRJyoEg6qgJjSw$8dm7g4-PD@;)zf)!9j=Qx{y^PqS~A%
zXeZ;Tif33=aRpZymeYy!XjQ5nhM~Vl!?1X6ypz^545uj1a8VD4Hk3Nw(yfp>I^B&@
zr-q-fj6tC?8=^ryXh=6)m^4MZ=xUI-NzFP_PK-ql1Aiat7TxYMd`@Uq-o_+7B!eJV
zdWkZ$({O1WAx)#5(Vm?>0{cpWgiEyMqQfzalB~uCDB?0{Obmop;rtPO^a1lfAiX_8
z--~LckoktJghS*=mJ?Yaxj&Kf)i2}`M=2sp@(m~$r>HkEL0^@U6;UT*<RmJ^z!<Jk
zTm{p(PCgRJ<Kz=(QX^d=FS$|}IE4E7I7D2?R0LU!O^zXD3Ni^cv`Qu2N`Mv;pxkWb
X5Eo8TO*bT$;7GU~MZ1HkXrKNAg5QRq

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SearchFormParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SearchFormParser.class
deleted file mode 100644
index af2e7422dfdc7d5417206b89925f0027eeff4537..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1672
zcmbVM>rN9v6#k|y-Lfo{i_{y6$gMXRL{zW{F$5A#1(RwMe{RcA7Pq_2?v})d@Llu|
zpe8<m4`n>FyQDxDA^e#+d-lxteRD4J=kL$o0G6<>Lc^4TX%#U{r7+WnS!7k@ke8l<
ziX!HuHLs!%T)~2ZCkhrBlB<Sgcxw#tY_7_X*sym6L%M8OV!Pd}3Fm`eGs!btw(GiC
z)g42Aht7nzZ@3Jla@}t7n(K+ryzPjV?RdPUJFalJ(QKLA6}nU3-?N=2ulVK`neY98
z5<`z4%J3#zww(swwVO)^eA5(7VR@xo1oW=hlbQ|Nibf_(MFi&=Mj}Azno<nI(#_CS
zx^Bz1NFQB(uza8&>b&h4CNCSVN9>vNx%$#N&DZ9I*wt(EZ=5og)`(y>I#s?9Q@0v?
zr*<IfQc7>dXjr;ORbem!_Ok&I{9)mO@?2kFr?9?4wPLrOy4W&g?~HbS2C(x|sfGch
z85X;H=c)oT^vn9qwQSdK0|iet8iHpEo@;o4WeqEMsi34`6ssCuVNF^YhLvuv@VZy^
zDb@L6b{WPmg$u69Fx1u23<J97IYzDRiK=e4DLpgUGli+pKdV7~-=Pa#)UMrp(W&z1
zD@+az!=dEa*<*Mc$#fG`YOS;@yz@jW*@%9+T46~(Jj>lGE-8)A=|3JHY367Gr~fkz
zXUDRi1aF+q5uF<ev(bskRWU*DqXz0QdRODLQ;*U*NMD?GMte{G80<S4F$~d~^qu1v
zCR-k)0F2-k?bP_l&?*mqC9nkTlfMxAbd31BVqrM(13fXEAbA9(aDvo!aqbAc#cvcA
z_n|Wc1w2Lylemp3jA5Ge&G=OL04}5=V2ZdyWGURoUECvaV^GK*BdiC6BBceMhlmfp
jCTZiLv;~TdQA9FdID#tKFS}SWWQ*aEA2mVRWc1`e>(<k#

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SelectInputParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SelectInputParser.class
deleted file mode 100644
index 2c678bf9d4576e9374d8609b268440e855ecf17c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3242
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
Nz;;Kf2Roc~=YPqXc0T|B

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SubmitButtonParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/SubmitButtonParser.class
deleted file mode 100644
index 132746d0989252de03e4de7fce749e93ed362069..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1838
zcmbtVSyK~15dJ2FYzzxRyl*ZcC#xJ@K`=zXBOF#Js`PCV23*`DZYEUm5BxDc=u5n+
zeDuNpq-D=$3xf$&P*$pDdbYa1?*96l$<N<kzXO=Yix}dV&|t(6!bB9edT<+)>M#|>
zwAyE)xTE&FQ4Ga!5BJsKK@_<dX7MnF0nBNb*YHR~o*^=8I;Nas=t?9v8Nvm3OE8=+
znvPhl+hyTx@Ulf;;zhT@txfKk>KuFw%hzU&;bF1j+D5r1#T%pUiK^>KqsqOS@C?(g
zT1HK9ukw1^^=zY5FWaVEs7vWO>%L2lq1$(6*hmyzZ^zhj?de@((Gs?BWG>kOd`oPr
zs!i893cKLiRo7AR44P;{F`VguPo0;g!!ZBfdAhk}?hsPExXbsrVR2{2C`r$BcBqKn
zlH`>)E4=DcNAuILK&92{RYe!WxkP(Z@)Zrl;Wp7f-kF-eiPp-yqN2JzRiYxeq&YCW
zYrza0I&^u&sFrA6%@NIZ2s+6K=BTV#$*p@8v1BSSU1*oVgla{{S)3z1wae)Q=}1o&
zFAGaULC0e(>R7@ueXPlSOXzr_4q>@pCHpCsH9XVt97P=~Sfw$QeQ9QEzD{XII@YkR
z;|i`a<l5^xg1h$q82bMm7Q@uB0sju;5KvQI3<GWVhM|v35+C&=Hn~+N*2g+YtVJOQ
zT8-9(EGi0*kR`nn%B7?TRT>s@gXm<)wzt!HZu#a#(e_kfYugNkj-{Oljx?r<3ZN$w
z$JVSLkyDRfM7*tYiypK?mod0F$yXSnw=)iUM(8CD(@tWg^*o&n+8OQLsZU@Z$q3;B
ztr7p@6<j1+Z#v)-F4KuAMbWB)KckD_fWkL~UVcK?N+ul-e?fN$4MfP+0y|3fslbk<
z<2}B)n*D*EO!hPM26{6e2&T(VJ&Y*X*J-^$bq>;R2pJ4x1|ztSQRFe^mz8R!4$7h;
zaE+pfOXMhWQ2n2vk79=jcZ3joz<wdGVN}CSavQ^V&_#}1L*$^P<9!XBeotmA2`N9@
t`KHT3HVp|vX8n1hBN+hQ3V<T1bOZgWqgI?&G9v*_2r1tyO&u!l>>uJ7;+y~g

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/TextInputParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/searchform/TextInputParser.class
deleted file mode 100644
index 32330530a8b6f3091562b2ba02b049502ddaf655..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1815
zcmbtV+fvg|6kVs3CX~pf0xGD07wDCsfFcDH5ELmF2ZkAWOWQ*Urb$gxMnAx3f5ZoU
zDPCs$06)rcpCkj=h8adCGdcStJ8Q4K_c}Yj|NQs`U=kZq#E_JbiXw!hjC4CP7!w;+
z#<*A?$apB$2^o`7OyQB(JeDyX#S_d#(T%KxSqXCz<{2Whx~V&4w8Rs;4B;iK$Qe3w
zy2&?c<vh1{w7fx2VmYgz8M~UTi@pCa>>TJ-hM8Q!Dy#Xb!{4ekn^!E`Q7f8V<+iGq
zD~4L-nq4^9x9qaI!{0lrW~JtAx$m<Kt*$4->v+zxOKQ<7Padkv1}}5d$tD7ji+o>D
z)-5v-c*!bPEK_{UAaM_e;c5UlLmTn-oEc^>8LC>Vh{PFs<GDlaNK*~XEUDX$t(&E6
zVvkB|YGt>OO>Y@SgOfk?+{_>Hf=H=tTQ8ZKLuF?8cqWkV5Rk+<omioEculxe=JUiU
zx^30$0$<UEP<k3#JSLJ*(1TtQO0!Nb+D(RzylxgVlns^9;kJaQ3Z7v>!6KGOMuwK>
zhJxo}6LvmSxPoP2cepPy6|3rMM#74M7kH^)6|ac8F2tB|NR|@T6y&h3U;sB6rklB*
zQ^|&e8M+$##xQYVw9~#YbT^#{%13iZQ~8?1cQvC%1s@60+Zko}5+qtx?krLbsq0<|
z&(SK40hwHLqM&q!$lRfFGE6n+5ZpcY%Pqg)gm5H?ZtgRz1ycPlSdyK{ry<l#Jm3Ia
zfMiz8zB6s}YDUwMzpH5mjktdfwSU$Udl;r^8Uu|Nn$2NaN#%6!qn%1CqqQ}84EB|b
z5U$ZZ;yxU}b+Q%D0XNW3J0@gDck%Hjw9p02{Y2=^F<REssaW_sT0^KKLbl}FGTCju
z9VNTnwZB2B<4XDq0eC_CDJ*asG6sp^5M9Ga;|{X8>k=9Ag84)!EN+oEset|-gXA3|
zdzkz^a#`Ak2v17II_l{Bd=kdXZPbPA^IT3KB?@&9tZRX?yzc{z`#_Oos*bKxy3I9;
P_&6bqxY0%tch|&Ux0&au

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ChartValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ChartValueParser.class
deleted file mode 100644
index c5073de892c7876cf63d4b1f6064b5bf668064fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9935
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/DatasetValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/DatasetValueParser.class
deleted file mode 100644
index 1b80f13c6751567a5568402d54491a0eec00aded..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6189
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
XSY4CCnbMU0*Ny1T-iS9^R5!f~;cDc$

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ExpressionValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ExpressionValueParser.class
deleted file mode 100644
index 4d15e901068ba962fc7b862b650e0eb25ba80d4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 936
zcmbW0TWb?R6vzK3mtEbiZF=((?M(%fRveMMNJJ2+AgmW`3G{K3jB(;#!tA8<W7(G$
z75o5xDDliDSYa0|?!%cmhx7l<nR8};{`&R<KnM3dxVY)!)&iQi?V*A@9vp1A*mSW)
zaGt3|ndgLRtKB2iUZz7ySPE1k-%jJc)Q4d|;>b#n4#KDxYGwU-ux37~jL;1RX)OAg
zk)Op>%Soz@n1ni$TBvvuiQ_PuO0j=3(K5?an)IyyK2PWp>Uk>Rbt_2qNDR}sGZy=i
zjAdfF?Gp4*ezY|+sGQ79SI+c=)e<P5nU_T9{2%^7d8y;@I22KsjKsVCSPl#q;vJ+@
zJ&>=I?P0UD1&^%E#}!;9JSjHvU$=F!?PCXbE#aPzB{T?6i<nE!gCH)W{cD1R<-*u_
z03&G*<%uDzwc5c&V-Ac~$%q@X-YQ1hJ-&#;@6~=)knIUuk3GRF@mk+K2c7b!f(5ot
z9&Ezry+2F9H7v5nZx{`>R{VisRbCt4Q90WCiYnn8wKosHaBRl0{{^tY%FUd$J<Ff7
rSczq<Fl~|ZR<VXk;|25A=lsVUwR&fF?+o<|YOy-!Pj%Pxvv2$c49x1d

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ImageValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ImageValueParser.class
deleted file mode 100644
index 7a10484794eb7ea2c2073fc713f42ff4059cd2fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2692
zcmb7G+jA3D82_C%$w{}{mbQRIMT8<GP1==OZUI5SBGtB_EkzJ7n{=CQn;Xdn>Rr6y
z{XWi=Ctn<1z03rvGmOkQKKSB;;~Ni-<C}kgqXXja?53ohM8#xs_MGo_zVG*4HsAmC
z)kOgP_(;P#3`p$P(13v;wl<>^_h~qQK@Iog0ksS%-f$4x)N>?=?HUf^kUBi5q#tU=
zD8`y`7~^U=BJr>y9}VJ|hDUI`iPDcMmE(&1n9_S(El((hsdfnsNld7nrC}{5B~lVo
z0)d@&)^>IYG=?MN0=|8@2}_`D$j(|LrA)#qjG2ivDIG((q?sN!3${8}h(2e^E(&ZJ
zO6D>~qUcyNMyX)sa|Or9n}woPFzie|ZJadICCeDhm?>*qZ4bG;9Rhw=N?><*C|5`s
z6S++Pv@wvjGFH~v5vgN!!kSd>+PQ4SsB4dw8ZG5yXB{)-<r32>fNArjX{60;$~c&q
zwvrCjeAaBfu#`9I6zpt@JWcVeVv&~#7<HVf@{J5pOB(~%6{s%hk&1&+y7AYyQ4>%V
zCED<xvL_ssq$$fzP0>`Km@5^Mj5J!upBh`Et}yMij5=m=X4uTTd1EC?*b>tcGZJam
zlEB9L8K?u9=2_iuE5KJ&-Sv{%t2A_UVZA_4ZB^8`Sk>2&K~^HCBaagj1sz2=I!ZXH
z;}m9fJc(KQtjJI4cpA^>coxq|Jg?&goMtFGUc^f}UdAf|?KS13<5iqt!X0bYVe~p)
z!|OVZA+F;MoYC<n-qP{5TKW|29h{MPSI2vJU&jadP)9eS0{yii{db`=^EaZls5JzZ
zRgw1!QXo=mqy|neH!NsZz2w+wW6-e*rjuipFS6-1fIzG1u-p?R$7@W14dF#?QfY-q
zElHqDA#CQ&<dmhN%jB{}ueUs<!@Qc4L9>e^IcG1MZidBD&-O7Us~YQI*0E9+eU)y{
z9GrA3v&ygIQALGS9<;NL3!*#B21zJd&JnMJeBnVg-kL}`Q0XNOojQhZ7-U|ktSunk
z8~z_1say$G<^xgc2v;C>6E<WQ)o5z1rchB-c-J$za*4u1hN&c{%;E?u+(m%U`m*j}
z`GWk?=_gZ`Gh$}g$4dn&D0AFcCrYNu<C4@>re}oqm4z|)3P~&unQB-qkzGg_16C4h
zLV8->E>;WoqN!S)r<HPQbDOP77T9-#NnB*L&a7^!xVA9u`|2h0-%Lct`A%KS*Sz{P
zg6)CzT<_q?;8XDF?>-OlIX4a1z%}3!*I*;}x+j1zB0LE-YPeEa{7&g6(tiCK4M)$T
zaX8xHn}?r&5qd5lFo)I{pR$Z#8BNg+&1J=XA)m`^i>ZyrZH{*6F82aj;{I63Uq)+m
z9&G~iSSAn;gaY$u7ns9wwd){BhU9nGehbM<=sb(Sxoba%<TvPy2SdSmEN9WKC}ZUu
zx<mdia8ntp=FlEftdKw%H=o1u>gkqqO8*ljd8;eAGFHZFb>{`#7MHOQeOwd!jBz%)
z*d(xu`z{0tVmonIMQRt(=^;LwiOwFxFv8Oqdf^b@)3}pkzmGHgE}Z2bu1_iTCAQ)s
zw&N0Z;9Km(54amYVHYlAH-4c7h5IBl>TIF49^U0(nDz`v%C*qqCg$iee|@wnRSqio
zQM-O>up`OeO#KFW`6KV!ME`qm9^1I{(Zi2<e;j^#0CmGvbV=-#xcdrLbG?c+61yaJ
zU%@(wd#<2YV$UCF`4bJRm+fJgd%Yr{D-HazWV)ke+^%5yrxFTWFQI*|)V+TLOKQxw

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/SimpleValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/SimpleValueParser.class
deleted file mode 100644
index 47ff6f36677f43ff66857b56fc0228f18f52bec6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcma))%We}f6o&tk%M470HobBw^ac`1i|Q_lShNBm1gqg9Qbp==l9=Eym&kD{9t$>9
zfW!mvP^iZ<5s5TeWES@Ene%@>{_Vg2e*FP(f=3=)+;MTYhI`oZP{Mr=4j#DJcCkZn
z&Qzkzb3(b%Y!fQ4(w-zN2P%>8#&JjL^RN?fW;IB=Vbl(_vg=8*Vm_-8;aSj4W6>EI
z`9+Mi9H!ccVW>w^3l$F|aT!KqDOxs`Z5w~cex4GlSsCF)BS>{$^wRibAYMl@mWerS
z&cXKNC)=+|lL<BBG0By=im)~ZMW~IY+Y^o#LC-YI8$6!h;vl>XMHD7|@xC*VUBi`L
zD;?{ue50&yn=_RB*hg04;|6XLj*7+=PB;T_vFl?G`&RwX$1>`Kr$xj9-V?+kx|!P|
ztQ4+@ZSPBSF25SWdZQUk&1e~|l0KWU(I{q{Z9as<@6vu{koAH`k5__c;<<Wo1^UiG
z2{j&_EV%`rV?QszEiCbh-zw@nTJcAQm3glJM(N`4C(48?RNg-M#<`qh-#@U;%AJh0
uo7YcRti%ddnYP4rYgk9A{*w6{6aF!0t=>5}{DJC}TI|mG-`!@m_w8%ULEr!Y

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/SlashValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/SlashValueParser.class
deleted file mode 100644
index 9dadde533bd94b8ce69fc355cf383b32362c0eb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2569
zcma)8*>h7>82{Zg$-PZ3PztTa1uP(>8yBQhNh@nXBcY(hvbx+fhxC?g+}vR63hukO
zpyEHkIKJphFf!w)56<X}55DlsyS_N%j57{Wf9E7!($=xl&N<)t&bR))?|e5u-~8rV
z06q9Lg!S03BN2j6?gv8fW4}BMh7rcWFb?72Fdo5>Tn_7aRI-N+YzpBBj_NoT!ZPfa
zV#f`fke4Szcnpur<q3KBqyby*NdqHtPZ<z$KV=|oU{q>2($<(<PRk`D-Dg9%8#x_$
z9R&@+ekbR6+ch*q+lMvy_vBMT!?J{v6N9B}Qn-ihWQLsPM1I814BM_F&o!ps8+D2r
zdJ`l0td%T!;<QzAMIrBcR>5|Q!nK@iA!D7jGbLdSW$fbUup|$uyFLv8C8c3UG?91H
zRw|$E8MF3gL{{XyzV-#Iro<^3u9MHzj4FH5Qc+sh(6JaL6$zDs1(){5WpZQoS=-9k
zxwJLpxlS(4+fdRjir$_9+p~#|kRYsBAWYunlVkNZ4kpLMh({Yb)nqaZP=TPqT6BO@
zsp%>;L7bbaVU|26V<nuTbkJH~mWjetY5M2L_AlCR-*(zvGUVAKrw`Z#RcUsyjx#!3
z9Yr>(4v+1lVZ*{@o56A#htN>I<c^4ajzqC#ZYOM%8YVU%s-b&+E6pqVj6O@EyeUX_
zxvo7SaWPTCSrboToKc&Yz|#!f#4~u-#B+FF!}59EX5s~$V_qiC<3$b8#YSP`B`F_F
ziL@((iI?$;j#o{*hSyEJfj3ROg|{_m<0jrw#Ds}=CE@qPIK91x3mU@JPU}voR%?}8
z%*onmVHMbk)ypmu@8g__5AdOhkEG#?_}IiJxL{%<EDb&LL;n9a$bMXm+N@WrVd)Iw
z5^Q$<3?uFd*Y@%*dsQ*ji>h`(9jp4t_{NIDQ`MC1y&^iNXZz$tGHOqV0?pC(xe~m0
zrhT^7-A~0LpW&!o93<Xq${i>8Idxb$B|j@nDV-MHpq*u>)(cEehM+i8vNH^*r55pQ
z{dU@Kuu~}lWqX_@$&x1&ej3)#7Oz>WWmG?Umd}6}&v_y(2&k?G$iY+U+0EQ9V5X+R
zObjRI)qHcj$2Bw(?*Y}S1R)w%6Q8W3JaIclFWe3*aO!fK^1^yZbgB}eqG!8a@rdJb
z@GdA$D1sT0OG|;qVu@b}Ia@ikqVf2Gi7%o1-P2<iZTwQL=hqZy0P{waYdcRCca3|X
z;|jE|NchmfHK>@Y(Mj5@3ZM(!JZbWcaHX<u6^%8LcjGF2$F88^z*YFU2L`*k%LsN>
zplhhW&=B)S{1r56xP)IN6(TDT3H&(uTO{y3!k-~{dGdNB@EyXjU?f<9$qrpo#?nhj
zUd1w+Y>MgK5xs)tJ{*bYkzjLk1uJ~`8Y|0aDWg^KZmHwls(6t)-ffC^yW*8`$7SrC
z@^+{4wz+v#jMghy%>a#v5z))I>k?L0skVqwMq3$cVn&xF*Iu6N?D~@V`xR!#(Moy^
z46H>H)}e)vZzbrv3HM&&m7vrKBAOzSSz>vfNM0nCpJNlQU^9NgJ@^G%aE(8Cu2b_5
z+>5`k4Syr1>Tr@+r!Yk6&Cn^?LHRADuCcg1qzroaf_lBI-d6lT?fVdr)u~lZQrmdT
zX2zei*~eNp;dk`oe%5h2C1s_noE_xsB&Q$2n^>b`myX>!_S}&4zzzA)+WQZBb?oE+
uB)tT5JV4&GAQ-i;X%{nmu-Yq(+Q&b3R!3(U>m+Lb)oH=$PKzt4hyDf2L5$@9

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ValueParser.class
deleted file mode 100644
index 6b6dca86b8af039c446469b7f3063e168de873a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 487
zcmb7BJx{|h5PfcwhK4{(VPQgSz<`CsmZ}R9Qv^swS&@^P;*u{pPXAXYBnEx}KMHYi
z87f2vWa-)W?)2WB@AK>Z1Hd(od~`ANaNuF&;gF#>R)sPXhVI#U%;4OVGs!TBR3Y!0
zJdyfQBpETIs7yr`3$5Dthjh$~su`}Lw9I)@8~Mr`Evr%+UI|@G%~f7yd?~U<^0>tZ
zONR{oshStUP&va>v=B?dGf~X>eX@|L3AZb*6~=!Q%;a-Biz<sv$8bV!{<Lg#DsNRg
z%5bBT%hox7iyj02=M<#$yKjb*ts?8jol|sZ1@zOj4@QTq2|bFqjRE)K4Qxe32Rnpq
X8aPIuFtBeIK6Y(Bu(*ePdk?+=7Qus}

diff --git a/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ZxingValueParser.class b/ureport2-core/target/classes/com/bstek/ureport/parser/impl/value/ZxingValueParser.class
deleted file mode 100644
index eb7047ea161e92af4c84d4cefb7515fd743dde24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3002
zcmb7GTW}Lq82&bGvLW39Ed`9A$USLO77<Wd?uAM*6r@m~D7s0v>4qd5HXEo{ykF}5
zibX~1tzKTxhd^=0(HF<@)fs1eb4F(z#}}U*br|qFn~*dlN}bG{J?Fn)zW<zjd*R#{
z09N7?ADXdU#w|X$u-%Idb(n*&4?EB;C_BB_<-@JmEtVcZ+2h4t@$L0upZM<g;(!l*
zI4BOcd2zcBhj52j?i3VF*o)L5ivBw27!XTL#-Jb@Uc`MkjKmbWOA4O}K~4!hQ!Hu0
zI3jkI4;k2Em-QitqcV=k7?R*wYorW&y@Z-TuvbEDhuN=7m=-otdUrM%(XBmNBtc4J
z*o<n4Ud=MZxj?M72aSw`)#0d_R3jN%KdfdgJ#AXHn%1n0ZmC8xoluWziL9>n4H>Ce
zuh{N#c<mD0j+BHAfv{=C)P6I$GOlh-=t(_gw+E|O?bioHxQ3Z37<KH?QjIQxoKeLL
zd1fRo5{PR@H8r87V(QLFT#wpRtJR0nRynW7wiqXQKEcy789I}oRtcuWSCgz-Lfu+a
zpt{V6L>|o2$-ladiiAp4q76^R%vw<<)>6fNg=&u@OttzRTZ<mvp{1QR5t=gYl5w|;
zdx#qeORHDAN_l*Flbwbr?#xnX`35c%8VXtvlF(X-fQtA^`U>vFeGE#${Wz}R0X)bm
z9W(mvK^YGT;=>9a!J`Tu!{e;Npl-wlZ3Ry_rvcMSYCJuOVF})-X6rH2Vt!8v#itcK
zgJ&fuQFf%Y-^ipB8hOtN-t!7xz>5lA!pjO?!K*S(D0mGcERBMbg7Z4wkkC*8MFnr-
z6v1NaL$-{!6uga51#xUt@D5HXco)M8-V;lkpuLY%GCoi+h7T2dgpU=hzzq^sR+i|>
zLqgO{Ms31aNeEVIRP-X>SR&u)de$})YL~5Bnr(6%re6*P2~#zja}mkfy5ma1lE8#{
zD$Go<lEgW1(7$uQnevk1qROO$C9tPtbo)}|%L4ynCdAd&P;%atB4~7G%26m$iy@Ur
z1wp#@8Y#PwI&aD@5*W)q0a*eg&?Ov*=(agf&F?!MpmK1kIidXWNu=(~Oh*CZ5<07y
znoJ$a>@b}=##%DFYErc<w{clXH=AZc*LYK2siXx##-K#<I;FDq5ojVX&hD1{=!)X@
z30L02b;{?aF;D=S1KY5X5jXi%r)fosXjl=?v&s}M;hakHpqA<8P}57w`7~XUEPp2C
zm~MA#NnV2G0>!st!o=ihytVWrSuMeE%i3Rfd4kMT7~SJ|m6>yCCti^}H@^#2!eqkB
zQ+jjua){|}nscd?$Pzjx37QF3tGs9R4058?71c2FUnYXRn9qM6&HUE{)PRo~LR?#U
zQu&qmbvK`Z^eHzkEaU2Ni1Ww>l)M0z<9ePXaiwylvh)j$$)x@HIa~+Mpk_x)W9>NH
zE}Vs@JJgzk9BOIw7ARA4@a0fPic&_YCuOQb$zdAz(+k{&92$9?Q8+f`Ff)f)E#sIi
zVH{UUXsh+pn_t2R4vO8?B)R?WuP^@QcYlRBC*c{p_@m$bCFZnw{GM^lC4R5T;o1=d
zTR+3R9IhKdLr8GuOUPlt7@A6_g=0c}l!A*K!C9dk77LGOv82r%^1E|b8amC~Yn*x=
z!ffsr!iz;{!eaQbghgJ8bqJt~rQgru$4MDx;ZLx3Ct2B1R`fJ$dX5$ShJR<j!)knw
zoA3kH;3vLkzoH$#V=ex`dZ!P&X?+x{D7lLL8Ah1$H^NQ1dTOmfEu}rwYbT98DfCP1
z)>4CGN&Y(8axuc6u>l(y`zA`xhv$O$OS)M`hm0-fu|USw^JtaP`4{T{hHLKhO$_no
ceA8*x#UCNk+>%2;l;GbW<0(RBn<Lfr4-x7-=l}o!

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/image/DefaultImageProvider.class b/ureport2-core/target/classes/com/bstek/ureport/provider/image/DefaultImageProvider.class
deleted file mode 100644
index 2b837158cb5635c9e211633ade43842905547a1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2342
zcmb7GZBrXn7(F)uHY8gpf%2lQrBG`il&x(k2$hylP$axqT9B&MO}K<DNj9^)0mgrV
zzo8%MjD<mFeEH%Bf0X07*(880QynIE@7wd-^PKbC=knLzzx)c|KDMIh#;As|2tJ8o
z91{^dY(^J8jbRdxVt9-x4XG%aF{-AgRqu&vW;D!3(Spx3e6C?GiZ*-^!Muia3>{dA
zVG&CjmNk5-;i-ldfw);J<*lsgS$1*SE_!m$6S$MMot)v89IKeybj*U>wViDv>n|Hq
z=PV`!Vj0twYcjKJdRz3Ger4{MM&2yuj1^D0;g+U{R?+e%1;UAeRe^?SdqWDermdn}
zEEh7;d1hwvoQbFHteIam9ZQX?lMUXM<qC|Zvv$GAxSrfL%8o4Aj%Sn{d&k<4j$swd
zoHU-uO|zW$=G0)hy2R5XIqA;{3?$CO8}O$r+n6hs${s;Wvp_RJKvz!ImS*;{vZTo3
zT0^N4?4=dY%x*83r3zFsFQB>QlEOyYptD|Z-j&{YA_eXx{xA26ORcJnA}C0@U74xN
zN0H7S%xI$Z&|D4AI9{>KPFBuZN|T--R)>|yI<BKv;8xJFWzWhRPo-ON^qd1K7|rHQ
z*Hz4oYk00>6~h$ASer@Ro?D#N@jk9<Skv(p)-}A)@io2?==yg$rOH;GlIysJ4|IHs
zmpZ<~_qB~wQNcc?q(W&5v{(EnkxzsaxO+aQWKCwmS3*wP1!je;Q>6T5m>q_|NKoYO
zBwR-p8ycjJP2}k0JcR#{)&iGLh*`?Kl38Zl@H<_dxf)Elpa3qu>{Gj@!;DA-S!JYI
zbd8j1>r|Zq=@$cLf$N!$=dM|*S_}udx)=b94exR-tpvt{u2|qT$l8uHsD90sS${M5
z?6dm>T2%EoDGW@s#6=aOi4|2AHw116;yMw`=c1a)gc9-W8a*8~?`JD$U@_tK?>>D}
zo%jh=8QKVZMLIiq$sDeh_ui`aJ;U`^jI%q4<*I^t(Rxh)Gw)aXTc?lrLzt+ta~eNx
z@U7}b2t9a@ZAe{pK6fE?hxu)QP^E<J4UP<c1;34hhY&wiw)L@Xs!aBwpMBlmfSdS`
zBbFe1#8w#}Bg{WwJ{b=mpy5a8$#^3>`)D8h8BNI}XdxUSBJk!I&FhDVayoXvZTubJ
zQu-Jz>&Zj3zF9a%+xpNU;=d6m=zI#7(Wf3@e#7j6u{5zwAdUf!lNiGgSBH^e3<_p1
z_oetYC%CSB%vS-c-XJ3vv;iUr$6H@&v}NMZ+7D!x7Rn~!2eOaGhSv(}pXf@)+s}r^
zrSNO+^-*=Ak^K>#`v5VF^2{+3G+sf}>HDnXNSwmah;Xc1QE%W5w<$J%pi9MOfASA>
z?4u|7J31ByhmLTCZ*}_-IzxDi*kJN4nv_td&!2>bM-=KYHBOP8={h4i|26p-cPmKx
b>qz=5IpH%BhPZ}%bf^;JK7S+Zhw$JZPbh5h

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/image/HttpImageProvider.class b/ureport2-core/target/classes/com/bstek/ureport/provider/image/HttpImageProvider.class
deleted file mode 100644
index c3388dd0077609b5b2e7a55aa669b776bce852fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1298
zcmah|TTc^F5dKbE*tV35AW#tRR$2<IBHk$Cg=i!xXh1RO({?#&7uwy;c1!qCn&=B8
zlIXiX%J`k_(w0=h!_JvAGv}LcF8k;2&tCu*@hXXaWHscHh+syEd=j&mQ(|6&uHjx1
zaomq%A&CcA)bLQlBMpxQdY3KR@>c|++1$23Y}MJ70)s`%mK%*)NqQfQQk9nBqGKA>
zZNszFJv7Grid7d_ESgSDFV%gyuQxpDI-ak)o^xRBN>8_HMp^1_ecxSE+WXL65Qvwh
zAJ_zP+2WpYVCYrDF6&#qXW8XKu4%Fyea&_oKCRNI@maLtRRso`UR(P5$IT+mNz<`y
zY5JC93#89@S6d#&^;vB+fzfl4MC4)18IXE?Xi8Us6C&msenqvUi?cxgmT#E*>xLV&
zh`krk>J3-*gn<7m^E0_`IStR0Z!Fd6v94att2`+TVn`qr<P6JJwkIh(#gc|X3d<Nu
z;Tbs0kv6jyae;jInB-|$`erb<R<weCF3?lq;E4Vrg_p<(EObL$G--jMHk)^)J<dpA
z{z9BH+j36pxUd6`EA94x1tzoM;)FeF`#8C=&hE86oRQhw5dx~M>|BxYQ^2lGOm~j6
z)wzQDk2*?jt}};R_YKdlf3o}vZX(4$mdW`0MtO3yl$UtZc?zCAGsh4=s6;SK*&7(A
zFhV`m48UcK^2VYtPN^P$BUlg5%n2ep`C~-aXO9rum^(rbzuu+TMC|+e3F14m$4LAR
zU?y<|8lR~o*QkNq61YWXw`seBG%}31iz!S8$yZ1vK~EYJq&C1R6hf5uC}XZ7MwuYe
zb$Ur8B&oC;L>5F2ius}uUl2bNQZF!Gz0mT*$s_cArP^8fT#$UM8PWpPLQp}1Dt`JO
DqJTA9

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/image/HttpsImageProvider.class b/ureport2-core/target/classes/com/bstek/ureport/provider/image/HttpsImageProvider.class
deleted file mode 100644
index 06061c99392adcfc0172f3bc3cd24b7daa5e3078..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1325
zcmah}Sx*yD7(KTOLrXyx*#!X=TM8W&aiO>pjU)vPC<Y%)re)F&v@?^LTf&d>0bd}I
zM1A&08PA;#Ev6z5bC+*9-*)c&`u*)YfctovL=Q3==8}jYtCo2U3rWP0Q;V+Qj)uEQ
zByg`2i%EJcX?URFp@v5S9V?b?$)^I*bY@#1w(9Jf0#^!_ZEn<SMbmq46swf<7o3t&
z-8MW+-9uqaRxDp&sZerideN8WzFzlC*YTw8dd`8hYkIm>Gs>p^MoQOTQ^$9qA}`Qc
zHf10a$fOH<#(|+%4ZEywNzby&`AkD(Ir^II)+ME;QKMV5?o|bP8d}?w`iIQ|#mSOm
z+h$2xjx8_~Xb*Lz_Wf!jKJ8YUHuUJSTDSs(7lezLhfQUW-mAls>8db<h`ENWsP437
zFVMXujne+Q;RfB}7z8xG?yB|>@LvUgVij9X-7A@|E!Fhl_O|6zpcH!1Cy)w)h8<9{
z$0;m>SxqU$|B6px1$`+z0S7<OO1)W`K(>9P=2_kPW-#NXwF>==RH~>UFKc+7!VAm_
zEVg4@N(+JBRz7cwdmN}h?oyz?sC7YiN$(!VHSHD$1jf=K%fc?UbZny*GKzkRsprWu
zeCF52&XMzjZMG<{9@n|b8WiWaeQ9{o|7ghyrqRup%*V%P9p%m$bM5C%=PtO%=T0EL
z@({rQ*N#9qfvY^H8U`4|5O1UoMz|{HBZ9@br%w^t$(|s(K7WkZPsBGCj?uwSTaJy!
zj@D0+*qJ{;@<)g|iB5W|IFr!0&hQU%gDKr)j9VDTEakUx9qAzcQ)ZK(W)x%0u8*aR
z;~M?P`AyI=M#}`hDQcNZn5Q~T6Il>BsOPgrd_nx#F#A01m4}w??>a{63y<fE&jrDU
Q8YWFpEd&)zP}!&d09+wJLjV8(

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/image/ImageProvider.class b/ureport2-core/target/classes/com/bstek/ureport/provider/image/ImageProvider.class
deleted file mode 100644
index 9f292594740c3e4623eeb2c9ebf43dcdd98ce279..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 245
zcmZvX%?g4*6ot<%Q?pG3y+dxCO*{925EQs;H`*X$>c}|ya4mX(9x56uh@jPlk9+>^
zkLwM<77Gt^4*|h1gh^^%2tv5omwe!?;!VL)qh(XX;TuWClBVsArGnQn!Rz|ARoW2N
z|5PVJkg8tiVkawWy?R9)wHoAE=xB@~M7gS2)){eOy%wVzYd;@Mj+NMtim?3FJ7lHE
ZjY}X*>>yy`5T<YdduMPhu_Z?i{|OdqL%9F|

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/report/ReportFile.class b/ureport2-core/target/classes/com/bstek/ureport/provider/report/ReportFile.class
deleted file mode 100644
index 17402b5e3beaa201762d8aa8273a39bfe3b5cae1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 917
zcmb7?OK;Oa6ot<?FKQf8(g&~7HWC$yTh$wORNa7BMMa_ziKUZ_(kYG|Iph8=kf@MY
z^au1uA<m55#%jX?MV`l<bI<+mOs@a@z5?(D9TzpcSV0wAW_a1ab^|*C)i|6=fp-5q
zya<CRj3>dVPE|a4E8u3caj4~cegdnxBGW1gOoZq4BNZ!sEU?$TpMF=~8?e~BWK648
zU&Znyn+|3AIUGi|d@>57L6|DDFM?Hlrse{N{ZTRvhI1{y1z9R*NveZcnp~){OoL+o
z$%a3u$Y3=lQlHqa*1Ns?U=+-61RG1h4QP`VUrNolZ;Z<AH)&HAtrcbqjj?i1lPn!c
z!^X}RpoiwdJ-FEQP)EbV1FQ%f{7<iZl*Oxk9G=UO7N~T419bSrHNLyUAI<HG{+w$d
z5*~8&xckcU3g?#p3&P*OgySDvqVmHgG&#0u1Z<gq4AZyq2s`|M-8>B~ta3*KTSnNG
zDde!gV`k@N0?y{F=KqBAoeKxXyl#UXYv|>I!cbrh>x>x2W2zmawtNdT*G6Blqdn`e
vnX7J*>IIU(1~v<?GDzhv$m^vbPw;dZNa>Dp5T79X{{S&JVs7A>ZT<OQ+KZ;>

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/report/ReportProvider.class b/ureport2-core/target/classes/com/bstek/ureport/provider/report/ReportProvider.class
deleted file mode 100644
index c6e17e4824939ef97ad6705ea4c33f461b0d6694..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 539
zcma)(&rSkC4934AvVe%lA74SZI3B!VJa{lMAxb3i;B8>*W^mahv$KR}^WX#cP{!^q
zh>09LHEqAPzqX%W?;ilJaOR=wp+~5PvG$*M8Cypf^ha~O(kj$ZpeD|mC>RckkcriO
zv`n2uSuci!hR-28-j??El|B=i0lPwTXF^U0?f#}?>P)CcCUMfNHZeh@U22(d`$up+
zn#Bt>O&q@|kz}lDY2%gg*{Y4dn=!nRhV?|Re%Q|Uu<cn?Xg#5Q&<mmHZYh4>f>8BM
zqNgGIgoFOzMaZRMZ28r!W#}YM?ToWU37vvyyy3ja4okTF?<U(iLTmSu$LXABu0kM`
t<c)w=77mmFv4^PS)<aeDHOZDxm-rDHdHfj7+@7G7+tbV!Wjj}Pz5xZsm4^TT

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/report/classpath/ClasspathReportProvider.class b/ureport2-core/target/classes/com/bstek/ureport/provider/report/classpath/ClasspathReportProvider.class
deleted file mode 100644
index bef2a86af3b3e9aec54d31b0c40aff91e039b95b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2702
zcmb7GTT>fl7=FGaWJ3ro4TZK^Yq8ko(6H5(s-e;X(n?LC0#d=_l6-_MVK=k80meh`
z9B;k#7kJ}Eol%(D8NKtu|K#EMc5^BTqaB9t_<rx{dER&P=ik5n2H+aD;uyqqFOrz)
z!#kMm!)@Hr@NNuqaoojw8VYg5Fdf4^HP5TV1vT7P+xImr#&H}=F)VBNK*NfL2O2&U
zNE+2@#Vi`0X<IY4<;guy;7Y-E%DP*1Osl-%7~68!cDD3laIH^uyqFM(-Y_lGn-mDA
z(klXy8M`C}ju%Wz&eyirrL%0TS9p>v*hQnVVmPMS*AFA!rs)dI7K-+^zV3Q*ORqVy
zYCE1@b?hCpBptoJFIEiKts35@KGRq&`jYqSg7hU`v5iu2Dv(YU9vVA_UNNk)zT~Np
zCep!?Y3p-VwdV0u8rysrl6wL}t;>bky`rqD)bO&;lDoIfikxRYR2&^z1q3f58<Y`<
zInuRjPLa!tM`Y8HIz3pd%h5vrl4lgR?ip1-Ej~`G8rF!iKyO)k_Z_)m(!-OfdI0S)
z2_#CgB0bp%e5hOCgeLA9J58ZWU4%L#Q;2Fl{1(}9jIIPmR62-Tvf)q7Gb?(*bUg;s
zyJVIv!y}FY(;Wgg{s+`88xxaM7%Q2s;!Mfs*cv^e9|0IcuJk%tDR4D)MCyH>cO$Zj
zG~Ptr)$kGbOFob)Sb?)g&~8l8A%W94lfW=eY4|vSPw*+>OW-qnE->ixMNzKBD(Y_X
zIj><g0R!s-rw&tVx@J~b1LR;+Jd;nLh*AO)8wr%LnScphAlq3&vO!{UP1RI0Jmu~~
zBGptXFw^<`xhqg$pcTNv`a@Y%E#<!z2i`U6nCLxU6PnsJ6xZ5p2h}bx+FjAJ^(T<(
zCbljO%hjjV*vy;2SU1t5`y+w#Yo^f=@?EMfeFRmX^^$d<%CD_$kuHtu>gZ>2*E1Z?
zePDW<>}%bOvW%kq0!WKhmFp(Z(G2Qbq$AOaw8}~|TmBqr<kr}_Reu#2PR-4A?NKq$
zZlH3y-CQ%b6X_L<@GCcn5KdwUY|5&h_zmpkn&rju1@3gtf^$#i0OBVuLU@s5)IYp{
zvs@<v0lb8B+zGsl^BnnDtRO;3;JeJv2xXrj9KyZJPY@A!JTLN*Y%;nJ?R$(qMQrr|
zy~+4K`mzJ@>^>6v=;vl1$MTUMkjbhmN{%!n`H+%*ha}HL{=m7Gt-w;g=P8b_<_<9M
zdvn1k`f!5b_n?9=@fGK=AJ=vC)89+HP4hOx^kkWq%Zw?9TNuL}6H>-&e07ztuHg~J
z@h#r;^DxO+A2EF+c!m0g@dYkmlo=Sr*Lam@VU>w`melGZZ^>AELwhNDl;-^?dj6r|
zu!f9=tVYX1L+&r+IP%~ke^un-d^P3+qX5crrvM5kPdw(-4$ov8JmDrhSLl9#?YJ*b
zoDSnU<3AjxGKFV=t6Bvf3%t(g0~I%wWhHf3#T{S8`QWlcg;I8n!G<`G<2q**3WMbz
zV-SZUx!V>=sIKh|CCStayoEf+XEcO=^lw{KUFf1gV4|7EqirvDeR%_K*S((PtP&N?
oWPd@Zm4~>0x=Jdn`5J<BMw_{a`t>F-$+r>uf0O^We6Oee1@8%kRR910

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/report/file/FileReportProvider$1.class b/ureport2-core/target/classes/com/bstek/ureport/provider/report/file/FileReportProvider$1.class
deleted file mode 100644
index 70267711ec5916aa2de838ae31ad25d08a5243dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1371
zcmbtUTW=CU7(D}&E$cv$R_ooWXt~Lj+Qb+ti9wrS@DhvFH?zP%w{CaI?$Tf7iw|Pr
zgYnrPW&CDX0|Ap_h0N{SGiT16@7w+P>)Uq#JJ?A;!z~@lxUFLecXVWNSHnG>!kZd$
z8uA(n4DsO5^0QkE)n>;%Hrjq5J{m($3|ucT2A+Fjb%key>z-u`V~@Hw>iO&Nag}Ix
zEyoIK47J>U@Z=8|Vs*DG7*?8=BVG=V+rn#^ZJQ#QrrR;?1JkqQIt<37d<Ncd9O2b%
z)At1}AD>-AwnDej$clmK(V-s}xz5-P>B}M}PNDM+hDfi%P+mar)IPaun_)B8JTgyA
z!#171@v40!Ize?lA`eOITYbk2D6b6f=ON?BFtBW+u5NAyuDAPdnrh^mzV8mbj*w0;
ztj`xpS<0o{K65&@>swC$g$NGau7)B<3HLd4oa5jqa~RmtP~q6d1BTM+r8#kjV+|Lm
zo=@M?`+GTODIw`uV;R;|XvQRlM`u2VA=MYbL^u_0CYPVeMbq*Fay6Qh??sZZZwFm7
z5KpPiLS>AgsforhDnaUGCAVCL)v#RD71V}&0~_=`SO!%HSUN5Jr>{qp8b^|%DVo&~
zp+BG(ieJDAUlI9Cs|Z%8j}r!HAx-_oF$(9gN-M%EHbw}_N67V@Fp9l2LbOP2gxDv-
zPP4sJY#X79KWv=%*VSnpmuMDAKOx@BA@4&%OWtIm_ybENY9qvFiN`XzB1wiaW4NM@
Zzlv*Wyp9_*#&DC2$<RzEv_>QSegpRNZ3zGX

diff --git a/ureport2-core/target/classes/com/bstek/ureport/provider/report/file/FileReportProvider.class b/ureport2-core/target/classes/com/bstek/ureport/provider/report/file/FileReportProvider.class
deleted file mode 100644
index 3067d0fc527153419764a095dce2bdcd78af0d36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5234
zcmbVQiGLL38GdH7yOV5&D<nv`!~@t|ECz^@a0CLh!6Y0(Xwa5Ul1VaTv$M|5LTD}3
z7PUeFuWC_St39x-ZK28rObcpTTkL(`x9Gpn{(8{ootbPl$s!hh@a@cZyx;S_@AE$2
zH@yDem(BrLhKms_#eqV6xCphlJA!-g5otau%|R9SMxf$=jNK<s_ZQ-0^80{_LlI2E
zVHF=&aU_DNII7}U1SL2u&4bcBq~hTSX5fIlJQBg9_=G$?CQpy6_@ulXmzO6Zn1d&a
z@f1F#;?ogaho>X>44x^(vnoCt!2*1)5TB3W3pgP!&#Cxg1eN%biZ2VY=T&^A7>n`M
zVtfrJ#p)>)Usv&hiWgO!R-iQ}5{BIr*HbAYr68QNjUIDQK}pLVeXkyi>xtf2yJMS)
z-Ud$YG2=$NW7)=f(^gQ}ZKm|jxY4aZ*~PUh&4lT!R!|VF*r6cUWOW+~rnHy|qb)tq
zY1rFkvY58I^!N_lHs#&#3_5)#_it$FvIb(EDaYuKrEMc=*-k8JTYJrJ!;bmy0wT7N
z%{F&@i$6?!k+`LId%X%Oq7z-H@VZPZ)|^PD9Xe*{16-&O*0tF&vE61l8?AJrd&6Lt
zk#tNe!C67snQr%_<MA!J)2CokyQ6pYx9UmP3pcVErk#=MHsXfkBUDh94+~?Y^eC7-
zX5R)<g?+t-<M|<27?+Z$4?XRe@mPzQa)_spVKfrmI#W^V8F5FO{9ZvE=S&4tb4LBO
zGsY%ie{v)djpOF7d<PjBh1#&14h*R{qoAnW>`mwnv#4O*1o;2ASp_PC(xwm4T<M6p
zvGk0j^u5`TFUk{g&$Zk|Lew&^TS&1vH{Ah)b>I)WYjOwGE-T>}2?n>w8X=N`Sy@w(
zx6Ns1lw_<{)+WnR#aXvRSTV&Z!&#rLp<r~Ez?s5MSv^{3W$am-OvcSFU6|M;I}dW_
zrO_74?v16AQl33FL$lAa`(rM$K_@nGNrTw;kjwg;^Df_KbY@NLG&=KGAwN@wy_W>f
zLYe0}J{a@+W9?(cg{z%<%J7P&M9<^PlDt^n#uZk3HXkV!FEJ71#};3{BJEb%?lL5f
z3a*i#v0|}U)J?-mtWpr_;c&f%n{kVZjD}%+L&G<5PQ!V;%+=$Ca9!GrQ;syOz%3eH
z!K<v}n1*j*_sC>YNw&<<7}=^#!CcptKRiKV6jV)AKVw9IVx9+Cr^V#AsWiDJHGBtg
z4X+`tV7fctD#BXZ*7r-{Yxpj{r{aQ!*YSM~Kfn(){0Ki*P(5+u@v=Kw<Qm?G-5P#^
zp9+SbvEViQ9KWD?U)hSpI*)kYc$1j=rHWr^_%(jRx_k4fBNq=nbMg3dZ$5Va8^f8m
zUKoCB_-O?*bKT7?Fj@awCNu5y)G&{~)9`!zLBk&<!(J%H7Py8#jSh`1Zw>VzWtZnG
zt}9lDhCkykD*meBZ}_{0HzXA+t~xH%Zr5QK;O5RfMi=XL$(7BGWjm!JpD&lMuC@Dg
zk?owly*mIaf0R{1D9Y9CV>FL(^P=q{-ri?h`@B;>nh!yzp(j$Yb<$>e&B9JOy6vQP
znsUVEJv!yK!K1HNCh)e=%;Ha_d20|MR4^mj-0UBhE{g2^B~0bvfvKP-&*3m}g<t5R
zUXC>qfSI{Vv!GpN4I6_DiQJ;R)1Rp1{1qu+=d@_Wgiw`?MswuU=BYp(Yfdl*i7w_~
z#>iPW{%qHHXLDMuZnMXf8yLf|$vZr@n*)@dRx{4cc?F1Wa#f#3WnlbOV!iGdbZ|kg
zSAM*_yt>=Ev&2k+-p#$n<iulTLj`lPI{FSS3zty<H-cq3@v!1?vYqFhIFaH-aP&&&
zViNi_<X~*F29mn1^LFZ*n&x}ti>=!?S2(CA^{zgHN8G>wZO2?yxQ(|eZWG#Pn+`*?
z>ax+`>|D|D_s?aSL@Cr2w^Fn-MNVekGI>YbZtIfGX-vb|vr)l(Kf`Zxdd`u!TyETB
z%r-;!FQp6fpr1%?COtgR-)-6{epA%)Lnpv5p5-XuFAqX~{{-ZGbAPFZ{4It;iCx8Z
zHQ!cnT#??&At;q4fzv2B<xXD1Ho`&ht0RaQ8u_GoQ?VB7_@<x<>wPm9xM7fe%~h2z
zq9B9daZL9gLsc1sG6=T}L+uzsAtw}N5Gg5U!=Xq9TI(<-byN>w^2xSgOzo%{!nE@=
zTt|d!FomWC%q)c2E+hWsm`&g6h<yzezL8!va-@;~8c~D|*vJ)x;=`1ucQFEDZ#v%1
zrvQ7vkG8<<OSl0ADmJOOm4BhAXyLq8wE1qG^WAE>TDMBXt?6ww8I&GJA%DttN_ahw
z=J6{NL|M#m&Sog<h<y#wZzSGZiLsHR;uVO>3%NXv_%g%yWevYkH)9KJidP!F`VV5R
zLtE*^Hnh`UW?In@LLq1L4Wpz(l0ab0$qeS?npP%aW?Rj<x?n+Fs4P?#d=_;zWue;o
z@EMfXtL18WID=Uk%&s2BoDO-JTdrm>ZwS|(#ryzv9t<fbE?wa0bsZ$q^=EKH^-1m(
zbThY*SplP}F|MV=T0^w8*h&^|!*;&!V%x*Ek+YT&Wi75}&uxrO4Hmh+N#^_f7-+bI
zG1x-iN;zu>cGAE1a9qgg^>p|do`t|A%tzQw@KzPORNStR?EfHh?%;|5-pe(-1F@A_
zsNt{FLP5!m0zTk^54&BvU2q=%3w$67-Vfbds=Vq4_t;etrA?_14r4)wWQOFQK7@t!
z!Rqp0$)YoemIq%$eR(j0iW8`<50$f)s!kwUACgij4@s@mhh<WUKPe&!<D~NN`BQ|o
zlfLdIk5(|+CaT@vG~K%k{NE4uo7e|=_c*x&Wqj@?Ck=A4mz?b5iapqbey+D@?M~Wr
zXwjzgDdx?gg*ZnCXvLz{J89RUWgGW#{4k%7V$coWHu6s=q7CR|+fRAv;!YvX^ZKM3
zj%AsC%xAjv8E)0qp~K~T0TJ!s&b{Q9aDD?+R&o<U*-Ccl-zW8KHmlgf;_knM$xz2n
zV81&l{7+_Ep_s(Id{XZ`Duh@lHP3U8Tr%91Lxxb63<F5`i&t}YfNR2)vrnUDyqw-m
zZ|`v}P=RDt*5k0;SKW=RtOAYNsydCL@wN`q*1eapC8{q@B$*Lc0dR>qmP+c$QGnKJ
zSDJ#Ss$Rk3<7lmV8H?L$&LYNW1j)eSvse;9eW=n`Z=qkrmvAaKF^xC&1PW>MrW~EC
zWo-fvusuWtKFlgTLT(*pX&yrq5Aw`<i0be#v-=23>QQF<ao4BSL_43^waKFb&Rj(<
zrJ3`kREWLwE+oEWqt`<o57J+aN+SB;seCa4|3;~bt^Z=zel7@d$_M!GgW0mr&2_=}
d!hh05;uZc#t^;JbFyce34ml(hp1kg#{{a(SFn<65

diff --git a/ureport2-core/target/classes/com/bstek/ureport/utils/ArithUtils.class b/ureport2-core/target/classes/com/bstek/ureport/utils/ArithUtils.class
deleted file mode 100644
index 5cdbc0d1994cca210ba9fa72a1350d44580b9e8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1798
zcmbVL+inwA6kW%+NhSkvu7-e1n$p&BLWWC90f%sN0aGWb8i<7Y(y=`_2gaUgJQEf1
z1N|J}!Jt;^2lQ)@c<B>jof&KFIEj#IOK0}Et+n>r`~3UquYUlnVoS$KENUp~NMLCc
z%ebJT6&)rn>bQi<YI;Qtt7`Z`$5s5OqH7wiYq%khS(9z)uL~p#i#r0Tdv3!P7_Z8<
zy&1G>w)fboIb4~nx^>Ihu{^2fy~UKjD?0+`t97?!);hlZ!VEln&-HvW@TJo+?|9PR
zeWJn=v0IjG3(OXNt3J2(Ez_~uO>^7#WV=}kxh=0rw5cPu1%$<$(Y==C@0xdIvuxL8
z%W{Y;YSeEv8Uoh}1K3-&=XTvM9bQ>Hyd;o*CcTcYGVQDDA<(9dU3c3gNOl56)(RZb
z))_VAK1UiLpl`c@SGVs=W!QK>_Z0<bU>sS2=@5J<1+`bwux8*U)(zakZ4Gw}+{HZ&
zWdlFqzJWY$8+f3Ghp1?HWZ-914QyajVByRD3uK4WVnqrSW&FU-_DfcgsU+QiR?I|J
zNZ0&@Rq|OY+iKD85t`t8R-H#ydWH{WRO(qgyv*{3G7drtXnTslVSCIRQ9&g#cR0te
zu>=g??RSGf@hE^Ok;7_6SV&*)IWGmq8g9VW-m#p3<>PZGA8@7|?o#Q#I<WOjDJ>5+
zQgndsWY`i?y`qc9cvGny;|{*Y3BG9c)4&!&mg59xCclE;bnzX;8wLqXa?FH_bC_am
zL<ca98O}yAiyT+fWd}+AfrY=3cslXn&v!^x!|>yO3^(2)wY1ztx{FL7c@in!$YTs&
z5$PO-&4(=W5fV<}H225IF^4ncnI->OMhP<Kc_(82opXhgExw1gvBY6>`9c>Xuelaw
za5BUzAdN-nD25!x=nh%ud5*V3c0N$@DYgVpW<s_k*%rRUmL6uiOr$HsSp6St-^6Tx
zP)C~T<__jIdLwl@)rI~ZV}0Jp%{89CN#1o<<yOeO8X?4)&c&I|#F=J$nNBd*^UOZQ
z@3*mvSDY&q`9T%g5v>d3cp(pX<spSs*es6*gydr(`B=!QSjbdQ$n=1a?_wcM3Q?ub
q4G5tPthU}c;6+sNUnyam5*`oKAQ#i;V*1IL{zQ*n;Cs>}Q1}e!22$Yw

diff --git a/ureport2-core/target/classes/com/bstek/ureport/utils/DataUtils.class b/ureport2-core/target/classes/com/bstek/ureport/utils/DataUtils.class
deleted file mode 100644
index f47bb5e0ef00f4b7973c4abed42e2d86af043ce4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5629
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/utils/ElCompute.class b/ureport2-core/target/classes/com/bstek/ureport/utils/ElCompute.class
deleted file mode 100644
index 52d5820fdfb9654ce19736602a7928775bbfbae1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5163
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

diff --git a/ureport2-core/target/classes/com/bstek/ureport/utils/ImageUtils.class b/ureport2-core/target/classes/com/bstek/ureport/utils/ImageUtils.class
deleted file mode 100644
index 31291cee1254cc03d0a8928f56d84a8702852a75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3815
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
E58Q7eP5=M^

diff --git a/ureport2-core/target/classes/com/bstek/ureport/utils/ProcedureUtils.class b/ureport2-core/target/classes/com/bstek/ureport/utils/ProcedureUtils.class
deleted file mode 100644
index ddf7348e00f63b4eb7de6accda4a601fcdcca005..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7229
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
T5ISp#E}gR<r!fz@PY?YMm%>xt

diff --git a/ureport2-core/target/classes/com/bstek/ureport/utils/StatementWrapper.class b/ureport2-core/target/classes/com/bstek/ureport/utils/StatementWrapper.class
deleted file mode 100644
index a4f1a0170e58e062db61683df5258e6087686e31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 714
zcma)3%SyvQ6g`vlVQaL$pH*D85zNM&;-(-JiVAAQ<un~MnkIEJ5&y^sf(jPFg&*KY
ziFc+Vq9PJ<pL5PVGxzoF`31l#7K+GXx_}I3w3*FgE{}PJQJ;q)Z-ru4aV0t;QViwB
z2|wpvau#~E@7*<m#FG1=sHHNAWj$((3kFta$gKxapf(tmDt{5wt4)SXEp7{jQX`1O
zR@!L^xu-=ij5T6X)Z{YI`A0FMj)R23ZTNA=Yb8pYdZ`rMSSl}7L6~@-;twS6c7-IB
z6GuY*P|vVfss1IdkK6uvLAz3=D;9U-RQh5w&{D^DWbBJJDcRQ|R`jDeD5C5jhrELU
z6c{T1mCP_=UOnW|k+<DC5k75#rZ%xe`^wT1E&7PqM8r+r21&voS%<Pi>f7W??h}~1
z+=Jzod$1o2V2JD(5doKEuLypPVcgIU8em{3VT3XwFk_gB^dO4{j1sy(#v`wLS@#jv
mJp~ptdCnAX4WZLN@Igo~g$b%?jbFj`?Kkk<ui!~@YU&-b@0h^=

diff --git a/ureport2-core/target/classes/com/bstek/ureport/utils/UnitUtils.class b/ureport2-core/target/classes/com/bstek/ureport/utils/UnitUtils.class
deleted file mode 100644
index 5eaacb4877fefc6bfe4d8a98d22e0633ff578f45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 953
zcmah{%Wl&^6g?9ho49V91gGf(T9VS@1gLp*S45=}1uR7ri8Oo1m}XkXjvTunzJd=y
zmDoVVf)C&?*zp5w5qIp+Gy#Dvd+waM=bU@5{q^VPF95c&tzrgMdH2VYQ~m9?rz+NQ
zL&XL*RosLj?|!E&x}?2#fP$KWI)nU>`#gHYaLK537^KI+OP683#eMf#-0!+!+wOXV
z6kCB~dmTIEVm|_<sK<v4>n$hfo84jL9-DFK4uUW;<A{4h^MJGuM6|=84Fc{*?ch0o
z<9g&|G-?(@HbEI!gW?n0i^)qHh!n~c1d)<5ehXN>)1xfOXx5rUq-SO%-G0pn;=mHh
zj2`tx5QmQ2<f4VS^J=z^>=RpqhFJx-G~C7=1zQ?S+*NQ-!+ktpsQkAlhP==*J=;Gt
z_q#`~L&aWz8bO?lPD$F@f5lLuo?By1nn0r||LK)XjYbg#d;GBBI=pYw(CWqodTO~d
zQtaDN&m8BHs-8Ga;S85)sGW4s^vx|)AbuNhWkH6RrS}}|Oj?;h>z}|rP>{hqz2yX4
zM4n<TO+W!f+U0NsIw68=L82QdZ0g7yTgDlrGh{zPeotU3q|yp3li*4swvg-#C}Dwc
znQAIilp)#0zsf5Al3gW%wF%j!DcL2mUKv$ul1<WTwV3ly&nrw@txmLB##K7c;Tl$_
Y$;)}YH*PN_Z%mL&R1=7HJ+Y|#0znY7e*gdg

diff --git a/ureport2-core/target/classes/ureport-core-context.xml b/ureport2-core/target/classes/ureport-core-context.xml
deleted file mode 100644
index c6ad50b..0000000
--- a/ureport2-core/target/classes/ureport-core-context.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-	">
-	
-	<bean id="ureport.props" class="com.bstek.ureport.UReportPropertyPlaceholderConfigurer" abstract="true">
-		<property name="ignoreUnresolvablePlaceholders" value="true"></property>
-	</bean>
-	
-	<context:property-placeholder location="classpath:ureport.properties" ignore-unresolvable="true"/>
-	
-	<bean id="ureport.exportManager" class="com.bstek.ureport.export.ExportManagerImpl">
-		<property name="reportRender" ref="ureport.reportRender"></property>
-	</bean>
-	
-	<bean id="ureport.reportRender" class="com.bstek.ureport.export.ReportRender">
-		<property name="reportParser" ref="ureport.reportParser"></property>
-		<property name="reportBuilder" ref="ureport.reportBuilder"></property>
-	</bean>
-	
-	<bean id="ureport.defaultImageProvider" class="com.bstek.ureport.provider.image.DefaultImageProvider"></bean>
-	
-	<bean id="ureport.fileReportProvider" class="com.bstek.ureport.provider.report.file.FileReportProvider">
-		<property name="fileStoreDir" value="${ureport.fileStoreDir}"></property>
-		<property name="disabled" value="${ureport.disableFileProvider}"></property>
-	</bean>
-	
-	<bean id="ureport.httpImageProvider" class="com.bstek.ureport.provider.image.HttpImageProvider"></bean>
-	<bean id="ureport.httpsImageProvider" class="com.bstek.ureport.provider.image.HttpsImageProvider"></bean>
-	
-	<bean id="ureport.reportBuilder" class="com.bstek.ureport.build.ReportBuilder">
-		<property name="hideRowColumnBuilder" ref="ureport.hideRowColumnBuilder"></property>
-	</bean>
-	
-	<bean id="ureport.hideRowColumnBuilder" class="com.bstek.ureport.build.HideRowColumnBuilder"></bean>
-	
-	<bean id="ureport.reportParser" class="com.bstek.ureport.parser.ReportParser"></bean>
-	
-	<bean id="ureport.formParserUtils" class="com.bstek.ureport.parser.impl.searchform.FormParserUtils"></bean>
-	<bean id="ureport.checkboxParser" class="com.bstek.ureport.parser.impl.searchform.CheckboxParser"></bean>
-	<bean id="ureport.gridParser" class="com.bstek.ureport.parser.impl.searchform.GridParser"></bean>
-	<bean id="ureport.radioInputParser" class="com.bstek.ureport.parser.impl.searchform.RadioInputParser"></bean>
-	<bean id="ureport.rextInputParser" class="com.bstek.ureport.parser.impl.searchform.TextInputParser"></bean>
-	<bean id="ureport.resetButtonParser" class="com.bstek.ureport.parser.impl.searchform.ResetButtonParser"></bean>
-	<bean id="ureport.submitButtonParser" class="com.bstek.ureport.parser.impl.searchform.SubmitButtonParser"></bean>
-	<bean id="ureport.selectInputParser" class="com.bstek.ureport.parser.impl.searchform.SelectInputParser"></bean>
-	<bean id="ureport.datetimeInputParser" class="com.bstek.ureport.parser.impl.searchform.DatetimeInputParser"></bean>
-	
-	<bean id="ureport.classpathReportProvider" class="com.bstek.ureport.provider.report.classpath.ClasspathReportProvider"></bean>
-	
-	<bean id="ureport.fontBuilder" class="com.bstek.ureport.export.pdf.font.FontBuilder"></bean>
-	
-	<bean id="ureport.expressionUtils" class="com.bstek.ureport.expression.ExpressionUtils"></bean>
-	<bean id="ureport.utils" class="com.bstek.ureport.Utils">
-		<property name="debug" value="${ureport.debug}"></property>
-	</bean>
-	<bean id="ureport.cacheUtils" class="com.bstek.ureport.cache.CacheUtils"></bean>
-	
-	<bean id="ureport.countFunction" class="com.bstek.ureport.expression.function.CountFunction"></bean>
-	<bean id="ureport.sumFunction" class="com.bstek.ureport.expression.function.SumFunction"></bean>
-	<bean id="ureport.maxFunction" class="com.bstek.ureport.expression.function.MaxFunction"></bean>
-	<bean id="ureport.minFunction" class="com.bstek.ureport.expression.function.MinFunction"></bean>
-	<bean id="ureport.listFunction" class="com.bstek.ureport.expression.function.ListFunction"></bean>
-	<bean id="ureport.avgFunction" class="com.bstek.ureport.expression.function.AvgFunction"></bean>
-	<bean id="ureport.orderFunction" class="com.bstek.ureport.expression.function.OrderFunction"></bean>
-	<bean id="ureport.WeekFunction" class="com.bstek.ureport.expression.function.date.WeekFunction"></bean>
-	<bean id="ureport.dayFunction" class="com.bstek.ureport.expression.function.date.DayFunction"></bean>
-	<bean id="ureport.monthFunction" class="com.bstek.ureport.expression.function.date.MonthFunction"></bean>
-	<bean id="ureport.yearFunction" class="com.bstek.ureport.expression.function.date.YearFunction"></bean>
-	<bean id="ureport.dateFunction" class="com.bstek.ureport.expression.function.date.DateFunction"></bean>
-	<bean id="ureport.formatNumberFunction" class="com.bstek.ureport.expression.function.FormatNumberFunction"></bean>
-	<bean id="ureport.formatDateFunction" class="com.bstek.ureport.expression.function.FormatDateFunction"></bean>
-	<bean id="ureport.getFunction" class="com.bstek.ureport.expression.function.GetFunction"></bean>
-	
-	<bean id="ureport.absFunction" class="com.bstek.ureport.expression.function.math.AbsFunction"></bean>
-	<bean id="ureport.ceilFunction" class="com.bstek.ureport.expression.function.math.CeilFunction"></bean>
-	<bean id="ureport.ChnFunction" class="com.bstek.ureport.expression.function.math.ChnFunction"></bean>
-	<bean id="ureport.ChnMoneyFunction" class="com.bstek.ureport.expression.function.math.ChnMoneyFunction"></bean>
-	<bean id="ureport.CosFunction" class="com.bstek.ureport.expression.function.math.CosFunction"></bean>
-	<bean id="ureport.ExpFunction" class="com.bstek.ureport.expression.function.math.ExpFunction"></bean>
-	<bean id="ureport.floorFunction" class="com.bstek.ureport.expression.function.math.FloorFunction"></bean>
-	<bean id="ureport.log10Function" class="com.bstek.ureport.expression.function.math.Log10Function"></bean>
-	<bean id="ureport.logFunction" class="com.bstek.ureport.expression.function.math.LogFunction"></bean>
-	<bean id="ureport.powFunction" class="com.bstek.ureport.expression.function.math.PowFunction"></bean>
-	<bean id="ureport.randomFunction" class="com.bstek.ureport.expression.function.math.RandomFunction"></bean>
-	<bean id="ureport.roundFunction" class="com.bstek.ureport.expression.function.math.RoundFunction"></bean>
-	<bean id="ureport.sinFunction" class="com.bstek.ureport.expression.function.math.SinFunction"></bean>
-	<bean id="ureport.sqrtFunction" class="com.bstek.ureport.expression.function.math.SqrtFunction"></bean>
-	<bean id="ureport.tanFunction" class="com.bstek.ureport.expression.function.math.TanFunction"></bean>
-	<bean id="ureport.stdevpFunction" class="com.bstek.ureport.expression.function.math.StdevpFunction"></bean>
-	<bean id="ureport.varaFunction" class="com.bstek.ureport.expression.function.math.VaraFunction"></bean>
-	<bean id="ureport.modeFunction" class="com.bstek.ureport.expression.function.math.ModeFunction"></bean>
-	<bean id="ureport.medianFunction" class="com.bstek.ureport.expression.function.math.MedianFunction"></bean>
-	
-	
-	<bean id="ureport.lengthFunction" class="com.bstek.ureport.expression.function.string.LengthFunction"></bean>
-	<bean id="ureport.lowerFunction" class="com.bstek.ureport.expression.function.string.LowerFunction"></bean>
-	<bean id="ureport.IndexOfFunction" class="com.bstek.ureport.expression.function.string.IndexOfFunction"></bean>
-	<bean id="ureport.replaceFunction" class="com.bstek.ureport.expression.function.string.ReplaceFunction"></bean>
-	<bean id="ureport.substringFunction" class="com.bstek.ureport.expression.function.string.SubstringFunction"></bean>
-	<bean id="ureport.trimFunction" class="com.bstek.ureport.expression.function.string.TrimFunction"></bean>
-	<bean id="ureport.upperFunction" class="com.bstek.ureport.expression.function.string.UpperFunction"></bean>
-	
-	<bean id="ureport.pageTotalFunction" class="com.bstek.ureport.expression.function.page.PageTotalFunction"></bean>
-	<bean id="ureport.pageNumberFunction" class="com.bstek.ureport.expression.function.page.PageNumberFunction"></bean>
-	<bean id="ureport.pageAvgFunction" class="com.bstek.ureport.expression.function.page.PageAvgFunction"></bean>
-	<bean id="ureport.pageCountFunction" class="com.bstek.ureport.expression.function.page.PageCountFunction"></bean>
-	<bean id="ureport.pageMaxFunction" class="com.bstek.ureport.expression.function.page.PageMaxFunction"></bean>
-	<bean id="ureport.pageMinFunction" class="com.bstek.ureport.expression.function.page.PageMinFunction"></bean>
-	<bean id="ureport.pageRowsFunction" class="com.bstek.ureport.expression.function.page.PageRowsFunction"></bean>
-	<bean id="ureport.pageSumFunction" class="com.bstek.ureport.expression.function.page.PageSumFunction"></bean>
-	
-	<bean id="ureport.parameterFunction" class="com.bstek.ureport.expression.function.ParameterFunction"></bean>
-	<bean id="ureport.parameterIsEmptyFunction" class="com.bstek.ureport.expression.function.ParameterIsEmptyFunction"></bean>
-	<bean id="ureport.jsonFunction" class="com.bstek.ureport.expression.function.JsonFunction"></bean>
-	
-	<bean id="ureport.rowFunction" class="com.bstek.ureport.expression.function.RowFunction"></bean>
-	<bean id="ureport.columnFunction" class="com.bstek.ureport.expression.function.ColumnFunction"></bean>
-</beans>
\ No newline at end of file
diff --git a/ureport2-core/target/classes/ureport.properties b/ureport2-core/target/classes/ureport.properties
deleted file mode 100644
index 2630667..0000000
--- a/ureport2-core/target/classes/ureport.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-ureport.disableHttpSessionReportCache=false
-ureport.disableFileProvider=false
-ureport.fileStoreDir=/WEB-INF/ureportfiles
-ureport.debug=true
diff --git a/ureport2-core/target/classes/ureport2.xsd b/ureport2-core/target/classes/ureport2.xsd
deleted file mode 100644
index 276f284..0000000
--- a/ureport2-core/target/classes/ureport2.xsd
+++ /dev/null
@@ -1,866 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/ureport2" xmlns:tns="http://www.example.org/ureport2" elementFormDefault="qualified">
-	<element name="ureport">
-		<complexType>
-			<sequence>
-				<element name="cell" type="tns:cell" minOccurs="1" maxOccurs="unbounded"></element>
-				<element name="row" type="tns:row" minOccurs="1" maxOccurs="unbounded"></element>
-				<element name="column" type="tns:column" minOccurs="1" maxOccurs="unbounded"></element>
-				<element name="header" type="tns:header-footer" minOccurs="0" maxOccurs="1"></element>
-				<element name="footer" type="tns:header-footer" minOccurs="0" maxOccurs="1"></element>
-				<element name="paper" type="tns:paper" minOccurs="1" maxOccurs="1"></element>
-				<element name="datasource" type="tns:datasource" minOccurs="0" maxOccurs="unbounded"></element>
-				<element name="search-form" type="tns:search-form" minOccurs="0" maxOccurs="1"></element>
-			</sequence>
-		</complexType>
-	</element>
-	
-	<complexType name="search-form">
-		<sequence>
-			<element name="input-text" type="tns:input-text" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-radio" type="tns:input-radio" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-checkbox" type="tns:input-checkbox" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-select" type="tns:input-select" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="button-submit" type="tns:button-submit" maxOccurs="1" minOccurs="1"></element>
-			<element name="button-reset" type="tns:button-reset" maxOccurs="1" minOccurs="0"></element>
-			<element name="grid" type="tns:grid" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="col" type="tns:col" maxOccurs="unbounded" minOccurs="0"></element>		
-		</sequence>
-		<attribute name="top-toolbar" type="boolean"></attribute>
-	</complexType>
-	
-	<complexType name="col">
-		<sequence>
-			<element name="input-text" type="tns:input-text" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-radio" type="tns:input-radio" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-checkbox" type="tns:input-checkbox" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-select" type="tns:input-select" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="button-submit" type="tns:button-submit" maxOccurs="1" minOccurs="1"></element>
-			<element name="button-reset" type="tns:button-reset" maxOccurs="1" minOccurs="0"></element>
-			<element name="grid" type="tns:grid" maxOccurs="unbounded" minOccurs="0"></element>		
-			<element name="col" type="tns:col" maxOccurs="unbounded" minOccurs="0"></element>		
-		</sequence>
-		<attribute name="size" type="int" use="required"></attribute>
-	</complexType>
-	
-	<complexType name="grid">
-		<sequence>
-			<element name="input-text" type="tns:input-text" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-radio" type="tns:input-radio" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-checkbox" type="tns:input-checkbox" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="input-select" type="tns:input-select" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="button-submit" type="tns:button-submit" maxOccurs="1" minOccurs="1"></element>
-			<element name="button-reset" type="tns:button-reset" maxOccurs="1" minOccurs="0"></element>
-			<element name="grid" type="tns:grid" maxOccurs="unbounded" minOccurs="0"></element>		
-			<element name="col" type="tns:col" maxOccurs="unbounded" minOccurs="0"></element>		
-		</sequence>
-		<attribute name="show-border" type="boolean"></attribute>
-		<attribute name="border-width" type="int"></attribute>
-		<attribute name="border-color" type="string"></attribute>
-	</complexType>
-	
-	<complexType name="button-submit">
-		<attribute name="label" type="string" use="required"></attribute>
-		<attribute name="style" type="string"></attribute>
-	</complexType>
-	<complexType name="button-reset">
-		<attribute name="label" type="string" use="required"></attribute>
-		<attribute name="style" type="string" use="required"></attribute>
-	</complexType>
-	
-	<complexType name="input" abstract="true">
-		<attribute name="label" type="string" use="required"></attribute>
-		<attribute name="label-position" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="left"></enumeration>
-					<enumeration value="top"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="bind-parameter" type="string" use="required"></attribute>
-	</complexType>
-	
-	<complexType name="input-text">
-		<complexContent>
-			<extension base="tns:input"></extension>
-		</complexContent>
-	</complexType>
-	
-	<complexType name="input-datetime">
-		<complexContent>
-			<extension base="tns:input">
-				<attribute name="format" type="string" use="required"></attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	
-	<complexType name="input-radio">
-		<complexContent>
-			<extension base="tns:input">
-				<sequence>
-					<element name="option" type="tns:input-option" maxOccurs="unbounded" minOccurs="1"></element>
-				</sequence>
-				<attribute name="options-inline" type="boolean"></attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	
-	<complexType name="input-checkbox">
-		<complexContent>
-			<extension base="tns:input">
-				<sequence>
-					<element name="option" type="tns:input-option" maxOccurs="unbounded" minOccurs="1"></element>
-				</sequence>
-				<attribute name="options-inline" type="boolean"></attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	
-	<complexType name="input-select">
-		<complexContent>
-			<extension base="tns:input">
-				<sequence>
-					<element name="option" type="tns:input-option" maxOccurs="unbounded" minOccurs="1"></element>
-				</sequence>
-				<attribute name="useDataset" type="boolean"></attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	
-	<complexType name="input-option">
-		<attribute name="label" type="string" use="required"></attribute>
-		<attribute name="value" type="string" use="required"></attribute>
-	</complexType>
-
-	<complexType name="header-footer">
-		<sequence>
-			<element name="left" type="tns:content" minOccurs="0" maxOccurs="1"></element>
-			<element name="center" type="tns:content" minOccurs="0" maxOccurs="1"></element>
-			<element name="right" type="tns:content" minOccurs="0" maxOccurs="1"></element>
-		</sequence>
-		<attribute name="font-family" type="string"></attribute>
-		<attribute name="font-size" type="int"></attribute>
-		<attribute name="forecolor" type="string"></attribute>
-		<attribute name="bgcolor" type="string"></attribute>
-		<attribute name="bold" type="boolean"></attribute>
-		<attribute name="italic" type="boolean"></attribute>
-		<attribute name="underline" type="boolean"></attribute>
-	</complexType>
-	
-	<complexType name="content" mixed="true"></complexType>
-
-	<complexType name="paper">
-		<attribute name="type" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="A0"></enumeration>
-					<enumeration value="A1"></enumeration>
-					<enumeration value="A2"></enumeration>
-					<enumeration value="A3"></enumeration>
-					<enumeration value="A4"></enumeration>
-					<enumeration value="A5"></enumeration>
-					<enumeration value="A6"></enumeration>
-					<enumeration value="A7"></enumeration>
-					<enumeration value="A8"></enumeration>
-					<enumeration value="A9"></enumeration>
-					<enumeration value="A10"></enumeration>
-					<enumeration value="B0"></enumeration>
-					<enumeration value="B1"></enumeration>
-					<enumeration value="B2"></enumeration>
-					<enumeration value="B3"></enumeration>
-					<enumeration value="B4"></enumeration>
-					<enumeration value="B5"></enumeration>
-					<enumeration value="B6"></enumeration>
-					<enumeration value="B7"></enumeration>
-					<enumeration value="B8"></enumeration>
-					<enumeration value="B9"></enumeration>
-					<enumeration value="B10"></enumeration>
-					<enumeration value="CUSTOM"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="orientation" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="portrait"></enumeration>
-					<enumeration value="landscape"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		
-		<attribute name="width" type="int"></attribute>
-		<attribute name="height" type="int"></attribute>
-		<attribute name="width-mm" type="int"></attribute>
-		<attribute name="height-mm" type="int"></attribute>
-		
-		<attribute name="left-margin" type="int"></attribute>
-		<attribute name="left-margin-mm" type="int"></attribute>
-		<attribute name="right-margin" type="int"></attribute>
-		<attribute name="right-margin-mm" type="int"></attribute>
-		<attribute name="top-margin" type="int"></attribute>
-		<attribute name="top-margin-mm" type="int"></attribute>
-		<attribute name="bottom-margin" type="int"></attribute>
-		<attribute name="bottom-margin-mm" type="int"></attribute>
-		
-		<attribute name="paging-mode">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="fitpage"></enumeration>
-					<enumeration value="fixrows"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="fixrows" type="int"></attribute>
-		
-		<attribute name="column-enabled" type="boolean"></attribute>
-		<attribute name="column-count" type="int"></attribute>
-		<attribute name="column-margin" type="int"></attribute>
-	</complexType>	
-	
-	<complexType name="row">
-		<attribute name="row-number" type="int" use="required"></attribute>
-		<attribute name="height" type="int" use="required"></attribute>
-		<attribute name="band">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="headerrepeat"></enumeration>
-					<enumeration value="footerrepeat"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	<complexType name="column">
-		<attribute name="col-number" type="int" use="required"></attribute>
-		<attribute name="width" type="int" use="required"></attribute>
-		<attribute name="hide" type="boolean"></attribute>
-	</complexType>
-	<complexType name="cell">
-		<sequence>
-			<element name="simple-value" type="tns:simple-value" minOccurs="0" maxOccurs="1"></element>
-			<element name="image-value" type="tns:image-value" minOccurs="0" maxOccurs="1"></element>
-			<element name="zxing-value" type="tns:zxing-value" minOccurs="0" maxOccurs="1"></element>
-			<element name="expression-value" type="tns:expression-value" minOccurs="0" maxOccurs="1"></element>
-			<element name="dataset-value" type="tns:dataset-value" minOccurs="0" maxOccurs="1"></element>
-			<element name="chart-value" type="tns:chart-value" minOccurs="0" maxOccurs="1"></element>
-			<element name="cell-style" type="tns:cell-style" minOccurs="0" maxOccurs="1"></element>
-			<element name="condition-property-item" type="tns:condition-property-item" maxOccurs="1" minOccurs="0"></element>
-			<element name="link-parameter" type="tns:link-parameter" maxOccurs="unbounded" minOccurs="0"></element>
-		</sequence>
-		<attribute name="name" type="string" use="required"></attribute>
-		<attribute name="row" type="int"></attribute>
-		<attribute name="col" type="int"></attribute>
-		<attribute name="left-cell" type="string"></attribute>
-		<attribute name="top-cell" type="string"></attribute>
-		<attribute name="col-span" type="int"></attribute>
-		<attribute name="row-span" type="int"></attribute>
-		<attribute name="expand" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="None"></enumeration>
-					<enumeration value="Right"></enumeration>
-					<enumeration value="Down"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		
-		<attribute name="fill-blank-rows" type="boolean" use="optional"></attribute>
-		<attribute name="multiple" type="int" use="optional"></attribute>
-		
-		<attribute name="link-url" type="string" use="optional"></attribute>
-		<attribute name="link-target-window" use="optional">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="_blank"></enumeration>
-					<enumeration value="_self"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="condition-property-item">
-		<sequence>
-			<element name="condition" type="tns:condition" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="link-parameter" type="tns:link-parameter" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="cell-style" type="tns:cell-style" maxOccurs="1" minOccurs="0"></element>
-			<element name="expr" type="tns:text" minOccurs="0" maxOccurs="1"></element>
-			<element name="paging" type="tns:condition-paging" maxOccurs="1" minOccurs="0"></element>
-		</sequence>
-		<attribute name="name" type="string" use="required"></attribute>
-		<attribute name="row-height" type="int" use="optional"></attribute>
-		<attribute name="col-width" type="int" use="optional"></attribute>
-		<attribute name="new-value" type="string" use="optional"></attribute>
-		<attribute name="link-url" type="string" use="optional"></attribute>
-		<attribute name="link-target-window" use="optional">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="_blank"></enumeration>
-					<enumeration value="_self"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="type" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="normal"></enumeration>
-					<enumeration value="expr"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="condition-paging">
-		<attribute name="line" type="int"></attribute>
-		<attribute name="position">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="beofore"></enumeration>
-					<enumeration value="after"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="cell-style">
-		<sequence>
-			<element name="left-border" type="tns:border" minOccurs="0" maxOccurs="1"></element>
-			<element name="right-border" type="tns:border" minOccurs="0" maxOccurs="1"></element>
-			<element name="top-border" type="tns:border" minOccurs="0" maxOccurs="1"></element>
-			<element name="bottom-border" type="tns:border" minOccurs="0" maxOccurs="1"></element>		
-		</sequence>
-		<attribute name="font-family" type="string"></attribute>
-		<attribute name="font-size" type="int"></attribute>
-		<attribute name="forecolor" type="string"></attribute>
-		<attribute name="bgcolor" type="string"></attribute>
-		<attribute name="format" type="string"></attribute>
-		<attribute name="bold" type="boolean"></attribute>
-		<attribute name="italic" type="boolean"></attribute>
-		<attribute name="underline" type="boolean"></attribute>
-		<attribute name="wrap-compute" type="boolean"></attribute>
-		<attribute name="align" default="left">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="left"></enumeration>
-					<enumeration value="center"></enumeration>
-					<enumeration value="right"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="valign">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="top"></enumeration>
-					<enumeration value="middle"></enumeration>
-					<enumeration value="bottom"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="border">
-		<attribute name="width" type="int"></attribute>
-		<attribute name="color" type="string"></attribute>
-		<attribute name="style" default="solid">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="solid"></enumeration>
-					<enumeration value="dashed"></enumeration>
-					<enumeration value="dotted"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>	
-	
-	<complexType name="simple-value" mixed="true"></complexType>
-	
-	<complexType name="image-value">
-		<sequence>
-			<element name="text" type="tns:text" minOccurs="0" maxOccurs="1"></element>
-		</sequence>
-		<attribute name="source" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="text"></enumeration>
-					<enumeration value="expression"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="chart-value">
-		<sequence>
-			<element name="xaxes" type="tns:xaxes" minOccurs="0" maxOccurs="1"></element>
-			<element name="yaxes" type="tns:yaxes" minOccurs="0" maxOccurs="1"></element>
-			<element name="dataset" type="tns:chart-dataset" minOccurs="1" maxOccurs="1"></element>
-			<element name="animations-option" type="tns:animations-option" minOccurs="0" maxOccurs="1"></element>
-			<element name="title-option" type="tns:title-option" minOccurs="0" maxOccurs="1"></element>
-			<element name="legend-option" type="tns:legend-option" minOccurs="0" maxOccurs="1"></element>
-			<element name="tooltip-option" type="tns:tooltip-option" minOccurs="0" maxOccurs="1"></element>
-			<element name="layout-option" type="tns:layout-option" minOccurs="0" maxOccurs="1"></element>
-		</sequence>
-	</complexType>
-	
-	<complexType name="title-option">
-		<attribute name="display" type="boolean"></attribute>
-		<attribute name="font-size" type="int"></attribute>
-		<attribute name="font-color" type="string"></attribute>
-		<attribute name="padding" type="int"></attribute>
-		<attribute name="text" type="string"></attribute>
-		<attribute name="font-style">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="normal"></enumeration>
-					<enumeration value="italic"></enumeration>
-					<enumeration value="bold"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="position">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="top"></enumeration>
-					<enumeration value="bottom"></enumeration>
-					<enumeration value="left"></enumeration>
-					<enumeration value="right"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="tooltip-option">
-		<attribute name="enabled" type="boolean"></attribute>
-		<attribute name="title-font-size" type="int"></attribute>
-		<attribute name="body-font-size" type="int"></attribute>
-		<attribute name="title-font-color" type="string"></attribute>
-		<attribute name="body-font-color" type="string"></attribute>
-		<attribute name="title-font-style">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="normal"></enumeration>
-					<enumeration value="italic"></enumeration>
-					<enumeration value="bold"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="body-font-style">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="normal"></enumeration>
-					<enumeration value="italic"></enumeration>
-					<enumeration value="bold"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="legend-option">
-		<sequence>
-			<element name="labels" type="tns:labels" minOccurs="1" maxOccurs="1"></element>
-		</sequence>
-		<attribute name="display" type="boolean"></attribute>
-		<attribute name="position">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="left"></enumeration>
-					<enumeration value="right"></enumeration>
-					<enumeration value="top"></enumeration>
-					<enumeration value="bottom"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="labels">
-		<attribute name="box-width" type="int"></attribute>
-		<attribute name="font-size" type="int"></attribute>
-		<attribute name="padding" type="int"></attribute>
-		<attribute name="font-color" type="string"></attribute>
-		<attribute name="font-style">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="normal"></enumeration>
-					<enumeration value="italic"></enumeration>
-					<enumeration value="bold"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="layout-option">
-		<attribute name="padding" type="int"></attribute>
-	</complexType>
-	
-	<complexType name="animations-option">
-		<attribute name="duration" type="int"></attribute>
-		<attribute name="easing">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="linear"></enumeration>				
-					<enumeration value="easeInQuad"></enumeration>				
-					<enumeration value="easeOutQuad"></enumeration>				
-					<enumeration value="easeInOutQuad"></enumeration>				
-					<enumeration value="easeInCubic"></enumeration>				
-					<enumeration value="easeOutCubic"></enumeration>				
-					<enumeration value="easeInOutCubic"></enumeration>				
-					<enumeration value="easeInQuart"></enumeration>				
-					<enumeration value="easeOutQuart"></enumeration>				
-					<enumeration value="easeInOutQuart"></enumeration>				
-					<enumeration value="easeInQuint"></enumeration>				
-					<enumeration value="easeOutQuint"></enumeration>				
-					<enumeration value="easeInOutQuint"></enumeration>				
-					<enumeration value="easeInSine"></enumeration>				
-					<enumeration value="easeOutSine"></enumeration>				
-					<enumeration value="easeInOutSine"></enumeration>				
-					<enumeration value="easeInExpo"></enumeration>				
-					<enumeration value="easeOutExpo"></enumeration>				
-					<enumeration value="easeInOutExpo"></enumeration>				
-					<enumeration value="easeInCirc"></enumeration>				
-					<enumeration value="easeOutCirc"></enumeration>				
-					<enumeration value="easeInOutCirc"></enumeration>				
-					<enumeration value="easeInElastic"></enumeration>				
-					<enumeration value="easeOutElastic"></enumeration>				
-					<enumeration value="easeInOutElastic"></enumeration>				
-					<enumeration value="easeInBack"></enumeration>				
-					<enumeration value="easeOutBack"></enumeration>				
-					<enumeration value="easeInOutBack"></enumeration>				
-					<enumeration value="easeInBounce"></enumeration>				
-					<enumeration value="easeOutBounce"></enumeration>				
-					<enumeration value="easeInOutBounce"></enumeration>	
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="chart-dataset">
-		<choice>
-				<element name="area-dataset" type="tns:area-dataset"></element>
-				<element name="line-dataset" type="tns:line-dataset"></element>
-				<element name="bubble-dataset" type="tns:bubble-dataset"></element>
-				<element name="polar-dataset" type="tns:polar-dataset"></element>
-				<element name="bar-dataset" type="tns:bar-dataset"></element>
-				<element name="pie-dataset" type="tns:pie-dataset"></element>
-				<element name="scatter-dataset" type="tns:scatter-dataset"></element>
-				<element name="doughnut-dataset" type="tns:doughnut-dataset"></element>
-				<element name="radar-dataset" type="tns:radar-dataset"></element>
-				<element name="horizontal-bar-dataset" type="tns:horizontal-bar-dataset"></element>
-				<element name="mix-dataset" type="tns:mix-dataset"></element>
-			</choice>
-	</complexType>
-	
-	<complexType name="mix-dataset">
-		<sequence>
-			<element name="bar-dataset" type="tns:bar-dataset" minOccurs="0" maxOccurs="unbounded"></element>
-			<element name="line-dataset" type="tns:line-dataset" minOccurs="0" maxOccurs="unbounded"></element>
-		</sequence>
-	</complexType>
-	
-	<complexType name="category-dataset">
-		<attribute name="dataset-name" type="string"></attribute>
-		<attribute name="category-property" type="string"></attribute>
-		<attribute name="series-property" type="string"></attribute>
-		<attribute name="value-property" type="string"></attribute>
-		<attribute name="format" type="string"></attribute>
-		<attribute name="collect-type">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="select"></enumeration>
-					<enumeration value="count"></enumeration>
-					<enumeration value="sum"></enumeration>
-					<enumeration value="avg"></enumeration>
-					<enumeration value="max"></enumeration>
-					<enumeration value="min"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="bubble-dataset">
-		<attribute name="dataset-name" type="string"></attribute>
-		<attribute name="x-property" type="string"></attribute>
-		<attribute name="y-property" type="string"></attribute>
-		<attribute name="category-property" type="string"></attribute>
-		<attribute name="line-tension" type="double"></attribute>
-		<attribute name="fill" type="boolean"></attribute>
-	</complexType>
-	
-	<complexType name="scatter-dataset">
-		<attribute name="dataset-name" type="string"></attribute>
-		<attribute name="x-property" type="string"></attribute>
-		<attribute name="y-property" type="string"></attribute>
-		<attribute name="r-property" type="string"></attribute>
-		<attribute name="category-property" type="string"></attribute>
-	</complexType>
-	
-	<complexType name="line-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-				<attribute name="line-tension" type="double"></attribute>
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="bar-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="horizontal-bar-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="area-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="doughnut-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="pie-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="polar-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="radar-dataset">
-		<complexContent>
-			<extension base="tns:category-dataset">
-				<attribute name="line-tension" type="double"></attribute>
-				<attribute name="fill" type="boolean"></attribute>
-			</extension>		
-		</complexContent>
-	</complexType>
-	
-	<complexType name="axes" abstract="true">
-		<sequence>
-			<element name="scale-label" type="tns:scale-label" minOccurs="0" maxOccurs="1"></element>
-		</sequence>
-		<attribute name="rotation" type="int"></attribute>
-	</complexType>
-	
-	<complexType name="scale-label">
-		<attribute name="display" type="boolean"></attribute>
-		<attribute name="label-string" type="string"></attribute>
-		<attribute name="font-color" type="string"></attribute>
-		<attribute name="font-size" type="int"></attribute>
-		<attribute name="font-style">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="normal"></enumeration>
-					<enumeration value="italic"></enumeration>
-					<enumeration value="bold"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="xaxes">
-		<complexContent>
-			<extension base="tns:axes">
-				<attribute name="xposition">
-					<simpleType>
-						<restriction base="string">
-							<enumeration value="top"></enumeration>
-							<enumeration value="bottom"></enumeration>
-						</restriction>
-					</simpleType>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	
-	<complexType name="yaxes">
-		<complexContent>
-			<extension base="tns:axes">
-				<attribute name="xposition">
-					<simpleType>
-						<restriction base="string">
-							<enumeration value="left"></enumeration>
-							<enumeration value="right"></enumeration>
-						</restriction>
-					</simpleType>
-				</attribute>
-			</extension>
-		</complexContent>
-	</complexType>
-	
-	<complexType name="zxing-value">
-		<sequence>
-			<element name="text" type="tns:text" minOccurs="0" maxOccurs="1"></element>
-		</sequence>
-		<attribute name="source" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="text"></enumeration>
-					<enumeration value="expression"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="category" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="barcode"></enumeration>
-					<enumeration value="qrcode"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="format" use="optional"></attribute>
-		<attribute name="code-display" use="optional"></attribute>
-	</complexType>
-	
-	<complexType name="slash-value">
-		<sequence>
-			<element name="slash" type="tns:slash" maxOccurs="unbounded" minOccurs="1"/>
-			<element name="base64-data" type="tns:text" maxOccurs="1" minOccurs="1"></element>
-		</sequence>
-	</complexType>
-	<complexType name="slash">
-		<attribute name="text" type="string" use="required"></attribute>
-		<attribute name="x" type="int" use="required"></attribute>
-		<attribute name="y" type="int" use="required"></attribute>
-		<attribute name="degree" type="int" use="required"></attribute>
-	</complexType>
-	
-	<complexType name="text" mixed="true"></complexType>
-	
-	<complexType name="expression-value" mixed="true"></complexType>
-	
-	<complexType name="dataset-value">
-		<sequence>
-			<element name="condition" type="tns:condition" maxOccurs="unbounded" minOccurs="0"></element>
-			<element name="group-item" type="tns:group-item" maxOccurs="unbounded" minOccurs="0"></element>
-		</sequence>
-		<attribute name="dataset-name" type="string" use="required"></attribute>
-		<attribute name="aggregate" type="string" use="required"></attribute>
-		<attribute name="property" type="string" use="required"></attribute>
-		<attribute name="order">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="desc"></enumeration>
-					<enumeration value="asc"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="link-parameter">
-		<sequence>
-			<element name="value" type="tns:link-parameter-value" maxOccurs="1" minOccurs="1"></element>
-		</sequence>
-		<attribute name="name" type="string" use="required"></attribute>
-	</complexType>
-	
-	<complexType name="link-parameter-value" mixed="true"></complexType>
-	
-	<complexType name="group-item">
-		<sequence>
-			<element name="condition" type="tns:condition" minOccurs="1" maxOccurs="unbounded"></element>
-		</sequence>
-		<attribute name="name" type="string" use="required"></attribute>
-	</complexType>
-	
-	<complexType name="condition">
-		<sequence>
-			<element name="value" type="tns:condition-value" minOccurs="1" maxOccurs="1"></element>
-		</sequence>
-		<attribute name="property" use="required"></attribute>
-		<attribute name="op" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="GreatThen"></enumeration>
-					<enumeration value="EqualsGreatThen"></enumeration>
-					<enumeration value="LessThen"></enumeration>
-					<enumeration value="EqualsLessThen"></enumeration>
-					<enumeration value="Equals"></enumeration>
-					<enumeration value="NotEquals"></enumeration>
-					<enumeration value="In"></enumeration>
-					<enumeration value="Like"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	<complexType name="condition-value" mixed="true"></complexType>
-	
-	<complexType name="datasource">
-		<sequence>
-			<element name="dataset" type="tns:dataset" minOccurs="1" maxOccurs="unbounded"></element>
-		</sequence>
-		<attribute name="name" type="string" use="required"></attribute>
-		
-		<attribute name="driver" type="string" use="optional"></attribute>
-		<attribute name="url" type="string" use="optional"></attribute>
-		<attribute name="username" type="string" use="optional"></attribute>
-		<attribute name="password" type="string" use="optional"></attribute>
-		
-		<attribute name="bean" type="string" use="optional"></attribute>
-		
-		<attribute name="type" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="jdbc"></enumeration>
-					<enumeration value="spring"></enumeration>
-					<enumeration value="buildin"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	
-	<complexType name="dataset">
-		<sequence>
-			<element name="sql" type="tns:sql" minOccurs="0" maxOccurs="1"></element>
-			<element name="parameter" type="tns:parameter" minOccurs="0" maxOccurs="unbounded"></element>
-			<element name="field" type="tns:field" minOccurs="1" maxOccurs="unbounded"></element>
-		</sequence>
-		<attribute name="name" type="string" use="required"></attribute>
-		<attribute name="method" type="string"></attribute>
-		<attribute name="type" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="sql"></enumeration>
-					<enumeration value="bean"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-	</complexType>
-	
-	<complexType name="sql" mixed="true"></complexType>
-	
-	<complexType name="parameter">
-		<attribute name="name" type="string" use="required"></attribute>
-		<attribute name="type" use="required">
-			<simpleType>
-				<restriction base="string">
-					<enumeration value="Integer"></enumeration>
-					<enumeration value="Float"></enumeration>
-					<enumeration value="Boolean"></enumeration>
-					<enumeration value="String"></enumeration>
-					<enumeration value="Date"></enumeration>
-				</restriction>
-			</simpleType>
-		</attribute>
-		<attribute name="default-value" type="string" use="optional"></attribute>
-	</complexType>
-	<complexType name="field">
-		<attribute name="name" type="string" use="required"></attribute>
-	</complexType>
-</schema>
\ No newline at end of file
diff --git a/ureport2-core/target/maven-archiver/pom.properties b/ureport2-core/target/maven-archiver/pom.properties
deleted file mode 100644
index 408de23..0000000
--- a/ureport2-core/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Jun 22 11:31:47 CST 2021
-version=2.3.1-SNAPSHOT
-groupId=com.bstek.ureport
-artifactId=ureport2-core
diff --git a/ureport2-core/target/test-classes/com/bstek/ureport/test/template.html b/ureport2-core/target/test-classes/com/bstek/ureport/test/template.html
deleted file mode 100644
index 3a6f939..0000000
--- a/ureport2-core/target/test-classes/com/bstek/ureport/test/template.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>UReport Test</title>
-</head>
-<body>
-${table}
-</body>
-</html>
\ No newline at end of file
diff --git a/ureport2-core/target/test-classes/com/bstek/ureport/test/test.xml b/ureport2-core/target/test-classes/com/bstek/ureport/test/test.xml
deleted file mode 100644
index 127d562..0000000
--- a/ureport2-core/target/test-classes/com/bstek/ureport/test/test.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ureport xmlns="http://www.example.org/ureport2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.example.org/ureport2 http://www.example.org/ureport2 ">
-	<cell expand="None" name="A1" row="1" col="1" col-span="5">
-		<simple-value>
-		<![CDATA[
-			我的报表
-		]]>
-		</simple-value>
-	</cell>
-	<cell expand="Down" name="A2" col="1" row="2">
-		<dataset-value aggregate="group" property="dept_id" dataset-name="employee" order="asc">
-		</dataset-value>
-	</cell>
-	<cell expand="Down" name="B2" col="2" row="2">
-		<dataset-value aggregate="group" property="degree" dataset-name="employee" order="asc"></dataset-value>
-	</cell>
-	<cell expand="Down" name="C2" col="3" row="2">
-		<dataset-value aggregate="select" property="employee_name" dataset-name="employee" order="asc"></dataset-value>
-	</cell>
-	<cell expand="Down" name="D2" col="4" row="2">
-		<dataset-value aggregate="select" property="salary" dataset-name="employee"></dataset-value>
-	</cell>
-	<cell expand="Down" name="E2" col="5" row="2">
-		<expression-value>
-			<![CDATA[list(1 to 20)]]>
-		</expression-value>
-	</cell>
-	<cell expand="None" name="A3" col="1" row="3" col-span="3">
-		<simple-value>
-		<![CDATA[
-			总计：
-		]]>
-		</simple-value>
-	</cell>
-	<cell expand="None" name="D3" col="4" row="3">
-		<expression-value>
-			<![CDATA[sum(D2)]]>
-		</expression-value>
-	</cell>
-	<cell expand="None" name="E3" col="5" row="3">
-		<expression-value>
-			<![CDATA[
-				100>151 ? "小计："+(sum(E2) * (2 - 1)) : "gaojie"
-			]]>
-		</expression-value>
-	</cell>
-
-	<row row-number="1" height="30"/>
-	<row row-number="2" height="30"/>
-	<row row-number="3" height="30"/>
-	
-	<column col-number="1" width="80"/>
-	<column col-number="2" width="80"/>
-	<column col-number="3" width="80"/>
-	<column col-number="4" width="80"/>
-	<column col-number="5" width="80"/>
-	
-	<paper type="A4" orientation="portrait"></paper>
-	
-	<datasource name="mysql" type="jdbc" driver="com.mysql.jdbc.Driver" 
-			username="root" password="qwertyuioplm" url="jdbc:mysql://localhost:3306/doradosample?useUnicode=true&amp;characterEncoding=UTF-8">
-		<dataset name="employee" type="sql">
-			<sql>
-				<![CDATA[
-					select * from employee
-				]]>
-			</sql>
-			<field name="employee_id"/>
-			<field name="dept_id"/>
-			<field name="employee_name"/>
-			<field name="sex"/>
-			<field name="birthday"/>
-			<field name="married"/>
-			<field name="salary"/>
-			<field name="degree"/>
-			<field name="email"/>
-			<field name="web"/>
-			<field name="category"/>
-		</dataset>
-	</datasource>
-</ureport>