IDEMPIERE-4933 Platform update for 9.x (#857)

* IDEMPIERE-4933 Platform update for 9.x

- WIP

* IDEMPIERE-4933 Platform update for 9.x

- project to repackaged some osgi bundles from maven

* IDEMPIERE-4933 Platform update for 9.x

- Fix target platform error

* IDEMPIERE-4933 Platform update for 9.x

* IDEMPIERE-4933 Platform update for 9.x

- minor eclipse setting fix
This commit is contained in:
hengsin 2021-09-04 22:12:10 +08:00 committed by GitHub
parent f1c663e100
commit ae5a665dd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
165 changed files with 4390 additions and 2313 deletions

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.base.feature" id="org.adempiere.base.feature"
label="Adempiere Base" label="Adempiere Base"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">
@ -82,20 +82,6 @@
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="javax.jms"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi-servlet-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.junit" id="org.junit"
download-size="0" download-size="0"
@ -110,20 +96,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.activemq.activemq-core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.activemq.kahadb"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.commons.collections" id="org.apache.commons.collections"
download-size="0" download-size="0"
@ -131,13 +103,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.commons.net"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.commons.logging" id="org.apache.commons.logging"
download-size="0" download-size="0"
@ -145,13 +110,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.xml.resolver" id="org.apache.xml.resolver"
download-size="0" download-size="0"
@ -235,13 +193,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.commons.beanutils"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.commons.lang" id="org.apache.commons.lang"
download-size="0" download-size="0"
@ -291,13 +242,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.commons.net"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.xalan" id="org.apache.xalan"
download-size="0" download-size="0"
@ -312,20 +256,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.poi.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.transaction-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="javax.interceptor-api" id="javax.interceptor-api"
download-size="0" download-size="0"
@ -340,13 +270,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="javax.inject"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec" id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec"
download-size="0" download-size="0"
@ -437,13 +360,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.sun.mail.imap"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="com.sun.mail.jakarta.mail" id="com.sun.mail.jakarta.mail"
download-size="0" download-size="0"
@ -451,20 +367,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.sun.mail.smtp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jakarta.mail.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="jakarta.xml.bind-api" id="jakarta.xml.bind-api"
download-size="0" download-size="0"
@ -472,13 +374,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.poi.poi-ooxml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="groovy-sql" id="groovy-sql"
download-size="0" download-size="0"
@ -487,13 +382,6 @@
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.commons.compress"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="jakarta.jws-api" id="jakarta.jws-api"
download-size="0" download-size="0"
@ -515,4 +403,151 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.glassfish.hk2.external.jakarta.inject"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.geronimo.specs.geronimo-jms_1.1_spec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jakarta.transaction-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.activemq.activemq-client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.commons-beanutils"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.commons-codec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.commons-compress"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.commons-net"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.activemq.activemq-jaas"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.activemq.activemq-kahadb-store"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.activemq.activemq-openwire-legacy"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.activemq.protobuf.activemq-protobuf"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.poi.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.poi.poi-ooxml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi.ooxml-schemas"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bcpg"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="bcutil"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="xstream"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fusesource.hawtbuf.hawtbuf"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.commons-text"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

View File

@ -44,29 +44,24 @@
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib.source"/> <setEntry value="org.apache.servicemix.bundles.cglib.source"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -76,20 +71,18 @@
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@1:true"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.jfree.chart@default:default"/> <setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -97,6 +90,14 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base@default:default"/> <setEntry value="org.adempiere.base@default:default"/>

View File

@ -32,6 +32,7 @@
<setAttribute key="selected_target_bundles"> <setAttribute key="selected_target_bundles">
<setEntry value="bcpkix@default:default"/> <setEntry value="bcpkix@default:default"/>
<setEntry value="bcprov@default:default"/> <setEntry value="bcprov@default:default"/>
<setEntry value="bcutil@default:default"/>
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/> <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/> <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
<setEntry value="com.github.librepdf.openpdf@default:default"/> <setEntry value="com.github.librepdf.openpdf@default:default"/>
@ -43,9 +44,7 @@
<setEntry value="com.google.zxing.core@default:default"/> <setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="groovy-console@default:false"/> <setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/> <setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/> <setEntry value="groovy-json@default:false"/>
@ -55,33 +54,29 @@
<setEntry value="groovy-xml@default:false"/> <setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/> <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
<setEntry value="org.apache.aries.util@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib.source"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.servicemix.bundles.xerces@default:default"/> <setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
<setEntry value="org.apache.xml.resolver@default:default"/> <setEntry value="org.apache.xml.resolver@default:default"/>
<setEntry value="org.apache.xml.serializer@default:default"/> <setEntry value="org.apache.xml.serializer@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -91,22 +86,25 @@
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@2:true"/>
<setEntry value="org.eclipse.equinox.event@2:true"/> <setEntry value="org.eclipse.equinox.event@2:true"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.util@default:default"/> <setEntry value="org.eclipse.jetty.util@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.jfree.chart@default:default"/> <setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.objectweb.asm.commons@default:default"/>
<setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
<setEntry value="org.objectweb.asm.tree@default:default"/>
<setEntry value="org.objectweb.asm.util@default:default"/>
<setEntry value="org.objectweb.asm@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -114,6 +112,14 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base.callout@default:default"/> <setEntry value="org.adempiere.base.callout@default:default"/>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.base.feature</artifactId> <artifactId>org.adempiere.base.feature</artifactId>

View File

@ -42,9 +42,7 @@
<setEntry value="com.google.zxing.core@default:default"/> <setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="groovy-console@default:false"/> <setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/> <setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/> <setEntry value="groovy-json@default:false"/>
@ -54,33 +52,29 @@
<setEntry value="groovy-xml@default:false"/> <setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/> <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
<setEntry value="org.apache.aries.util@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib.source"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.servicemix.bundles.xerces@default:default"/> <setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
<setEntry value="org.apache.xml.resolver@default:default"/> <setEntry value="org.apache.xml.resolver@default:default"/>
<setEntry value="org.apache.xml.serializer@default:default"/> <setEntry value="org.apache.xml.serializer@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -90,20 +84,23 @@
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@2:true"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.jfree.chart@default:default"/> <setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.objectweb.asm.commons@default:default"/>
<setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
<setEntry value="org.objectweb.asm.tree@default:default"/>
<setEntry value="org.objectweb.asm.util@default:default"/>
<setEntry value="org.objectweb.asm@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -111,6 +108,14 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base.callout@default:default"/> <setEntry value="org.adempiere.base.callout@default:default"/>

View File

@ -42,9 +42,7 @@
<setEntry value="com.google.zxing.core@default:default"/> <setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="groovy-console@default:false"/> <setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/> <setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/> <setEntry value="groovy-json@default:false"/>
@ -54,33 +52,34 @@
<setEntry value="groovy-xml@default:false"/> <setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/> <setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="xstream@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/> <setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/> <setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/> <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/> <setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/> <setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib.source"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.servicemix.bundles.xerces@default:default"/> <setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
<setEntry value="org.apache.xml.resolver@default:default"/> <setEntry value="org.apache.xml.resolver@default:default"/>
<setEntry value="org.apache.xml.serializer@default:default"/> <setEntry value="org.apache.xml.serializer@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/> <setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -90,21 +89,20 @@
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@2:true"/>
<setEntry value="org.eclipse.equinox.event@2:true"/> <setEntry value="org.eclipse.equinox.event@2:true"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.jfree.chart@default:default"/> <setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/> <setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -112,6 +110,13 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="org.objectweb.asm.commons@default:default"/>
<setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
<setEntry value="org.objectweb.asm.tree@default:default"/>
<setEntry value="org.objectweb.asm.util@default:default"/>
<setEntry value="org.objectweb.asm@default:default"/>
<setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
<setEntry value="org.apache.aries.util@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base.callout@default:default"/> <setEntry value="org.adempiere.base.callout@default:default"/>

View File

@ -33,7 +33,7 @@
<setEntry value="bcprov@default:default"/> <setEntry value="bcprov@default:default"/>
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/> <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/> <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
<setEntry value="com.github.relaxng.Datatype@default:default"/> <setEntry value="com.github.librepdf.openpdf@default:default"/>
<setEntry value="com.google.gson@default:default"/> <setEntry value="com.google.gson@default:default"/>
<setEntry value="com.google.guava.failureaccess@default:default"/> <setEntry value="com.google.guava.failureaccess@default:default"/>
<setEntry value="com.google.guava@default:default"/> <setEntry value="com.google.guava@default:default"/>
@ -42,9 +42,7 @@
<setEntry value="com.google.zxing.core@default:default"/> <setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="groovy-console@default:false"/> <setEntry value="groovy-console@default:false"/>
<setEntry value="groovy-datetime@default:false"/> <setEntry value="groovy-datetime@default:false"/>
<setEntry value="groovy-json@default:false"/> <setEntry value="groovy-json@default:false"/>
@ -54,33 +52,29 @@
<setEntry value="groovy-xml@default:false"/> <setEntry value="groovy-xml@default:false"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/> <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
<setEntry value="org.apache.aries.util@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib.source"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.servicemix.bundles.xerces@default:default"/> <setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
<setEntry value="org.apache.xml.resolver@default:default"/> <setEntry value="org.apache.xml.resolver@default:default"/>
<setEntry value="org.apache.xml.serializer@default:default"/> <setEntry value="org.apache.xml.serializer@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -90,20 +84,23 @@
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@2:true"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.jfree.chart@default:default"/> <setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.objectweb.asm.commons@default:default"/>
<setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
<setEntry value="org.objectweb.asm.tree@default:default"/>
<setEntry value="org.objectweb.asm.util@default:default"/>
<setEntry value="org.objectweb.asm@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -111,6 +108,14 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base.callout@default:default"/> <setEntry value="org.adempiere.base.callout@default:default"/>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Callout Bundle-Name: iDempiere Callout
Bundle-SymbolicName: org.adempiere.base.callout Bundle-SymbolicName: org.adempiere.base.callout
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Require-Bundle: org.adempiere.base;bundle-version="0.0.0"

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.base.callout</artifactId> <artifactId>org.adempiere.base.callout</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Processes Bundle-Name: iDempiere Processes
Bundle-SymbolicName: org.adempiere.base.process Bundle-SymbolicName: org.adempiere.base.process
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Require-Bundle: org.adempiere.base;bundle-version="0.0.0"

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.base.process</artifactId> <artifactId>org.adempiere.base.process</artifactId>

View File

@ -31,12 +31,12 @@
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.pde.ds.core.builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.pde.ds.core.builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Core Bundle-Name: iDempiere Core
Bundle-SymbolicName: org.adempiere.base;singleton:=true Bundle-SymbolicName: org.adempiere.base;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-ClassPath: ., Bundle-ClassPath: .,
lib/bsh.jar, lib/bsh.jar,
lib/commons-validator.jar, lib/commons-validator.jar,
@ -68,26 +68,26 @@ Import-Package: com.google.zxing,
com.google.zxing.qrcode.decoder, com.google.zxing.qrcode.decoder,
com.google.zxing.qrcode.encoder, com.google.zxing.qrcode.encoder,
com.sun.mail.smtp;version="1.5", com.sun.mail.smtp;version="1.5",
io.grpc;version="1.35.0", io.grpc;version="1.27.0",
io.opencensus.common;version="0.28.3", io.opencensus.common;version="0.28.0",
io.opencensus.contrib.http;version="0.28.3", io.opencensus.contrib.http;version="0.28.0",
io.opencensus.contrib.http.util;version="0.28.3", io.opencensus.contrib.http.util;version="0.28.0",
io.opencensus.internal;version="0.28.3", io.opencensus.internal;version="0.28.0",
io.opencensus.metrics;version="0.28.3", io.opencensus.metrics;version="0.28.0",
io.opencensus.metrics.data;version="0.28.3", io.opencensus.metrics.data;version="0.28.0",
io.opencensus.metrics.export;version="0.28.3", io.opencensus.metrics.export;version="0.28.0",
io.opencensus.resource;version="0.28.3", io.opencensus.resource;version="0.28.0",
io.opencensus.stats;version="0.28.3", io.opencensus.stats;version="0.28.0",
io.opencensus.tags;version="0.28.3", io.opencensus.tags;version="0.28.0",
io.opencensus.tags.propagation;version="0.28.3", io.opencensus.tags.propagation;version="0.28.0",
io.opencensus.tags.unsafe;version="0.28.3", io.opencensus.tags.unsafe;version="0.28.0",
io.opencensus.trace;version="0.28.3", io.opencensus.trace;version="0.28.0",
io.opencensus.trace.config;version="0.28.3", io.opencensus.trace.config;version="0.28.0",
io.opencensus.trace.export;version="0.28.3", io.opencensus.trace.export;version="0.28.0",
io.opencensus.trace.internal;version="0.28.3", io.opencensus.trace.internal;version="0.28.0",
io.opencensus.trace.propagation;version="0.28.3", io.opencensus.trace.propagation;version="0.28.0",
io.opencensus.trace.samplers;version="0.28.3", io.opencensus.trace.samplers;version="0.28.0",
io.opencensus.trace.unsafe;version="0.28.3", io.opencensus.trace.unsafe;version="0.28.0",
javax.jms;version="1.1.0", javax.jms;version="1.1.0",
javax.mail;version="1.5", javax.mail;version="1.5",
javax.mail.internet;version="1.5", javax.mail.internet;version="1.5",
@ -114,7 +114,8 @@ Import-Package: com.google.zxing,
org.apache.commons.net.ftp, org.apache.commons.net.ftp,
org.apache.ecs, org.apache.ecs,
org.apache.ecs.xhtml, org.apache.ecs.xhtml,
org.apache.felix.scr;version="1.6.0", org.apache.felix.scr.component;version="1.1.0",
org.apache.felix.scr.info;version="1.0.0",
org.apache.tools.ant, org.apache.tools.ant,
org.apache.tools.ant.taskdefs, org.apache.tools.ant.taskdefs,
org.eclipse.core.runtime;version="3.4.0", org.eclipse.core.runtime;version="3.4.0",
@ -133,6 +134,7 @@ Import-Package: com.google.zxing,
org.osgi.service.event;version="1.2.0", org.osgi.service.event;version="1.2.0",
org.osgi.util.promise;version="1.0.0", org.osgi.util.promise;version="1.0.0",
org.osgi.util.tracker;version="1.5.0" org.osgi.util.tracker;version="1.5.0"
DynamicImport-Package: org.adempiere.db.*
Eclipse-BuddyPolicy: registered Eclipse-BuddyPolicy: registered
Eclipse-ExtensibleAPI: true Eclipse-ExtensibleAPI: true
Bundle-Activator: org.adempiere.base.BaseActivator Bundle-Activator: org.adempiere.base.BaseActivator
@ -146,23 +148,23 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
org.krysalis.barcode4j;bundle-version="0.0.0", org.krysalis.barcode4j;bundle-version="0.0.0",
groovy, groovy,
com.sun.activation.jakarta.activation;bundle-version="1.2.1", com.sun.activation.jakarta.activation;bundle-version="1.2.1",
org.apache.poi.poi;bundle-version="4.1.0", org.apache.commons.commons-compress;bundle-version="1.21.0",
org.apache.poi.poi-ooxml;bundle-version="4.1.0",
org.apache.commons.compress;bundle-version="1.18.0",
org.apache.poi.poi-ooxml-schemas;bundle-version="4.1.0",
org.apache.xmlbeans;bundle-version="3.1.0",
org.jfree.chart;bundle-version="1.0.19",
org.jfree.jcommon;bundle-version="1.0.23",
com.google.gson;bundle-version="2.8.2", com.google.gson;bundle-version="2.8.2",
com.google.http-client.google-http-client;bundle-version="1.38.1", com.google.http-client.google-http-client;bundle-version="1.38.1",
com.google.oauth-client;bundle-version="1.31.4", com.google.oauth-client;bundle-version="1.31.4",
wrapped.com.google.http-client.google-http-client-gson;bundle-version="1.38.1",
org.apache.httpcomponents.httpclient;bundle-version="4.5.10", org.apache.httpcomponents.httpclient;bundle-version="4.5.10",
org.apache.httpcomponents.httpcore;bundle-version="4.4.12", org.apache.httpcomponents.httpcore;bundle-version="4.4.12",
com.google.guava;bundle-version="28.2.0", com.google.guava;bundle-version="28.2.0",
com.github.librepdf.openpdf;bundle-version="1.3.26",
com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26",
wrapped.org.apache.poi.poi;bundle-version="4.1.2",
wrapped.org.apache.poi.poi-ooxml;bundle-version="4.1.2",
wrapped.org.apache.xmlbeans.xmlbeans;bundle-version="3.1.0",
wrapped.org.jfree.jcommon;bundle-version="1.0.24",
wrapped.org.jfree.jfreechart;bundle-version="1.5.3",
wrapped.com.google.http-client.google-http-client-gson;bundle-version="1.39.2",
wrapped.com.google.zxing.javase;bundle-version="3.4.1", wrapped.com.google.zxing.javase;bundle-version="3.4.1",
wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1", wrapped.dev.samstevens.totp.totp;bundle-version="1.7.1",
com.github.librepdf.openpdf;bundle-version="1.3.26", org.apache.poi.ooxml-schemas;bundle-version="4.1.2"
com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26"
Automatic-Module-Name: org.adempiere.base Automatic-Module-Name: org.adempiere.base
Bundle-Vendor: iDempiere Community Bundle-Vendor: iDempiere Community

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.base</artifactId> <artifactId>org.adempiere.base</artifactId>
@ -36,7 +36,7 @@
<artifactItem> <artifactItem>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
<version>1.6</version> <version>1.7</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.apache.avalon.framework</groupId> <groupId>org.apache.avalon.framework</groupId>

View File

@ -155,6 +155,7 @@ public class ChartBuilder {
} }
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
private void addData(MChartDatasource ds) { private void addData(MChartDatasource ds) {
String value = ds.getValueColumn(); String value = ds.getValueColumn();
@ -371,6 +372,7 @@ public class ChartBuilder {
return (IntervalXYDataset) dataset; return (IntervalXYDataset) dataset;
} }
@SuppressWarnings("rawtypes")
public PieDataset getPieDataset() { public PieDataset getPieDataset() {
dataset = new DefaultPieDataset(); dataset = new DefaultPieDataset();
loadData(); loadData();
@ -461,7 +463,7 @@ public class ChartBuilder {
} }
private JFreeChart create3DPieChart() { private JFreeChart create3DPieChart() {
final JFreeChart chart = ChartFactory.createPieChart3D(chartModel.get_Translation(MChart.COLUMNNAME_Name), final JFreeChart chart = ChartFactory.createPieChart(chartModel.get_Translation(MChart.COLUMNNAME_Name),
getPieDataset(), false, true, true); getPieDataset(), false, true, true);
return chart; return chart;
@ -491,7 +493,7 @@ public class ChartBuilder {
} }
private JFreeChart create3DBarChart() { private JFreeChart create3DBarChart() {
JFreeChart chart = ChartFactory.createBarChart3D( JFreeChart chart = ChartFactory.createBarChart(
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
@ -532,7 +534,7 @@ public class ChartBuilder {
} }
private JFreeChart create3DStackedBarChart() { private JFreeChart create3DStackedBarChart() {
JFreeChart chart = ChartFactory.createStackedBarChart3D( JFreeChart chart = ChartFactory.createStackedBarChart(
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label
@ -605,7 +607,7 @@ public class ChartBuilder {
private JFreeChart create3DLineChart() { private JFreeChart create3DLineChart() {
// create the chart... // create the chart...
JFreeChart chart = ChartFactory.createLineChart3D( JFreeChart chart = ChartFactory.createLineChart(
chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title chartModel.get_Translation(MChart.COLUMNNAME_Name), // chart title
chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label chartModel.get_Translation(MChart.COLUMNNAME_DomainLabel), // domain axis label
chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label chartModel.get_Translation(MChart.COLUMNNAME_RangeLabel), // range axis label

View File

@ -45,6 +45,7 @@ public class GraphBuilder {
protected String m_Y_AxisLabel = "Y Axis"; protected String m_Y_AxisLabel = "Y Axis";
protected DefaultCategoryDataset dataset = new DefaultCategoryDataset(); protected DefaultCategoryDataset dataset = new DefaultCategoryDataset();
protected DefaultCategoryDataset linearDataset = new DefaultCategoryDataset(); protected DefaultCategoryDataset linearDataset = new DefaultCategoryDataset();
@SuppressWarnings("rawtypes")
protected DefaultPieDataset pieDataset = new DefaultPieDataset(); protected DefaultPieDataset pieDataset = new DefaultPieDataset();
private static final CLogger log = CLogger.getCLogger(GraphBuilder.class); private static final CLogger log = CLogger.getCLogger(GraphBuilder.class);
@ -113,7 +114,7 @@ public class GraphBuilder {
} }
private JFreeChart createBarChart() { private JFreeChart createBarChart() {
JFreeChart chart = ChartFactory.createBarChart3D( JFreeChart chart = ChartFactory.createBarChart(
m_goal.getMeasure().getName(), // chart title m_goal.getMeasure().getName(), // chart title
m_X_AxisLabel, // domain axis label m_X_AxisLabel, // domain axis label
m_Y_AxisLabel, // range axis label m_Y_AxisLabel, // range axis label
@ -129,7 +130,7 @@ public class GraphBuilder {
} }
private JFreeChart createPieChart() { private JFreeChart createPieChart() {
final JFreeChart chart = ChartFactory.createPieChart3D(m_goal.getMeasure().getName(), final JFreeChart chart = ChartFactory.createPieChart(m_goal.getMeasure().getName(),
pieDataset, false, true, true); pieDataset, false, true, true);
return chart; return chart;
@ -168,7 +169,7 @@ public class GraphBuilder {
private JFreeChart createLineChart() { private JFreeChart createLineChart() {
// create the chart... // create the chart...
JFreeChart chart = ChartFactory.createLineChart3D( JFreeChart chart = ChartFactory.createLineChart(
m_goal.getMeasure().getName(), // chart title m_goal.getMeasure().getName(), // chart title
m_X_AxisLabel, // domain axis label m_X_AxisLabel, // domain axis label
m_Y_AxisLabel, // range axis label m_Y_AxisLabel, // range axis label
@ -250,6 +251,7 @@ public class GraphBuilder {
return list; return list;
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
public void loadDataSet(List<GraphColumn> list) { public void loadDataSet(List<GraphColumn> list) {
pieDataset = new DefaultPieDataset(); pieDataset = new DefaultPieDataset();
dataset = new DefaultCategoryDataset(); dataset = new DefaultCategoryDataset();

View File

@ -64,9 +64,9 @@ public final class Adempiere
/** Timestamp */ /** Timestamp */
static public final String ID = "$Id: Adempiere.java,v 1.8 2006/08/11 02:58:14 jjanke Exp $"; static public final String ID = "$Id: Adempiere.java,v 1.8 2006/08/11 02:58:14 jjanke Exp $";
/** Main Version String */ /** Main Version String */
static public String MAIN_VERSION = "Release 8.2"; static public String MAIN_VERSION = "Development 9.0";
/** Detail Version as date Used for Client/Server */ /** Detail Version as date Used for Client/Server */
static public String DATE_VERSION = "2020-12-20"; static public String DATE_VERSION = "2021-09-01";
/** Database Version as date Compared with AD_System */ /** Database Version as date Compared with AD_System */
static public String DB_VERSION = "2020-12-20"; static public String DB_VERSION = "2020-12-20";
@ -560,6 +560,8 @@ public final class Adempiere
log.log(Level.FINEST, System.getProperties().toString()); log.log(Level.FINEST, System.getProperties().toString());
} }
loadDBProvider();
// Set Default Database Connection from Ini // Set Default Database Connection from Ini
DB.setDBTarget(CConnection.get()); DB.setDBTarget(CConnection.get());
@ -573,6 +575,19 @@ public final class Adempiere
return startupEnvironment(isClient); return startupEnvironment(isClient);
} // startup } // startup
private static void loadDBProvider() {
try {
Adempiere.class.getClassLoader().loadClass("org.adempiere.db.oracle.config.ConfigOracle");
} catch (Exception e) {
e.printStackTrace();
}
try {
Adempiere.class.getClassLoader().loadClass("org.adempiere.db.postgresql.config.ConfigPostgreSQL");
} catch (Exception e) {
e.printStackTrace();
}
}
private static void createThreadPool() { private static void createThreadPool() {
int max = Runtime.getRuntime().availableProcessors() * 20; int max = Runtime.getRuntime().availableProcessors() * 20;
int defaultMax = max; int defaultMax = max;

View File

@ -367,7 +367,6 @@ public class DocumentEngine implements DocAction
for (PO docafter : docsPostProcess) { for (PO docafter : docsPostProcess) {
if (docafter.get_ValueAsBoolean("Posted")) if (docafter.get_ValueAsBoolean("Posted"))
continue; continue;
@SuppressWarnings("unused")
String ignoreError = DocumentEngine.postImmediate(docafter.getCtx(), docafter.getAD_Client_ID(), docafter.get_Table_ID(), docafter.get_ID(), true, docafter.get_TrxName()); String ignoreError = DocumentEngine.postImmediate(docafter.getCtx(), docafter.getAD_Client_ID(), docafter.get_Table_ID(), docafter.get_ID(), true, docafter.get_TrxName());
if (!Util.isEmpty(ignoreError, true)) { if (!Util.isEmpty(ignoreError, true)) {
log.warning("Error posting " + docafter + ". Error="+ignoreError); log.warning("Error posting " + docafter + ". Error="+ignoreError);

View File

@ -57,11 +57,15 @@ public class CLogFilter implements Filter
*/ */
public boolean isLoggable (LogRecord record) public boolean isLoggable (LogRecord record)
{ {
String loggerName = record.getLoggerName();
if ("org.eclipse.jetty.annotations.AnnotationParser".equals(loggerName)
|| "org.eclipse.jetty.annotations.ClassInheritanceHandler".equals(loggerName))
return false;
if (record.getLevel() == Level.SEVERE if (record.getLevel() == Level.SEVERE
|| record.getLevel() == Level.WARNING) || record.getLevel() == Level.WARNING)
return true; return true;
// //
String loggerName = record.getLoggerName();
if (loggerName != null) if (loggerName != null)
{ {
// if (loggerName.toLowerCase().indexOf("focus") != -1) // if (loggerName.toLowerCase().indexOf("focus") != -1)

View File

@ -9,18 +9,18 @@ Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
et;tag=v20100503 et;tag=v20100503
Bundle-Activator: org.adempiere.eclipse.equinox.http.servlet.Activator Bundle-Activator: org.adempiere.eclipse.equinox.http.servlet.Activator
Export-Package: org.adempiere.eclipse.equinox.http.servlet Export-Package: org.adempiere.eclipse.equinox.http.servlet
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Name: %bundleName Bundle-Name: %bundleName
Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are
specified for compatibility with 3.2 specified for compatibility with 3.2
Import-Package: javax.servlet;version="2.3", Import-Package: javax.servlet;version="4.0",
javax.servlet.descriptor;version="3.0.0", javax.servlet.descriptor;version="4.0",
javax.servlet.http;version="2.3", javax.servlet.http;version="4.0",
org.eclipse.equinox.http.servlet;version="1.2.0", org.eclipse.equinox.http.servlet;version="1.2.0",
org.osgi.framework;version="1.3.0", org.osgi.framework;version="1.10.0",
org.osgi.service.http;version="1.2.0" org.osgi.service.http;version="1.2.1"
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-ClassPath: . Bundle-ClassPath: .
Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servlet Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servlet

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.eclipse.equinox.http.servlet</artifactId> <artifactId>org.adempiere.eclipse.equinox.http.servlet</artifactId>

View File

@ -302,4 +302,39 @@ public class ServletContextAdaptor implements ServletContext {
public String getVirtualServerName() { public String getVirtualServerName() {
return servletContext.getVirtualServerName(); return servletContext.getVirtualServerName();
} }
@Override
public javax.servlet.ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
return servletContext.addJspFile(servletName, jspFile);
}
@Override
public int getSessionTimeout() {
return servletContext.getSessionTimeout();
}
@Override
public void setSessionTimeout(int sessionTimeout) {
servletContext.setSessionTimeout(sessionTimeout);
}
@Override
public String getRequestCharacterEncoding() {
return servletContext.getRequestCharacterEncoding();
}
@Override
public void setRequestCharacterEncoding(String encoding) {
servletContext.setRequestCharacterEncoding(encoding);
}
@Override
public String getResponseCharacterEncoding() {
return servletContext.getResponseCharacterEncoding();
}
@Override
public void setResponseCharacterEncoding(String encoding) {
servletContext.setResponseCharacterEncoding(encoding);
}
} }

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Setup Bundle-Name: iDempiere Setup
Bundle-SymbolicName: org.adempiere.install;singleton:=true Bundle-SymbolicName: org.adempiere.install;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Export-Package: org.adempiere.install, Export-Package: org.adempiere.install,
org.compiere.install org.compiere.install
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Require-Bundle: org.adempiere.base;bundle-version="0.0.0",

View File

@ -29,6 +29,7 @@
<setAttribute key="selected_target_bundles"> <setAttribute key="selected_target_bundles">
<setEntry value="bcpkix@default:default"/> <setEntry value="bcpkix@default:default"/>
<setEntry value="bcprov@default:default"/> <setEntry value="bcprov@default:default"/>
<setEntry value="bcutil@default:default"/>
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/> <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
<setEntry value="com.github.librepdf.openpdf@default:default"/> <setEntry value="com.github.librepdf.openpdf@default:default"/>
<setEntry value="com.google.gson@default:default"/> <setEntry value="com.google.gson@default:default"/>
@ -40,36 +41,28 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/> <setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/> <setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.mail.api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -79,24 +72,22 @@
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@1:true"/>
<setEntry value="org.eclipse.equinox.event@default:default"/> <setEntry value="org.eclipse.equinox.event@default:default"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.util@default:default"/> <setEntry value="org.eclipse.jetty.util@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.hamcrest.core@default:default"/> <setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.jfree.chart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.junit@default:default"/> <setEntry value="org.junit@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -104,6 +95,14 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base@default:default"/> <setEntry value="org.adempiere.base@default:default"/>

View File

@ -29,6 +29,7 @@
<setAttribute key="selected_target_bundles"> <setAttribute key="selected_target_bundles">
<setEntry value="bcpkix@default:default"/> <setEntry value="bcpkix@default:default"/>
<setEntry value="bcprov@default:default"/> <setEntry value="bcprov@default:default"/>
<setEntry value="bcutil@default:default"/>
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/> <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
<setEntry value="com.github.librepdf.openpdf@default:default"/> <setEntry value="com.github.librepdf.openpdf@default:default"/>
<setEntry value="com.google.gson@default:default"/> <setEntry value="com.google.gson@default:default"/>
@ -40,35 +41,33 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/> <setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/> <setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.mail.api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/> <setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/> <setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/> <setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/> <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/> <setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/> <setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/> <setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
<setEntry value="org.eclipse.core.jobs@default:default"/> <setEntry value="org.eclipse.core.jobs@default:default"/>
@ -76,24 +75,23 @@
<setEntry value="org.eclipse.core.variables@default:default"/> <setEntry value="org.eclipse.core.variables@default:default"/>
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.ds@1:true"/>
<setEntry value="org.eclipse.equinox.event@default:default"/> <setEntry value="org.eclipse.equinox.event@default:default"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.util@default:default"/> <setEntry value="org.eclipse.jetty.util@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.hamcrest.core@default:default"/> <setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.jfree.chart@default:default"/> <setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/> <setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.junit@default:default"/> <setEntry value="org.junit@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -101,6 +99,7 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base@default:default"/> <setEntry value="org.adempiere.base@default:default"/>

View File

@ -29,6 +29,7 @@
<setAttribute key="selected_target_bundles"> <setAttribute key="selected_target_bundles">
<setEntry value="bcpkix@default:default"/> <setEntry value="bcpkix@default:default"/>
<setEntry value="bcprov@default:default"/> <setEntry value="bcprov@default:default"/>
<setEntry value="bcutil@default:default"/>
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/> <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
<setEntry value="com.github.librepdf.openpdf@default:default"/> <setEntry value="com.github.librepdf.openpdf@default:default"/>
<setEntry value="com.google.gson@default:default"/> <setEntry value="com.google.gson@default:default"/>
@ -40,34 +41,26 @@
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/> <setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/> <setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.mail.api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -76,24 +69,22 @@
<setEntry value="org.eclipse.core.variables@default:default"/> <setEntry value="org.eclipse.core.variables@default:default"/>
<setEntry value="org.eclipse.equinox.app@default:default"/> <setEntry value="org.eclipse.equinox.app@default:default"/>
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.ds@1:true"/>
<setEntry value="org.eclipse.equinox.event@default:default"/> <setEntry value="org.eclipse.equinox.event@default:default"/>
<setEntry value="org.eclipse.equinox.preferences@default:default"/> <setEntry value="org.eclipse.equinox.preferences@default:default"/>
<setEntry value="org.eclipse.equinox.registry@default:default"/> <setEntry value="org.eclipse.equinox.registry@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/> <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.util@default:default"/> <setEntry value="org.eclipse.jetty.util@default:default"/>
<setEntry value="org.eclipse.osgi.compatibility.state@default:false"/> <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
<setEntry value="org.eclipse.osgi.services@default:default"/> <setEntry value="org.eclipse.osgi.services@default:default"/>
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.hamcrest.core@default:default"/> <setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.jfree.chart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.junit@default:default"/> <setEntry value="org.junit@default:default"/>
<setEntry value="org.krysalis.barcode4j@default:default"/> <setEntry value="org.krysalis.barcode4j@default:default"/>
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
@ -101,6 +92,14 @@
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="xstream@default:default"/>
</setAttribute> </setAttribute>
<setAttribute key="selected_workspace_bundles"> <setAttribute key="selected_workspace_bundles">
<setEntry value="org.adempiere.base@default:default"/> <setEntry value="org.adempiere.base@default:default"/>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.install</artifactId> <artifactId>org.adempiere.install</artifactId>

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.payment.processor.feature" id="org.adempiere.payment.processor.feature"
label="Payment Processor" label="Payment Processor"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.payment.processor.feature</artifactId> <artifactId>org.adempiere.payment.processor.feature</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Payment Processor Bundle-Name: iDempiere Payment Processor
Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Require-Bundle: org.adempiere.base;bundle-version="0.0.0"

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.payment.processor</artifactId> <artifactId>org.adempiere.payment.processor</artifactId>

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.pipo.feature" id="org.adempiere.pipo.feature"
label="Pipo-feature" label="Pipo-feature"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.pipo.feature</artifactId> <artifactId>org.adempiere.pipo.feature</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere 2Pack Handlers Bundle-Name: iDempiere 2Pack Handlers
Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0", Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.pipo.handlers</artifactId> <artifactId>org.adempiere.pipo.handlers</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere 2Pack Core Bundle-Name: iDempiere 2Pack Core
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: org.apache.commons.codec, Import-Package: org.apache.commons.codec,

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.pipo</artifactId> <artifactId>org.adempiere.pipo</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Plugin Utils Bundle-Name: iDempiere Plugin Utils
Bundle-SymbolicName: org.adempiere.plugin.utils Bundle-SymbolicName: org.adempiere.plugin.utils
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: org.apache.xerces.dom;version="2.9.0", Import-Package: org.apache.xerces.dom;version="2.9.0",

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.plugin.utils</artifactId> <artifactId>org.adempiere.plugin.utils</artifactId>

View File

@ -21,10 +21,13 @@ import java.util.logging.Level;
import org.adempiere.base.Core; import org.adempiere.base.Core;
import org.adempiere.base.IDictionaryService; import org.adempiere.base.IDictionaryService;
import org.adempiere.util.IProcessUI; import org.adempiere.util.IProcessUI;
import org.compiere.Adempiere;
import org.compiere.model.MClient; import org.compiere.model.MClient;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.model.ServerStateChangeEvent;
import org.compiere.model.ServerStateChangeListener;
import org.compiere.model.X_AD_Package_Imp; import org.compiere.model.X_AD_Package_Imp;
import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfo;
import org.compiere.util.AdempiereSystemError; import org.compiere.util.AdempiereSystemError;
@ -250,9 +253,17 @@ public abstract class AbstractActivator implements BundleActivator, ServiceTrack
@Override @Override
public IDictionaryService addingService( public IDictionaryService addingService(
ServiceReference<IDictionaryService> reference) { ServiceReference<IDictionaryService> reference) {
Runnable runnable = () -> {
service = context.getService(reference); service = context.getService(reference);
if (isFrameworkStarted()) if (isFrameworkStarted())
frameworkStarted (); frameworkStarted ();
};
if (Adempiere.getThreadPoolExecutor() != null) {
Adempiere.getThreadPoolExecutor().submit(runnable);
} else {
MyServerStateChangeListener l = new MyServerStateChangeListener(runnable);
Adempiere.addServerStateChangeListener(l);
}
return null; return null;
} }
@ -265,4 +276,18 @@ public abstract class AbstractActivator implements BundleActivator, ServiceTrack
public void removedService(ServiceReference<IDictionaryService> reference, public void removedService(ServiceReference<IDictionaryService> reference,
IDictionaryService service) { IDictionaryService service) {
} }
private class MyServerStateChangeListener implements ServerStateChangeListener {
private Runnable runnable;
private MyServerStateChangeListener(Runnable r) {
this.runnable = r;
}
@Override
public void stateChange(ServerStateChangeEvent e) {
if (e.getEventType() == ServerStateChangeEvent.SERVER_START) {
Adempiere.getThreadPoolExecutor().submit(runnable);
Adempiere.removeServerStateChangeListener(this);
}
}
}
} }

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.replication.feature" id="org.adempiere.replication.feature"
label="Replication-feature" label="Replication-feature"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.replication.feature</artifactId> <artifactId>org.adempiere.replication.feature</artifactId>

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.replication.server.feature" id="org.adempiere.replication.server.feature"
label="Replication Server-feature" label="Replication Server-feature"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.replication.server.feature</artifactId> <artifactId>org.adempiere.replication.server.feature</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Replication Server Bundle-Name: iDempiere Replication Server
Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.server;bundle-version="0.0.0", Require-Bundle: org.adempiere.server;bundle-version="0.0.0",

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.replication.server</artifactId> <artifactId>org.adempiere.replication.server</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Replication Bundle-Name: iDempiere Replication
Bundle-SymbolicName: org.adempiere.replication;singleton:=true Bundle-SymbolicName: org.adempiere.replication;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Require-Bundle: org.adempiere.base;bundle-version="0.0.0"

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.replication</artifactId> <artifactId>org.adempiere.replication</artifactId>

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.report.jasper.feature" id="org.adempiere.report.jasper.feature"
label="JasperReport-feature" label="JasperReport-feature"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">
@ -21,13 +21,13 @@
id="org.adempiere.report.jasper" id="org.adempiere.report.jasper"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="8.2.0.qualifier"/> version="0.0.0"/>
<plugin <plugin
id="org.adempiere.report.jasper.library" id="org.adempiere.report.jasper.library"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="8.2.0.qualifier" version="0.0.0"
fragment="true"/> fragment="true"/>
<plugin <plugin
@ -36,13 +36,6 @@
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin
id="org.antlr.runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="com.jaspersoft.studio.bundles.barbecue" id="com.jaspersoft.studio.bundles.barbecue"
download-size="0" download-size="0"
@ -78,13 +71,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.jfree.jcommon"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.servicemix.bundles.rhino" id="org.apache.servicemix.bundles.rhino"
download-size="0" download-size="0"
@ -92,13 +78,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.jfree.chart"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="net.sf.jasperreports.engine" id="net.sf.jasperreports.engine"
download-size="0" download-size="0"
@ -106,20 +85,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.dom4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.w3c.dom.smil"
download-size="0"
install-size="0"
version="1.0.0.v200806040011"
unpack="false"/>
<plugin <plugin
id="org.w3c.dom.svg" id="org.w3c.dom.svg"
download-size="0" download-size="0"
@ -141,13 +106,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.commons.digester"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="com.google.zxing.core" id="com.google.zxing.core"
download-size="0" download-size="0"
@ -155,34 +113,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.poi.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi.poi-ooxml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi.poi-ooxml-schemas"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="com.fasterxml.jackson.core.jackson-annotations" id="com.fasterxml.jackson.core.jackson-annotations"
download-size="0" download-size="0"
@ -271,7 +201,7 @@
id="javax.validation.api" id="javax.validation.api"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="1.1.0.Final" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
@ -316,146 +246,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-anim"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-bridge"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-codec"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-constants"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-css"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-dom"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-svg-dom"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-ext"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-awt-util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-extension"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-gvt"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-i18n"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-parser"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-script"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-svggen"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.xmlgraphics.batik-xml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.lucene.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.lucene.analyzers-common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.github.relaxng.Datatype"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.apache.commons.math3" id="org.apache.commons.math3"
download-size="0" download-size="0"
@ -463,4 +253,116 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="com.sun.xml.bind.external.relaxng-datatype"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.antlr.antlr4-runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.batik"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.w3c.dom.smil"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.lucene.lucene-analyzers-common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.lucene.lucene-core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.poi.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.poi.poi-ooxml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.poi.ooxml-schemas"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.apache.xmlgraphics.xmlgraphics-commons"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.dom4j.dom4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.jfree.jcommon"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.org.jfree.jfreechart"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.w3c.dom.events"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.jaspersoft.studio.bundles.commons-digester"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.com.zaxxer.SparseBitSet"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.report.jasper.feature</artifactId> <artifactId>org.adempiere.report.jasper.feature</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: Library Bundle-Name: Library
Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.11.0" Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.11.0"
@ -14,8 +14,6 @@ Bundle-ClassPath: .,
lib/jasperreports-fonts.jar, lib/jasperreports-fonts.jar,
lib/jasperreports-functions.jar, lib/jasperreports-functions.jar,
lib/olap4j.jar, lib/olap4j.jar,
lib/xmpcore.jar, lib/xmpcore.jar
lib/SparseBitSet.jar
Automatic-Module-Name: org.adempiere.report.jasper.library Automatic-Module-Name: org.adempiere.report.jasper.library
Bundle-Vendor: iDempiere Community Bundle-Vendor: iDempiere Community
Export-Package: com.zaxxer.sparsebits

View File

@ -7,5 +7,4 @@ bin.includes = META-INF/,\
lib/jasperreports-fonts.jar,\ lib/jasperreports-fonts.jar,\
lib/jasperreports-functions.jar,\ lib/jasperreports-functions.jar,\
lib/olap4j.jar,\ lib/olap4j.jar,\
lib/xmpcore.jar,\ lib/xmpcore.jar
lib/SparseBitSet.jar

View File

@ -1,53 +1,10 @@
jasper report use some library have osgi version on maven or orbit. Guide for update:
but alot not yet have osgi version or have but outdate. 1. Download release file from https://github.com/TIBCOSoftware/jasperreports/releases (jasperreports-x.x.x-project.zip)
it ever use a modify version like itext
guide for update: 2. Extract it and get the version of dependencies from ivy.xml.
1. download distribute at https://sourceforge.net/projects/jasperreports/files/jasperreports/
download file (jasperreports-x.x.x-project.zip)
2. extract it and run ant to get all dependency library 3. Update pom.xml with updated version of dependencies (if any has change)
(ant just get normal library to let Jasperreport do common job,
for extra like encrypt, have go to sample project to get dependency
but just focus common job and already know extra like encrypt)
3. also download jasperreports-functions-x.x.x.jar and jasperreports-fonts-x.x.x.jar 4. We get some dependencies from jasper studio's p2 repository (https://sourceforge.net/projects/jasperstudio/files/updatesite/${version},
maintained at org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd). If we moved to a new version of JasperReport,
4. now edit org.adempiere.report.jasper.library follow bellow rule We need to update the repository version at org.idempiere.p2.targetplatform.tpd and re-create org.idempiere.p2.targetplatform.target
+ if library have same version with library already use on idempiere, just use import package or bundle dependency
+ if library have osgi on net (manven, orbit,...), add to org.adempiere.base-feature or org.adempiere.report.jasper-feature to materialize it
+ if library not yet have osgi version, push it in lib folder and use Bundle-ClassPath
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
==========================
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
5. TIBCOJaspersoftStudio-6.3.1.final/plugins also have osgi version of jasper report runtime, bundle name net.sf.jasperreports, file name net.sf.jasperreports_6.3.1.final
but it use bundle dependency, so have to use all bundle package by jasper ever it already have osgi version on idempiere
it ever force us to use a old version of beanshell (bsh-2.0b4) with a security issue
so i like to create osgi version from jasperreports-6.3.1/dist/jasperreports-6.3.1.jar
manifest of jasperreports-6.3.1.jar already have osgi metadata and bundle name is net.sf.jasperreports.engine
so just change file name to net.sf.jasperreports.engine_6.3.1.jar and run ${ECLIPSE_FOLDER}/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher
note: net.sf.jasperreports.engine_6.3.1.jar use package dynamic import
6. com.jaspersoft.studio.bundles.itext_2.1.7.js5 already have bcprov-jdk14-139 on Bundle-ClassPath, but manifest still import package from bcprov-jdk14-139. so i modify its manifest before call ${ECLIPSE_FOLDER}/eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher
7. org.krysalis.barcode4j_2.1.0.jar have osgi version on maven but it dependency to org.apache.avalon, so use version from jasper report. it modify manifest.mf to don't depend to org.apache.avalon

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.report.jasper.library</artifactId> <artifactId>org.adempiere.report.jasper.library</artifactId>
@ -63,11 +63,6 @@
<artifactId>xmpcore</artifactId> <artifactId>xmpcore</artifactId>
<version>5.1.3</version> <version>5.1.3</version>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>com.zaxxer</groupId>
<artifactId>SparseBitSet</artifactId>
<version>1.2</version>
</artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<stripVersion>true</stripVersion> <stripVersion>true</stripVersion>

View File

@ -2,10 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere JasperReport integration Bundle-Name: iDempiere JasperReport integration
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: net.sourceforge.barbecue, Import-Package: com.zaxxer.sparsebits;version="1.2.0",
net.sourceforge.barbecue,
org.apache.commons.codec, org.apache.commons.codec,
org.apache.commons.codec.binary, org.apache.commons.codec.binary,
org.apache.commons.logging;version="1.1.1", org.apache.commons.logging;version="1.1.1",
@ -17,7 +18,8 @@ Import-Package: net.sourceforge.barbecue,
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
net.sf.jasperreports.engine;bundle-version="6.3.1", net.sf.jasperreports.engine;bundle-version="6.3.1",
com.github.librepdf.openpdf;bundle-version="1.3.26", com.github.librepdf.openpdf;bundle-version="1.3.26",
com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26" com.github.librepdf.openpdf-fonts-extra;bundle-version="1.3.26",
com.jaspersoft.studio.bundles.commons-digester;bundle-version="2.1.0"
Service-Component: OSGI-INF/*.xml Service-Component: OSGI-INF/*.xml
Export-Package: org.adempiere.report.jasper Export-Package: org.adempiere.report.jasper
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.report.jasper</artifactId> <artifactId>org.adempiere.report.jasper</artifactId>

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.server.feature" id="org.adempiere.server.feature"
label="iDempiere Server-feature" label="iDempiere Server-feature"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">
@ -68,13 +68,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.taglibs.standard-jstlel"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="javax.websocket-api" id="javax.websocket-api"
download-size="0" download-size="0"
@ -158,13 +151,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.aries.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.objectweb.asm.commons" id="org.objectweb.asm.commons"
download-size="0" download-size="0"
@ -348,13 +334,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.jetty.websocket.common" id="org.eclipse.jetty.websocket.common"
download-size="0" download-size="0"
@ -362,20 +341,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.javax.websocket.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.javax.websocket"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.eclipse.jetty.websocket.server" id="org.eclipse.jetty.websocket.server"
download-size="0" download-size="0"
@ -401,7 +366,7 @@
id="slf4j.api" id="slf4j.api"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="1.7.30"
unpack="false"/> unpack="false"/>
<plugin <plugin
@ -454,13 +419,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.eclipse.jetty.continuation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="jakarta.persistence-api" id="jakarta.persistence-api"
download-size="0" download-size="0"
@ -475,13 +433,6 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.aopalliance"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="org.objectweb.asm.util" id="org.objectweb.asm.util"
download-size="0" download-size="0"
@ -518,7 +469,57 @@
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.jsr-305" id="org.idempiere.keikai"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.antlr.antlr4-runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.glassfish.hk2.external.aopalliance-repackaged"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.apache.jstl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.javax.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.javax.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.core.client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.javax.client"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
@ -531,6 +532,20 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="wrapped.com.google.zxing.javase"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.dev.samstevens.totp.totp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin <plugin
id="wrapped.io.grpc.grpc-context" id="wrapped.io.grpc.grpc-context"
download-size="0" download-size="0"
@ -553,32 +568,81 @@
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.idempiere.keikai" id="org.apache.aries.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.activemq.activemq-client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fusesource.hawtbuf.hawtbuf"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="xstream"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.alpn.client"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.osgi.boot.warurl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.rewrite"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.core.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.websocket.core.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="jakarta.transaction-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.idempiere.jetty.osgi.boot.fragment"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin
id="org.antlr.antlr4-runtime"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.com.google.zxing.javase"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="wrapped.dev.samstevens.totp.totp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
~ Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. ~ Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
~ ~
~ Licensed under the Apache License, Version 2.0 (the "License"); ~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License. ~ you may not use this file except in compliance with the License.
@ -21,7 +21,7 @@
This XML file is used when no hazelcast.xml is present. This XML file is used when no hazelcast.xml is present.
To learn how to configure Hazelcast, please see the schema at To learn how to configure Hazelcast, please see the schema at
https://hazelcast.com/schema/config/hazelcast-config-3.11.xsd https://hazelcast.com/schema/config/hazelcast-config-3.12.xsd
or the Reference Manual at https://hazelcast.org/documentation/ or the Reference Manual at https://hazelcast.org/documentation/
--> -->
@ -29,7 +29,7 @@
<hazelcast xmlns="http://www.hazelcast.com/schema/config" <hazelcast xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hazelcast.com/schema/config xsi:schemaLocation="http://www.hazelcast.com/schema/config
http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"> http://www.hazelcast.com/schema/config/hazelcast-config-3.12.xsd">
<group> <group>
<name>@ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@:@ADEMPIERE_DB_PORT@</name> <name>@ADEMPIERE_DB_USER@.@ADEMPIERE_DB_NAME@/@ADEMPIERE_DB_SERVER@:@ADEMPIERE_DB_PORT@</name>

View File

@ -30,6 +30,5 @@ FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
@Set VMOPTS=%VMOPTS% -Dmail.mime.decodefilename=true @Set VMOPTS=%VMOPTS% -Dmail.mime.decodefilename=true
@Set VMOPTS=%VMOPTS% -Dmail.mime.encodeparameters=true @Set VMOPTS=%VMOPTS% -Dmail.mime.encodeparameters=true
@Set VMOPTS=%VMOPTS% -Dmail.mime.decodeparameters=true @Set VMOPTS=%VMOPTS% -Dmail.mime.decodeparameters=true
@Set VMOPTS=%VMOPTS% -Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
@"%JAVA%" %IDEMPIERE_JAVA_OPTIONS% %VMOPTS% -jar %JARFILE% -application org.adempiere.server.application @"%JAVA%" %IDEMPIERE_JAVA_OPTIONS% %VMOPTS% -jar %JARFILE% -application org.adempiere.server.application

View File

@ -35,7 +35,6 @@ VMOPTS="-Dorg.osgi.framework.bootdelegation=sun.security.ssl
-Dmail.mime.decodefilename=true -Dmail.mime.decodefilename=true
-Dmail.mime.encodeparameters=true -Dmail.mime.encodeparameters=true
-Dmail.mime.decodeparameters=true -Dmail.mime.decodeparameters=true
-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
--add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED
--add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED
--add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED

View File

@ -1,6 +1,13 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =============================================================== --><!-- Create the deployment manager --><!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --><!-- The deplyment manager handles the lifecycle of deploying web --><!-- applications. Apps are provided by instances of the --><!-- AppProvider interface. --><!-- =============================================================== --> <!-- =============================================================== -->
<!-- Create the deployment manager -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- The deplyment manager handles the lifecycle of deploying web -->
<!-- applications. Apps are provided by instances of the -->
<!-- AppProvider interface. -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="addBean"> <Call name="addBean">
@ -29,38 +36,6 @@
</Arg> </Arg>
</Call> --> </Call> -->
<!-- idempiere need to study before use this feature
<Call id="webappprovider" name="addAppProvider">
<Arg>
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
<Set name="monitoredDirName">
<Property>
<Name>jetty.deploy.monitoredPath</Name>
<Default>
<Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="webapps"/>
</Default>
</Property>
</Set>
<Set name="defaultsDescriptor">
<Property>
<Name>jetty.deploy.defaultsDescriptorPath</Name>
<Default>
<Property name="jetty.home" default="." />/etc/webdefault.xml
</Default>
</Property>
</Set>
<Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
<Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
<Set name="configurationManager">
<New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
</New>
</Set>
</New>
</Arg>
</Call>
-->
</New> </New>
</Arg> </Arg>
</Call> </Call>

View File

@ -1,6 +1,11 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
@ -24,7 +29,6 @@
<Item> <Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory"> <New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config"><Ref refid="httpConfig" /></Arg> <Arg name="config"><Ref refid="httpConfig" /></Arg>
<Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230_LEGACY"/></Arg></Call></Arg>
</New> </New>
</Item> </Item>
</Array> </Array>

View File

@ -1,6 +1,11 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ============================================================= --><!-- Configure an HTTPS connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- and jetty-ssl.xml. --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Configure an HTTPS connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- and jetty-ssl.xml. -->
<!-- ============================================================= -->
<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
<Call name="addIfAbsentConnectionFactory"> <Call name="addIfAbsentConnectionFactory">
@ -16,7 +21,6 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.server.HttpConnectionFactory"> <New class="org.eclipse.jetty.server.HttpConnectionFactory">
<Arg name="config"><Ref refid="sslHttpConfig" /></Arg> <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
<Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230"/></Arg></Call></Arg>
</New> </New>
</Arg> </Arg>
</Call> </Call>

View File

@ -1,6 +1,9 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ============================================================= --><!-- SSL ContextFactory configuration --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- SSL ContextFactory configuration -->
<!-- ============================================================= -->
<!-- <!--
To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at

View File

@ -1,6 +1,11 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- ============================================================= --><!-- Base SSL configuration --><!-- This configuration needs to be used together with 1 or more --><!-- of jetty-https.xml or jetty-http2.xml --><!-- ============================================================= --> <!-- ============================================================= -->
<!-- Base SSL configuration -->
<!-- This configuration needs to be used together with 1 or more -->
<!-- of jetty-https.xml or jetty-http2.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
@ -49,7 +54,7 @@
<Arg> <Arg>
<New class="org.eclipse.jetty.server.SecureRequestCustomizer"> <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
<Arg name="sniRequired" type="boolean"><Property name="jetty.ssl.sniRequired" default="false"/></Arg> <Arg name="sniRequired" type="boolean"><Property name="jetty.ssl.sniRequired" default="false"/></Arg>
<Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg> <Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="false"/></Arg>
<Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg> <Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>
<Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg> <Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>
</New> </New>

View File

@ -1,4 +1,5 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Documentation of this file format can be found at: --> <!-- Documentation of this file format can be found at: -->
@ -69,11 +70,10 @@
<Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="1024" /></Set> <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="1024" /></Set>
<Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set> <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
<Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set> <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
<Set name="blockingTimeout"><Property deprecated="jetty.httpConfig.blockingTimeout" name="jetty.httpConfig.blockingTimeout.DEPRECATED" default="-1"/></Set>
<Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set> <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
<Set name="httpCompliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="from"><Arg><Property name="jetty.httpConfig.compliance" deprecated="jetty.http.compliance" default="RFC7230"/></Arg></Call></Set>
<Set name="requestCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.requestCookieCompliance" deprecated="jetty.httpConfig.cookieCompliance" default="RFC6265"/></Arg></Call></Set> <Set name="requestCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.requestCookieCompliance" deprecated="jetty.httpConfig.cookieCompliance" default="RFC6265"/></Arg></Call></Set>
<Set name="responseCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.responseCookieCompliance" default="RFC6265"/></Arg></Call></Set> <Set name="responseCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.responseCookieCompliance" default="RFC6265"/></Arg></Call></Set>
<Set name="multiPartFormDataCompliance"><Call class="org.eclipse.jetty.server.MultiPartFormDataCompliance" name="valueOf"><Arg><Property name="jetty.httpConfig.multiPartFormDataCompliance" default="RFC7578"/></Arg></Call></Set>
<Set name="relativeRedirectAllowed"><Property name="jetty.httpConfig.relativeRedirectAllowed" default="false"/></Set> <Set name="relativeRedirectAllowed"><Property name="jetty.httpConfig.relativeRedirectAllowed" default="false"/></Set>
</New> </New>
@ -114,21 +114,32 @@
<!-- IDEMPIERE-2761 --> <!-- IDEMPIERE-2761 -->
<Set class="org.eclipse.jetty.util.resource.Resource" name="defaultUseCaches">false</Set> <Set class="org.eclipse.jetty.util.resource.Resource" name="defaultUseCaches">false</Set>
<Call name="setAttribute"> <Call class="org.eclipse.jetty.webapp.Configurations" name="setServerDefault">
<Arg>org.eclipse.jetty.webapp.configuration</Arg>
<Arg>
<New class="org.eclipse.jetty.webapp.Configuration$ClassList">
<Arg> <Arg>
<Ref refid="Server"/>
</Arg>
<Call name="add">
<Arg name="configClass">
<Array type="String"> <Array type="String">
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
<Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
<Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item> <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item> <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
<Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
<Item>org.eclipse.jetty.webapp.WebAppConfiguration</Item>
<Item>org.eclipse.jetty.webapp.ServletsConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JspConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JaasConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JndiConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>
</Array> </Array>
</Arg> </Arg>
</New> </Call>
</Arg>
</Call> </Call>
<!-- for jndi --> <!-- for jndi -->

View File

@ -1,4 +1,5 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure> <Configure>
<!-- =========================================================== --> <!-- =========================================================== -->

View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
metadata-complete="false" version="4.0">
version="3.1">
<!-- ===================================================================== --> <!-- ===================================================================== -->
<!-- This file contains the default descriptor for web applications. --> <!-- This file contains the default descriptor for web applications. -->
@ -26,7 +24,7 @@
<description> <description>
Default web.xml file. Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file This file is applied to a Web application before its own WEB_INF/web.xml file
</description> </description>
<!-- ==================================================================== --> <!-- ==================================================================== -->
@ -82,7 +80,7 @@
* resources could be found. If false, then a welcome * resources could be found. If false, then a welcome
* file must exist on disk. If "exact", then exact * file must exist on disk. If "exact", then exact
* servlet matches are supported without an existing file. * servlet matches are supported without an existing file.
* Default is true. * Default is false.
* *
* This must be false if you want directory listings, * This must be false if you want directory listings,
* but have index.jsp in your welcome file list. * but have index.jsp in your welcome file list.
@ -92,7 +90,15 @@
* *
* gzip If set to true, then static content will be served as * gzip If set to true, then static content will be served as
* gzip content encoded if a matching resource is * gzip content encoded if a matching resource is
* found ending with ".gz" * found ending with ".gz" (default false)
* (deprecated: use precompressed)
*
* precompressed If set to a comma separated list of encoding types (that may be
* listed in a requests Accept-Encoding header) to file
* extension mappings to look for and serve. For example:
* "br=.br,gzip=.gz,bzip2=.bz".
* If set to a boolean True, then a default set of compressed formats
* will be used, otherwise no precompressed formats.
* *
* resourceBase Set to replace the context resource base * resourceBase Set to replace the context resource base
* *
@ -109,9 +115,6 @@
* stylesheet Set with the location of an optional stylesheet that will be used * stylesheet Set with the location of an optional stylesheet that will be used
* to decorate the directory listing html. * to decorate the directory listing html.
* *
* aliases If True, aliases of resources are allowed (eg. symbolic
* links and caps variations). May bypass security constraints.
*
* etags If True, weak etags will be generated and handled. * etags If True, weak etags will be generated and handled.
* *
* maxCacheSize The maximum total size of the cache or 0 for no cache. * maxCacheSize The maximum total size of the cache or 0 for no cache.
@ -127,15 +130,17 @@
* cacheControl If set, all static content will have this value set as the cache-control * cacheControl If set, all static content will have this value set as the cache-control
* header. * header.
* *
* encodingHeaderCacheSize
* Max entries in a cache of ACCEPT-ENCODING headers.
*
* otherGzipFileExtensions
* defaults to .svgz but a comma separated list of gzip equivalent file extensions can be supplied
*
--> -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet> <servlet>
<servlet-name>default</servlet-name> <servlet-name>default</servlet-name>
<servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class> <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
<init-param>
<param-name>aliases</param-name>
<param-value>false</param-value>
</init-param>
<init-param> <init-param>
<param-name>acceptRanges</param-name> <param-name>acceptRanges</param-name>
<param-value>true</param-value> <param-value>true</param-value>
@ -164,10 +169,6 @@
<param-name>maxCachedFiles</param-name> <param-name>maxCachedFiles</param-name>
<param-value>2048</param-value> <param-value>2048</param-value>
</init-param> </init-param>
<init-param>
<param-name>gzip</param-name>
<param-value>false</param-value>
</init-param>
<init-param> <init-param>
<param-name>etags</param-name> <param-name>etags</param-name>
<param-value>false</param-value> <param-value>false</param-value>
@ -176,18 +177,6 @@
<param-name>useFileMappedBuffer</param-name> <param-name>useFileMappedBuffer</param-name>
<param-value>true</param-value> <param-value>true</param-value>
</init-param> </init-param>
<!--
<init-param>
<param-name>resourceCache</param-name>
<param-value>resourceCache</param-value>
</init-param>
-->
<!--
<init-param>
<param-name>cacheControl</param-name>
<param-value>max-age=3600,public</param-value>
</init-param>
-->
<load-on-startup>0</load-on-startup> <load-on-startup>0</load-on-startup>
</servlet> </servlet>
@ -203,107 +192,25 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- The JSP page compiler and execution servlet, which is the mechanism --> <!-- The JSP page compiler and execution servlet, which is the mechanism -->
<!-- used by the jsp container to support JSP pages. Traditionally, --> <!-- used by the jsp container to support JSP pages. Traditionally, -->
<!-- this servlet is mapped to URL pattern "*.jsp". This servlet --> <!-- this servlet is mapped to URL pattern "*.jsp". -->
<!-- supports the following initialization parameters (default values --> <!-- See http://https://www.eclipse.org/jetty/documentation/ -->
<!-- are in square brackets): --> <!-- for applicable configuration params. -->
<!-- -->
<!-- checkInterval If development is false and reloading is true, -->
<!-- background compiles are enabled. checkInterval -->
<!-- is the time in seconds between checks to see -->
<!-- if a JSP page needs to be recompiled. [300] -->
<!-- -->
<!-- compiler Which compiler Ant should use to compile JSP -->
<!-- pages. See the Ant documentation for more -->
<!-- information. [javac] -->
<!-- -->
<!-- classdebuginfo Should the class file be compiled with -->
<!-- debugging information? [true] -->
<!-- -->
<!-- classpath What class path should I use while compiling -->
<!-- generated servlets? [Created dynamically -->
<!-- based on the current web application] -->
<!-- Set to ? to make the container explicitly set -->
<!-- this parameter. -->
<!-- -->
<!-- development Is Jasper used in development mode (will check -->
<!-- for JSP modification on every access)? [true] -->
<!-- -->
<!-- enablePooling Determines whether tag handler pooling is -->
<!-- enabled [true] -->
<!-- -->
<!-- fork Tell Ant to fork compiles of JSP pages so that -->
<!-- a separate JVM is used for JSP page compiles -->
<!-- from the one Tomcat is running in. [true] -->
<!-- -->
<!-- ieClassId The class-id value to be sent to Internet -->
<!-- Explorer when using <jsp:plugin> tags. -->
<!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
<!-- -->
<!-- javaEncoding Java file encoding to use for generating java -->
<!-- source files. [UTF-8] -->
<!-- -->
<!-- keepgenerated Should we keep the generated Java source code -->
<!-- for each page instead of deleting it? [true] -->
<!-- -->
<!-- logVerbosityLevel The level of detailed messages to be produced -->
<!-- by this servlet. Increasing levels cause the -->
<!-- generation of more messages. Valid values are -->
<!-- FATAL, ERROR, WARNING, INFORMATION, and DEBUG. -->
<!-- [WARNING] -->
<!-- -->
<!-- mappedfile Should we generate static content with one -->
<!-- print statement per input line, to ease -->
<!-- debugging? [false] -->
<!-- -->
<!-- -->
<!-- reloading Should Jasper check for modified JSPs? [true] -->
<!-- -->
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
<!-- debugging be suppressed? [false] -->
<!-- -->
<!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
<!-- dumped to a file? [false] -->
<!-- False if suppressSmap is true -->
<!-- -->
<!-- scratchdir What scratch directory should we use when -->
<!-- compiling JSP pages? [default work directory -->
<!-- for the current web application] -->
<!-- -->
<!-- tagpoolMaxSize The maximum tag handler pool size [5] -->
<!-- -->
<!-- xpoweredBy Determines whether X-Powered-By response -->
<!-- header is added by generated servlet [false] -->
<!-- -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet id="jsp"> <servlet id="jsp">
<servlet-name>jsp</servlet-name> <servlet-name>jsp</servlet-name>
<servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class> <servlet-class>org.eclipse.jetty.jsp.JettyJspServlet</servlet-class>
<init-param>
<param-name>logVerbosityLevel</param-name>
<param-value>DEBUG</param-value>
</init-param>
<init-param>
<param-name>fork</param-name>
<param-value>false</param-value>
</init-param>
<init-param> <init-param>
<param-name>xpoweredBy</param-name> <param-name>xpoweredBy</param-name>
<param-value>false</param-value> <param-value>false</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>compilerTargetVM</param-name> <param-name>compilerTargetVM</param-name>
<param-value>1.7</param-value> <param-value>1.8</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>compilerSourceVM</param-name> <param-name>compilerSourceVM</param-name>
<param-value>1.7</param-value> <param-value>1.8</param-value>
</init-param> </init-param>
<!--
<init-param>
<param-name>classpath</param-name>
<param-value>?</param-value>
</init-param>
-->
<load-on-startup>0</load-on-startup> <load-on-startup>0</load-on-startup>
</servlet> </servlet>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.server.feature</artifactId> <artifactId>org.adempiere.server.feature</artifactId>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="8.2.0.qualifier" useFeatures="true" includeLaunchers="true"> <product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="9.0.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default"> <configIni use="default">
</configIni> </configIni>
@ -9,7 +9,7 @@
<launcherArgs> <launcherArgs>
<programArgs>-console <programArgs>-console
</programArgs> </programArgs>
<vmArgs>--add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF <vmArgs>--add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml
</vmArgs> </vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac> </vmArgsMac>
@ -37,39 +37,39 @@
<configurations> <configurations>
<plugin id="org.adempiere.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" /> <plugin id="org.adempiere.eclipse.equinox.http.servlet" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.pipo" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.server" autoStart="true" startLevel="0" /> <plugin id="org.adempiere.server" autoStart="true" startLevel="0" />
<plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="0" /> <plugin id="org.adempiere.ui.zk" autoStart="true" startLevel="0" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="1" /> <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" /> <plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.jetty.annotations" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.apache-jsp" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.http" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="true" startLevel="10" /> <plugin id="org.eclipse.jetty.osgi.httpservice" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.jetty.websocket.common" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.jetty.websocket.common" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.jetty.websocket.core.server" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.websocket.server" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.jetty.websocket.javax.common" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.javax.server" autoStart="true" startLevel="3" />
<plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" /> <plugin id="org.eclipse.jetty.websocket.server" autoStart="true" startLevel="3" />
<plugin id="org.glassfish.jersey.core.jersey-common" autoStart="true" startLevel="0" />
<plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" /> <plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" /> <plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
<plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" /> <plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />
<property name="osgi.framework.activeThreadType" value="normal" />
<property name="osgi.console.enable.builtin" value="false" />
<property name="org.eclipse.update.reconcile" value="false" />
<property name="osgi.compatibility.bootdelegation" value="true" />
<property name="osgi.checkConfiguration" value="true" />
<property name="osgi.instance.area.default" value="@config.dir/../workspace" /> <property name="osgi.instance.area.default" value="@config.dir/../workspace" />
<property name="org.eclipse.equinox.simpleconfigurator.exclusiveInstallation" value="false" />
<property name="osgi.noShutdown" value="true" />
<property name="eclipse.product" value="org.adempiere.server.product" /> <property name="eclipse.product" value="org.adempiere.server.product" />
<property name="osgi.checkConfiguration" value="true" />
<property name="osgi.console.enable.builtin" value="false" />
<property name="osgi.compatibility.bootdelegation" value="true" />
<property name="org.eclipse.equinox.simpleconfigurator.exclusiveInstallation" value="false" />
<property name="osgi.framework.activeThreadType" value="normal" />
<property name="org.eclipse.update.reconcile" value="false" />
<property name="osgi.noShutdown" value="true" />
</configurations> </configurations>
<preferencesInfo> <preferencesInfo>

View File

@ -51,7 +51,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-modules=java.se&#10;--add-opens=java.base/java.lang=ALL-UNNAMED&#10;--add-opens=java.base/java.nio=ALL-UNNAMED&#10;--add-opens=java.base/sun.nio.ch=ALL-UNNAMED&#10;--add-opens=java.management/sun.management=ALL-UNNAMED&#10;--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED&#10;--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED&#10;--add-exports=java.desktop/sun.awt=ALL-UNNAMED&#10;--add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED&#10;--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED&#10;-Declipse.product=org.adempiere.server.product&#10;-Dosgi.noShutdown=true&#10;-Dosgi.framework.activeThreadType=normal&#10;-Dorg.osgi.framework.bootdelegation=sun.security.ssl&#10;-Dosgi.compatibility.bootdelegation=true&#10;-Djetty.home=jettyhome&#10;-Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml&#10;-Dmail.mime.encodefilename=true&#10;-Dmail.mime.decodefilename=true&#10;-Dmail.mime.encodeparameters=true&#10;-Dmail.mime.decodeparameters=true&#10;-Dhazelcast.config=hazelcast.xml&#10;-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF&#10;-Dorg.zkoss.zk.config.path=file://${project_loc:org.adempiere.ui.zk}/WEB-INF/zk-selenium.xml"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-modules=java.se&#10;--add-opens=java.base/java.lang=ALL-UNNAMED&#10;--add-opens=java.base/java.nio=ALL-UNNAMED&#10;--add-opens=java.base/sun.nio.ch=ALL-UNNAMED&#10;--add-opens=java.management/sun.management=ALL-UNNAMED&#10;--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED&#10;--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED&#10;--add-exports=java.desktop/sun.awt=ALL-UNNAMED&#10;--add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED&#10;--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED&#10;-Declipse.product=org.adempiere.server.product&#10;-Dosgi.noShutdown=true&#10;-Dosgi.framework.activeThreadType=normal&#10;-Dorg.osgi.framework.bootdelegation=sun.security.ssl&#10;-Dosgi.compatibility.bootdelegation=true&#10;-Djetty.home=jettyhome&#10;-Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml&#10;-Dmail.mime.encodefilename=true&#10;-Dmail.mime.decodefilename=true&#10;-Dmail.mime.encodeparameters=true&#10;-Dmail.mime.decodeparameters=true&#10;-Dhazelcast.config=hazelcast.xml&#10;-Dorg.zkoss.zk.config.path=file://${project_loc:org.adempiere.ui.zk}/WEB-INF/zk-selenium.xml"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:org.adempiere.base}/.."/> <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:org.adempiere.base}/.."/>
<stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/> <stringAttribute key="product" value="org.adempiere.server.server_product"/>
@ -75,9 +75,11 @@
</setAttribute> </setAttribute>
<setAttribute key="selected_target_bundles"> <setAttribute key="selected_target_bundles">
<setEntry value="bcmail@default:default"/> <setEntry value="bcmail@default:default"/>
<setEntry value="bcpg*1.69.0@default:default"/>
<setEntry value="bcpkix@default:default"/> <setEntry value="bcpkix@default:default"/>
<setEntry value="bcprov@default:default"/> <setEntry value="bcprov@default:default"/>
<setEntry value="bctsp@default:default"/> <setEntry value="bctsp@default:default"/>
<setEntry value="bcutil@default:default"/>
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/> <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
<setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/> <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
<setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/> <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
@ -95,7 +97,6 @@
<setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/> <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/> <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
<setEntry value="com.github.librepdf.openpdf@default:default"/> <setEntry value="com.github.librepdf.openpdf@default:default"/>
<setEntry value="com.github.relaxng.Datatype@default:default"/>
<setEntry value="com.google.gson@default:default"/> <setEntry value="com.google.gson@default:default"/>
<setEntry value="com.google.guava.failureaccess@default:default"/> <setEntry value="com.google.guava.failureaccess@default:default"/>
<setEntry value="com.google.guava@default:default"/> <setEntry value="com.google.guava@default:default"/>
@ -104,16 +105,15 @@
<setEntry value="com.google.zxing.core@default:default"/> <setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.ibm.icu@default:default"/> <setEntry value="com.ibm.icu@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.commons-digester@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.istack.commons-runtime@default:default"/> <setEntry value="com.sun.istack.commons-runtime@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/> <setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/>
<setEntry value="com.sun.org.apache.xml.internal.resolver@default:default"/>
<setEntry value="com.sun.xml.bind.jaxb-impl@default:default"/> <setEntry value="com.sun.xml.bind.jaxb-impl@default:default"/>
<setEntry value="com.sun.xml.fastinfoset.FastInfoset@default:default"/> <setEntry value="com.sun.xml.fastinfoset.FastInfoset*1.2.18.v202109010034@default:default"/>
<setEntry value="com.sun.xml.fastinfoset.FastInfoset*2.0.0@default:default"/>
<setEntry value="com.sun.xml.messaging.saaj.impl@default:default"/> <setEntry value="com.sun.xml.messaging.saaj.impl@default:default"/>
<setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/> <setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
<setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/> <setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/>
@ -128,46 +128,38 @@
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/> <setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.jws-api@default:default"/> <setEntry value="jakarta.jws-api@default:default"/>
<setEntry value="jakarta.mail.api@default:default"/>
<setEntry value="jakarta.persistence-api@default:default"/> <setEntry value="jakarta.persistence-api@default:default"/>
<setEntry value="jakarta.ws.rs-api@default:default"/> <setEntry value="jakarta.ws.rs-api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="jakarta.xml.soap-api@default:default"/> <setEntry value="jakarta.xml.soap-api@default:default"/>
<setEntry value="jakarta.xml.ws-api@default:default"/> <setEntry value="jakarta.xml.ws-api@default:default"/>
<setEntry value="javax.enterprise.cdi-api@default:default"/> <setEntry value="javax.enterprise.cdi-api@default:default"/>
<setEntry value="javax.inject@default:default"/>
<setEntry value="javax.interceptor-api@default:default"/> <setEntry value="javax.interceptor-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="javax.transaction-api@default:default"/>
<setEntry value="javax.validation.api@default:default"/> <setEntry value="javax.validation.api@default:default"/>
<setEntry value="javax.websocket-api@default:default"/> <setEntry value="javax.websocket-api@default:default"/>
<setEntry value="joda-time@default:default"/> <setEntry value="joda-time@default:default"/>
<setEntry value="json*20180813.0.0@default:default"/> <setEntry value="json@default:default"/>
<setEntry value="json*20190722.0.0@default:default"/>
<setEntry value="net.sf.jasperreports.engine@default:default"/> <setEntry value="net.sf.jasperreports.engine@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.antlr.runtime@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.aopalliance@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.aries.spifly.dynamic.bundle@1:true"/> <setEntry value="org.apache.aries.spifly.dynamic.bundle@1:true"/>
<setEntry value="org.apache.aries.util@default:default"/> <setEntry value="org.apache.aries.util@default:default"/>
<setEntry value="org.apache.commons.beanutils@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-beanutils@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-configuration2@default:default"/> <setEntry value="org.apache.commons.commons-configuration2@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-fileupload@default:default"/>
<setEntry value="org.apache.commons.digester@default:default"/> <setEntry value="org.apache.commons.commons-io@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.commons-text@default:default"/>
<setEntry value="org.apache.commons.discovery@default:default"/> <setEntry value="org.apache.commons.discovery@default:default"/>
<setEntry value="org.apache.commons.fileupload@default:default"/>
<setEntry value="org.apache.commons.io@default:default"/>
<setEntry value="org.apache.commons.lang3@default:default"/> <setEntry value="org.apache.commons.lang3@default:default"/>
<setEntry value="org.apache.commons.lang@default:default"/> <setEntry value="org.apache.commons.lang@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.cxf.cxf-core@default:default"/> <setEntry value="org.apache.cxf.cxf-core@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-bindings-soap@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-bindings-soap@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-bindings-xml@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-bindings-xml@default:default"/>
@ -179,67 +171,33 @@
<setEntry value="org.apache.cxf.cxf-rt-rs-extension-providers@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-rs-extension-providers@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-rs-service-description@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-rs-service-description@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-security@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-security@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-transports-http-jetty@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-transports-http@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-transports-http@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-ws-addr@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-ws-addr@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-ws-policy@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-ws-policy@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-wsdl@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-wsdl@default:default"/>
<setEntry value="org.apache.cxf.rt-ws-transfer@default:default"/>
<setEntry value="org.apache.felix.gogo.command@default:default"/> <setEntry value="org.apache.felix.gogo.command@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@1:true"/>
<setEntry value="org.apache.felix.webconsole@default:true"/> <setEntry value="org.apache.felix.webconsole@default:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.lucene.analyzers-common@default:default"/>
<setEntry value="org.apache.lucene.core@default:default"/>
<setEntry value="org.apache.neethi@default:default"/> <setEntry value="org.apache.neethi@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/> <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.servicemix.bundles.jaxen@default:default"/> <setEntry value="org.apache.servicemix.bundles.jaxen@default:default"/>
<setEntry value="org.apache.servicemix.bundles.rhino@default:default"/> <setEntry value="org.apache.servicemix.bundles.rhino@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-aop@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-beans@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-context-support@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-context@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-core@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-expression@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-web@default:default"/>
<setEntry value="org.apache.servicemix.bundles.wsdl4j@default:default"/>
<setEntry value="org.apache.servicemix.bundles.xerces@default:default"/> <setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
<setEntry value="org.apache.taglibs.standard-impl@default:default"/> <setEntry value="org.apache.taglibs.standard-impl@default:default"/>
<setEntry value="org.apache.taglibs.standard-jstlel@default:default"/>
<setEntry value="org.apache.taglibs.taglibs-standard-spec@default:default"/> <setEntry value="org.apache.taglibs.taglibs-standard-spec@default:default"/>
<setEntry value="org.apache.ws.xmlschema.core@default:default"/> <setEntry value="org.apache.ws.xmlschema.core@default:default"/>
<setEntry value="org.apache.xalan@default:default"/> <setEntry value="org.apache.xalan@default:default"/>
<setEntry value="org.apache.xml.resolver@default:default"/> <setEntry value="org.apache.xml.resolver@default:default"/>
<setEntry value="org.apache.xml.serializer@default:default"/> <setEntry value="org.apache.xml.serializer@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-anim@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-awt-util@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-bridge@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-codec@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-constants@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-css@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-dom@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-ext@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-extension@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-gvt@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-i18n@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-parser@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-script@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-svg-dom@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-svggen@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-util@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-xml@default:default"/>
<setEntry value="org.apache.xmlgraphics@default:default"/>
<setEntry value="org.atmosphere.runtime@default:default"/> <setEntry value="org.atmosphere.runtime@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.dom4j@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.commands@default:default"/> <setEntry value="org.eclipse.core.commands@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -261,7 +219,6 @@
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.concurrent@default:default"/> <setEntry value="org.eclipse.equinox.concurrent@default:default"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@2:true"/>
<setEntry value="org.eclipse.equinox.event@2:true"/> <setEntry value="org.eclipse.equinox.event@2:true"/>
<setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/> <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
<setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/> <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
@ -291,33 +248,35 @@
<setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/> <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
<setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/> <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
<setEntry value="org.eclipse.jdt.core@default:default"/> <setEntry value="org.eclipse.jdt.core@default:default"/>
<setEntry value="org.eclipse.jetty.alpn.client@default:default"/>
<setEntry value="org.eclipse.jetty.annotations@default:default"/> <setEntry value="org.eclipse.jetty.annotations@default:default"/>
<setEntry value="org.eclipse.jetty.apache-jsp@default:true"/> <setEntry value="org.eclipse.jetty.apache-jsp@default:true"/>
<setEntry value="org.eclipse.jetty.apache.jstl@default:default"/>
<setEntry value="org.eclipse.jetty.client@default:default"/> <setEntry value="org.eclipse.jetty.client@default:default"/>
<setEntry value="org.eclipse.jetty.continuation@default:default"/>
<setEntry value="org.eclipse.jetty.deploy@default:default"/> <setEntry value="org.eclipse.jetty.deploy@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:true"/> <setEntry value="org.eclipse.jetty.http@default:true"/>
<setEntry value="org.eclipse.jetty.io@default:default"/> <setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.jaas@default:default"/> <setEntry value="org.eclipse.jetty.jaas@default:default"/>
<setEntry value="org.eclipse.jetty.jmx@default:default"/> <setEntry value="org.eclipse.jetty.jmx@default:default"/>
<setEntry value="org.eclipse.jetty.jndi@default:default"/> <setEntry value="org.eclipse.jetty.jndi@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:false"/> <setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:false"/>
<setEntry value="org.eclipse.jetty.osgi.boot@default:true"/> <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>
<setEntry value="org.eclipse.jetty.osgi.httpservice@10:true"/> <setEntry value="org.eclipse.jetty.osgi.httpservice@10:true"/>
<setEntry value="org.eclipse.jetty.plus@default:default"/> <setEntry value="org.eclipse.jetty.plus@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/> <setEntry value="org.eclipse.jetty.security@default:default"/>
<setEntry value="org.eclipse.jetty.server@default:default"/> <setEntry value="org.eclipse.jetty.server@default:default"/>
<setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.servlet@default:default"/> <setEntry value="org.eclipse.jetty.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.servlets@default:default"/> <setEntry value="org.eclipse.jetty.servlets@default:default"/>
<setEntry value="org.eclipse.jetty.util.ajax@default:default"/> <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
<setEntry value="org.eclipse.jetty.util@default:default"/> <setEntry value="org.eclipse.jetty.util@default:default"/>
<setEntry value="org.eclipse.jetty.webapp@default:default"/> <setEntry value="org.eclipse.jetty.webapp@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.api@default:default"/> <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.common@3:true"/> <setEntry value="org.eclipse.jetty.websocket.common@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.websocket.server@3:true"/> <setEntry value="org.eclipse.jetty.websocket.core.common@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.javax.websocket@3:true"/> <setEntry value="org.eclipse.jetty.websocket.core.server@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.javax.common@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.javax.server@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.server@3:true"/> <setEntry value="org.eclipse.jetty.websocket.server@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/> <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.xml@default:default"/> <setEntry value="org.eclipse.jetty.xml@default:default"/>
@ -326,18 +285,21 @@
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.eclipse.text@default:default"/> <setEntry value="org.eclipse.text@default:default"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.glassfish.external.management-api@default:default"/> <setEntry value="org.glassfish.external.management-api@default:default"/>
<setEntry value="org.glassfish.gmbal.gmbal@default:default"/> <setEntry value="org.glassfish.gmbal.gmbal@default:default"/>
<setEntry value="org.glassfish.ha.ha-api@default:default"/>
<setEntry value="org.glassfish.hk2.api@default:default"/> <setEntry value="org.glassfish.hk2.api@default:default"/>
<setEntry value="org.glassfish.hk2.external.aopalliance-repackaged@default:default"/>
<setEntry value="org.glassfish.hk2.external.jakarta.inject@default:default"/>
<setEntry value="org.glassfish.hk2.locator@default:default"/> <setEntry value="org.glassfish.hk2.locator@default:default"/>
<setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/> <setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
<setEntry value="org.glassfish.hk2.utils@default:default"/> <setEntry value="org.glassfish.hk2.utils@default:default"/>
<setEntry value="org.glassfish.jaxb.txw2@default:default"/> <setEntry value="org.glassfish.jersey.containers.jersey-container-servlet-core@default:default"/>
<setEntry value="org.glassfish.jersey.containers.servlet.core@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/> <setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-common@default:true"/> <setEntry value="org.glassfish.jersey.core.jersey-common@default:true"/>
<setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/> <setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/>
<setEntry value="org.glassfish.jersey.ext.entityfiltering@default:default"/> <setEntry value="org.glassfish.jersey.ext.jersey-entity-filtering@default:default"/>
<setEntry value="org.glassfish.jersey.inject.jersey-hk2@default:default"/> <setEntry value="org.glassfish.jersey.inject.jersey-hk2@default:default"/>
<setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/> <setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/>
<setEntry value="org.glassfish.pfl.pfl-asm@default:default"/> <setEntry value="org.glassfish.pfl.pfl-asm@default:default"/>
@ -345,8 +307,6 @@
<setEntry value="org.glassfish.pfl.pfl-dynamic@default:default"/> <setEntry value="org.glassfish.pfl.pfl-dynamic@default:default"/>
<setEntry value="org.glassfish.pfl.pfl-tf@default:default"/> <setEntry value="org.glassfish.pfl.pfl-tf@default:default"/>
<setEntry value="org.hamcrest.core@default:default"/> <setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.jfree.chart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/> <setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.junit@default:default"/> <setEntry value="org.junit@default:default"/>
<setEntry value="org.jvnet.mimepull@default:default"/> <setEntry value="org.jvnet.mimepull@default:default"/>
@ -362,21 +322,39 @@
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="org.sat4j.core@default:default"/> <setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/> <setEntry value="org.sat4j.pb@default:default"/>
<setEntry value="org.springframework.spring-jcl@default:default"/>
<setEntry value="org.tukaani.xz@default:default"/> <setEntry value="org.tukaani.xz@default:default"/>
<setEntry value="org.w3c.css.sac@default:default"/> <setEntry value="org.w3c.css.sac@default:default"/>
<setEntry value="org.w3c.dom.events@default:default"/>
<setEntry value="org.w3c.dom.smil@default:default"/> <setEntry value="org.w3c.dom.smil@default:default"/>
<setEntry value="org.w3c.dom.svg@default:default"/> <setEntry value="org.w3c.dom.svg@default:default"/>
<setEntry value="org.zkoss.zsoup@default:default"/> <setEntry value="org.zkoss.zsoup@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.api*2.0.0.alpha1@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="stax2-api@default:default"/> <setEntry value="stax2-api@default:default"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.zaxxer.SparseBitSet@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/> <setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="wrapped.org.springframework.spring-aop@default:default"/>
<setEntry value="wrapped.org.springframework.spring-beans@default:default"/>
<setEntry value="wrapped.org.springframework.spring-context-support@default:default"/>
<setEntry value="wrapped.org.springframework.spring-context@default:default"/>
<setEntry value="wrapped.org.springframework.spring-core@default:default"/>
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
<setEntry value="wrapped.org.springframework.spring-web@default:default"/>
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
<setEntry value="xstream@default:default"/>
<setEntry value="zcommon@default:default"/> <setEntry value="zcommon@default:default"/>
<setEntry value="zel@default:default"/> <setEntry value="zel@default:default"/>
<setEntry value="zhtml@default:default"/> <setEntry value="zhtml@default:default"/>

View File

@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<setAttribute key="additional_plugins"> <setAttribute key="additional_plugins">
<setEntry value="org.adempiere.eclipse.equinox.http.servlet:8.2.0.qualifier:default:true:default:true"/> <setEntry value="org.adempiere.eclipse.equinox.http.servlet:9.0.0.qualifier:default:true:default:true"/>
<setEntry value="org.adempiere.pipo:8.2.0.qualifier:default:true:default:true"/> <setEntry value="org.adempiere.server:9.0.0.qualifier:default:true:default:true"/>
<setEntry value="org.adempiere.server:8.2.0.qualifier:default:true:default:true"/> <setEntry value="org.adempiere.ui.zk:9.0.0.qualifier:default:true:default:true"/>
<setEntry value="org.adempiere.ui.zk:8.2.0.qualifier:default:true:default:true"/> <setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.3:default:true:2:true"/>
<setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.2:default:true:1:true"/> <setEntry value="org.apache.felix.scr:2.1.24.v20200924-1939:default:true:2:true"/>
<setEntry value="org.apache.felix.webconsole:4.3.8:default:true:default:true"/> <setEntry value="org.apache.felix.webconsole:4.6.4.v202109010034:default:true:default:true"/>
<setEntry value="org.eclipse.core.runtime:3.19.0.v20200724-1004:default:true:default:true"/> <setEntry value="org.eclipse.core.runtime:3.22.0.v20210506-1025:default:true:default:true"/>
<setEntry value="org.eclipse.equinox.cm:1.4.400.v20200422-1833:default:true:default:true"/> <setEntry value="org.eclipse.equinox.cm:1.5.0.v20210202-1256:default:true:default:true"/>
<setEntry value="org.eclipse.equinox.common:3.13.0.v20200828-1034:default:true:2:true"/> <setEntry value="org.eclipse.equinox.common:3.15.0.v20210518-0604:default:true:2:true"/>
<setEntry value="org.eclipse.equinox.ds:1.6.200.v20200422-1833:default:true:2:true"/> <setEntry value="org.eclipse.equinox.event:1.6.0.v20210212-1143:default:true:2:true"/>
<setEntry value="org.eclipse.equinox.event:1.5.500.v20200616-0800:default:true:2:true"/>
<setEntry value="org.eclipse.equinox.http.registry:1.2.0.v20200614-1851:default:true:default:true"/> <setEntry value="org.eclipse.equinox.http.registry:1.2.0.v20200614-1851:default:true:default:true"/>
<setEntry value="org.eclipse.equinox.simpleconfigurator:1.3.600.v20200721-1308:default:true:1:true"/> <setEntry value="org.eclipse.equinox.simpleconfigurator:1.4.0.v20210315-2228:default:true:1:true"/>
<setEntry value="org.eclipse.jetty.apache-jsp:9.4.33.v20201020:default:true:default:true"/> <setEntry value="org.eclipse.jetty.annotations:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.http:9.4.33.v20201020:default:true:default:true"/> <setEntry value="org.eclipse.jetty.apache-jsp:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.osgi.boot:9.4.33.v20201020:default:true:default:true"/> <setEntry value="org.eclipse.jetty.http:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.osgi.httpservice:9.4.33.v20201020:default:true:10:true"/> <setEntry value="org.eclipse.jetty.osgi.boot:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.websocket.common:9.4.33.v20201020:default:true:3:true"/> <setEntry value="org.eclipse.jetty.osgi.httpservice:10.0.6:default:true:default:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.websocket.server:9.4.33.v20201020:default:true:3:true"/> <setEntry value="org.eclipse.jetty.websocket.common:10.0.6:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.websocket:9.4.33.v20201020:default:true:3:true"/> <setEntry value="org.eclipse.jetty.websocket.core.server:10.0.6:default:true:3:true"/>
<setEntry value="org.eclipse.jetty.websocket.server:9.4.33.v20201020:default:true:3:true"/> <setEntry value="org.eclipse.jetty.websocket.javax.common:10.0.6:default:true:3:true"/>
<setEntry value="org.glassfish.jersey.core.jersey-common:2.30.1.v20200513-1859:default:true:default:true"/> <setEntry value="org.eclipse.jetty.websocket.javax.server:10.0.6:default:true:3:true"/>
<setEntry value="org.idempiere.felix.webconsole:8.2.0.qualifier:default:true:default:true"/> <setEntry value="org.eclipse.jetty.websocket.server:10.0.6:default:true:3:true"/>
<setEntry value="org.mortbay.jasper.apache-el:8.5.54:default:true:default:true"/> <setEntry value="org.idempiere.felix.webconsole:9.0.0.qualifier:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-jsp:8.5.54:default:true:default:true"/> <setEntry value="org.mortbay.jasper.apache-el:9.0.29:default:true:default:true"/>
<setEntry value="org.mortbay.jasper.apache-jsp:9.0.29:default:true:default:true"/>
</setAttribute> </setAttribute>
<booleanAttribute key="append.args" value="true"/> <booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.adempiere.server.application"/> <stringAttribute key="application" value="org.adempiere.server.application"/>
@ -51,7 +51,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:org.adempiere.base}/.."/> <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:org.adempiere.base}/.."/>
<stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.adempiere.server.server_product"/> <stringAttribute key="product" value="org.adempiere.server.server_product"/>
@ -75,9 +75,11 @@
</setAttribute> </setAttribute>
<setAttribute key="selected_target_bundles"> <setAttribute key="selected_target_bundles">
<setEntry value="bcmail@default:default"/> <setEntry value="bcmail@default:default"/>
<setEntry value="bcpg*1.69.0@default:default"/>
<setEntry value="bcpkix@default:default"/> <setEntry value="bcpkix@default:default"/>
<setEntry value="bcprov@default:default"/> <setEntry value="bcprov@default:default"/>
<setEntry value="bctsp@default:default"/> <setEntry value="bctsp@default:default"/>
<setEntry value="bcutil@default:default"/>
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/> <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
<setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/> <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
<setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/> <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
@ -95,7 +97,6 @@
<setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/> <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/> <setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
<setEntry value="com.github.librepdf.openpdf@default:default"/> <setEntry value="com.github.librepdf.openpdf@default:default"/>
<setEntry value="com.github.relaxng.Datatype@default:default"/>
<setEntry value="com.google.gson@default:default"/> <setEntry value="com.google.gson@default:default"/>
<setEntry value="com.google.guava.failureaccess@default:default"/> <setEntry value="com.google.guava.failureaccess@default:default"/>
<setEntry value="com.google.guava@default:default"/> <setEntry value="com.google.guava@default:default"/>
@ -104,16 +105,16 @@
<setEntry value="com.google.zxing.core@default:default"/> <setEntry value="com.google.zxing.core@default:default"/>
<setEntry value="com.ibm.icu@default:default"/> <setEntry value="com.ibm.icu@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.commons-digester@default:default"/>
<setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/> <setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
<setEntry value="com.sun.activation.jakarta.activation@default:default"/> <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
<setEntry value="com.sun.istack.commons-runtime@default:default"/> <setEntry value="com.sun.istack.commons-runtime@default:default"/>
<setEntry value="com.sun.mail.gimap@default:default"/> <setEntry value="com.sun.mail.gimap@default:default"/>
<setEntry value="com.sun.mail.imap@default:default"/>
<setEntry value="com.sun.mail.jakarta.mail@default:default"/> <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
<setEntry value="com.sun.mail.smtp@default:default"/> <setEntry value="com.sun.xml.bind.external.relaxng-datatype@default:default"/>
<setEntry value="com.sun.org.apache.xml.internal.resolver@default:default"/>
<setEntry value="com.sun.xml.bind.jaxb-impl@default:default"/> <setEntry value="com.sun.xml.bind.jaxb-impl@default:default"/>
<setEntry value="com.sun.xml.fastinfoset.FastInfoset@default:default"/> <setEntry value="com.sun.xml.fastinfoset.FastInfoset*1.2.18.v202109010034@default:default"/>
<setEntry value="com.sun.xml.fastinfoset.FastInfoset*2.0.0@default:default"/>
<setEntry value="com.sun.xml.messaging.saaj.impl@default:default"/> <setEntry value="com.sun.xml.messaging.saaj.impl@default:default"/>
<setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/> <setEntry value="com.sun.xml.stream.buffer.streambuffer@default:default"/>
<setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/> <setEntry value="com.sun.xml.ws.jaxws-rt@default:default"/>
@ -128,47 +129,40 @@
<setEntry value="groovy@default:default"/> <setEntry value="groovy@default:default"/>
<setEntry value="jakarta.annotation-api@default:default"/> <setEntry value="jakarta.annotation-api@default:default"/>
<setEntry value="jakarta.jws-api@default:default"/> <setEntry value="jakarta.jws-api@default:default"/>
<setEntry value="jakarta.mail.api@default:default"/>
<setEntry value="jakarta.persistence-api@default:default"/> <setEntry value="jakarta.persistence-api@default:default"/>
<setEntry value="jakarta.transaction-api@default:default"/>
<setEntry value="jakarta.ws.rs-api@default:default"/> <setEntry value="jakarta.ws.rs-api@default:default"/>
<setEntry value="jakarta.xml.bind-api@default:default"/> <setEntry value="jakarta.xml.bind-api@default:default"/>
<setEntry value="jakarta.xml.soap-api@default:default"/> <setEntry value="jakarta.xml.soap-api@default:default"/>
<setEntry value="jakarta.xml.ws-api@default:default"/> <setEntry value="jakarta.xml.ws-api@default:default"/>
<setEntry value="javax.enterprise.cdi-api@default:default"/> <setEntry value="javax.enterprise.cdi-api@default:default"/>
<setEntry value="javax.inject@default:default"/>
<setEntry value="javax.interceptor-api@default:default"/> <setEntry value="javax.interceptor-api@default:default"/>
<setEntry value="javax.jms@default:default"/>
<setEntry value="javax.transaction-api@default:default"/>
<setEntry value="javax.validation.api@default:default"/> <setEntry value="javax.validation.api@default:default"/>
<setEntry value="javax.websocket-api@default:default"/> <setEntry value="javax.websocket-api@default:default"/>
<setEntry value="joda-time@default:default"/> <setEntry value="joda-time@default:default"/>
<setEntry value="json*20180813.0.0@default:default"/> <setEntry value="json@default:default"/>
<setEntry value="json*20190722.0.0@default:default"/>
<setEntry value="net.sf.jasperreports.engine@default:default"/> <setEntry value="net.sf.jasperreports.engine@default:default"/>
<setEntry value="net.sf.supercsv.super-csv@default:default"/> <setEntry value="net.sf.supercsv.super-csv@default:default"/>
<setEntry value="org.antlr.antlr4-runtime@default:default"/> <setEntry value="org.antlr.antlr4-runtime@default:default"/>
<setEntry value="org.antlr.runtime@default:default"/> <setEntry value="org.apache.activemq.activemq-client@default:default"/>
<setEntry value="org.aopalliance@default:default"/>
<setEntry value="org.apache.activemq.activemq-core@default:default"/>
<setEntry value="org.apache.activemq.kahadb@default:default"/>
<setEntry value="org.apache.ant@default:default"/> <setEntry value="org.apache.ant@default:default"/>
<setEntry value="org.apache.aries.spifly.dynamic.bundle@1:true"/> <setEntry value="org.apache.aries.spifly.dynamic.bundle@2:true"/>
<setEntry value="org.apache.aries.util@default:default"/> <setEntry value="org.apache.aries.util@default:default"/>
<setEntry value="org.apache.commons.beanutils@default:default"/>
<setEntry value="org.apache.commons.codec@default:default"/>
<setEntry value="org.apache.commons.collections@default:default"/> <setEntry value="org.apache.commons.collections@default:default"/>
<setEntry value="org.apache.commons.commons-beanutils@default:default"/>
<setEntry value="org.apache.commons.commons-codec@default:default"/>
<setEntry value="org.apache.commons.commons-collections4@default:default"/> <setEntry value="org.apache.commons.commons-collections4@default:default"/>
<setEntry value="org.apache.commons.commons-compress@default:default"/>
<setEntry value="org.apache.commons.commons-configuration2@default:default"/> <setEntry value="org.apache.commons.commons-configuration2@default:default"/>
<setEntry value="org.apache.commons.compress@default:default"/> <setEntry value="org.apache.commons.commons-fileupload@default:default"/>
<setEntry value="org.apache.commons.digester@default:default"/> <setEntry value="org.apache.commons.commons-io@default:default"/>
<setEntry value="org.apache.commons.commons-net@default:default"/>
<setEntry value="org.apache.commons.commons-text@default:default"/>
<setEntry value="org.apache.commons.discovery@default:default"/> <setEntry value="org.apache.commons.discovery@default:default"/>
<setEntry value="org.apache.commons.fileupload@default:default"/>
<setEntry value="org.apache.commons.io@default:default"/>
<setEntry value="org.apache.commons.lang3@default:default"/> <setEntry value="org.apache.commons.lang3@default:default"/>
<setEntry value="org.apache.commons.lang@default:default"/> <setEntry value="org.apache.commons.lang@default:default"/>
<setEntry value="org.apache.commons.logging@default:default"/> <setEntry value="org.apache.commons.logging@default:default"/>
<setEntry value="org.apache.commons.math3@default:default"/> <setEntry value="org.apache.commons.math3@default:default"/>
<setEntry value="org.apache.commons.net@default:default"/>
<setEntry value="org.apache.cxf.cxf-core@default:default"/> <setEntry value="org.apache.cxf.cxf-core@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-bindings-soap@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-bindings-soap@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-bindings-xml@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-bindings-xml@default:default"/>
@ -180,67 +174,34 @@
<setEntry value="org.apache.cxf.cxf-rt-rs-extension-providers@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-rs-extension-providers@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-rs-service-description@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-rs-service-description@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-security@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-security@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-transports-http-jetty@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-transports-http@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-transports-http@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-ws-addr@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-ws-addr@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-ws-policy@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-ws-policy@default:default"/>
<setEntry value="org.apache.cxf.cxf-rt-wsdl@default:default"/> <setEntry value="org.apache.cxf.cxf-rt-wsdl@default:default"/>
<setEntry value="org.apache.cxf.rt-ws-transfer@default:default"/>
<setEntry value="org.apache.felix.gogo.command@default:default"/> <setEntry value="org.apache.felix.gogo.command@default:default"/>
<setEntry value="org.apache.felix.gogo.runtime@default:default"/> <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/> <setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/> <setEntry value="org.apache.felix.scr@2:true"/>
<setEntry value="org.apache.felix.webconsole@default:true"/> <setEntry value="org.apache.felix.webconsole@default:true"/>
<setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/> <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
<setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient@default:default"/> <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
<setEntry value="org.apache.httpcomponents.httpcore@default:default"/> <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.lucene.analyzers-common@default:default"/>
<setEntry value="org.apache.lucene.core@default:default"/>
<setEntry value="org.apache.neethi@default:default"/> <setEntry value="org.apache.neethi@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/> <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
<setEntry value="org.apache.poi.poi-ooxml@default:default"/> <setEntry value="org.apache.servicemix.bundles.batik@default:default"/>
<setEntry value="org.apache.poi.poi@default:default"/>
<setEntry value="org.apache.servicemix.bundles.cglib@default:default"/> <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
<setEntry value="org.apache.servicemix.bundles.jaxen@default:default"/> <setEntry value="org.apache.servicemix.bundles.jaxen@default:default"/>
<setEntry value="org.apache.servicemix.bundles.rhino@default:default"/> <setEntry value="org.apache.servicemix.bundles.rhino@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-aop@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-beans@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-context-support@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-context@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-core@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-expression@default:default"/>
<setEntry value="org.apache.servicemix.bundles.spring-web@default:default"/>
<setEntry value="org.apache.servicemix.bundles.wsdl4j@default:default"/>
<setEntry value="org.apache.servicemix.bundles.xerces@default:default"/> <setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
<setEntry value="org.apache.taglibs.standard-impl@default:default"/> <setEntry value="org.apache.taglibs.standard-impl@default:default"/>
<setEntry value="org.apache.taglibs.standard-jstlel@default:default"/>
<setEntry value="org.apache.taglibs.taglibs-standard-spec@default:default"/> <setEntry value="org.apache.taglibs.taglibs-standard-spec@default:default"/>
<setEntry value="org.apache.ws.xmlschema.core@default:default"/> <setEntry value="org.apache.ws.xmlschema.core@default:default"/>
<setEntry value="org.apache.xalan@default:default"/> <setEntry value="org.apache.xalan@default:default"/>
<setEntry value="org.apache.xml.resolver@default:default"/> <setEntry value="org.apache.xml.resolver@default:default"/>
<setEntry value="org.apache.xml.serializer@default:default"/> <setEntry value="org.apache.xml.serializer@default:default"/>
<setEntry value="org.apache.xmlbeans@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-anim@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-awt-util@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-bridge@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-codec@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-constants@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-css@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-dom@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-ext@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-extension@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-gvt@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-i18n@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-parser@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-script@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-svg-dom@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-svggen@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-util@default:default"/>
<setEntry value="org.apache.xmlgraphics.batik-xml@default:default"/>
<setEntry value="org.apache.xmlgraphics@default:default"/>
<setEntry value="org.atmosphere.runtime@default:default"/> <setEntry value="org.atmosphere.runtime@default:default"/>
<setEntry value="org.cryptacular@default:default"/> <setEntry value="org.cryptacular@default:default"/>
<setEntry value="org.dom4j@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/> <setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.core.commands@default:default"/> <setEntry value="org.eclipse.core.commands@default:default"/>
<setEntry value="org.eclipse.core.contenttype@default:default"/> <setEntry value="org.eclipse.core.contenttype@default:default"/>
@ -262,7 +223,6 @@
<setEntry value="org.eclipse.equinox.common@2:true"/> <setEntry value="org.eclipse.equinox.common@2:true"/>
<setEntry value="org.eclipse.equinox.concurrent@default:default"/> <setEntry value="org.eclipse.equinox.concurrent@default:default"/>
<setEntry value="org.eclipse.equinox.console@default:default"/> <setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.ds@2:true"/>
<setEntry value="org.eclipse.equinox.event@2:true"/> <setEntry value="org.eclipse.equinox.event@2:true"/>
<setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/> <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
<setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/> <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
@ -292,33 +252,39 @@
<setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/> <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
<setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/> <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
<setEntry value="org.eclipse.jdt.core@default:default"/> <setEntry value="org.eclipse.jdt.core@default:default"/>
<setEntry value="org.eclipse.jetty.annotations@default:default"/> <setEntry value="org.eclipse.jetty.alpn.client@default:default"/>
<setEntry value="org.eclipse.jetty.annotations@default:true"/>
<setEntry value="org.eclipse.jetty.apache-jsp@default:true"/> <setEntry value="org.eclipse.jetty.apache-jsp@default:true"/>
<setEntry value="org.eclipse.jetty.apache.jstl@default:default"/>
<setEntry value="org.eclipse.jetty.client@default:default"/> <setEntry value="org.eclipse.jetty.client@default:default"/>
<setEntry value="org.eclipse.jetty.continuation@default:default"/>
<setEntry value="org.eclipse.jetty.deploy@default:default"/> <setEntry value="org.eclipse.jetty.deploy@default:default"/>
<setEntry value="org.eclipse.jetty.http@default:true"/> <setEntry value="org.eclipse.jetty.http@default:true"/>
<setEntry value="org.eclipse.jetty.io@default:default"/> <setEntry value="org.eclipse.jetty.io@default:default"/>
<setEntry value="org.eclipse.jetty.jaas@default:default"/> <setEntry value="org.eclipse.jetty.jaas@default:default"/>
<setEntry value="org.eclipse.jetty.jmx@default:default"/> <setEntry value="org.eclipse.jetty.jmx@default:default"/>
<setEntry value="org.eclipse.jetty.jndi@default:default"/> <setEntry value="org.eclipse.jetty.jndi@default:default"/>
<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:false"/> <setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:false"/>
<setEntry value="org.eclipse.jetty.osgi.boot.warurl@default:default"/>
<setEntry value="org.eclipse.jetty.osgi.boot@default:true"/> <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>
<setEntry value="org.eclipse.jetty.osgi.httpservice@10:true"/> <setEntry value="org.eclipse.jetty.osgi.httpservice@default:true"/>
<setEntry value="org.eclipse.jetty.plus@default:default"/> <setEntry value="org.eclipse.jetty.plus@default:default"/>
<setEntry value="org.eclipse.jetty.rewrite@default:default"/>
<setEntry value="org.eclipse.jetty.security@default:default"/> <setEntry value="org.eclipse.jetty.security@default:default"/>
<setEntry value="org.eclipse.jetty.server@default:default"/> <setEntry value="org.eclipse.jetty.server@default:default"/>
<setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
<setEntry value="org.eclipse.jetty.servlet@default:default"/> <setEntry value="org.eclipse.jetty.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.servlets@default:default"/> <setEntry value="org.eclipse.jetty.servlets@default:default"/>
<setEntry value="org.eclipse.jetty.util.ajax@default:default"/> <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
<setEntry value="org.eclipse.jetty.util@default:default"/> <setEntry value="org.eclipse.jetty.util@default:default"/>
<setEntry value="org.eclipse.jetty.webapp@default:default"/> <setEntry value="org.eclipse.jetty.webapp@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.api@default:default"/> <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.common@3:true"/> <setEntry value="org.eclipse.jetty.websocket.common@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.websocket.server@3:true"/> <setEntry value="org.eclipse.jetty.websocket.core.client@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.javax.websocket@3:true"/> <setEntry value="org.eclipse.jetty.websocket.core.common@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.core.server@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.client@default:default"/>
<setEntry value="org.eclipse.jetty.websocket.javax.common@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.javax.server@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.server@3:true"/> <setEntry value="org.eclipse.jetty.websocket.server@3:true"/>
<setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/> <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>
<setEntry value="org.eclipse.jetty.xml@default:default"/> <setEntry value="org.eclipse.jetty.xml@default:default"/>
@ -327,18 +293,21 @@
<setEntry value="org.eclipse.osgi.util@default:default"/> <setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/> <setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.eclipse.text@default:default"/> <setEntry value="org.eclipse.text@default:default"/>
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
<setEntry value="org.glassfish.external.management-api@default:default"/> <setEntry value="org.glassfish.external.management-api@default:default"/>
<setEntry value="org.glassfish.gmbal.gmbal@default:default"/> <setEntry value="org.glassfish.gmbal.gmbal@default:default"/>
<setEntry value="org.glassfish.ha.ha-api@default:default"/>
<setEntry value="org.glassfish.hk2.api@default:default"/> <setEntry value="org.glassfish.hk2.api@default:default"/>
<setEntry value="org.glassfish.hk2.external.aopalliance-repackaged@default:default"/>
<setEntry value="org.glassfish.hk2.external.jakarta.inject@default:default"/>
<setEntry value="org.glassfish.hk2.locator@default:default"/> <setEntry value="org.glassfish.hk2.locator@default:default"/>
<setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/> <setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
<setEntry value="org.glassfish.hk2.utils@default:default"/> <setEntry value="org.glassfish.hk2.utils@default:default"/>
<setEntry value="org.glassfish.jaxb.txw2@default:default"/> <setEntry value="org.glassfish.jersey.containers.jersey-container-servlet-core@default:default"/>
<setEntry value="org.glassfish.jersey.containers.servlet.core@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/> <setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-common@default:true"/> <setEntry value="org.glassfish.jersey.core.jersey-common@default:default"/>
<setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/> <setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/>
<setEntry value="org.glassfish.jersey.ext.entityfiltering@default:default"/> <setEntry value="org.glassfish.jersey.ext.jersey-entity-filtering@default:default"/>
<setEntry value="org.glassfish.jersey.inject.jersey-hk2@default:default"/> <setEntry value="org.glassfish.jersey.inject.jersey-hk2@default:default"/>
<setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/> <setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/>
<setEntry value="org.glassfish.pfl.pfl-asm@default:default"/> <setEntry value="org.glassfish.pfl.pfl-asm@default:default"/>
@ -346,9 +315,6 @@
<setEntry value="org.glassfish.pfl.pfl-dynamic@default:default"/> <setEntry value="org.glassfish.pfl.pfl-dynamic@default:default"/>
<setEntry value="org.glassfish.pfl.pfl-tf@default:default"/> <setEntry value="org.glassfish.pfl.pfl-tf@default:default"/>
<setEntry value="org.hamcrest.core@default:default"/> <setEntry value="org.hamcrest.core@default:default"/>
<setEntry value="org.jfree.chart@default:default"/>
<setEntry value="org.jfree.jcommon@default:default"/>
<setEntry value="org.jsr-305@default:default"/>
<setEntry value="org.junit@default:default"/> <setEntry value="org.junit@default:default"/>
<setEntry value="org.jvnet.mimepull@default:default"/> <setEntry value="org.jvnet.mimepull@default:default"/>
<setEntry value="org.jvnet.staxex.stax-ex@default:default"/> <setEntry value="org.jvnet.staxex.stax-ex@default:default"/>
@ -363,21 +329,48 @@
<setEntry value="org.passay@default:default"/> <setEntry value="org.passay@default:default"/>
<setEntry value="org.sat4j.core@default:default"/> <setEntry value="org.sat4j.core@default:default"/>
<setEntry value="org.sat4j.pb@default:default"/> <setEntry value="org.sat4j.pb@default:default"/>
<setEntry value="org.springframework.spring-jcl@default:default"/>
<setEntry value="org.tukaani.xz@default:default"/> <setEntry value="org.tukaani.xz@default:default"/>
<setEntry value="org.w3c.css.sac@default:default"/> <setEntry value="org.w3c.css.sac@default:default"/>
<setEntry value="org.w3c.dom.events@default:default"/>
<setEntry value="org.w3c.dom.smil@default:default"/> <setEntry value="org.w3c.dom.smil@default:default"/>
<setEntry value="org.w3c.dom.svg@default:default"/> <setEntry value="org.w3c.dom.svg@default:default"/>
<setEntry value="org.zkoss.zsoup@default:default"/> <setEntry value="org.zkoss.zsoup@default:default"/>
<setEntry value="slf4j.api@default:default"/> <setEntry value="slf4j.api*1.7.30@default:default"/>
<setEntry value="slf4j.jcl@default:false"/> <setEntry value="slf4j.jcl@default:false"/>
<setEntry value="stax2-api@default:default"/> <setEntry value="stax2-api@default:default"/>
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/> <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
<setEntry value="wrapped.com.google.zxing.javase@default:default"/> <setEntry value="wrapped.com.google.zxing.javase@default:default"/>
<setEntry value="wrapped.com.sun.net.httpserver.http@default:default"/>
<setEntry value="wrapped.com.sun.org.apache.xml.internal.resolver@default:default"/>
<setEntry value="wrapped.com.zaxxer.SparseBitSet@default:default"/>
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/> <setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/> <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
<setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/> <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-jaas@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
<setEntry value="wrapped.org.apache.activemq.activemq-openwire-legacy@default:default"/>
<setEntry value="wrapped.org.apache.activemq.protobuf.activemq-protobuf@default:default"/>
<setEntry value="wrapped.org.apache.cxf.cxf-rt-ws-transfer@default:default"/>
<setEntry value="wrapped.org.apache.lucene.lucene-analyzers-common@default:default"/>
<setEntry value="wrapped.org.apache.lucene.lucene-core@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
<setEntry value="wrapped.org.apache.poi.poi@default:default"/>
<setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
<setEntry value="wrapped.org.apache.xmlgraphics.xmlgraphics-commons@default:default"/>
<setEntry value="wrapped.org.dom4j.dom4j@default:default"/>
<setEntry value="wrapped.org.glassfish.jaxb.txw2@default:default"/>
<setEntry value="wrapped.org.jfree.jcommon@default:default"/>
<setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
<setEntry value="wrapped.org.springframework.spring-aop@default:default"/>
<setEntry value="wrapped.org.springframework.spring-beans@default:default"/>
<setEntry value="wrapped.org.springframework.spring-context-support@default:default"/>
<setEntry value="wrapped.org.springframework.spring-context@default:default"/>
<setEntry value="wrapped.org.springframework.spring-core@default:default"/>
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
<setEntry value="wrapped.org.springframework.spring-web@default:default"/>
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
<setEntry value="xstream@default:default"/>
<setEntry value="zcommon@default:default"/> <setEntry value="zcommon@default:default"/>
<setEntry value="zel@default:default"/> <setEntry value="zel@default:default"/>
<setEntry value="zhtml@default:default"/> <setEntry value="zhtml@default:default"/>
@ -398,7 +391,7 @@
<setEntry value="org.adempiere.install@default:default"/> <setEntry value="org.adempiere.install@default:default"/>
<setEntry value="org.adempiere.payment.processor@default:default"/> <setEntry value="org.adempiere.payment.processor@default:default"/>
<setEntry value="org.adempiere.pipo.handlers@default:default"/> <setEntry value="org.adempiere.pipo.handlers@default:default"/>
<setEntry value="org.adempiere.pipo@default:true"/> <setEntry value="org.adempiere.pipo@default:default"/>
<setEntry value="org.adempiere.plugin.utils@default:default"/> <setEntry value="org.adempiere.plugin.utils@default:default"/>
<setEntry value="org.adempiere.replication.server@default:default"/> <setEntry value="org.adempiere.replication.server@default:default"/>
<setEntry value="org.adempiere.replication@default:default"/> <setEntry value="org.adempiere.replication@default:default"/>
@ -412,6 +405,7 @@
<setEntry value="org.compiere.db.postgresql.provider@default:default"/> <setEntry value="org.compiere.db.postgresql.provider@default:default"/>
<setEntry value="org.idempiere.felix.webconsole@default:true"/> <setEntry value="org.idempiere.felix.webconsole@default:true"/>
<setEntry value="org.idempiere.hazelcast.service@default:default"/> <setEntry value="org.idempiere.hazelcast.service@default:default"/>
<setEntry value="org.idempiere.jetty.osgi.boot.fragment@default:false"/>
<setEntry value="org.idempiere.keikai@default:false"/> <setEntry value="org.idempiere.keikai@default:false"/>
<setEntry value="org.idempiere.printformat.editor@default:default"/> <setEntry value="org.idempiere.printformat.editor@default:default"/>
<setEntry value="org.idempiere.webservices@default:default"/> <setEntry value="org.idempiere.webservices@default:default"/>

View File

@ -1,5 +1,5 @@
-startup -startup
plugins/org.eclipse.equinox.launcher_1.5.800.v20200727-1323.jar plugins/org.eclipse.equinox.launcher_1.6.200.v20210416-2027.jar
-install -install
setup setup
--launcher.XXMaxPermSize --launcher.XXMaxPermSize

View File

@ -1,6 +1,6 @@
osgi.framework=file\:../plugins/org.eclipse.osgi_3.16.0.v20200828-0759.jar osgi.framework=file\:../plugins/org.eclipse.osgi_3.16.300.v20210525-1715.jar
osgi.install.area=setup osgi.install.area=setup
osgi.bundles=org.eclipse.equinox.ds@1:start,\ osgi.bundles=org.apache.felix.scr@1:start,\
org.eclipse.core.variables,\ org.eclipse.core.variables,\
org.eclipse.ant.core,\ org.eclipse.ant.core,\
org.eclipse.core.runtime@start,\ org.eclipse.core.runtime@start,\
@ -12,55 +12,50 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.adempiere.install,\ org.adempiere.install,\
org.apache.servicemix.bundles.cglib,\ org.apache.servicemix.bundles.cglib,\
com.sun.mail.gimap,\ com.sun.mail.gimap,\
com.sun.mail.imap,\
com.sun.mail.jakarta.mail,\ com.sun.mail.jakarta.mail,\
com.sun.mail.smtp,\
jakarta.mail.api,\
com.sun.activation.jakarta.activation,\ com.sun.activation.jakarta.activation,\
org.apache.commons.collections,\ org.apache.commons.collections,\
org.apache.commons.commons-collections4,\ org.apache.commons.commons-collections4,\
org.apache.ant,\ org.apache.ant,\
javax.jms,\ org.apache.geronimo.specs.geronimo-jms_1.1_spec,\
org.apache.ecs,\ org.apache.ecs,\
org.apache.commons.net,\ org.apache.commons.commons-net,\
org.eclipse.equinox.app,\ org.eclipse.equinox.app,\
org.eclipse.equinox.registry,\ org.eclipse.equinox.registry,\
org.eclipse.equinox.common@2:start,\ org.eclipse.equinox.common@2:start,\
org.eclipse.osgi.util,\ org.eclipse.osgi.util,\
org.apache.felix.scr,\
org.eclipse.core.contenttype,\ org.eclipse.core.contenttype,\
org.apache.poi.poi,\ wrapped.org.apache.poi.poi,\
org.apache.poi.poi-ooxml,\ wrapped.org.apache.poi.poi-ooxml,\
org.apache.commons.compress,\ org.apache.commons.commons-compress,\
org.apache.poi.poi-ooxml-schemas,\ org.apache.poi.ooxml-schemas,\
org.apache.xmlbeans,\ wrapped.org.apache.xmlbeans.xmlbeans,\
org.eclipse.core.jobs,\ org.eclipse.core.jobs,\
org.eclipse.equinox.preferences,\ org.eclipse.equinox.preferences,\
org.eclipse.equinox.event,\ org.eclipse.equinox.event,\
org.apache.commons.logging,\ org.apache.commons.logging,\
org.eclipse.osgi,\ org.eclipse.osgi,\
org.eclipse.osgi.services,\ org.eclipse.osgi.services,\
javax.xml,\ org.apache.activemq.activemq-client,\
org.apache.activemq.activemq-core,\ jakarta.transaction-api,\
org.apache.activemq.kahadb,\ org.eclipse.jetty.servlet-api,\
javax.transaction,\
org.eclipse.jetty.osgi-servlet-api,\
org.eclipse.jetty.util,\ org.eclipse.jetty.util,\
jakarta.annotation-api,\ jakarta.annotation-api,\
slf4j.api,\ slf4j.api,\
slf4j.jcl,\ slf4j.jcl,\
org.apache.commons.codec,\ org.apache.commons.commons-codec,\
org.eclipse.osgi.compatibility.state,\ org.eclipse.osgi.compatibility.state,\
org.cryptacular,\ org.cryptacular,\
net.sf.supercsv.super-csv,\ net.sf.supercsv.super-csv,\
com.github.librepdf.openpdf,\ com.github.librepdf.openpdf,\
com.github.librepdf.openpdf-fonts-extra,\ com.github.librepdf.openpdf-fonts-extra,\
com.jaspersoft.studio.bundles.barbecue,\ com.jaspersoft.studio.bundles.barbecue,\
org.jfree.chart,\ wrapped.org.jfree.jfreechart,\
org.jfree.jcommon,\ wrapped.org.jfree.jcommon,\
org.krysalis.barcode4j,\ org.krysalis.barcode4j,\
bcprov,\ bcprov,\
bcpkix,\ bcpkix,\
bcutil,\
org.eclipse.equinox.common,\ org.eclipse.equinox.common,\
org.passay,\ org.passay,\
groovy,\ groovy,\
@ -70,7 +65,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
com.google.zxing.core,\ com.google.zxing.core,\
com.google.http-client.google-http-client,\ com.google.http-client.google-http-client,\
com.google.oauth-client,\ com.google.oauth-client,\
org.jsr-305,\
wrapped.com.google.http-client.google-http-client-gson,\ wrapped.com.google.http-client.google-http-client-gson,\
wrapped.io.grpc.grpc-context,\ wrapped.io.grpc.grpc-context,\
wrapped.io.opencensus.opencensus-api,\ wrapped.io.opencensus.opencensus-api,\
@ -80,10 +74,12 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\ org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\
jakarta.xml.bind-api,\ jakarta.xml.bind-api,\
org.eclipse.osgi@start,\ org.eclipse.osgi@start,\
org.dom4j,\ wrapped.org.dom4j.dom4j,\
wrapped.com.google.zxing.javase,\ wrapped.com.google.zxing.javase,\
wrapped.dev.samstevens.totp.totp,\ wrapped.dev.samstevens.totp.totp,\
org.antlr.antlr4-runtime org.antlr.antlr4-runtime,\
xstream,\
org.fusesource.hawtbuf.hawtbuf
osgi.framework.extensions= osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4 osgi.bundles.defaultStartLevel=4
osgi.compatibility.bootdelegation=true osgi.compatibility.bootdelegation=true

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Server Bundle-Name: iDempiere Server
Bundle-SymbolicName: org.adempiere.server;singleton:=true Bundle-SymbolicName: org.adempiere.server;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.eclipse.equinox.app;bundle-version="0.0.0", org.eclipse.equinox.app;bundle-version="0.0.0",
org.eclipse.jetty.apache-jsp;bundle-version="0.0.0" org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="3.1"> version="4.0">
<display-name>iDempiere Root</display-name> <display-name>iDempiere Root</display-name>
<description></description> <description></description>
<context-param> <context-param>
@ -22,15 +22,7 @@
<filter-name>idempiereMonitorFilter</filter-name> <filter-name>idempiereMonitorFilter</filter-name>
<url-pattern>/idempiereMonitor/*</url-pattern> <url-pattern>/idempiereMonitor/*</url-pattern>
</filter-mapping> </filter-mapping>
<!-- <servlet>
<description>iDempiere Server Status Info</description>
<display-name>Server Status</display-name>
<servlet-name>StatusInfo</servlet-name>
<servlet-class>org.compiere.web.StatusInfo</servlet-class>
</servlet> -->
<servlet> <servlet>
<description>iDempiere Server Monitor</description>
<display-name>iDempiere Monitor</display-name>
<servlet-name>idempiereMonitor</servlet-name> <servlet-name>idempiereMonitor</servlet-name>
<servlet-class>org.compiere.web.AdempiereMonitor</servlet-class> <servlet-class>org.compiere.web.AdempiereMonitor</servlet-class>
<load-on-startup>1</load-on-startup> <load-on-startup>1</load-on-startup>
@ -51,18 +43,10 @@
<servlet-name>OAuthCodeCallbackHandlerServlet</servlet-name> <servlet-name>OAuthCodeCallbackHandlerServlet</servlet-name>
<url-pattern>/oauth2/callback</url-pattern> <url-pattern>/oauth2/callback</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- <servlet-mapping>
<servlet-name>StatusInfo</servlet-name>
<url-pattern>/statusInfo</url-pattern>
</servlet-mapping> -->
<servlet-mapping> <servlet-mapping>
<servlet-name>idempiereMonitor</servlet-name> <servlet-name>idempiereMonitor</servlet-name>
<url-pattern>/idempiereMonitor/*</url-pattern> <url-pattern>/idempiereMonitor/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- <servlet-mapping>
<servlet-name>RestletServlet</servlet-name>
<url-pattern>/server/*</url-pattern>
</servlet-mapping> -->
<session-config> <session-config>
<session-timeout>15</session-timeout> <session-timeout>15</session-timeout>
</session-config> </session-config>

View File

@ -44,7 +44,7 @@
<tbody> <tbody>
<tr> <tr>
<td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the iDempiere (OSGi+ADempiere) 8.2z Phong Page!<br> <td align="left" valign="middle"><font color="#ffffff" face="Arial, Helvetica, sans-serif" size="4">Welcome to the iDempiere 9.0.0 Development Build Page!<br>
</font></td> </font></td>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.server</artifactId> <artifactId>org.adempiere.server</artifactId>

View File

@ -90,7 +90,7 @@ public final class Prop implements Serializable {
public static final String SOC_7 = "Social7"; public static final String SOC_7 = "Social7";
/**Defaults*/ /**Defaults*/
private static final String CREDITS = "Welcome to the iDempiere (OSGi+ADempiere) 8.2z Phong Page!"; private static final String CREDITS = "Welcome to the iDempiere 9.0.0 Development Build Page!";
private static String LOGO_URL = null; private static String LOGO_URL = null;

View File

@ -52,5 +52,5 @@ CustomImagePath = NONE
ClientName = iDempiere Application Home ClientName = iDempiere Application Home
#Custom Credits & Copyright tail #Custom Credits & Copyright tail
Credits = Welcome to iDempiere 8.2z Phong Credits = Welcome to iDempiere 9.0.0 Development Build
Copyriright = || by <a href="http://www.idempiere.org" target="blank">iDempiere Community</a> Copyriright = || by <a href="http://www.idempiere.org" target="blank">iDempiere Community</a>

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.adempiere.ui.zk.feature" id="org.adempiere.ui.zk.feature"
label="Zk Client-feature" label="Zk Client-feature"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">
@ -25,7 +25,7 @@
id="org.adempiere.ui.zk" id="org.adempiere.ui.zk"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="8.2.0.qualifier"/> version="0.0.0"/>
<plugin <plugin
id="org.atmosphere.runtime" id="org.atmosphere.runtime"

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.ui.zk.feature</artifactId> <artifactId>org.adempiere.ui.zk.feature</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Web Client Bundle-Name: iDempiere Web Client
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Import-Package: com.google.common.annotations;version="30.1.1", Import-Package: com.google.common.annotations;version="30.1.1",
@ -43,13 +43,18 @@ Import-Package: com.google.common.annotations;version="30.1.1",
org.apache.commons.fileupload.servlet;version="1.2.2", org.apache.commons.fileupload.servlet;version="1.2.2",
org.apache.commons.fileupload.util;version="1.2.2", org.apache.commons.fileupload.util;version="1.2.2",
org.apache.commons.lang3;version="3.1.0", org.apache.commons.lang3;version="3.1.0",
org.apache.commons.text;version="1.9.0",
org.apache.commons.text.diff;version="1.9.0",
org.apache.commons.text.io;version="1.9.0",
org.apache.commons.text.lookup;version="1.9.0",
org.apache.commons.text.matcher;version="1.9.0",
org.apache.commons.text.similarity;version="1.9.0",
org.apache.commons.text.translate;version="1.9.0",
org.apache.ecs, org.apache.ecs,
org.apache.ecs.xhtml, org.apache.ecs.xhtml,
org.apache.tools.ant, org.apache.tools.ant,
org.apache.tools.ant.taskdefs, org.apache.tools.ant.taskdefs,
org.eclipse.core.runtime;version="3.4.0", org.eclipse.core.runtime;version="3.4.0",
org.eclipse.jetty.websocket.jsr356;version="9.4.12",
org.eclipse.jetty.websocket.jsr356.server;version="9.4.12",
org.jfree.chart, org.jfree.chart,
org.jfree.chart.encoders, org.jfree.chart.encoders,
org.jfree.chart.entity, org.jfree.chart.entity,
@ -176,7 +181,7 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
zkplus;bundle-version="0.0.0", zkplus;bundle-version="0.0.0",
zul;bundle-version="0.0.0", zul;bundle-version="0.0.0",
zweb;bundle-version="0.0.0", zweb;bundle-version="0.0.0",
org.apache.commons.io;bundle-version="0.0.0", org.apache.commons.commons-io;bundle-version="0.0.0",
org.atmosphere.runtime;bundle-version="0.0.0", org.atmosphere.runtime;bundle-version="0.0.0",
zkwebfragment, zkwebfragment,
com.sun.activation.jakarta.activation;bundle-version="1.2.1", com.sun.activation.jakarta.activation;bundle-version="1.2.1",

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<!-- IDEMPIERE-2490 --> <!-- IDEMPIERE-2490 -->

View File

@ -28,7 +28,6 @@ import org.adempiere.webui.util.ZKUpdateUtil;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.zkoss.zk.ui.Page;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
@ -133,10 +132,12 @@ public class NumberBox extends Div
btn.setImage(ThemeManager.getThemeResource("images/Calculator16.png")); btn.setImage(ThemeManager.getThemeResource("images/Calculator16.png"));
btn.setTabindex(-1); btn.setTabindex(-1);
ZKUpdateUtil.setHflex(btn, "0"); ZKUpdateUtil.setHflex(btn, "0");
btn.addEventListener(Events.ON_CLICK, new EventListener<Event>() { btn.addEventListener(Events.ON_CLICK, new EventListener<Event>() {
@Override @Override
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
if (btn.getPopup() != null) { if (popup != null) {
popup.open(NumberBox.this, "after_start");
// Fill the calculator with the actual value of the field // Fill the calculator with the actual value of the field
// TODO: this could be made a user preference // TODO: this could be made a user preference
String curValue = ""; String curValue = "";
@ -162,7 +163,6 @@ public class NumberBox extends Div
popup = getCalculatorPopup(); popup = getCalculatorPopup();
appendChild(popup); appendChild(popup);
btn.setPopup(popup);
btn.setStyle("text-align: center;"); btn.setStyle("text-align: center;");
LayoutUtils.addSclass("number-box", this); LayoutUtils.addSclass("number-box", this);
@ -248,22 +248,7 @@ public class NumberBox extends Div
private Popup getCalculatorPopup() private Popup getCalculatorPopup()
{ {
Popup popup = new Popup() { Popup popup = new Popup();
/**
*
*/
private static final long serialVersionUID = -5991248152956632527L;
@Override
public void onPageAttached(Page newpage, Page oldpage) {
super.onPageAttached(newpage, oldpage);
if (newpage != null) {
if (btn.getPopup() != null) {
btn.setPopup(this);
}
}
}
};
Vbox vbox = new Vbox(); Vbox vbox = new Vbox();
@ -482,12 +467,9 @@ public class NumberBox extends Div
{ {
if (btn.getParent() != decimalBox.getParent()) if (btn.getParent() != decimalBox.getParent())
btn.setParent(decimalBox.getParent()); btn.setParent(decimalBox.getParent());
btn.setPopup(popup);
} }
else else
{ {
Popup p = null;
btn.setPopup(p);
if (btn.getParent() != null) if (btn.getParent() != null)
btn.detach(); btn.detach();
} }

View File

@ -46,7 +46,7 @@ import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart; import org.jfree.chart.JFreeChart;
import org.jfree.chart.encoders.EncoderUtil; import org.jfree.chart.encoders.EncoderUtil;
import org.jfree.chart.encoders.ImageFormat; import org.jfree.chart.encoders.ImageFormat;
import org.jfree.chart.plot.PiePlot3D; import org.jfree.chart.plot.PiePlot;
import org.jfree.data.general.DefaultPieDataset; import org.jfree.data.general.DefaultPieDataset;
import org.zkoss.calendar.Calendars; import org.zkoss.calendar.Calendars;
import org.zkoss.calendar.api.CalendarEvent; import org.zkoss.calendar.api.CalendarEvent;
@ -329,6 +329,7 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
} }
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
private void syncModel() { private void syncModel() {
Hashtable<String,BigDecimal> ht = new Hashtable<String,BigDecimal>(); Hashtable<String,BigDecimal> ht = new Hashtable<String,BigDecimal>();
@ -362,8 +363,8 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
pieDataset.setValue(name == null ? "" : name, Double.valueOf(size > 0 ? value.doubleValue()/size*100 : 0)); pieDataset.setValue(name == null ? "" : name, Double.valueOf(size > 0 ? value.doubleValue()/size*100 : 0));
} }
JFreeChart chart = ChartFactory.createPieChart3D(Msg.getMsg(Env.getCtx(),"EventsAnalysis"), pieDataset, true, true, true); JFreeChart chart = ChartFactory.createPieChart(Msg.getMsg(Env.getCtx(),"EventsAnalysis"), pieDataset, true, true, true);
PiePlot3D plot = (PiePlot3D) chart.getPlot(); PiePlot plot = (PiePlot) chart.getPlot();
plot.setForegroundAlpha(0.5f); plot.setForegroundAlpha(0.5f);
BufferedImage bi = chart.createBufferedImage(600, 250); BufferedImage bi = chart.createBufferedImage(600, 250);
try { try {

View File

@ -596,6 +596,8 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
{ {
pnlHead.invalidate(); pnlHead.invalidate();
} }
homeTab.invalidate();
} }
protected void setSidePopupWidth(Popup popup) { protected void setSidePopupWidth(Popup popup) {

View File

@ -29,7 +29,7 @@ import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.text.StringEscapeUtils;
import org.zkoss.lang.Objects; import org.zkoss.lang.Objects;
import org.zkoss.xel.VariableResolver; import org.zkoss.xel.VariableResolver;
import org.zkoss.zk.au.out.AuSetAttribute; import org.zkoss.zk.au.out.AuSetAttribute;

View File

@ -9,7 +9,7 @@ Copyright (C) 2009 Idalica Corporation
if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo&quot;) or desktop.execution.serverName.startsWith(&quot;test&quot;) or desktop.execution.serverName.startsWith(&quot;triage&quot;)}"> if="${desktop.execution.serverName.equals(&quot;127.0.0.1&quot;) or desktop.execution.serverName.startsWith(&quot;demo&quot;) or desktop.execution.serverName.startsWith(&quot;test&quot;) or desktop.execution.serverName.startsWith(&quot;triage&quot;)}">
<hbox align="center"> <hbox align="center">
<a href="http://www.idempiere.org" target="_blank"><image src="~./theme/default/images/login-logo.png"/></a> <a href="http://www.idempiere.org" target="_blank"><image src="~./theme/default/images/login-logo.png"/></a>
<label value="iDempiere 8.2z Online Demonstration" <label value="iDempiere 9.0.0 Development Build Online Demonstration"
style="font-family:Arial,sans-serif; color:#578BB8; font-size:1.5em; font-weight: bold;" /> style="font-family:Arial,sans-serif; color:#578BB8; font-size:1.5em; font-weight: bold;" />
</hbox> </hbox>
</div> </div>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="3.1"> version="4.0">
<display-name>iDempiere Web Client</display-name> <display-name>iDempiere Web Client</display-name>
<context-param> <context-param>
<param-name>org.eclipse.jetty.servlet.SessionCookie</param-name> <param-name>org.eclipse.jetty.servlet.SessionCookie</param-name>
@ -29,7 +29,7 @@
</init-param> </init-param>
<init-param> <init-param>
<param-name>org.atmosphere.websocket.suppressJSR356</param-name> <param-name>org.atmosphere.websocket.suppressJSR356</param-name>
<param-value>true</param-value> <param-value>false</param-value>
</init-param> </init-param>
<load-on-startup>0</load-on-startup> <load-on-startup>0</load-on-startup>
<!-- Remove async-supported if you are not using Servlet 3.0 --> <!-- Remove async-supported if you are not using Servlet 3.0 -->
@ -178,10 +178,4 @@
<!-- <transport-guarantee>CONFIDENTIAL</transport-guarantee> --> <!-- <transport-guarantee>CONFIDENTIAL</transport-guarantee> -->
<!-- </user-data-constraint> --> <!-- </user-data-constraint> -->
<!-- </security-constraint> --> <!-- </security-constraint> -->
<!--env-entry>
<env-entry-name>IDEMPIERE_HOME</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>/opt/adempiere/</env-entry-value>
</env-entry-->
</web-app> </web-app>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.ui.zk</artifactId> <artifactId>org.adempiere.ui.zk</artifactId>
@ -53,12 +53,12 @@
<artifactItem> <artifactItem>
<groupId>org.zkoss.zkforge</groupId> <groupId>org.zkoss.zkforge</groupId>
<artifactId>ckez</artifactId> <artifactId>ckez</artifactId>
<version>4.7.0.0</version> <version>4.16.1.1</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId> <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
<artifactId>owasp-java-html-sanitizer</artifactId> <artifactId>owasp-java-html-sanitizer</artifactId>
<version>20190503.1</version> <version>20200713.1</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere UI base Bundle-Name: iDempiere UI base
Bundle-SymbolicName: org.adempiere.ui;singleton:=true Bundle-SymbolicName: org.adempiere.ui;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Require-Bundle: org.adempiere.base;bundle-version="0.0.0",

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.adempiere.ui</artifactId> <artifactId>org.adempiere.ui</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: Apache ECS Library Bundle-Name: Apache ECS Library
Bundle-SymbolicName: org.apache.ecs Bundle-SymbolicName: org.apache.ecs
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-Activator: org.apache.ecs.Activator Bundle-Activator: org.apache.ecs.Activator
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.apache.ecs</artifactId> <artifactId>org.apache.ecs</artifactId>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Oracle Provider Bundle-Name: iDempiere Oracle Provider
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0", Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
@ -19,3 +19,4 @@ Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator
Service-Component: OSGI-INF/*.xml Service-Component: OSGI-INF/*.xml
Automatic-Module-Name: org.compiere.db.oracle.provider Automatic-Module-Name: org.compiere.db.oracle.provider
Bundle-Vendor: iDempiere Community Bundle-Vendor: iDempiere Community
Export-Package: org.adempiere.db.oracle.config

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.compiere.db.oracle.provider</artifactId> <artifactId>org.compiere.db.oracle.provider</artifactId>
@ -41,7 +41,7 @@
<artifactItem> <artifactItem>
<groupId>com.oracle.database.jdbc</groupId> <groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc10</artifactId> <artifactId>ojdbc10</artifactId>
<version>19.8.0.0</version> <version>19.12.0.0</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>

View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Postgresql Provider Bundle-Name: iDempiere Postgresql Provider
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
Bundle-Version: 8.2.0.qualifier Bundle-Version: 9.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Bundle-ClassPath: ., Bundle-ClassPath: .,
@ -18,3 +18,4 @@ Bundle-Activator: org.adempiere.db.postgresql.PostgreSQLBundleActivator
Service-Component: OSGI-INF/*.xml Service-Component: OSGI-INF/*.xml
Automatic-Module-Name: org.compiere.db.postgresql.provider Automatic-Module-Name: org.compiere.db.postgresql.provider
Bundle-Vendor: iDempiere Community Bundle-Vendor: iDempiere Community
Export-Package: org.adempiere.db.postgresql.config

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.idempiere</groupId> <groupId>org.idempiere</groupId>
<artifactId>org.idempiere.parent</artifactId> <artifactId>org.idempiere.parent</artifactId>
<version>8.2.0-SNAPSHOT</version> <version>${revision}</version>
<relativePath>../org.idempiere.parent/pom.xml</relativePath> <relativePath>../org.idempiere.parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>org.compiere.db.postgresql.provider</artifactId> <artifactId>org.compiere.db.postgresql.provider</artifactId>
@ -36,7 +36,7 @@
<artifactItem> <artifactItem>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>42.2.18</version> <version>42.2.23</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>

View File

@ -2,7 +2,7 @@
<feature <feature
id="org.compiere.db.provider.feature" id="org.compiere.db.provider.feature"
label="Database Provider-feature" label="Database Provider-feature"
version="8.2.0.qualifier" version="9.0.0.qualifier"
provider-name="iDempiere Community"> provider-name="iDempiere Community">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">

Some files were not shown because too many files have changed in this diff Show More