This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jasperreports.
commit bf516f3f4b31dea6d606cfcb3af2fa75f56f317c Merge: 0ce6566 03686a0 Author: Emmanuel Bourg <ebo...@apache.org> Date: Mon Dec 11 10:45:12 2017 +0100 Update upstream source from tag 'upstream/6.3.1' Update to upstream version '6.3.1' with Debian dir 979f9ec18c0348d4c5a055fce5a03084a2055f2c jasperreports/build.xml | 11 +- jasperreports/changes.txt | 50 + jasperreports/clirr-ignore.xml | 112 +- jasperreports/docs/config.reference.xml | 955 +++++++++-- jasperreports/docs/sample.reference.xml | 4 + jasperreports/docs/sample.xsl | 132 +- jasperreports/ivy.xml | 2 +- jasperreports/ivysettings.xml | 4 +- jasperreports/pom.xml | 21 +- jasperreports/src/META-INF/MANIFEST.MF | 6 +- jasperreports/src/default.jasperreports.properties | 11 + .../src/jasperreports_extension.properties | 17 +- .../src/jasperreports_messages.properties | 2 + .../ChartCopyObjectFactory.java} | 11 +- .../base/ChartCopyBaseObjectFactory.java} | 34 +- .../jasperreports/charts/base/JRBaseBar3DPlot.java | 10 +- .../jasperreports/charts/base/JRBaseBarPlot.java | 10 +- .../jasperreports/charts/base/JRBasePie3DPlot.java | 10 +- .../jasperreports/charts/base/JRBasePiePlot.java | 10 +- ...Plot.java => ChartCopyDesignObjectFactory.java} | 34 +- .../charts/design/JRDesignBar3DPlot.java | 2 +- .../charts/design/JRDesignBarPlot.java | 2 +- .../charts/design/JRDesignPie3DPlot.java | 2 +- .../charts/design/JRDesignPiePlot.java | 2 +- .../sf/jasperreports/compilers/JRBshCompiler.java | 1 + .../sf/jasperreports/compilers/JRBshEvaluator.java | 1 + .../sf/jasperreports/compilers/JRBshGenerator.java | 1 + .../components/barbecue/BarbecueCompiler.java | 2 +- .../components/barcode4j/BarcodeVerifier.java | 2 +- .../headertoolbar/HeaderToolbarElement.java | 2 + .../headertoolbar/HeaderToolbarElementUtils.java | 2 + .../HeaderToolbarParameterContributor.java | 3 +- .../actions/EditTextElementCommand.java | 2 +- .../json/HeaderToolbarElementJsonHandler.java | 3 + .../resources/HeaderToolbarElementJsonTemplate.vm | 3 +- .../headertoolbar/resources/require/jive.js | 20 +- .../iconlabel/IconLabelComponentFill.java | 3 +- .../components/list/FillDatasetRun.java | 8 +- .../jasperreports/components/map/MapCompiler.java | 2 +- .../components/spiderchart/FillSpiderChart.java | 2 +- .../components/table/TableComponent.java | 7 +- .../components/table/fill/TableReport.java | 38 +- .../components/table/fill/TableReportDataset.java | 7 + .../interactive/jive.crosstab.interactive.js | 2 + .../AbstractClasspathAwareDataAdapterService.java | 10 + .../data/AbstractDataAdapterService.java | 25 +- .../data/BuiltinDataFileServiceFactory.java | 4 +- ...ory.java => DataAdapterContributorFactory.java} | 6 +- .../DataAdapterParameterContributorFactory.java | 2 +- .../data/DataAdapterServiceFactory.java | 1 + .../jasperreports/data/DataAdapterServiceUtil.java | 41 +- .../sf/jasperreports/data/DataFileResolver.java | 10 +- .../jasperreports/data/DataFileServiceFactory.java | 4 +- .../net/sf/jasperreports/data/DataFileUtils.java | 25 +- ...ataAdapterServiceExtensionsRegistryFactory.java | 4 +- .../data/DefaultDataAdapterServiceFactory.java | 51 +- .../data/RepositoryDataLocationService.java | 6 +- .../data/bean/BeanDataAdapterService.java | 9 + .../data/csv/CsvDataAdapterService.java | 11 +- .../data/ds/DataSourceDataAdapterService.java | 9 + .../data/ejbql/EjbqlDataAdapterService.java | 9 + .../data/empty/EmptyDataAdapterService.java | 9 + .../data/excel/ExcelDataAdapterService.java | 9 + .../hibernate/HibernateDataAdapterService.java | 9 + .../spring/SpringHibernateDataAdapterService.java | 11 +- .../jasperreports/data/http/HttpDataLocation.java | 2 + .../jasperreports/data/http/HttpDataService.java | 263 ++- .../data/http/StandardHttpDataLocation.java | 13 + .../data/http/StandardHttpDataLocation.xml | 3 + .../data/jdbc/JdbcDataAdapterService.java | 9 + .../data/jndi/JndiDataAdapterService.java | 9 + .../jasperreports/data/json/JsonDataAdapter.java | 4 + ...AdapterImpl.xml => JsonDataAdapterImpl-630.xml} | 76 +- .../data/json/JsonDataAdapterImpl.java | 14 + .../data/json/JsonDataAdapterImpl.xml | 5 +- .../data/json/JsonDataAdapterService.java | 31 +- .../json/JsonExpressionLanguageEnum.java} | 62 +- .../json/JsonExpressionLanguageFieldHandler.java} | 58 +- .../data/mondrian/MondrianDataAdapterService.java | 10 + .../DataSourceProviderDataAdapterService.java | 12 + .../data/qe/QueryExecuterDataAdapterService.java | 9 + .../data/xls/AbstractXlsDataAdapterService.java | 11 +- .../data/xls/XlsDataAdapterService.java | 9 + .../data/xlsx/XlsxDataAdapterService.java | 9 + .../data/xml/XmlDataAdapterService.java | 14 +- .../data/xmla/XmlaDataAdapterService.java | 9 + .../sf/jasperreports/engine/BookmarkHelper.java | 11 +- .../DatasetPropertyExpression.java} | 15 +- .../engine/JRAbstractChartCustomizer.java | 78 +- .../jasperreports/engine/JRAbstractExporter.java | 23 +- .../sf/jasperreports/engine/JRChartCustomizer.java | 5 +- .../net/sf/jasperreports/engine/JRConstants.java | 2 + .../src/net/sf/jasperreports/engine/JRDataset.java | 10 +- .../engine/JRExpressionCollector.java | 16 + .../src/net/sf/jasperreports/engine/JRField.java | 9 +- .../net/sf/jasperreports/engine/JRParameter.java | 6 + .../sf/jasperreports/engine/JRPropertiesUtil.java | 41 + .../src/net/sf/jasperreports/engine/JRReport.java | 11 + .../engine/JRResultSetDataSource.java | 133 +- .../sf/jasperreports/engine/JRVirtualizable.java | 4 +- .../net/sf/jasperreports/engine/JRVirtualizer.java | 4 +- .../NamedChartCustomizer.java} | 30 +- .../analytics/dataset/FillMultiAxisData.java | 6 + .../analytics/dataset/FillMultiAxisDataset.java | 14 + .../BaseDatasetPropertyExpression.java} | 62 +- .../jasperreports/engine/base/JRBaseDataset.java | 11 + .../jasperreports/engine/base/JRBaseElement.java | 17 +- .../sf/jasperreports/engine/base/JRBaseField.java | 20 +- .../engine/base/JRBaseObjectFactory.java | 43 + .../jasperreports/engine/base/JRBaseParameter.java | 15 +- .../engine/base/JRBasePropertyExpression.java | 8 +- .../sf/jasperreports/engine/base/JRBaseReport.java | 9 +- .../engine/base/JRVirtualPrintPage.java | 4 +- .../engine/data/AbstractPoiXlsDataSource.java | 28 +- .../engine/data/AbstractXlsDataSource.java | 75 + .../engine/data/AbstractXmlDataSource.java | 63 +- .../engine/data/JRAbstractBeanDataSource.java | 71 +- .../engine/data/JRAbstractTextDataSource.java | 12 +- .../jasperreports/engine/data/JRCsvDataSource.java | 115 +- .../engine/data/JRHibernateAbstractDataSource.java | 15 +- .../jasperreports/engine/data/JRXlsDataSource.java | 13 +- .../jasperreports/engine/data/JRXmlDataSource.java | 170 +- .../jasperreports/engine/data/JsonDataSource.java | 55 +- .../engine/data/JsonQLDataSource.java | 242 +++ .../data/JsonQLDataSourceProvider.java} | 48 +- .../sf/jasperreports/engine/data/package-info.java | 6 +- .../design/DesignDatasetPropertyExpression.java} | 49 +- .../engine/design/JRDesignDataset.java | 97 ++ .../jasperreports/engine/design/JRDesignField.java | 113 ++ .../engine/design/JRDesignParameter.java | 13 + .../jasperreports/engine/design/JRJdtCompiler.java | 4 +- .../sf/jasperreports/engine/design/JRVerifier.java | 18 +- .../jasperreports/engine/design/JasperDesign.java | 37 + .../sf/jasperreports/engine/dtds/jasperreport.xsd | 74 +- .../jasperreports/engine/export/JRPdfExporter.java | 9 +- .../jasperreports/engine/export/JRXlsExporter.java | 36 + .../jasperreports/engine/export/JRXmlExporter.java | 6 +- .../engine/export/oasis/GraphicStyle.java | 57 +- .../export/oasis/InternalImageProcessor.java | 243 +++ .../oasis/InternalImageProcessorResult.java} | 55 +- .../engine/export/oasis/JROdsExporter.java | 198 +-- .../engine/export/oasis/JROdtExporter.java | 164 +- .../engine/export/oasis/StyleCache.java | 23 +- .../engine/export/ooxml/DocxDocumentHelper.java | 7 + .../jasperreports/engine/export/ooxml/DocxZip.java | 23 + .../engine/export/ooxml/JRDocxExporter.java | 46 +- .../engine/export/ooxml/JRPptxExporter.java | 47 +- .../engine/export/ooxml/JRXlsxExporter.java | 49 +- .../export/ooxml/OoxmlUtils.java} | 48 +- .../export/ooxml/PptxContentTypesHelper.java | 2 + .../jasperreports/engine/export/ooxml/PptxZip.java | 24 + .../export/ooxml/PropsAppHelper.java} | 42 +- .../engine/export/ooxml/PropsCoreHelper.java | 78 + .../export/ooxml/XlsxContentTypesHelper.java | 4 +- .../engine/export/ooxml/XlsxRunHelper.java | 165 +- .../engine/export/ooxml/XlsxSheetHelper.java | 24 +- .../jasperreports/engine/export/ooxml/XlsxZip.java | 24 + .../engine/export/ooxml/docx/Content_Types.xml | 2 + .../engine/export/ooxml/docx/_rels/xml.rels | 2 + .../engine/export/ooxml/pptx/_rels/xml.rels | 2 + .../engine/export/ooxml/type/PaperSizeEnum.java | 60 +- .../engine/export/ooxml/xlsx/_rels/xml.rels | 2 + .../engine/fill/AbstractThreadSubreportRunner.java | 14 + .../engine/fill/BandReportFillerParent.java | 2 + .../engine/fill/BaseReportFiller.java | 3 +- .../engine/fill/FillerSubreportParent.java | 9 + .../engine/fill/JRAbstractLRUVirtualizer.java | 4 +- .../sf/jasperreports/engine/fill/JRBaseFiller.java | 81 +- .../engine/fill/JRContinuationSubreportRunner.java | 6 + .../engine/fill/JRFileVirtualizer.java | 4 +- .../sf/jasperreports/engine/fill/JRFillChart.java | 83 +- .../jasperreports/engine/fill/JRFillCrosstab.java | 4 +- .../jasperreports/engine/fill/JRFillDataset.java | 207 ++- .../engine/fill/JRFillDatasetRun.java | 7 +- .../engine/fill/JRFillElementDataset.java | 12 + .../sf/jasperreports/engine/fill/JRFillField.java | 68 +- .../engine/fill/JRFillHyperlinkHelper.java | 2 +- .../sf/jasperreports/engine/fill/JRFillImage.java | 12 +- .../jasperreports/engine/fill/JRFillParameter.java | 7 + .../engine/fill/JRFillStaticText.java | 3 +- .../engine/fill/JRFillTextElement.java | 32 +- .../jasperreports/engine/fill/JRFillTextField.java | 5 +- .../jasperreports/engine/fill/JRFillVariable.java | 4 + .../engine/fill/JRGzipVirtualizer.java | 4 +- .../engine/fill/JRHorizontalFiller.java | 2 +- .../engine/fill/JRSubreportRunner.java | 5 + .../engine/fill/JRVerticalFiller.java | 8 +- .../sf/jasperreports/engine/fill/TextMeasurer.java | 4 + .../JsonOperatorEnum.java => json/JRJsonNode.java} | 52 +- .../engine/json/JsonNodeContainer.java | 91 ++ .../expression/EvaluationContext.java} | 39 +- .../expression/JsonQLExpression.java} | 66 +- .../json/expression/JsonQLExpressionEvaluator.java | 94 ++ .../expression/filter/BasicFilterExpression.java | 151 ++ .../filter/CompoundFilterExpression.java | 65 + .../expression/filter/FilterExpression.java} | 45 +- .../expression/filter/NotFilterExpression.java} | 48 +- .../expression/filter/ValueDescriptor.java} | 48 +- .../evaluation/BasicFilterExpressionEvaluator.java | 259 +++ .../CompoundFilterExpressionEvaluator.java | 58 + .../DefaultFilterExpressionEvaluatorVisitor.java | 60 + .../evaluation/FilterExpressionEvaluator.java} | 11 +- .../FilterExpressionEvaluatorVisitor.java} | 37 +- .../evaluation/NotFilterExpressionEvaluator.java} | 43 +- .../member/AbstractMemberExpression.java} | 56 +- .../member/ArrayConstructionExpression.java | 64 + .../expression/member/ArrayIndexExpression.java} | 54 +- .../expression/member/ArraySliceExpression.java | 63 + .../expression/member/MemberExpression.java} | 42 +- .../expression/member/MultiLevelUpExpression.java} | 53 +- .../member/ObjectConstructionExpression.java | 65 + .../expression/member/ObjectKeyExpression.java | 71 + .../AbstractMemberExpressionEvaluator.java | 158 ++ .../ArrayConstructionExpressionEvaluator.java | 149 ++ .../evaluation/ArrayIndexExpressionEvaluator.java | 138 ++ .../evaluation/ArraySliceExpressionEvaluator.java | 196 +++ .../DefaultMemberExpressionEvaluatorVisitor.java | 85 + ...MemberExpressionEvaluatorVisitorForFilter.java} | 44 +- .../evaluation/MemberExpressionEvaluator.java} | 14 +- .../MemberExpressionEvaluatorVisitor.java | 50 + .../MultiLevelUpExpressionEvaluator.java | 104 ++ .../ObjectConstructionExpressionEvaluator.java | 174 ++ .../evaluation/ObjectKeyExpressionEvaluator.java | 256 +++ .../engine/json/parser/JsonQueryLexer.java | 1632 +++++++++++++++++++ .../engine/json/parser/JsonQueryParser.java | 1666 ++++++++++++++++++++ .../json/parser/JsonQueryParserTokenTypes.java | 91 ++ .../json/parser/JsonQueryParserTokenTypes.txt | 62 + .../engine/json/parser/JsonQueryWalker.java | 1279 +++++++++++++++ .../engine/json/parser/json_grammar.g | 625 ++++++++ ...xecuter.java => AbstractJsonQueryExecuter.java} | 57 +- .../engine/query/JRHibernateQueryExecuter.java | 2 +- .../engine/query/JRJdbcQueryExecuterFactory.java | 1 + .../engine/query/JRJpaQueryExecuter.java | 2 +- .../engine/query/JRXPathQueryExecuter.java | 2 +- .../engine/query/JsonQLQueryExecuter.java | 103 ++ .../query/JsonQLQueryExecuterFactory.java} | 39 +- .../engine/query/JsonQueryExecuter.java | 105 +- .../engine/query/JsonQueryExecuterFactory.java | 2 +- .../engine/type/JsonOperatorEnum.java | 8 +- ...eType.java => ParameterEvaluationTimeEnum.java} | 29 +- .../engine/type/PartEvaluationTimeType.java | 2 +- ...meType.java => PropertyEvaluationTimeEnum.java} | 29 +- .../sf/jasperreports/engine/util/JRApiWriter.java | 52 +- .../engine/util/JRFloatLocaleConverter.java | 1 + .../sf/jasperreports/engine/util/JRStyledText.java | 2 +- .../engine/util/JRXmlWriteHelper.java | 38 +- .../jasperreports/engine/util/StyleResolver.java | 2 +- .../engine/util/json/DefaultJsonQLExecuter.java | 125 ++ .../util/json/JsonQLExecuter.java} | 24 +- .../xml/DatasetPropertyExpressionFactory.java} | 42 +- .../engine/xml/JRParameterFactory.java | 11 +- .../engine/xml/JRXmlDigesterFactory.java | 33 +- .../sf/jasperreports/engine/xml/JRXmlWriter.java | 55 +- .../export/AbstractXlsExporterConfiguration.java | 77 +- .../export/DocxExporterConfiguration.java | 56 + .../export/PptxExporterConfiguration.java | 56 + .../export/SimpleDocxExporterConfiguration.java | 75 + .../export/SimplePptxExporterConfiguration.java | 75 + .../export/XlsExporterConfiguration.java | 55 + .../extensions/DefaultExtensionsRegistry.java | 84 +- .../sf/jasperreports/olap/JROlapDataSource.java | 26 +- .../parts/subreport/SubreportFillPart.java | 6 + .../renderers/BatikFontFamilyResolver.java | 17 +- .../jasperreports/renderers/util/RendererUtil.java | 1 + .../renderers/util/SvgFontProcessor.java | 64 +- .../renderers/util/XmlDataSniffer.java | 46 +- .../net/sf/jasperreports/search/LuceneUtil.java | 35 +- .../web/servlets/ReportJiveComponentsServlet.java | 15 +- .../jasperreports/web/servlets/ReportServlet.java | 476 ------ .../jsonql/JsonQLExpressionsTest.java | 208 +++ .../sf/jasperreports/jsonql/allOrders_result.json | 62 + .../jasperreports/jsonql/allProducts_result.json | 34 + .../jsonql/customerXorders_result.json | 28 + .../jsonql/customerXproducts_result.json | 14 + .../tests/net/sf/jasperreports/jsonql/orders.json | 66 + ...roductsOfOrdersWithAtLeast2products_result.json | 30 + .../jsonql/productsOfShippedOrders_result.json | 18 + .../virtualization/FirstJasper.reference.jrpxml | 2 +- 278 files changed, 14535 insertions(+), 2636 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasperreports.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits