From 333458f8c1491243c14dc0a85eaf22d69e880c1c Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 14 May 2017 20:58:08 +0700 Subject: [PATCH] IDEMPIERE-3136:update jasper report to use P2 pending to correct dependency of org.compiere.db.oracle.provider org.compiere.db.postgresql.provider to org.jfree.io it better use common from apache or create new one --- org.adempiere.base/.classpath | 4 - org.adempiere.base/META-INF/MANIFEST.MF | 109 +--- org.adempiere.base/build.properties | 4 - .../feature.xml | 173 ++++++ .../.classpath | 40 +- .../META-INF/MANIFEST.MF | 524 ++++++++++-------- .../build.properties | 42 +- .../copyjars.xml | 40 +- .../note_for_update_jr_library.readme | 16 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 5 +- org.adempiere.sdk-feature/adempiere.rmap | 29 + .../materialize.properties | 2 + org.adempiere.ui.swing/META-INF/MANIFEST.MF | 4 +- org.adempiere.ui.zk/META-INF/MANIFEST.MF | 7 + .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 1 + 17 files changed, 544 insertions(+), 460 deletions(-) diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath index 15964d86e7..d7d871a535 100644 --- a/org.adempiere.base/.classpath +++ b/org.adempiere.base/.classpath @@ -10,11 +10,7 @@ - - - - diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index a64afe48db..a9bcd16e09 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -7,11 +7,7 @@ Bundle-ClassPath: base.jar, jython-engine.jar, jython.jar, cron4j-2.2.5.jar, - barbecue-1.5-beta1.jar, - jcommon-1.0.23.jar, - jfreechart-1.0.19.jar, jnlp.jar, - barcode4j-2.1.jar, bsh-2.0b6.jar, commons-validator-1.6.jar Export-Package: bsh, @@ -26,19 +22,6 @@ Export-Package: bsh, com.akunagroup.uk.postcode, it.sauronsoftware.cron4j, javax.jnlp, - net.sourceforge.barbecue, - net.sourceforge.barbecue.env, - net.sourceforge.barbecue.formatter, - net.sourceforge.barbecue.linear, - net.sourceforge.barbecue.linear.codabar, - net.sourceforge.barbecue.linear.code128, - net.sourceforge.barbecue.linear.code39, - net.sourceforge.barbecue.linear.ean, - net.sourceforge.barbecue.linear.postnet, - net.sourceforge.barbecue.linear.twoOfFive, - net.sourceforge.barbecue.linear.upc, - net.sourceforge.barbecue.output, - net.sourceforge.barbecue.twod.pdf417, org.adempiere.apps.graph, org.adempiere.base, org.adempiere.base.equinox, @@ -72,81 +55,7 @@ Export-Package: bsh, org.eevolution.model, org.idempiere.broadcast, org.idempiere.distributed, - org.idempiere.model, - org.jfree, - org.jfree.base, - org.jfree.base.config, - org.jfree.base.log, - org.jfree.base.modules, - org.jfree.chart, - org.jfree.chart.annotations, - org.jfree.chart.axis, - org.jfree.chart.block, - org.jfree.chart.editor, - org.jfree.chart.encoders, - org.jfree.chart.entity, - org.jfree.chart.event, - org.jfree.chart.imagemap, - org.jfree.chart.labels, - org.jfree.chart.needle, - org.jfree.chart.panel, - org.jfree.chart.plot, - org.jfree.chart.plot.dial, - org.jfree.chart.renderer, - org.jfree.chart.renderer.category, - org.jfree.chart.renderer.xy, - org.jfree.chart.resources, - org.jfree.chart.servlet, - org.jfree.chart.title, - org.jfree.chart.urls, - org.jfree.chart.util, - org.jfree.data, - org.jfree.data.category, - org.jfree.data.contour, - org.jfree.data.function, - org.jfree.data.gantt, - org.jfree.data.general, - org.jfree.data.io, - org.jfree.data.jdbc, - org.jfree.data.resources, - org.jfree.data.statistics, - org.jfree.data.time, - org.jfree.data.time.ohlc, - org.jfree.data.xml, - org.jfree.data.xy, - org.jfree.date, - org.jfree.io, - org.jfree.layout, - org.jfree.resources, - org.jfree.text, - org.jfree.threads, - org.jfree.ui, - org.jfree.ui.about, - org.jfree.ui.about.resources, - org.jfree.ui.action, - org.jfree.ui.tabbedui, - org.jfree.util, - org.krysalis.barcode4j, - org.krysalis.barcode4j.ant, - org.krysalis.barcode4j.cli, - org.krysalis.barcode4j.impl, - org.krysalis.barcode4j.impl.codabar, - org.krysalis.barcode4j.impl.code128, - org.krysalis.barcode4j.impl.code39, - org.krysalis.barcode4j.impl.datamatrix, - org.krysalis.barcode4j.impl.fourstate, - org.krysalis.barcode4j.impl.int2of5, - org.krysalis.barcode4j.impl.pdf417, - org.krysalis.barcode4j.impl.postnet, - org.krysalis.barcode4j.impl.upcean, - org.krysalis.barcode4j.output, - org.krysalis.barcode4j.output.bitmap, - org.krysalis.barcode4j.output.eps, - org.krysalis.barcode4j.output.java2d, - org.krysalis.barcode4j.output.svg, - org.krysalis.barcode4j.servlet, - org.krysalis.barcode4j.tools, - org.krysalis.barcode4j.xalan + org.idempiere.model Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.sun.mail.smtp;version="1.5", javax.activation, @@ -158,6 +67,8 @@ Import-Package: com.sun.mail.smtp;version="1.5", junit.framework;version="3.8.2";resolution:=optional, junit.textui;version="3.8.2";resolution:=optional, net.sf.cglib.proxy, + net.sourceforge.barbecue;version="1.5.0.beta1", + net.sourceforge.barbecue.linear.ean;version="1.5.0.beta1", org.apache.activemq;version="5.3.0", org.apache.commons.collections;version="3.2.0", org.apache.commons.collections.keyvalue;version="3.2.0", @@ -173,6 +84,20 @@ Import-Package: com.sun.mail.smtp;version="1.5", org.eclipse.core.runtime;version="3.4.0", org.eclipse.osgi.framework.console;version="1.1.0", org.eclipse.osgi.service.datalocation, + org.jfree.chart;version="1.0.19", + org.jfree.chart.axis;version="1.0.19", + org.jfree.chart.plot;version="1.0.19", + org.jfree.chart.renderer.category;version="1.0.19", + org.jfree.data.category;version="1.0.19", + org.jfree.data.general;version="1.0.19", + org.jfree.data.time;version="1.0.19", + org.jfree.data.xy;version="1.0.19", + org.jfree.date;version="1.0.23", + org.jfree.io;version="1.0.23", + org.krysalis.barcode4j;version="2.1.0", + org.krysalis.barcode4j.impl;version="2.1.0", + org.krysalis.barcode4j.impl.upcean;version="2.1.0", + org.krysalis.barcode4j.output.bitmap;version="2.1.0", org.osgi.framework, org.osgi.service.cm;version="1.3.0", org.osgi.service.component;version="1.1.0", diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties index 85f93f6cad..47da21473d 100644 --- a/org.adempiere.base/build.properties +++ b/org.adempiere.base/build.properties @@ -4,9 +4,6 @@ bin.includes = META-INF/,\ jython-engine.jar,\ jython.jar,\ cron4j-2.2.5.jar,\ - barbecue-1.5-beta1.jar,\ - jcommon-1.0.23.jar,\ - jfreechart-1.0.19.jar,\ jnlp.jar,\ OSGI-INF/,\ OSGI-INF/dslocator.xml,\ @@ -26,7 +23,6 @@ bin.includes = META-INF/,\ OSGI-INF/defaulttaxproviderfactory.xml,\ OSGI-INF/addressvalidationeventhandler.xml,\ schema/,\ - barcode4j-2.1.jar,\ bsh-2.0b6.jar,\ commons-validator-1.6.jar output.base.jar = bin/ diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index 9b38b8c3e4..4f07d7b32b 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -28,5 +28,178 @@ install-size="0" version="0.0.0"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath index d2dd51c2f5..689fb7ad7d 100644 --- a/org.adempiere.report.jasper.library/.classpath +++ b/org.adempiere.report.jasper.library/.classpath @@ -1,54 +1,20 @@ - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF index f0d001711e..55b773c0d9 100644 --- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF @@ -5,225 +5,22 @@ Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ClassPath: ., - lib/batik-anim-1.8.jar, - lib/batik-awt-util-1.8.jar, - lib/batik-bridge-1.8.jar, - lib/batik-codec-1.8.jar, - lib/batik-css-1.8.jar, - lib/batik-dom-1.8.jar, - lib/batik-ext-1.8.jar, - lib/batik-extension-1.8.jar, - lib/batik-gui-util-1.8.jar, - lib/batik-gvt-1.8.jar, - lib/batik-parser-1.8.jar, - lib/batik-script-1.8.jar, - lib/batik-svg-dom-1.8.jar, - lib/batik-svggen-1.8.jar, - lib/batik-swing-1.8.jar, - lib/batik-transcoder-1.8.jar, - lib/batik-util-1.8.jar, - lib/batik-xml-1.8.jar, lib/castor-core-1.3.3.jar, lib/castor-xml-1.3.3.jar, - lib/commons-digester-2.1.jar, - lib/commons-javaflow-20160505.jar, lib/fop-transcoder-allinone-1.1.jar, - lib/hibernate-core-3.3.2.GA.jar, - lib/itext-2.1.7.js5.jar, - lib/jaxen-1.1.1.jar, - lib/jcommon-1.0.23.jar, - lib/jfreechart-1.0.19.jar, lib/js.jar, - lib/jxl-2.6.10.jar, - lib/lucene-analyzers-common-4.5.1.jar, - lib/lucene-core-4.5.1.jar, - lib/lucene-queryparser-4.5.1.jar, lib/mondrian-3.1.1.12687.jar, lib/olap4j-0.9.7.309-JS-3.jar, lib/persistence-api-1.0.jar, - lib/poi-3.10.1.jar, - lib/poi-ooxml-3.10.1.jar, - lib/rhino-1.7.6.jar, lib/spring-beans-2.5.jar, lib/spring-core-2.5.jar, - lib/velocity-1.7.jar, lib/xml-apis-ext-1.3.04.jar, - lib/xmlgraphics-commons-1.5.jar, lib/xmpcore-5.1.1.jar, - lib/bcprov-jdk14-139.jar, - lib/core-3.2.1.jar, - lib/jasperreports-6.3.1.jar, lib/jasperreports-fonts-6.3.1.jar, - lib/jasperreports-functions-6.3.1.jar -Export-Package: net.sf.jasperreports.ant, - net.sf.jasperreports.charts, - net.sf.jasperreports.charts.base, - net.sf.jasperreports.charts.design, - net.sf.jasperreports.charts.fill, - net.sf.jasperreports.charts.type, - net.sf.jasperreports.charts.util, - net.sf.jasperreports.charts.xml, - net.sf.jasperreports.compilers, - net.sf.jasperreports.components, - net.sf.jasperreports.components.barbecue, - net.sf.jasperreports.components.barcode4j, - net.sf.jasperreports.components.charts, - net.sf.jasperreports.components.headertoolbar, - net.sf.jasperreports.components.headertoolbar.actions, - net.sf.jasperreports.components.headertoolbar.json, - net.sf.jasperreports.components.headertoolbar.json.resources, - net.sf.jasperreports.components.headertoolbar.resources, - net.sf.jasperreports.components.headertoolbar.resources.images, - net.sf.jasperreports.components.headertoolbar.resources.images.format, - net.sf.jasperreports.components.headertoolbar.resources.images.jive, - net.sf.jasperreports.components.headertoolbar.resources.images.style, - net.sf.jasperreports.components.headertoolbar.resources.require, - net.sf.jasperreports.components.iconlabel, - net.sf.jasperreports.components.items, - net.sf.jasperreports.components.items.fill, - net.sf.jasperreports.components.list, - net.sf.jasperreports.components.map, - net.sf.jasperreports.components.map.fill, - net.sf.jasperreports.components.map.resources.require, - net.sf.jasperreports.components.map.resources.templates, - net.sf.jasperreports.components.map.type, - net.sf.jasperreports.components.sort, - net.sf.jasperreports.components.sort.actions, - net.sf.jasperreports.components.sort.resources, - net.sf.jasperreports.components.sort.resources.images, - net.sf.jasperreports.components.spiderchart, - net.sf.jasperreports.components.spiderchart.type, - net.sf.jasperreports.components.table, - net.sf.jasperreports.components.table.fill, - net.sf.jasperreports.components.table.util, - net.sf.jasperreports.crosstabs, - net.sf.jasperreports.crosstabs.base, - net.sf.jasperreports.crosstabs.design, - net.sf.jasperreports.crosstabs.fill, - net.sf.jasperreports.crosstabs.fill.calculation, - net.sf.jasperreports.crosstabs.interactive, - net.sf.jasperreports.crosstabs.type, - net.sf.jasperreports.crosstabs.xml, - net.sf.jasperreports.data, - net.sf.jasperreports.data.bean, - net.sf.jasperreports.data.cache, - net.sf.jasperreports.data.csv, - net.sf.jasperreports.data.ds, - net.sf.jasperreports.data.ejbql, - net.sf.jasperreports.data.empty, - net.sf.jasperreports.data.excel, - net.sf.jasperreports.data.hibernate, - net.sf.jasperreports.data.hibernate.spring, - net.sf.jasperreports.data.http, - net.sf.jasperreports.data.jdbc, - net.sf.jasperreports.data.jndi, - net.sf.jasperreports.data.json, - net.sf.jasperreports.data.mondrian, - net.sf.jasperreports.data.provider, - net.sf.jasperreports.data.qe, - net.sf.jasperreports.data.xls, - net.sf.jasperreports.data.xlsx, - net.sf.jasperreports.data.xml, - net.sf.jasperreports.data.xmla, - net.sf.jasperreports.engine, - net.sf.jasperreports.engine.analytics.data, - net.sf.jasperreports.engine.analytics.dataset, - net.sf.jasperreports.engine.base, - net.sf.jasperreports.engine.component, - net.sf.jasperreports.engine.convert, - net.sf.jasperreports.engine.data, - net.sf.jasperreports.engine.design, - net.sf.jasperreports.engine.design.events, - net.sf.jasperreports.engine.dtds, - net.sf.jasperreports.engine.export, - net.sf.jasperreports.engine.export.data, - net.sf.jasperreports.engine.export.draw, - net.sf.jasperreports.engine.export.oasis, - net.sf.jasperreports.engine.export.ooxml, - net.sf.jasperreports.engine.export.ooxml.docx, - net.sf.jasperreports.engine.export.ooxml.docx._rels, - net.sf.jasperreports.engine.export.ooxml.pptx._rels, - net.sf.jasperreports.engine.export.ooxml.pptx.ppt.slideLayouts, - net.sf.jasperreports.engine.export.ooxml.pptx.ppt.slideLayouts._rels, - net.sf.jasperreports.engine.export.ooxml.pptx.ppt.slideMasters, - net.sf.jasperreports.engine.export.ooxml.pptx.ppt.slideMasters._rels, - net.sf.jasperreports.engine.export.ooxml.pptx.ppt.theme, - net.sf.jasperreports.engine.export.ooxml.type, - net.sf.jasperreports.engine.export.ooxml.xlsx._rels, - net.sf.jasperreports.engine.export.tabulator, - net.sf.jasperreports.engine.export.type, - net.sf.jasperreports.engine.export.zip, - net.sf.jasperreports.engine.fill, - net.sf.jasperreports.engine.fonts, - net.sf.jasperreports.engine.images, - net.sf.jasperreports.engine.part, - net.sf.jasperreports.engine.print, - net.sf.jasperreports.engine.query, - net.sf.jasperreports.engine.scriptlets, - net.sf.jasperreports.engine.style, - net.sf.jasperreports.engine.type, - net.sf.jasperreports.engine.util, - net.sf.jasperreports.engine.util.xml, - net.sf.jasperreports.engine.virtualization, - net.sf.jasperreports.engine.xml, - net.sf.jasperreports.export, - net.sf.jasperreports.export.annotations, - net.sf.jasperreports.export.parameters, - net.sf.jasperreports.export.type, - net.sf.jasperreports.expressions, - net.sf.jasperreports.extensions, - net.sf.jasperreports.fonts, - net.sf.jasperreports.fonts.dejavu, - net.sf.jasperreports.fonts.pictonic, - net.sf.jasperreports.functions, - net.sf.jasperreports.functions.annotations, - net.sf.jasperreports.functions.standard, - net.sf.jasperreports.governors, - net.sf.jasperreports.j2ee.servlets, - net.sf.jasperreports.olap, - net.sf.jasperreports.olap.mapping, - net.sf.jasperreports.olap.mondrian, - net.sf.jasperreports.olap.olap4j, - net.sf.jasperreports.olap.result, - net.sf.jasperreports.olap.xmla, - net.sf.jasperreports.parts, - net.sf.jasperreports.parts.subreport, - net.sf.jasperreports.renderers, - net.sf.jasperreports.renderers.util, - net.sf.jasperreports.repo, - net.sf.jasperreports.search, - net.sf.jasperreports.swing, - net.sf.jasperreports.types.date, - net.sf.jasperreports.util, - net.sf.jasperreports.view, - net.sf.jasperreports.view.images, - net.sf.jasperreports.view.save, - net.sf.jasperreports.web, - net.sf.jasperreports.web.actions, - net.sf.jasperreports.web.commands, - net.sf.jasperreports.web.listeners, - net.sf.jasperreports.web.servlets, - net.sf.jasperreports.web.servlets.resources, - net.sf.jasperreports.web.servlets.resources.require.report, - net.sf.jasperreports.web.servlets.resources.require.util, - net.sf.jasperreports.web.servlets.resources.require.viewer, - net.sf.jasperreports.web.servlets.resources.templates, - net.sf.jasperreports.web.servlets.resources.viewer, - net.sf.jasperreports.web.util -Require-Bundle: bcprov;bundle-version="1.54.0", - org.apache.commons.beanutils;bundle-version="0.0.0", - org.apache.commons.collections;bundle-version="0.0.0", - org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0", - org.apache.httpcomponents.httpclient;bundle-version="0.0.0", - org.apache.httpcomponents.httpcore;bundle-version="0.0.0", - groovy-all;bundle-version="0.0.0", - com.fasterxml.jackson.core.jackson-annotations;bundle-version="0.0.0", - com.fasterxml.jackson.core.jackson-core;bundle-version="0.0.0", - com.fasterxml.jackson.core.jackson-databind;bundle-version="0.0.0", - joda-time;bundle-version="0.0.0", - com.ibm.icu;bundle-version="0.0.0", - org.apache.xalan;bundle-version="2.7.1", - org.apache.xerces;bundle-version="2.9.0" + lib/jasperreports-functions-6.3.1.jar, + lib/jasperreports-chart-customizers-6.3.1.jar, + lib/jasperreports-chart-themes-6.3.1.jar, + lib/bcprov-jdk14-139.jar Import-Package: bsh, bsh.classpath, bsh.collection, @@ -236,19 +33,6 @@ Import-Package: bsh, javax.servlet;version="3.1.0", javax.servlet.http;version="3.1.0", javax.servlet.resources;version="3.1.0", - net.sourceforge.barbecue, - net.sourceforge.barbecue.env, - net.sourceforge.barbecue.formatter, - net.sourceforge.barbecue.linear, - net.sourceforge.barbecue.linear.codabar, - net.sourceforge.barbecue.linear.code128, - net.sourceforge.barbecue.linear.code39, - net.sourceforge.barbecue.linear.ean, - net.sourceforge.barbecue.linear.postnet, - net.sourceforge.barbecue.linear.twoOfFive, - net.sourceforge.barbecue.linear.upc, - net.sourceforge.barbecue.output, - net.sourceforge.barbecue.twod.pdf417, org.apache.commons.codec.digest;version="1.6.0", org.apache.tools.ant, org.apache.tools.ant.attribute, @@ -321,26 +105,282 @@ Import-Package: bsh, org.apache.tools.mail, org.apache.tools.tar, org.apache.tools.zip, - org.apache.xml.serializer;version="2.7.1", - org.krysalis.barcode4j, - org.krysalis.barcode4j.ant, - org.krysalis.barcode4j.cli, - org.krysalis.barcode4j.impl, - org.krysalis.barcode4j.impl.codabar, - org.krysalis.barcode4j.impl.code128, - org.krysalis.barcode4j.impl.code39, - org.krysalis.barcode4j.impl.datamatrix, - org.krysalis.barcode4j.impl.fourstate, - org.krysalis.barcode4j.impl.int2of5, - org.krysalis.barcode4j.impl.pdf417, - org.krysalis.barcode4j.impl.postnet, - org.krysalis.barcode4j.impl.upcean, - org.krysalis.barcode4j.output, - org.krysalis.barcode4j.output.bitmap, - org.krysalis.barcode4j.output.eps, - org.krysalis.barcode4j.output.java2d, - org.krysalis.barcode4j.output.svg, - org.krysalis.barcode4j.servlet, - org.krysalis.barcode4j.tools, - org.krysalis.barcode4j.xalan + org.apache.xml.serializer;version="2.7.1" DynamicImport-Package: * +Export-Package: com.adobe.xmp, + com.adobe.xmp.impl, + com.adobe.xmp.impl.xpath, + com.adobe.xmp.options, + com.adobe.xmp.properties, + javax.persistence, + javax.persistence.spi, + mondrian.calc, + mondrian.calc.impl, + mondrian.i18n, + mondrian.mdx, + mondrian.olap, + mondrian.olap.fun, + mondrian.olap.fun.extra, + mondrian.olap.fun.vba, + mondrian.olap.type, + mondrian.olap4j, + mondrian.recorder, + mondrian.resource, + mondrian.rolap, + mondrian.rolap.agg, + mondrian.rolap.aggmatcher, + mondrian.rolap.cache, + mondrian.rolap.sql, + mondrian.spi, + mondrian.spi.impl, + mondrian.test.loader, + mondrian.tui, + mondrian.udf, + mondrian.util, + mondrian.web.servlet, + mondrian.web.taglib, + mondrian.xmla, + mondrian.xmla.impl, + net.sf.jasperreports.chartthemes, + net.sf.jasperreports.chartthemes.simple, + net.sf.jasperreports.chartthemes.simple.handlers, + net.sf.jasperreports.chartthemes.spring, + net.sf.jasperreports.chartthemes.spring.beans, + net.sf.jasperreports.customizers, + net.sf.jasperreports.customizers.axis, + net.sf.jasperreports.customizers.marker, + net.sf.jasperreports.customizers.shape, + net.sf.jasperreports.customizers.type, + net.sf.jasperreports.customizers.util, + net.sf.jasperreports.fonts, + net.sf.jasperreports.fonts.dejavu, + net.sf.jasperreports.functions.standard, + org.apache.avalon.framework, + org.apache.avalon.framework.activity, + org.apache.avalon.framework.configuration, + org.apache.avalon.framework.container, + org.apache.commons.io, + org.apache.commons.io.filefilter, + org.apache.commons.io.output, + org.apache.commons.logging, + org.apache.commons.logging.impl, + org.apache.fop, + org.apache.fop.accessibility, + org.apache.fop.apps, + org.apache.fop.complexscripts.fonts, + org.apache.fop.fo, + org.apache.fop.fonts, + org.apache.fop.fonts.apps, + org.apache.fop.fonts.autodetect, + org.apache.fop.fonts.base14, + org.apache.fop.fonts.substitute, + org.apache.fop.fonts.truetype, + org.apache.fop.fonts.type1, + org.apache.fop.image.loader.batik, + org.apache.fop.pdf, + org.apache.fop.pdf.xref, + org.apache.fop.render, + org.apache.fop.render.intermediate, + org.apache.fop.render.pdf, + org.apache.fop.render.pdf.extensions, + org.apache.fop.render.ps, + org.apache.fop.render.ps.extensions, + org.apache.fop.render.ps.fonts, + org.apache.fop.svg, + org.apache.fop.util, + org.apache.xmlgraphics.fonts, + org.apache.xmlgraphics.java2d, + org.apache.xmlgraphics.java2d.color, + org.apache.xmlgraphics.java2d.color.profile, + org.apache.xmlgraphics.java2d.ps, + org.apache.xmlgraphics.ps, + org.apache.xmlgraphics.ps.dsc, + org.apache.xmlgraphics.ps.dsc.events, + org.apache.xmlgraphics.ps.dsc.tools, + org.apache.xmlgraphics.util.io, + org.bouncycastle, + org.bouncycastle.asn1, + org.bouncycastle.asn1.cmp, + org.bouncycastle.asn1.cms, + org.bouncycastle.asn1.crmf, + org.bouncycastle.asn1.cryptopro, + org.bouncycastle.asn1.esf, + org.bouncycastle.asn1.ess, + org.bouncycastle.asn1.gnu, + org.bouncycastle.asn1.iana, + org.bouncycastle.asn1.icao, + org.bouncycastle.asn1.isismtt, + org.bouncycastle.asn1.isismtt.ocsp, + org.bouncycastle.asn1.isismtt.x509, + org.bouncycastle.asn1.kisa, + org.bouncycastle.asn1.microsoft, + org.bouncycastle.asn1.misc, + org.bouncycastle.asn1.mozilla, + org.bouncycastle.asn1.nist, + org.bouncycastle.asn1.ntt, + org.bouncycastle.asn1.ocsp, + org.bouncycastle.asn1.oiw, + org.bouncycastle.asn1.pkcs, + org.bouncycastle.asn1.sec, + org.bouncycastle.asn1.smime, + org.bouncycastle.asn1.teletrust, + org.bouncycastle.asn1.tsp, + org.bouncycastle.asn1.util, + org.bouncycastle.asn1.x500, + org.bouncycastle.asn1.x509, + org.bouncycastle.asn1.x509.qualified, + org.bouncycastle.asn1.x509.sigi, + org.bouncycastle.asn1.x9, + org.bouncycastle.crypto, + org.bouncycastle.crypto.agreement, + org.bouncycastle.crypto.agreement.kdf, + org.bouncycastle.crypto.digests, + org.bouncycastle.crypto.encodings, + org.bouncycastle.crypto.engines, + org.bouncycastle.crypto.examples, + org.bouncycastle.crypto.generators, + org.bouncycastle.crypto.io, + org.bouncycastle.crypto.macs, + org.bouncycastle.crypto.modes, + org.bouncycastle.crypto.paddings, + org.bouncycastle.crypto.params, + org.bouncycastle.crypto.prng, + org.bouncycastle.crypto.signers, + org.bouncycastle.crypto.tls, + org.bouncycastle.crypto.util, + org.bouncycastle.i18n, + org.bouncycastle.i18n.filter, + org.bouncycastle.jce, + org.bouncycastle.jce.examples, + org.bouncycastle.jce.exception, + org.bouncycastle.jce.interfaces, + org.bouncycastle.jce.netscape, + org.bouncycastle.jce.provider, + org.bouncycastle.jce.provider.symmetric, + org.bouncycastle.jce.spec, + org.bouncycastle.math.ec, + org.bouncycastle.mozilla, + org.bouncycastle.ocsp, + org.bouncycastle.openssl, + org.bouncycastle.util, + org.bouncycastle.util.encoders, + org.bouncycastle.util.io, + org.bouncycastle.util.test, + org.bouncycastle.voms, + org.bouncycastle.x509, + org.bouncycastle.x509.examples, + org.bouncycastle.x509.extension, + org.bouncycastle.x509.util, + org.castor, + org.castor.core, + org.castor.core.annotationprocessing, + org.castor.core.constants.cpa, + org.castor.core.constants.solrj, + org.castor.core.exception, + org.castor.core.exceptions, + org.castor.core.nature, + org.castor.core.util, + org.castor.mapping, + org.castor.xml, + org.exolab.castor, + org.exolab.castor.core.exceptions, + org.exolab.castor.dsml, + org.exolab.castor.dsml.jndi, + org.exolab.castor.dsml.mozilla, + org.exolab.castor.dsml.schema, + org.exolab.castor.dsml.tools, + org.exolab.castor.mapping, + org.exolab.castor.mapping.handlers, + org.exolab.castor.mapping.loader, + org.exolab.castor.mapping.loader.collection.handler, + org.exolab.castor.mapping.xml, + org.exolab.castor.mapping.xml.descriptors, + org.exolab.castor.mapping.xml.types, + org.exolab.castor.mapping.xml.types.descriptors, + org.exolab.castor.net, + org.exolab.castor.net.util, + org.exolab.castor.tools, + org.exolab.castor.types, + org.exolab.castor.util, + org.exolab.castor.util.dialog, + org.exolab.castor.util.resources, + org.exolab.castor.xml, + org.exolab.castor.xml.descriptors, + org.exolab.castor.xml.handlers, + org.exolab.castor.xml.location, + org.exolab.castor.xml.parsing, + org.exolab.castor.xml.parsing.primitive.objects, + org.exolab.castor.xml.util, + org.exolab.castor.xml.util.resolvers, + org.exolab.castor.xml.validators, + org.exolab.castor.xml.wls8, + org.mozilla.classfile, + org.mozilla.javascript, + org.mozilla.javascript.continuations, + org.mozilla.javascript.debug, + org.mozilla.javascript.jdk11, + org.mozilla.javascript.jdk13, + org.mozilla.javascript.optimizer, + org.mozilla.javascript.regexp, + org.mozilla.javascript.resources, + org.mozilla.javascript.serialize, + org.mozilla.javascript.tools, + org.mozilla.javascript.tools.debugger, + org.mozilla.javascript.tools.debugger.downloaded, + org.mozilla.javascript.tools.idswitch, + org.mozilla.javascript.tools.jsc, + org.mozilla.javascript.tools.resources, + org.mozilla.javascript.tools.shell, + org.mozilla.javascript.xml, + org.mozilla.javascript.xmlimpl, + org.olap4j, + org.olap4j.driver.xmla, + org.olap4j.driver.xmla.cache, + org.olap4j.driver.xmla.proxy, + org.olap4j.impl, + org.olap4j.layout, + org.olap4j.mdx, + org.olap4j.mdx.parser, + org.olap4j.mdx.parser.impl, + org.olap4j.metadata, + org.olap4j.query, + org.olap4j.sample, + org.olap4j.transform, + org.olap4j.type, + org.springframework.asm, + org.springframework.asm.commons, + org.springframework.asm.signature, + org.springframework.beans, + org.springframework.beans.annotation, + org.springframework.beans.factory, + org.springframework.beans.factory.access, + org.springframework.beans.factory.annotation, + org.springframework.beans.factory.config, + org.springframework.beans.factory.generic, + org.springframework.beans.factory.parsing, + org.springframework.beans.factory.serviceloader, + org.springframework.beans.factory.support, + org.springframework.beans.factory.wiring, + org.springframework.beans.factory.xml, + org.springframework.beans.propertyeditors, + org.springframework.beans.support, + org.springframework.core, + org.springframework.core.annotation, + org.springframework.core.enums, + org.springframework.core.io, + org.springframework.core.io.support, + org.springframework.core.style, + org.springframework.core.task, + org.springframework.core.task.support, + org.springframework.core.type, + org.springframework.core.type.classreading, + org.springframework.core.type.filter, + org.springframework.metadata, + org.springframework.metadata.commons, + org.springframework.util, + org.springframework.util.comparator, + org.springframework.util.xml, + org.w3c.css.sac, + org.w3c.css.sac.helpers, + org.w3c.dom.smil, + org.w3c.dom.svg diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties index 236cd73fe9..6e6d69bace 100644 --- a/org.adempiere.report.jasper.library/build.properties +++ b/org.adempiere.report.jasper.library/build.properties @@ -1,52 +1,18 @@ bin.includes = META-INF/,\ .,\ - lib/batik-anim-1.8.jar,\ - lib/batik-awt-util-1.8.jar,\ - lib/batik-bridge-1.8.jar,\ - lib/batik-codec-1.8.jar,\ - lib/batik-css-1.8.jar,\ - lib/batik-dom-1.8.jar,\ - lib/batik-ext-1.8.jar,\ - lib/batik-extension-1.8.jar,\ - lib/batik-gui-util-1.8.jar,\ - lib/batik-gvt-1.8.jar,\ - lib/batik-parser-1.8.jar,\ - lib/batik-script-1.8.jar,\ - lib/batik-svg-dom-1.8.jar,\ - lib/batik-svggen-1.8.jar,\ - lib/batik-swing-1.8.jar,\ - lib/batik-transcoder-1.8.jar,\ - lib/batik-util-1.8.jar,\ - lib/batik-xml-1.8.jar,\ lib/castor-core-1.3.3.jar,\ lib/castor-xml-1.3.3.jar,\ - lib/commons-digester-2.1.jar,\ - lib/commons-javaflow-20160505.jar,\ lib/fop-transcoder-allinone-1.1.jar,\ - lib/hibernate-core-3.3.2.GA.jar,\ - lib/itext-2.1.7.js5.jar,\ - lib/jaxen-1.1.1.jar,\ - lib/jcommon-1.0.23.jar,\ - lib/jfreechart-1.0.19.jar,\ lib/js.jar,\ - lib/jxl-2.6.10.jar,\ - lib/lucene-analyzers-common-4.5.1.jar,\ - lib/lucene-core-4.5.1.jar,\ - lib/lucene-queryparser-4.5.1.jar,\ lib/mondrian-3.1.1.12687.jar,\ lib/olap4j-0.9.7.309-JS-3.jar,\ lib/persistence-api-1.0.jar,\ - lib/poi-3.10.1.jar,\ - lib/poi-ooxml-3.10.1.jar,\ - lib/rhino-1.7.6.jar,\ lib/spring-beans-2.5.jar,\ lib/spring-core-2.5.jar,\ - lib/velocity-1.7.jar,\ lib/xml-apis-ext-1.3.04.jar,\ - lib/xmlgraphics-commons-1.5.jar,\ lib/xmpcore-5.1.1.jar,\ - lib/bcprov-jdk14-139.jar,\ - lib/core-3.2.1.jar,\ - lib/jasperreports-6.3.1.jar,\ lib/jasperreports-fonts-6.3.1.jar,\ - lib/jasperreports-functions-6.3.1.jar + lib/jasperreports-functions-6.3.1.jar,\ + lib/jasperreports-chart-customizers-6.3.1.jar,\ + lib/jasperreports-chart-themes-6.3.1.jar,\ + lib/bcprov-jdk14-139.jar diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml index 8b50ad9815..57cead5015 100644 --- a/org.adempiere.report.jasper.library/copyjars.xml +++ b/org.adempiere.report.jasper.library/copyjars.xml @@ -1,55 +1,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - + diff --git a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme index 91a8fad01e..e2c0670cfc 100644 --- a/org.adempiere.report.jasper.library/note_for_update_jr_library.readme +++ b/org.adempiere.report.jasper.library/note_for_update_jr_library.readme @@ -22,4 +22,18 @@ note for version 6.3.0 poi-3.10.1 haven't yet osgi version, ever on newest obit repository. so use Bundle-ClassPath batik haven't yet osgi version, ever on newest obit repository. so use Bundle-ClassPath current batik osgi version isn't use by other bundle, so can remove it. -itext is very old and have modify code from JP community, so use version from JP \ No newline at end of file +itext is very old and have modify code from JP community, so use version from JP + +========================== +note for p2 + +1. use jasper report at jasperreports-6.3.1/dist to create p2 + +2. use TIBCOJaspersoftStudio-6.3.1.final/plugins to create extra p2 for jasperreport, it provide almost dependency osgi version + +3. have to run ${ECLIPSE_FOLDER}/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher for TIBCOJaspersoftStudio-6.3.1.final/plugins + +4. com.jaspersoft.studio.bundles.itext_2.1.7.js5 need package from bcprov. idempiere already have osgi of bcprov at version 1.56 +but after 1.50 bcprov change some package like org.bouncycastle.ocsp to org.bouncycastle.cert.ocsp +success to run both version bcprov 1.50 and bcprov 1.56 but it make start progress take long time (about 2 minute) +so better use Bundle-ClassPath for bcprov-jdk14-139 go with jasperreport diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF index 4a6a8937a8..6cea09ab37 100644 --- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Import-Package: net.sf.jasperreports.engine, net.sf.jasperreports.engine.export, net.sf.jasperreports.view, - net.sf.jasperreports.view.images, org.adempiere.report.jasper, org.osgi.framework Service-Component: OSGI-INF/jrviewerprovider.xml diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF index a61006650c..e97cb7afd3 100644 --- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF @@ -5,12 +5,13 @@ Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true Bundle-Version: 4.1.0.qualifier Bundle-ClassPath: JasperReports.jar Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.apache.commons.codec, +Import-Package: net.sourceforge.barbecue;version="1.5.0.beta1", + org.apache.commons.codec, org.apache.commons.codec.binary, org.apache.commons.logging;version="1.1.1", org.apache.commons.logging.impl;version="1.1.1" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", - org.adempiere.report.jasper.library;bundle-version="0.0.0" + net.sf.jasperreports.engine;bundle-version="6.3.1" Service-Component: OSGI-INF/processfactory.xml Export-Package: org.adempiere.report.jasper Bundle-ActivationPolicy: lazy diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap index 879a39bfa9..cdc510651a 100644 --- a/org.adempiere.sdk-feature/adempiere.rmap +++ b/org.adempiere.sdk-feature/adempiere.rmap @@ -24,6 +24,10 @@ + + + + @@ -57,7 +61,21 @@ + + + + + + + + + + + + + + @@ -152,6 +170,10 @@ + + + + @@ -179,6 +201,13 @@ + + + + + + + diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties index 650a193a82..0ef1a6dc26 100644 --- a/org.adempiere.sdk-feature/materialize.properties +++ b/org.adempiere.sdk-feature/materialize.properties @@ -30,6 +30,8 @@ url.modify.bundle=http://downloads.sourceforge.net/project/idempiere/binary.file url.file.jp.lib=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-6.3.1 +url.jp.p2=http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/jp-p2/jp-6.3.1 + url.alpn.boot=http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar extend.bundle.folder.1 diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF index 9c577c294f..d888e56e51 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -72,7 +72,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.ui;bundle-version="0.0.0", org.restlet;bundle-version="0.0.0", org.restlet.ext.servlet;bundle-version="0.0.0", - groovy-all;bundle-version="0.0.0" + groovy-all;bundle-version="0.0.0", + org.jfree.chart-osgi;bundle-version="1.0.19" Eclipse-ExtensibleAPI: true Eclipse-RegisterBuddy: org.adempiere.base Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -84,6 +85,7 @@ Import-Package: javax.net.ssl, org.compiere.css, org.eclipse.core.runtime;version="3.4.0", org.eclipse.equinox.app, + org.jfree.ui;version="1.0.23", org.osgi.framework;version="1.5.0" Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 3d1253ea44..27e0cd61ac 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -24,6 +24,13 @@ Import-Package: javax.activation, org.apache.tools.ant, org.apache.tools.ant.taskdefs, org.compiere.css, + org.jfree.chart;version="1.0.19", + org.jfree.chart.encoders;version="1.0.19", + org.jfree.chart.entity;version="1.0.19", + org.jfree.chart.plot;version="1.0.19", + org.jfree.data;version="1.0.19", + org.jfree.data.general;version="1.0.19", + org.jfree.data.time;version="1.0.19", org.eclipse.core.runtime;version="3.4.0", org.osgi.framework;version="1.7.0", org.osgi.service.event;version="1.3.0", diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index de70e2b369..3671cae969 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Bundle-ClassPath: ., c3p0-0.9.5.jar, c3p0-oracle-thin-extras-0.9.5.jar, mchange-commons-java-0.2.9.jar -Import-Package: org.osgi.framework, +Import-Package: org.jfree.io;version="1.0.23", + org.osgi.framework, org.slf4j;version="1.7.2" Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 3d361e95bf..967988cfbd 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Bundle-ClassPath: ., Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.install;bundle-version="0.0.0" Import-Package: junit.framework;version="3.8.2", + org.jfree.io;version="1.0.23", org.junit;version="4.8.1", org.osgi.framework, org.slf4j;version="1.7.2"