From c3cad0d1e2a2d4dc1afbc089c4cbb7320d779506 Mon Sep 17 00:00:00 2001 From: hengsin Date: Thu, 30 Apr 2020 22:01:19 +0800 Subject: [PATCH] IDEMPIERE-4249 Platform Refresh for 7.1z (#19) Upgrade to Tycho 1.7.0, Eclipse 2020-03, Zk 9.0.1 and Jetty 9.4.28 --- .gitignore | 2 +- org.adempiere.base-feature/feature.xml | 22 +- .../model.generator.launch | 215 +-- .../packinfolder.app.launch | 215 +-- .../sign.database.build.launch | 216 +-- .../synchronize-terminology.app.launch | 216 +-- .../translation.app.launch | 216 +-- org.adempiere.base.callout/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.base.process/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.base/.classpath | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + .../.project | 23 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../feature.xml | 83 - .../pom.xml | 12 - .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.install/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.install/install.app.launch | 14 +- .../install.console.app.launch | 14 +- org.adempiere.payment.processor/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.pipo.handlers/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.pipo/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.plugin.utils/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.replication.server/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.replication/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + .../feature.xml | 315 ++-- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.report.jasper.webapp/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.report.jasper/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.server-feature/feature.xml | 43 +- org.adempiere.server-feature/server.product | 15 +- .../server.product.functionaltest.launch | 216 +-- .../server.product.launch | 213 +-- org.adempiere.server-feature/setup.ini | 2 +- .../setup/configuration/config.ini | 3 +- org.adempiere.server/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../build.properties | 1 - org.adempiere.ui.zk-feature/feature.xml | 8 + org.adempiere.ui.zk/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.adempiere.ui.zk/META-INF/MANIFEST.MF | 2 - .../org/adempiere/webui/AdempiereWebUI.java | 5 + .../adempiere/webui/adwindow/GridView.java | 3 - .../webui/apps/ProcessModalDialog.java | 5 +- .../adempiere/webui/apps/wf/WWFActivity.java | 2 +- .../webui/component/DatetimeBox.java | 2 - .../adempiere/webui/component/WListbox.java | 67 +- .../webui/component/test/ComponentTests.java | 36 - .../component/test/ListModelTableTest.java | 231 --- .../component/test/WListItemRendererTest.java | 220 --- .../org/adempiere/webui/editor/WEditor.java | 5 +- .../src/org/adempiere/webui/window/WChat.java | 1 - .../org/adempiere/webui/window/WPostIt.java | 2 +- org.adempiere.ui.zk/index.zul | 91 +- .../default/css/fragment/adwindow.css.dsp | 3 +- .../css/fragment/application-menu.css.dsp | 8 +- .../default/css/fragment/desktop.css.dsp | 4 + .../default/css/fragment/field-editor.css.dsp | 5 - .../default/css/fragment/font-icons.css.dsp | 2 +- .../css/fragment/parameter-process.css.dsp | 8 +- .../default/css/fragment/window-size.css.dsp | 7 +- org.adempiere.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.apache.ecs/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.compiere.db.oracle.provider/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + .../feature.xml | 36 +- .../director/configuration/config.ini | 7 +- org.idempiere.felix.webconsole/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.idempiere.hazelcast.service/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + .../pom-jetty-run.xml | 26 + .../org.idempiere.maven.to.p2/pom.xml | 649 ++------ .../org.idempiere.maven.to.p2/readme.txt | 3 + .../org.idempiere.webservice.client/pom.xml | 2 +- .../org.idempiere.p2.targetplatform.target | 1421 ++++++----------- org.idempiere.p2/category.xml | 30 +- org.idempiere.p2/server.product | 15 +- org.idempiere.parent/pom-jetty-run.xml | 0 org.idempiere.parent/pom.xml | 156 +- .../.project | 8 +- .../build.properties | 0 .../feature.xml | 320 ++-- .../pom.xml | 2 +- .../feature.xml | 7 + org.idempiere.webservices/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.idempiere.zk-feature/feature.xml | 15 + org.idempiere.zk.extra/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 7 + org.idempiere.zk.extra/pom.xml | 8 +- pom.xml | 3 +- 113 files changed, 1627 insertions(+), 4084 deletions(-) delete mode 100644 org.adempiere.bundles.external-feature/.project delete mode 100644 org.adempiere.bundles.external-feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.adempiere.bundles.external-feature/.settings/org.eclipse.m2e.core.prefs delete mode 100644 org.adempiere.bundles.external-feature/feature.xml delete mode 100644 org.adempiere.bundles.external-feature/pom.xml delete mode 100644 org.adempiere.target.platform-feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.adempiere.target.platform-feature/.settings/org.eclipse.m2e.core.prefs delete mode 100644 org.adempiere.target.platform-feature/build.properties delete mode 100644 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java delete mode 100644 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java delete mode 100644 org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java create mode 100644 org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom-jetty-run.xml create mode 100644 org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/readme.txt create mode 100644 org.idempiere.parent/pom-jetty-run.xml rename {org.adempiere.target.platform-feature => org.idempiere.webservices-feature}/.project (60%) rename {org.adempiere.bundles.external-feature => org.idempiere.webservices-feature}/build.properties (100%) rename {org.adempiere.target.platform-feature => org.idempiere.webservices-feature}/feature.xml (63%) rename {org.adempiere.target.platform-feature => org.idempiere.webservices-feature}/pom.xml (86%) diff --git a/.gitignore b/.gitignore index 053f76c4aa..6c7cdafc53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*/target/ +**/target/ **/lib/*.jar **/seed/*.jar /org.adempiere.ui.zk/labelapplet.jar diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 180b4fb743..69926f4c0c 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -382,14 +382,6 @@ version="0.0.0" unpack="false"/> - - - - + + diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 0181913278..2b9f3a9b79 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -33,28 +33,8 @@ - - - - - - - - - - - - - - - - - - + - - - @@ -82,120 +62,44 @@ - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + @@ -217,11 +121,8 @@ - - - - - + + @@ -237,8 +138,6 @@ - - @@ -276,54 +175,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -334,47 +191,26 @@ - - - - - - - - - - - + - - - - - + - - - - - - - @@ -385,19 +221,10 @@ - - - - - - - - - diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 367d7595ad..fb21129ccb 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -33,28 +33,8 @@ - - - - - - - - - - - - - - - - - - + - - - @@ -82,120 +62,44 @@ - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + @@ -217,11 +121,8 @@ - - - - - + + @@ -237,8 +138,6 @@ - - @@ -276,54 +175,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -334,46 +191,26 @@ - - - - - - - - - - - + - - - - - + - - - - - - @@ -385,19 +222,9 @@ - - - - - - - - - - diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index 2d31b70adb..04999f4ac6 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -33,28 +33,8 @@ - - - - - - - - - - - - - - - - - - + - - - @@ -82,120 +62,44 @@ - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + @@ -217,11 +121,8 @@ - - - - - + + @@ -237,8 +138,6 @@ - - @@ -276,54 +175,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -334,47 +191,26 @@ - - - - - - - - - - - + - - - - - + - - - - - - - @@ -385,19 +221,9 @@ - - - - - - - - - - diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index 6906e5df29..d5b6b5b813 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -33,28 +33,8 @@ - - - - - - - - - - - - - - - - - - + - - - @@ -82,120 +62,44 @@ - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + @@ -217,11 +121,8 @@ - - - - - + + @@ -237,8 +138,6 @@ - - @@ -276,54 +175,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -334,47 +191,26 @@ - - - - - - - - - - - + - - - - - + - - - - - - - @@ -385,19 +221,9 @@ - - - - - - - - - - diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index 14fff3fa11..2ada622caf 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -33,28 +33,8 @@ - - - - - - - - - - - - - - - - - - + - - - @@ -82,120 +62,44 @@ - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + @@ -217,11 +121,8 @@ - - - - - + + @@ -237,8 +138,6 @@ - - @@ -276,54 +175,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -334,47 +191,26 @@ - - - - - - - - - - - + - - - - - + - - - - - - - @@ -385,19 +221,9 @@ - - - - - - - - - - diff --git a/org.adempiere.base.callout/.classpath b/org.adempiere.base.callout/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.base.callout/.classpath +++ b/org.adempiere.base.callout/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.base.process/.classpath b/org.adempiere.base.process/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.base.process/.classpath +++ b/org.adempiere.base.process/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath index 9db4307152..6f77efb119 100644 --- a/org.adempiere.base/.classpath +++ b/org.adempiere.base/.classpath @@ -1,12 +1,12 @@ - + - + diff --git a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs index 182138f43f..5eff75d1ce 100644 --- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs @@ -10,12 +10,15 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -68,6 +73,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -105,3 +111,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.bundles.external-feature/.project b/org.adempiere.bundles.external-feature/.project deleted file mode 100644 index a6ea001c47..0000000000 --- a/org.adempiere.bundles.external-feature/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.adempiere.bundles.external-feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.FeatureNature - - diff --git a/org.adempiere.bundles.external-feature/.settings/org.eclipse.core.resources.prefs b/org.adempiere.bundles.external-feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/org.adempiere.bundles.external-feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.adempiere.bundles.external-feature/.settings/org.eclipse.m2e.core.prefs b/org.adempiere.bundles.external-feature/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb..0000000000 --- a/org.adempiere.bundles.external-feature/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml deleted file mode 100644 index d039b6072c..0000000000 --- a/org.adempiere.bundles.external-feature/feature.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - [Enter Feature Description here.] - - - - [Enter Copyright Description here.] - - - - [Enter License Description here.] - - - - - - - - - - - - - - - - - - - - - diff --git a/org.adempiere.bundles.external-feature/pom.xml b/org.adempiere.bundles.external-feature/pom.xml deleted file mode 100644 index c06d8fd0e3..0000000000 --- a/org.adempiere.bundles.external-feature/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.idempiere - org.idempiere.parent - 7.1.0-SNAPSHOT - ../org.idempiere.parent/pom.xml - - org.adempiere.bundles.external.feature - eclipse-feature - \ No newline at end of file diff --git a/org.adempiere.eclipse.equinox.http.servlet/.classpath b/org.adempiere.eclipse.equinox.http.servlet/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/.classpath +++ b/org.adempiere.eclipse.equinox.http.servlet/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath index b89f6895b7..348589869a 100644 --- a/org.adempiere.install/.classpath +++ b/org.adempiere.install/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 7ff77a9da0..2264da801e 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -41,16 +41,15 @@ - - - + + - - + + @@ -58,7 +57,7 @@ - + @@ -71,12 +70,11 @@ - - + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index 196bf406ee..d6260fc571 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -41,16 +41,15 @@ - - - + + - - + + @@ -58,7 +57,7 @@ - + @@ -71,12 +70,11 @@ - - + diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath index 16d91fc017..44efb3fa6c 100644 --- a/org.adempiere.payment.processor/.classpath +++ b/org.adempiere.payment.processor/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.pipo.handlers/.classpath b/org.adempiere.pipo.handlers/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.pipo.handlers/.classpath +++ b/org.adempiere.pipo.handlers/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.pipo/.classpath +++ b/org.adempiere.pipo/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.plugin.utils/.classpath b/org.adempiere.plugin.utils/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.plugin.utils/.classpath +++ b/org.adempiere.plugin.utils/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.replication.server/.classpath b/org.adempiere.replication.server/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.replication.server/.classpath +++ b/org.adempiere.replication.server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.replication/.classpath b/org.adempiere.replication/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.replication/.classpath +++ b/org.adempiere.replication/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index d3412cb3f1..a756ae7840 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -99,20 +99,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath index aafa60f23e..6ca4348ac8 100644 --- a/org.adempiere.report.jasper.library/.classpath +++ b/org.adempiere.report.jasper.library/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper.webapp/.classpath b/org.adempiere.report.jasper.webapp/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.report.jasper.webapp/.classpath +++ b/org.adempiere.report.jasper.webapp/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath index 423c974870..96d268005a 100644 --- a/org.adempiere.report.jasper/.classpath +++ b/org.adempiere.report.jasper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index ce3bf1c39a..986b6b3330 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -50,6 +50,10 @@ id="org.idempiere.zk.feature" version="0.0.0"/> + + - - - + - - + + + + + + diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index 2a034f6f4a..c67228b90b 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -9,7 +9,7 @@ -console - --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,org.w3c.dom.events -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 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml + --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,org.w3c.dom.events -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 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -32,7 +32,6 @@ - @@ -66,15 +65,15 @@ - - - - - - + + + + + + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index b7d4987e9d..5df8ce00f6 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -34,39 +34,32 @@ - - - - - - + + + - - + - - - - + + - - - + + + - - - - + + + @@ -83,10 +76,12 @@ + + @@ -96,78 +91,33 @@ - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + - - + @@ -186,30 +136,17 @@ - - - - - - + + + - - - - - - - - - - - - - - - + + + + + @@ -223,6 +160,7 @@ + @@ -231,11 +169,25 @@ - - - - - + + + + + + + + + + + + + + + + + + + @@ -251,8 +203,7 @@ - - + @@ -282,7 +233,6 @@ - @@ -293,23 +243,19 @@ - - - + - - + - - + @@ -319,15 +265,11 @@ - - - - - - + + + - - + @@ -338,11 +280,10 @@ - - + @@ -352,44 +293,41 @@ + + + + + - + + - - - - - - - - - + + + - - - - + + - - + @@ -398,15 +336,15 @@ - - + + - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 2cb0bb70d8..b8c3b6e294 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -34,39 +34,32 @@ - - - - - - + + + - - + - - - - + + - - - + + + - - - - + + + @@ -83,10 +76,12 @@ + + @@ -96,79 +91,33 @@ - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - + + + - - + @@ -187,30 +136,17 @@ - - - - - - + + + - - - - - - - - - - - - - - - + + + + + @@ -224,6 +160,7 @@ + @@ -232,10 +169,25 @@ - - - - + + + + + + + + + + + + + + + + + + + @@ -251,8 +203,7 @@ - - + @@ -282,7 +233,6 @@ - @@ -293,23 +243,19 @@ - - - + - - + - - + @@ -319,15 +265,11 @@ - - - - - - + + + - - + @@ -338,10 +280,10 @@ - + @@ -351,7 +293,12 @@ + + + + + @@ -359,38 +306,28 @@ - - - - - - - - - - + + + - - - - + + - - + @@ -399,15 +336,15 @@ - - + + - + diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini index 6bfa731164..98d18128e6 100644 --- a/org.adempiere.server-feature/setup.ini +++ b/org.adempiere.server-feature/setup.ini @@ -1,5 +1,5 @@ -startup -plugins/org.eclipse.equinox.launcher_1.5.200.v20180922-1751.jar +plugins/org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar -install setup --launcher.XXMaxPermSize diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 1e1be726ac..f2aec7cf11 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -1,7 +1,6 @@ -osgi.framework=file\:../plugins/org.eclipse.osgi_3.13.200.v20181130-2106.jar +osgi.framework=file\:../plugins/org.eclipse.osgi_3.15.200.v20200214-1600.jar osgi.install.area=setup osgi.bundles=org.eclipse.equinox.ds@1:start,\ - org.eclipse.equinox.util,\ org.eclipse.core.variables,\ org.eclipse.ant.core,\ org.eclipse.core.runtime@start,\ diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath index 5fc3e08d0c..d555409883 100644 --- a/org.adempiere.server/.classpath +++ b/org.adempiere.server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs index 182138f43f..5eff75d1ce 100644 --- a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs @@ -10,12 +10,15 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -68,6 +73,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -105,3 +111,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.target.platform-feature/.settings/org.eclipse.core.resources.prefs b/org.adempiere.target.platform-feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/org.adempiere.target.platform-feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.adempiere.target.platform-feature/.settings/org.eclipse.m2e.core.prefs b/org.adempiere.target.platform-feature/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb..0000000000 --- a/org.adempiere.target.platform-feature/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/org.adempiere.target.platform-feature/build.properties b/org.adempiere.target.platform-feature/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/org.adempiere.target.platform-feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml index ec5da6390f..72204c9677 100644 --- a/org.adempiere.ui.zk-feature/feature.xml +++ b/org.adempiere.ui.zk-feature/feature.xml @@ -34,4 +34,12 @@ version="0.0.0" unpack="false"/> + + diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath index b58918e146..f72bc0eeeb 100644 --- a/org.adempiere.ui.zk/.classpath +++ b/org.adempiere.ui.zk/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 49075c207a..5762b7c2ed 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -75,7 +75,6 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere, org.adempiere.webui.apps.graph.model, org.adempiere.webui.apps.wf, org.adempiere.webui.component, - org.adempiere.webui.component.test, org.adempiere.webui.dashboard, org.adempiere.webui.desktop, org.adempiere.webui.editor, @@ -165,7 +164,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", zkplus;bundle-version="0.0.0", zul;bundle-version="0.0.0", zweb;bundle-version="0.0.0", - org.junit;bundle-version="0.0.0", org.apache.commons.io;bundle-version="0.0.0", com.itextpdf;bundle-version="0.0.0", org.atmosphere.runtime;bundle-version="0.0.0", diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index 1a3d451780..e825ce95fc 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -150,6 +150,11 @@ public class AdempiereWebUI extends Window implements EventListener, IWeb else { Clients.showBusy(null); + if (session.getAttribute(CLIENT_INFO) != null) + { + clientInfo = (ClientInfo) session.getAttribute(CLIENT_INFO); + } + getRoot().addEventListener(Events.ON_CLIENT_INFO, this); //use echo event to make sure server push have been started when loginCompleted is call Events.echoEvent(ON_LOGIN_COMPLETED, this, null); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java index a19e8c434f..94b4bbed08 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java @@ -295,9 +295,6 @@ public class GridView extends Vlayout implements EventListener, IdSpace, setupColumns(); render(); - if (listbox.getFrozen() != null){ - listbox.getFrozen().setWidgetOverride("syncScroll", "function (){syncScrollOVR(this);}"); - } updateListIndex(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java index 97ae60155a..68f0e539b8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java @@ -97,6 +97,7 @@ public class ProcessModalDialog extends AbstractProcessDialog implements EventLi if (topParameterLayout != null) { topParameterLayout.setStyle("max-height:" + (ClientInfo.get().desktopHeight-130) + "px"); + ZKUpdateUtil.setVflex(topParameterLayout, "1"); } if (bottomParameterLayout != null) { @@ -106,7 +107,9 @@ public class ProcessModalDialog extends AbstractProcessDialog implements EventLi ZKUpdateUtil.setVflex((HtmlBasedComponent) c, "min"); } } - this.setSclass("popup-dialog process-modal-dialog"); + this.setSclass("popup-dialog process-modal-dialog z-flex z-flex-column"); + this.setSizable(true); + this.setMaximizable(true); if (ClientInfo.isMobile()) { orientation = ClientInfo.get().orientation; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java index 7a58856102..7a02e89be4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java @@ -439,7 +439,7 @@ public class WWFActivity extends ADForm implements EventListener model.setNoColumns(columns.length); listbox.setModel(model); listbox.setItemRenderer(renderer); - listbox.repaint(); + listbox.initialiseHeader(); listbox.setSizedByContent(false); return m_activities.length; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java index 75e2c12335..f5d4d28382 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/DatetimeBox.java @@ -16,7 +16,6 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import org.adempiere.webui.util.ZKUpdateUtil; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zul.Timebox; @@ -42,7 +41,6 @@ public class DatetimeBox extends Panel { //timeBox.setButtonVisible(false); appendChild(dateBox); appendChild(timeBox); - ZKUpdateUtil.setHflex(this, "1"); initComponents(); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java index e185425a6a..8bc53b0a4f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java @@ -125,7 +125,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis this.setItemRenderer(rowRenderer); //recreate listhead if needed - ListHead head = super.getListHead(); + ListHead head = getListHead(); if (head != null) { head.getChildren().clear(); @@ -133,14 +133,14 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } } - // re-render - this.repaint(); - - return; + repaint(); } public void setModel(ListModel model) { + if (getModel() == model) + return; + super.setModel(model); if (model instanceof ListModelTable) { @@ -156,20 +156,21 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis * it to the Listbox. * */ - private void initialiseHeader() + public void initialiseHeader() { - ListHead head = null; - - head = super.getListHead(); + ListHead head = getListHead(); //init only once - if (head != null) + if (head == null) + { + head = new ListHead(); + appendChild(head); + } + else if (head.getChildren().size() > 0) { return; } - head = new ListHead(); - // render list head if (this.getItemRenderer() instanceof WListItemRenderer) { @@ -180,11 +181,6 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis throw new ApplicationException("Rendering of the ListHead is unsupported for " + this.getItemRenderer().getClass().getSimpleName()); } - - //attach the listhead - head.setParent(this); - - return; } /** @@ -254,7 +250,11 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis */ public ListModelTable getModel() { - if (super.getModel() instanceof ListModelTable) + if (super.getModel() == null) + { + return null; + } + else if (super.getModel() instanceof ListModelTable) { return (ListModelTable)super.getModel(); } @@ -360,9 +360,6 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis boolean multiSelection, String tableName,boolean addAccessSQL) { - if (getListhead() != null) - getListHead().detach(); - int columnIndex = 0; StringBuilder sql = new StringBuilder ("SELECT "); setLayout(layout); @@ -581,7 +578,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis throw new UnsupportedOperationException("Layout not defined"); } - clearTable(); + clearTable(); try { @@ -661,15 +658,10 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } if (getShowTotals()) addTotals(m_layout); - // TODO implement this - //autoSize(); - - // repaint the table - this.repaint(); + + repaint(); if (logger.isLoggable(Level.CONFIG)) logger.config("Row(rs)=" + getRowCount()); - - return; } // loadTable /** @@ -740,15 +732,10 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } if (getShowTotals()) addTotals(m_layout); - // TODO implement this - //autoSize(); - - // repaint the table - this.repaint(); + + repaint(); if (logger.isLoggable(Level.CONFIG)) logger.config("Row(array)=" + getRowCount()); - - return; } // loadTable /** @@ -1081,13 +1068,9 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis */ public void repaint() { - // create the head + // create header (if needed) initialiseHeader(); - - // this causes re-rendering of the Listbox - this.setModel(this.getModel()); - - return; + invalidate(); } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java deleted file mode 100644 index 8c3bace658..0000000000 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ComponentTests.java +++ /dev/null @@ -1,36 +0,0 @@ -/****************************************************************************** - * Product: Posterita Ajax UI * - * Copyright (C) 2007 Posterita Ltd. All Rights Reserved. * - * This program is free software; you can redistribute it and/or modify it * - * under the terms version 2 of the GNU General Public License as published * - * by the Free Software Foundation. This program is distributed in the hope * - * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * - * For the text or an alternative of this public license, you may reach us * - * Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius * - * or via info@posterita.org or http://www.posterita.org/ * - *****************************************************************************/ - -package org.adempiere.webui.component.test; - - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Test Suite for running all of the tests in - * {@link org.adempiere.webui.component.test}. - * - * @author Andrew Kimball - * - */ -@RunWith(value=Suite.class) -@SuiteClasses({ListModelTableTest.class, WListItemRendererTest.class}) -public class ComponentTests -{ -} diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java deleted file mode 100644 index 1340ad0d6d..0000000000 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/ListModelTableTest.java +++ /dev/null @@ -1,231 +0,0 @@ -/****************************************************************************** - * Product: Posterita Ajax UI * - * Copyright (C) 2007 Posterita Ltd. All Rights Reserved. * - * This program is free software; you can redistribute it and/or modify it * - * under the terms version 2 of the GNU General Public License as published * - * by the Free Software Foundation. This program is distributed in the hope * - * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * - * For the text or an alternative of this public license, you may reach us * - * Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius * - * or via info@posterita.org or http://www.posterita.org/ * - *****************************************************************************/ - -package org.adempiere.webui.component.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.Vector; - -import org.adempiere.webui.component.ListModelTable; -import org.adempiere.webui.event.WTableModelEvent; -import org.adempiere.webui.event.WTableModelListener; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Test class for {@link org.adempiere.webui.component.ListModelTable}. - * - * @author Andrew Kimball - * - */ -public class ListModelTableTest implements WTableModelListener -{ - /** First data object. */ - private static final Integer ms_number0 = Integer.valueOf(0); - /** Second data object. */ - private static final Integer ms_number1 = Integer.valueOf(1); - /** Third data object. */ - private static final Integer ms_number2 = Integer.valueOf(2); - /** Third data object. */ - private static final Integer ms_number3 = Integer.valueOf(3); - /** Fourth data object. */ - private static final Integer ms_number4 = Integer.valueOf(4); - /** Fifth data object. */ - private static final Integer ms_number5 = Integer.valueOf(5); - /** Sixth data object. */ - private static final Integer ms_number6 = Integer.valueOf(6); - - /** The table instance on which tests are to be run. */ - private ListModelTable m_table; - /** A flag to indicate whether the listener has been called and has succeeded. */ - private boolean m_isListenerCalled = false; - - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception - { - Vector row0 = new Vector(); - Vector row1 = new Vector(); - Vector data = new Vector(); - - // create two rows of data - row0.add(ms_number0); - row0.add(ms_number1); - row1.add(ms_number2); - row1.add(ms_number3); - - // create the data - data.add(row0); - data.add(row1); - - // instantiate the model - m_table = new ListModelTable(data); - } - - /** - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception - { - } - - /** - * Test method for {@link org.adempiere.webui.component.ListModelTable#ListModelTable()}. - */ - @Test - public final void testListModelTable() - { - ListModelTable table = new ListModelTable(); - boolean isException = false; - Object data; - - assertEquals(0, table.getNoColumns()); - assertEquals(0, table.getSize()); - // try to get data from an invalid field - try - { - data = table.getDataAt(0, 0); - // never reach here, but removes warnings - assertNull(data); - } - catch (IllegalArgumentException exception) - { - isException = true; - } - assertTrue(isException); - } - - /** - * Test method for {@link org.adempiere.webui.component.ListModelTable#ListModelTable(java.util.Collection)}. - */ - @Test (expected= IllegalArgumentException.class) - public final void testListModelTableCollection() - { - final int invalidRow = 2; - final int noColumns = 2; - @SuppressWarnings("unused") - Object data; - - assertEquals(noColumns, m_table.getNoColumns()); - assertEquals(noColumns, m_table.getSize()); - assertEquals(Integer.valueOf(0), m_table.getDataAt(0, 0)); - - //try to get data from an invalid field - data = m_table.getDataAt(invalidRow, 0); - } - - - /** - * Test method for {@link org.adempiere.webui.component.ListModelTable#addColumn()}. - */ - @Test - public final void testAddColumn() - { - final int noColumns = 3; - m_table.addColumn(); - - assertEquals(noColumns, m_table.getNoColumns()); - assertNull(m_table.getDataAt(0, noColumns - 1)); - } - - /** - * Test method for {@link org.adempiere.webui.component.ListModelTable#setNoColumns(int)}. - */ - @Test - public final void testSetNoColumns() - { - final int noColumns = 3; - - m_table.setNoColumns(noColumns); - - assertEquals(noColumns, m_table.getNoColumns()); - assertNull(m_table.getDataAt(0, noColumns - 1)); - } - - /** - * Test method for {@link org.adempiere.webui.component.ListModelTable#getDataAt(int, int)}. - */ - @Test - public final void testGetDataAt() - { - assertEquals(ms_number0, m_table.getDataAt(0, 0)); - assertEquals(ms_number3, m_table.getDataAt(1, 1)); - } - - /** - * Test method for {@link org.adempiere.webui.component.ListModelTable#setDataAt(java.lang.Object, int, int)}. - */ - @Test (expected= IllegalArgumentException.class) - public final void testSetDataAt() - { - final int invalidRow = 2; - - m_table.setDataAt(ms_number4, 0, 0); - m_table.setDataAt(ms_number5, 1, 1); - - assertEquals(ms_number4, m_table.getDataAt(0, 0)); - assertEquals(ms_number5, m_table.getDataAt(1, 1)); - - // expect this to throw an exception - m_table.setDataAt(ms_number6, invalidRow, 0); - } - - /** - * Test method for {@link org.adempiere.webui.component.ListModelTable#setNoRows(int)}. - */ - @Test - public final void testSetNoRows() - { - final int noRows = 3; - m_table.setNoRows(m_table.getSize() + 1); - - assertEquals(noRows, m_table.getSize()); - assertEquals(ms_number3, m_table.getDataAt(1, 1)); - assertNull(m_table.getDataAt(2, 1)); - } - - /** - * Test method for - * {@link org.adempiere.webui.component.ListModelTable#addTableModelListener(org.adempiere.webui.event.WTableModelListener)}. - */ - @Test - public final void testAddTableModelListener() - { - m_table.addTableModelListener(this); - m_table.setDataAt(ms_number4, 0, 0); - - assertTrue(m_isListenerCalled); - } - - /* (non-Javadoc) - * @see org.adempiere.webui.event.WTableModelListener#tableChanged(org.adempiere.webui.event.WTableModelEvent) - */ - public void tableChanged(WTableModelEvent event) - { - assertEquals(ms_number4, m_table.getDataAt(0, 0)); - m_isListenerCalled = true; - } - -} diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java deleted file mode 100644 index 3907bc9c98..0000000000 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/test/WListItemRendererTest.java +++ /dev/null @@ -1,220 +0,0 @@ -/****************************************************************************** - * Product: Posterita Ajax UI * - * Copyright (C) 2007 Posterita Ltd. All Rights Reserved. * - * This program is free software; you can redistribute it and/or modify it * - * under the terms version 2 of the GNU General Public License as published * - * by the Free Software Foundation. This program is distributed in the hope * - * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * - * For the text or an alternative of this public license, you may reach us * - * Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius * - * or via info@posterita.org or http://www.posterita.org/ * - *****************************************************************************/ - -package org.adempiere.webui.component.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Vector; - -import org.adempiere.webui.component.ListHead; -import org.adempiere.webui.component.ListHeader; -import org.adempiere.webui.component.WListItemRenderer; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * @author Andrew Kimball - * - */ -public class WListItemRendererTest -{ - - WListItemRenderer m_renderer; - Vector m_dataValid = new Vector(); - Vector m_dataInvalid = new Vector(); - - Vector m_columnNames = new Vector(); - - /** - * @throws java.lang.Exception - */ - @Before - public void setUp() throws Exception - { - Vector dataRowValid = new Vector(); - Vector dataRowInvalid = new Vector(); - - m_columnNames.add("Name"); - m_columnNames.add("Age"); - - m_renderer = new WListItemRenderer(m_columnNames); - - dataRowValid.add("River Phoenix"); - dataRowValid.add(Integer.valueOf(23)); - m_dataValid.add(dataRowValid); - - dataRowInvalid.add("Elvis Presley"); - dataRowInvalid.add(Integer.valueOf(42)); - dataRowInvalid.add("Graceland"); - m_dataInvalid.add(dataRowInvalid); - } - - /** - * @throws java.lang.Exception - */ - @After - public void tearDown() throws Exception - { - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#WListItemRenderer()}. - */ - @Test - public final void testWListItemRenderer() - { - WListItemRenderer renderer = new WListItemRenderer(); - assertEquals(0, renderer.getNoColumns()); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#WListItemRenderer(java.util.Vector)}. - */ - @Test - public final void testWListItemRendererVectorOfQextendsString() - { - assertEquals(2, m_renderer.getNoColumns()); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#render(org.zkoss.zul.Listitem, java.lang.Object)}. - */ - @Ignore("Not running because instantiating a ZX listbox causes a NullPointerException as it" + - " attempts to post events") - @Test - public final void testRender() throws Exception - { - /*ListModelTable model = new ListModelTable(m_dataValid); - WListbox table = new WListbox(); - table.setData(model, m_columnNames); - - Listitem item = m_renderer.newListitem(table); - m_renderer.render(item, table.getModel().get(0)); - */ - - fail("Not yet implemented"); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#updateColumn(int, java.lang.String)}. - */ - @Test - public final void testUpdateColumn() - { - ListHead head = new ListHead(); - ListHeader header; - - m_renderer.updateColumn(1, "Address"); - assertEquals(2, m_renderer.getNoColumns()); - - m_renderer.renderListHead(head); - - header = (ListHeader)head.getChildren().get(1); - assertEquals("Address", header.getLabel()); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#addColumn(java.lang.String)}. - */ - @Test - public final void testAddColumn() - { - m_renderer.addColumn("Address"); - assertEquals(3, m_renderer.getNoColumns()); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#renderListHead(org.adempiere.webui.component.ListHead)}. - */ - @Test - public final void testRenderListHead() - { - ListHead head = new ListHead(); - Object header; - - m_renderer.renderListHead(head); - - assertEquals(2, head.getChildren().size()); - - header = head.getChildren().get(1); - - assertTrue(header instanceof ListHeader); - assertEquals("Age", ((ListHeader)header).getLabel()); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#getRowPosition(org.zkoss.zk.ui.Component)}. - */ - @Ignore("Not running because the ZX listbox cannot be instantiated in JUnit") - @Test - public final void testGetRowPosition() - { - fail("Not yet implemented"); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#getColumnPosition(org.zkoss.zk.ui.Component)}. - */ - @Ignore("Not running because the ZX listbox cannot be instantiated in JUnit") - @Test - public final void testGetColumnPosition() - { - fail("Not yet implemented"); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#clearColumns()}. - */ - @Test - public final void testClearColumns() - { - ListHead head = new ListHead(); - - m_renderer.clearColumns(); - assertEquals(0, m_renderer.getNoColumns()); - - m_renderer.renderListHead(head); - - assertEquals(0, head.getChildren().size()); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#clearSelection()}. - */ - @Ignore("Not running because the ZX listbox cannot be instantiated in JUnit") - @Test - public final void testClearSelection() - { - fail("Not yet implemented"); - } - - /** - * Test method for {@link org.adempiere.webui.component.WListItemRenderer#addTableValueChangeListener(org.adempiere.webui.event.TableValueChangeListener)}. - */ - @Ignore("Not running because the ZX listbox cannot be instantiated in JUnit") - @Test - public final void testAddTableValueChangeListener() - { - fail("Not yet implemented"); - } - -} diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java index 414b6bc23d..f9e014e64e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java @@ -59,6 +59,7 @@ import org.zkoss.zk.ui.event.Events; import org.zkoss.zul.Combobox; import org.zkoss.zul.Menuitem; import org.zkoss.zul.Textbox; +import org.zkoss.zul.Timebox; import org.zkoss.zul.impl.InputElement; import org.zkoss.zul.impl.XulElement; @@ -676,7 +677,9 @@ public abstract class WEditor implements EventListener, PropertyChangeLis if (getComponent() instanceof HtmlBasedComponent) { //can't stretch bandbox & datebox if (!(getComponent() instanceof Bandbox) && - !(getComponent() instanceof Datebox)) { + !(getComponent() instanceof Datebox) && + !(getComponent() instanceof DatetimeBox) && + !(getComponent() instanceof Timebox)) { String width = tableEditor ? "96%" : "100%"; if (getComponent() instanceof Button) { if (!tableEditor) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java index 9e5219327f..9f70cf947b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java @@ -163,7 +163,6 @@ public class WChat extends Window implements EventListener, DialogEvents newText.setRows(3); newText.setMultiline(true); ZKUpdateUtil.setHflex(newText, "1"); - ZKUpdateUtil.setVflex(newText, "min"); addButton = new Button(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Add"))); addButton.addActionListener(this); content.appendChild(addButton); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java index a96c2df3c9..c148d18800 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPostIt.java @@ -108,7 +108,7 @@ public class WPostIt extends Window implements EventListener{ tabPanels.appendChild(tabPanel); textBox = new Textbox(note); textBox.setCols(80); - textBox.setRows(30); + textBox.setMultiline(true); textBox.setEnabled(editable); if (ClientInfo.minWidth(730)) textBox.setWidth("700px"); diff --git a/org.adempiere.ui.zk/index.zul b/org.adempiere.ui.zk/index.zul index c3f0a69bf4..b632a9c35f 100644 --- a/org.adempiere.ui.zk/index.zul +++ b/org.adempiere.ui.zk/index.zul @@ -20,27 +20,6 @@ Copyright (C) 2007 Ashley G Ramdass. if (console) console.log(msg); }; - // default non th, tr, td use clone method to create ghost element - // this code implement same behavior for li to get drag-drop effect - // still have room for improve: https://www.zkoss.org/wiki/ZK_Client-side_Reference/Customization/Drag-and-Drop_Effects - var superghost = zk.DnD.ghost; - zk.DnD.ghost = function (drag, ofs, msg) { - if (msg == null && drag.node){ - var dragNode = jq(drag.node)[0]; - var dragWg = zk.Widget.$(dragNode); - - var textNote = dragWg.$n('real') || dragWg.getCaveNode(); - - if (jq.nodeName(dragNode, 'li')){ - msg = textNote ? textNote.textContent || textNote.innerText || '' : ''; - } - } - - return superghost(drag, ofs, msg); - }; - - - zk.$package('id.zk'); id.zk.Extend = zk.$extends(zk.Object, {}, { @@ -193,7 +172,7 @@ Copyright (C) 2007 Ashley G Ramdass. zk.override(zul.mesh.Paging.prototype, "bind_", function () { this.$bind_.apply(this, arguments); if (this._totalSize == 0x7fffffff){ - jq(".z-paging-text", this).text("?"); + jq(".z-paging-text", this).text(" / ?"); } }); @@ -252,73 +231,7 @@ Copyright (C) 2007 Ashley G Ramdass. } this.$onSize.apply(this, arguments); }); - }); - - // overload for recalculate width of scroll when has frozen control - function syncScrollOVR (wgt){ - var parent = wgt.parent; - - if (parent.eheadtbl && parent._nativebar) { - var scroll = wgt.$n('scrollX'); - var cells = parent._getFirstRowCells(parent.eheadrows); - var totalcols = cells.length; - var columns = wgt._columns; - var scrollScale = totalcols - columns - 1; - var leftWidth = 0; - - var headerWidth = 0; - for (var i = 0; i < columns; i++) - headerWidth += cells[i].offsetWidth; - - var bodyWidth = parent.$n('body').offsetWidth; - var extraWidth = parent.$n('body').offsetWidth - headerWidth; - var extraColumnNum = 0; - for (var i = totalcols - 1; i >= columns; i--){ - extraWidth -= cells[i].offsetWidth; - if (cells[i].offsetWidth == 0)// when scroll to right, column at left has width = 0 - continue; - if (extraWidth >= 0){ - extraColumnNum++; - }else{ - break; - } - } - - - scroll.firstChild.style.width = jq.px0(bodyWidth + 50 * (scrollScale - extraColumnNum)); - } - - wgt.$syncScroll () - } - - //Incorporate fix from https://tracker.zkoss.org/browse/ZK-4204 - //Probably can be removed after the upgrade to zk9 - zk.afterLoad('zk', function () { - if (navigator.sendBeacon && window.URLSearchParams) { - zAu._rmDesktop = function(dt, dummy) { - var url = zk.ajaxURI(null, {desktop: dt, au: true}), - data = jq.param({dtid: dt.id, cmd_0: dummy ? 'dummy' : 'rmDesktop', opt_0: 'i'}), - headers = {}; - if (zk.pfmeter) { - var fakeReq = { - setRequestHeader: function (name, value) { - headers[name] = value; - } - }; - zAu._pfsend(dt, fakeReq, true, false); - } - var params = new URLSearchParams(data); - for (var key in headers) { - if (headers.hasOwnProperty(key)) - params.append(key, headers[key]); - } - navigator.sendBeacon(url, zk.chrome // https://crbug.com/747787 - ? new Blob([params.toString()], {type: 'application/x-www-form-urlencoded'}) - : params - ); - } - } - }); + }); ]]> diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp index d5dd3e430a..5ee586ce35 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp @@ -174,7 +174,8 @@ } .adwindow-gridview-detail { - height: 200px; + min-height: 200px; + height: 35%; } .adwindow-gridview-detail + .z-south-splitter { diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp index 910f3ba725..7c7891a96d 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/application-menu.css.dsp @@ -122,14 +122,14 @@ width: 180px; } .global-search-box.z-bandbox > input.z-bandbox-input { - width: 156px; + width: 180px; } @media screen and (min-width: 500px) { .global-search-box.z-bandbox { width: 200px; } .global-search-box.z-bandbox > input.z-bandbox-input { - width: 176px; + width: 200px; } } @media screen and (min-width: 768px) { @@ -137,7 +137,7 @@ width: 250px; } .global-search-box.z-bandbox > input.z-bandbox-input { - width: 226px; + width: 250px; } } @media screen and (min-width: 1024px) { @@ -145,7 +145,7 @@ width: 300px; } .global-search-box.z-bandbox > input.z-bandbox-input { - width: 276px; + width: 300px; } } diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp index dbebfde52a..797bc59ad4 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp @@ -101,6 +101,10 @@ padding-bottom: 0px; } +.desktop-tabbox > .z-tabpanels { + flex-grow: 1 1 0; +} + .desktop-north, .desktop-center { border: none; } diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp index 35b542cbb9..9db8e10ba0 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/field-editor.css.dsp @@ -78,16 +78,11 @@ } .datetime-box { - display: inline-block; white-space:nowrap; } - .datetime-box .z-datebox { - display: inline; } - .datetime-box .z-timebox { - display: inline; } span.grid-combobox-editor { diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp index 198f0a555f..63eebc7b18 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/font-icons.css.dsp @@ -268,7 +268,7 @@ .z-icon-Wizard:before { content: "\f0d0"; } -.z-icon-WorkFlow:before { +.z-icon-Workflow:before, .z-icon-WorkFlow:before { content: "\f126"; } .z-icon-Zoom:before { diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp index 9e17d1df13..9dd9e9e3aa 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp @@ -9,7 +9,7 @@ when detect side effect, fix to only apply for parameter window*/ height: 100%; } .process-modal-dialog.z-window > .z-window-content { - height: 100%; + flex: 1 1 0; } .main-parameter-layout, @@ -31,7 +31,7 @@ when detect side effect, fix to only apply for parameter window*/ } .bottom-parameter-layout{ - padding-top: 4px; + padding: 4px 4px 0px 4px; border-top: 1px solid rgba(0, 0, 0, 0.2); } @@ -60,6 +60,10 @@ when detect side effect, fix to only apply for parameter window*/ overflow-y: hidden; } +.result-parameter-layout { + overflow: auto; +} + .popup-dialog.z-window.z-window-overlapped.z-window-shadow, .popup-dialog.z-window.z-window-noborder.z-window-highlighted.z-window-shadow{ width:600px; diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp index 7cefdc4d1c..d69950d3e7 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp @@ -386,8 +386,13 @@ } } -@media screen and (max-height: 600px) { +@media screen and (max-height: 500px) { .popup-dialog.process-modal-dialog { height: 100%; } } +@media screen and (min-height: 501px) { + .popup-dialog.process-modal-dialog { + min-height: 500px; + } +} diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath index 3e551e9bf2..fedf37b629 100644 --- a/org.adempiere.ui/.classpath +++ b/org.adempiere.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath index 423c974870..96d268005a 100644 --- a/org.apache.ecs/.classpath +++ b/org.apache.ecs/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs +++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath index 68b6058e5e..d9b7c6591d 100644 --- a/org.compiere.db.oracle.provider/.classpath +++ b/org.compiere.db.oracle.provider/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath index 838d301005..683a34db2c 100644 --- a/org.compiere.db.postgresql.provider/.classpath +++ b/org.compiere.db.postgresql.provider/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml index b8ba8d78f0..574f804799 100644 --- a/org.idempiere.eclipse.platform-feature/feature.xml +++ b/org.idempiere.eclipse.platform-feature/feature.xml @@ -41,18 +41,14 @@ id="org.eclipse.ecf.filetransfer.feature" version="0.0.0"/> - - - - + + - - - - - - - + diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath index cf47451aff..d21edb338e 100644 --- a/org.idempiere.hazelcast.service/.classpath +++ b/org.idempiere.hazelcast.service/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom-jetty-run.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom-jetty-run.xml new file mode 100644 index 0000000000..134a28a2e3 --- /dev/null +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom-jetty-run.xml @@ -0,0 +1,26 @@ + + 4.0.0 + org.idempiere + maven.p2 + war + 9.0.1 + + 9.4.28.v20200408 + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jettyVersion} + + ${project.basedir}/target/repository + + /maven.p2 + + + + + + diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml index 128bb8106a..2d2736f374 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -10,21 +10,18 @@ org.idempiere.maven.to.p2 pom - https://iweb.dl.sourceforge.net/project/zk1/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip - - 9.4.14.v20181114 - 1.1.3.v20160715 - 8.5.33.1 + 9.4.28.v20200408 + 8.5.49 3.1.0.M3 1.2.5 2.5.3 1.60 - 2.9.8 - 3.1.4 - 1.1.0.Final - 5.0.3 - 20171018 - 1.7.25 + 2.10.0 + 4.2 + 1.1.0.Final + 6.0.1 + 20180813 + 1.7.25 2.3.2 2.4 3.3.1 @@ -34,24 +31,16 @@ 7.0 1.6.3 4.1.0 + 1.11 - - - orbit-photon-R20180531190352 - https://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository - p2 - - - jasperstudio-6.11.0 - https://sourceforge.net/projects/jasperstudio/files/updatesite/6.11.0 - p2 - - - zkoss - https://mavensync.zkoss.org/maven2 - - + + + jasperstudio-6.11.0 + https://sourceforge.net/projects/jasperstudio/files/updatesite/6.11.0 + p2 + + @@ -89,8 +78,8 @@ false true - *;resolution:=optional - * + *;resolution:=optional + * @@ -99,8 +88,8 @@ false true - *;resolution:=optional - * + *;resolution:=optional + * @@ -789,245 +778,15 @@ true false - - - - - org.idempiere.zk.source.feature - ${project.version} - - Idempiere - feature group all zk source get from maven - repository - Idempiere - GPL v2.1 - true - - org.zkoss.zk:zkplus:jar:sources:${zk.version} - false + org.zkoss:zsoup:jar:1.8.2.5 + true false - - zkplus;version="${zk.version}";roots:="." - zkplus - zkplus.source - - - - - org.zkoss.common:zweb:jar:sources:${zk.version} - false + com.github.relaxng:relaxngDatatype:jar:2011.1 + true false - - zweb;version="${zk.version}";roots:="." - zweb - zweb.source - - - - - - - org.zkoss.zk:zul:jar:sources:${zk.version} - false - false - - zul;version="${zk.version}";roots:="." - zul - zul.source - - - - - - - org.zkoss.zk:zk:jar:sources:${zk.version} - false - false - - zk;version="${zk.version}";roots:="." - zk - zk.source - - - - - - - org.zkoss.zk:zhtml:jar:sources:${zk.version} - false - false - - zhtml;version="${zk.version}";roots:="." - zhtml - zhtml.source - - - - - - - org.zkoss.zk:zkbind:jar:sources:${zk.version} - false - false - - zkbind;version="${zk.version}";roots:="." - zkbind - zkbind.source - - - - - - - org.zkoss.common:zel:jar:sources:${zk.version} - false - false - - zel;version="${zk.version}";roots:="." - zel - zel.source - - - - - - - org.zkoss.common:zcommon:jar:sources:${zk.version} - false - false - - zcommon;version="${zk.version}";roots:="." - zcommon - zcommon.source - - - - - - - org.zkoss.zk:zkwebfragment:jar:sources:${zk.version} - false - false - - zkwebfragment;version="${zk.version}";roots:="." - zkwebfragment - zkwebfragment.source - - - - - - - org.javassist:javassist:jar:sources:${zk.javassist.src.version} - false - false - - zjavassist;version="${zk.version}";roots:="." - zjavassist - ${zk.version} - zjavassist.source - - - - - - - - - org.idempiere.zk.feature - ${project.version} - - Idempiere - feature group all zk osgi bundle get from - sourcefore - Idempiere - GPL v2.1 - true - - - org.zkoss.zk:zkplus:${zk.version} - false - false - - zkplus - zkplus - - - - org.zkoss.common:zweb:${zk.version} - false - false - - zweb - zweb - - - - org.zkoss.zk:zul:${zk.version} - false - false - - zul - zul - - - - org.zkoss.zk:zk:${zk.version} - false - false - - zk - zk - - - - org.zkoss.zk:zhtml:${zk.version} - false - false - - zhtml - zhtml - - - - org.zkoss.zk:zkbind:${zk.version} - false - false - - zkbind - zkbind - - - - org.zkoss.common:zel:${zk.version} - false - false - - zel - zel - - - - org.zkoss.common:zcommon:${zk.version} - false - false - - zcommon - zcommon - - - - org.zkoss.zk:zkwebfragment:${zk.version} - false - false - - zkwebfragment - zkwebfragment - @@ -1071,36 +830,36 @@ org.apache.poi:poi:jar:${poi.version} true false - true + true org.apache.poi.poi poi-ooxml - *;resolution:=optional - * + *;resolution:=optional + * org.apache.poi:poi-ooxml:jar:${poi.version} true false - true + true org.apache.poi.poi-ooxml poi-ooxml - *;resolution:=optional - * + *;resolution:=optional + * org.apache.poi:poi-ooxml-schemas:jar:${poi.version} true false - true + true org.apache.poi.poi-ooxml-schemas poi-ooxml-schemas - *;resolution:=optional,org.apache.xmlbeans.impl.schema - * + *;resolution:=optional,org.apache.xmlbeans.impl.schema + * @@ -1185,6 +944,106 @@ + + + org.idempiere.batik.feature + ${project.version} + + Idempiere + feature group apache batik osgi bundle get from maven + Idempiere + GPL v2.1 + true + + + + org.apache.xmlgraphics:batik-anim:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-awt-util:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-bridge:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-codec:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-constants:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-css:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-dom:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-ext:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-extension:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-gvt:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-i18n:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-parser:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-script:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-svg-dom:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-svggen:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-util:${batik.version} + true + false + + + org.apache.xmlgraphics:batik-xml:${batik.version} + true + false + + + + org.idempiere.asm.feature ${asm.version} @@ -1224,35 +1083,6 @@ - - org.idempiere.apache.feature - ${project.version} - - Idempiere - feature group apache util osgi bundle get from maven - Idempiere - GPL v2.1 - true - - - - commons-io:commons-io:jar:2.6 - true - false - - - commons-fileupload:commons-fileupload:jar:1.3.3 - true - false - - - org.apache.httpcomponents:httpclient-osgi:jar:4.5.6 - true - false - - - - org.idempiere.jetty.feature ${jetty.version} @@ -1477,156 +1307,29 @@ - + - org.javassist:javassist:${zk.javassist.src.version} - false - false - true - - zjavassist - zjavassist - - - ${zk.version} - + com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02 - - - - org.apache.batik.anim:1.9.1.v20180528-1434 - - - org.apache.batik.bridge:1.9.1.v20180313-1559 - - - org.apache.batik.codec:1.9.1.v20180313-1559 - - - org.apache.batik.constants:1.9.1.v20180227-1645 - - - org.apache.batik.css:1.9.1.v20180313-1559 - - - org.apache.batik.dom:1.9.1.v20180528-1434 - - - org.apache.batik.dom.svg:1.9.1.v20180313-1559 - - - org.apache.batik.ext.awt:1.9.1.v20180227-1645 - - - org.apache.batik.extension:1.9.1.v20180313-1559 - - - org.apache.batik.gvt:1.9.1.v20180227-1645 - - - org.apache.batik.i18n:1.9.1.v20180227-1645 - - - org.apache.batik.parser:1.9.1.v20180313-1559 - - - org.apache.batik.pdf:1.9.1.v20180417-1407 - - - org.apache.batik.script:1.9.1.v20180313-1559 - - - org.apache.batik.svggen:1.9.1.v20180313-1559 - - - org.apache.batik.swing:1.9.1.v20180313-1559 - - - org.apache.batik.transcoder:1.9.1.v20180313-1559 - - - org.apache.batik.util:1.9.1.v20180227-1645 - - - org.apache.batik.util.gui:1.9.1.v20180227-1645 - - - org.apache.batik.xml:1.9.1.v20180227-1645 - - - org.apache.xmlgraphics:2.2.0.v20180410-1551 - - - com.jaspersoft.studio.bundles.barbecue:1.5.0.beta1_b02 - - - com.jaspersoft.studio.bundles.itext:2.1.7.js7_b01 - - - org.w3c.dom.svg.patch:1.1.0.b02 - - - org.krysalis.barcode4j:2.1.0 - - + + com.jaspersoft.studio.bundles.itext:2.1.7.js7_b01 + + + org.w3c.dom.svg.patch:1.1.0.b02 + + + org.krysalis.barcode4j:2.1.0 + + - + com.googlecode.maven-download-plugin download-maven-plugin - - - download-zk-package - package - - wget - - - ${zk-osgi-zip-file} - true - zk-bin-osgi-${zk.version}.zip - ${project.build.directory} - 5 - - - - - download-zk-patch-source-for-IDEMPIERE-2003 - package - - wget - - - ${url.file.srv}/extra.jar/zul.sources_8.6.0.1-patched.jar - false - zul.sources_8.6.0.1-patched.jar - ${project.build.directory}/repository/plugins - 5 - true - true - - - - download-zk-patch-binary-for-IDEMPIERE-2003 - package - - wget - - - ${url.file.srv}/extra.jar/zul_8.6.0.1-patched.jar - false - zul_8.6.0.1-patched.jar - ${project.build.directory}/repository/plugins - 5 - true - true - - + + com.coderplus.maven.plugins copy-rename-maven-plugin - - rename-file - package - - copy - - - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zcommon.osgi.jar - ${project.build.directory}/repository/plugins/zcommon_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zel.osgi.jar - ${project.build.directory}/repository/plugins/zel_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zhtml.osgi.jar - ${project.build.directory}/repository/plugins/zhtml_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zjavassist.osgi.jar - ${project.build.directory}/repository/plugins/zjavassist_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zk.osgi.jar - ${project.build.directory}/repository/plugins/zk_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkbind.osgi.jar - ${project.build.directory}/repository/plugins/zkbind_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkplus.osgi.jar - ${project.build.directory}/repository/plugins/zkplus_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zul.osgi.jar - ${project.build.directory}/repository/plugins/zul_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zweb.osgi.jar - ${project.build.directory}/repository/plugins/zweb_${zk.version}.jar - - - ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkwebfragment.osgi.jar - ${project.build.directory}/repository/plugins/zkwebfragment_${zk.version}.jar - - - - - - + move-file package @@ -1729,7 +1380,7 @@ - + org.eclipse.tycho.extras tycho-p2-extras-plugin diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/readme.txt b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/readme.txt new file mode 100644 index 0000000000..b900054fd3 --- /dev/null +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/readme.txt @@ -0,0 +1,3 @@ +To host the build p2 repository for local testing: + +mvn -Djetty.http.port= -f pom-jetty-run.xml jetty:run diff --git a/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml index 71cead9d68..c05106a427 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml @@ -3,7 +3,7 @@ org.idempiere org.idempiere.parent - 6.2.0-SNAPSHOT + 7.1.0-SNAPSHOT ../../org.idempiere.parent/pom.xml 4.0.0 diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 3a1aa5fa0f..ed3306632e 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,65 +1,91 @@ - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + - - - - - - - - - - - - - - - + + @@ -74,244 +100,105 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + - - - - - - + + - - - - - - - - - - - + + + + - - - - - - - + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -332,38 +219,24 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -378,111 +251,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -491,8 +322,6 @@ - - @@ -503,357 +332,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - + @@ -863,32 +434,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -969,10 +542,12 @@ + + - - + + @@ -985,26 +560,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -1013,10 +568,6 @@ - - - - @@ -1045,6 +596,8 @@ + + @@ -1059,8 +612,6 @@ - - @@ -1073,14 +624,11 @@ - - - @@ -1104,6 +652,7 @@ + @@ -1116,105 +665,140 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -1230,97 +814,42 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml index 470c6be0d4..cdbe958159 100644 --- a/org.idempiere.p2/category.xml +++ b/org.idempiere.p2/category.xml @@ -3,9 +3,6 @@ - - - @@ -24,9 +21,6 @@ - - - @@ -48,31 +42,37 @@ - + - + - + - + - + - + - + - + - + + + + + + + diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product index 2a034f6f4a..c67228b90b 100644 --- a/org.idempiere.p2/server.product +++ b/org.idempiere.p2/server.product @@ -9,7 +9,7 @@ -console - --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,org.w3c.dom.events -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 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml + --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,org.w3c.dom.events -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 -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -32,7 +32,6 @@ - @@ -66,15 +65,15 @@ - - - - - - + + + + + + diff --git a/org.idempiere.parent/pom-jetty-run.xml b/org.idempiere.parent/pom-jetty-run.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml index 1ad7d68a62..12d1555072 100644 --- a/org.idempiere.parent/pom.xml +++ b/org.idempiere.parent/pom.xml @@ -10,11 +10,11 @@ Maven parent project for idempiere - 1.5.0 + 1.7.0 ${tycho.version} UTF-8 6.11.0 - 8.6.0.1 + 9.0.1 3.23.1-GA 3.1.1 1.4.1 @@ -26,10 +26,10 @@ 2.5 org.idempiere.p2.targetplatform - https://download.eclipse.org/eclipse/updates/4.10 - eclipse-photon-201810 - https://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository - orbit-photon-R20181128170323 + https://download.eclipse.org/eclipse/updates/4.15 + eclipse-2020-03 + https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository + orbit-2020-03-R20200224183213 https://raw.githubusercontent.com/idempiere/binary.file/master org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group org.adempiere.server.product @@ -107,27 +107,23 @@ tycho-eclipserun-plugin ${tycho.extras.version} - - - ${idempiere-equinox-repository-id} - ${idempiere-equinox-url} - p2 - - - ${idempiere-orbit-repository-id} - ${idempiere-orbit-url} - p2 - - + + + ${idempiere-equinox-repository-id} + ${idempiere-equinox-url} + p2 + + + ${idempiere-orbit-repository-id} + ${idempiere-orbit-url} + p2 + + org.eclipse.ecf eclipse-plugin - - org.eclipse.equinox.util - eclipse-plugin - org.eclipse.equinox.ds eclipse-plugin @@ -144,16 +140,12 @@ org.eclipse.equinox.p2.publisher.eclipse eclipse-plugin - - org.eclipse.ecf.provider.filetransfer.httpclient4.ssl - eclipse-plugin - org.apache.commons.logging eclipse-plugin - org.eclipse.ecf.provider.filetransfer.httpclient4 + org.eclipse.ecf.provider.filetransfer.httpclient45 eclipse-plugin @@ -355,7 +347,7 @@ org.eclipse.tycho tycho-compiler-plugin ${tycho.version} - + true @@ -515,61 +507,61 @@ - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - honor - - - - - eclipse-plugin - org.eclipse.core.runtime - 0.0.0 - - - eclipse-plugin - org.eclipse.equinox.common - 0.0.0 - - - - - - org.idempiere - ${idempiere.target} - 7.1.0-SNAPSHOT - - + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + honor + + + + + eclipse-plugin + org.eclipse.core.runtime + 0.0.0 + + + eclipse-plugin + org.eclipse.equinox.common + 0.0.0 + + + + + + org.idempiere + ${idempiere.target} + 7.1.0-SNAPSHOT + + - - - - linux - gtk - x86_64 - - - win32 - win32 - x86_64 - - - macosx - cocoa - x86_64 - - - JavaSE-11 - JavaSE-11 - - - - - + + + + linux + gtk + x86_64 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + JavaSE-11 + JavaSE-11 + + + + + buildP2FromMaven diff --git a/org.adempiere.target.platform-feature/.project b/org.idempiere.webservices-feature/.project similarity index 60% rename from org.adempiere.target.platform-feature/.project rename to org.idempiere.webservices-feature/.project index e92bd7ae6a..16731a5d40 100644 --- a/org.adempiere.target.platform-feature/.project +++ b/org.idempiere.webservices-feature/.project @@ -1,6 +1,6 @@ - org.adempiere.target.platform-feature + org.idempiere.webservices.feature @@ -10,14 +10,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.FeatureNature diff --git a/org.adempiere.bundles.external-feature/build.properties b/org.idempiere.webservices-feature/build.properties similarity index 100% rename from org.adempiere.bundles.external-feature/build.properties rename to org.idempiere.webservices-feature/build.properties diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.idempiere.webservices-feature/feature.xml similarity index 63% rename from org.adempiere.target.platform-feature/feature.xml rename to org.idempiere.webservices-feature/feature.xml index c08410b281..9bbc14253d 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.idempiere.webservices-feature/feature.xml @@ -1,9 +1,9 @@ + provider-name="iDempiere"> [Enter Feature Description here.] @@ -17,153 +17,64 @@ [Enter License Description here.] - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + unpack="false"/> - + unpack="false"/> + - - + unpack="false"/> + id="org.glassfish.jersey.containers.servlet.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> - + id="org.glassfish.jersey.ext.entityfiltering" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + - + id="org.glassfish.jersey.media.jersey-media-json-jackson" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + - - 7.1.0-SNAPSHOT ../org.idempiere.parent/pom.xml - org.adempiere.target.platform.feature + org.idempiere.webservices.feature eclipse-feature \ No newline at end of file diff --git a/org.idempiere.webservices.client-feature/feature.xml b/org.idempiere.webservices.client-feature/feature.xml index 3c455996f9..f4d9b52275 100644 --- a/org.idempiere.webservices.client-feature/feature.xml +++ b/org.idempiere.webservices.client-feature/feature.xml @@ -179,4 +179,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath index 83a96b9803..5879c673b2 100644 --- a/org.idempiere.webservices/.classpath +++ b/org.idempiere.webservices/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs index 6783713ef0..7adc0fb9a0 100644 --- a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml index 77536ce89e..2ea8c02ae9 100644 --- a/org.idempiere.zk-feature/feature.xml +++ b/org.idempiere.zk-feature/feature.xml @@ -108,4 +108,19 @@ version="0.0.0" unpack="false"/> + + + + diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath index 92d760e60b..e634c2aa34 100644 --- a/org.idempiere.zk.extra/.classpath +++ b/org.idempiere.zk.extra/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs index b5eacefd65..a58ebdcad3 100644 --- a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml index 9ce19857ec..a184610178 100644 --- a/org.idempiere.zk.extra/pom.xml +++ b/org.idempiere.zk.extra/pom.xml @@ -11,6 +11,12 @@ ../org.idempiere.parent/pom.xml + + + idempiere.github.io.maven.zk + https://idempiere.github.io/binary.file/maven.zk + + @@ -70,4 +76,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 8d5c5584c7..e4e48dcfe6 100644 --- a/pom.xml +++ b/pom.xml @@ -35,15 +35,14 @@ org.idempiere.felix.webconsole org.idempiere.hazelcast.service org.idempiere.webservices + org.idempiere.webservices-feature org.idempiere.zk.extra org.adempiere.report.jasper-feature - org.adempiere.bundles.external-feature org.adempiere.base-feature org.adempiere.replication-feature org.adempiere.pipo-feature org.adempiere.replication.server-feature org.adempiere.server-feature - org.adempiere.target.platform-feature org.adempiere.ui.zk-feature org.compiere.db.provider-feature org.idempiere.eclipse.platform-feature