From e20f725f6cedf0f3bf0cb1a129c9e2e119d63815 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 2 Mar 2019 20:37:28 +0700 Subject: [PATCH 1/8] IDEMPIERE-3911:lookup table should consistent --- org.adempiere.base/src/org/compiere/model/MTable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MTable.java b/org.adempiere.base/src/org/compiere/model/MTable.java index 55e32993bb..c2e7980d79 100644 --- a/org.adempiere.base/src/org/compiere/model/MTable.java +++ b/org.adempiere.base/src/org/compiere/model/MTable.java @@ -624,13 +624,13 @@ public class MTable extends X_AD_Table */ public static int getTable_ID(String tableName, String trxName) { int retValue = 0; - String SQL = "SELECT AD_Table_ID FROM AD_Table WHERE tablename = ?"; + String SQL = "SELECT AD_Table_ID FROM AD_Table WHERE UPPER(tablename) = ?"; PreparedStatement pstmt = null; ResultSet rs = null; try { pstmt = DB.prepareStatement(SQL, trxName); - pstmt.setString(1, tableName); + pstmt.setString(1, tableName.toUpperCase()); rs = pstmt.executeQuery(); if (rs.next()) retValue = rs.getInt(1); From 874d238c5c5a1e026ce0f4124024dfe893aff01f Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 2 Mar 2019 12:42:44 +0700 Subject: [PATCH 2/8] IDEMPIERE-3908:webservice client example add project to build p2 repository for webservice client --- .../.classpath | 5 + .../org.idempiere.webservice.client/.project | 23 ++ .../org.idempiere.webservice.client/pom.xml | 196 ++++++++++++++++++ org.idempiere.maven.to.p2/pom.xml | 1 + .../org.idempiere.p2.targetplatform.target | 47 +++++ 5 files changed, 272 insertions(+) create mode 100644 org.idempiere.maven.to.p2/org.idempiere.webservice.client/.classpath create mode 100644 org.idempiere.maven.to.p2/org.idempiere.webservice.client/.project create mode 100644 org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml diff --git a/org.idempiere.maven.to.p2/org.idempiere.webservice.client/.classpath b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/.classpath new file mode 100644 index 0000000000..364549af64 --- /dev/null +++ b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/.classpath @@ -0,0 +1,5 @@ + + + + + diff --git a/org.idempiere.maven.to.p2/org.idempiere.webservice.client/.project b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/.project new file mode 100644 index 0000000000..8fcd5afe3a --- /dev/null +++ b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/.project @@ -0,0 +1,23 @@ + + + org.idempiere.webservice.client + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + 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 new file mode 100644 index 0000000000..2981921f65 --- /dev/null +++ b/org.idempiere.maven.to.p2/org.idempiere.webservice.client/pom.xml @@ -0,0 +1,196 @@ + + + org.idempiere + org.idempiere.parent + 6.2.0-SNAPSHOT + ../../org.idempiere.parent/pom.xml + + 4.0.0 + org.idempiere.webservice.client + pom + + 2.3.2 + + + + + + org.reficio + p2-maven-plugin + 1.3.0 + + + default-cli + package + + site + + + + + org.idempiere.webservice.client.p2.feature + ${project.version} + + Idempiere + feature group all osgi bundle get from maven repository for webservice client dependency + Idempiere + GPL v2.1 + true + + + + + com.sun.xml.stream.buffer:streambuffer:jar:1.5.7 + true + false + + + + + com.sun.xml.ws:policy:jar:2.7.6 + true + false + + + + + org.jvnet.mimepull:mimepull:1.9.11 + true + false + + + + + org.jvnet.staxex:stax-ex:jar:1.8.1 + true + false + + + + + org.glassfish.gmbal:gmbal:jar:4.0.0 + true + false + + + + + com.sun.xml.fastinfoset:FastInfoset:jar:1.2.16 + true + false + + + + + org.glassfish.ha:ha-api:jar:3.1.12 + true + false + + + + + org.glassfish.external:management-api:jar:3.2.1 + true + false + + + + + org.glassfish.pfl:pfl-tf:jar:4.0.1 + true + false + + + + + org.glassfish.pfl:pfl-asm:jar:4.0.1 + true + false + + + + + org.glassfish.pfl:pfl-dynamic:jar:4.0.1 + true + false + + + + + org.glassfish.pfl:pfl-basic:jar:4.0.1 + true + false + + + + javax.interceptor:javax.interceptor-api:jar:1.2.2 + true + false + + + + com.sun.org.apache.xml.internal:resolver:jar:20050927 + true + false + + *;resolution:=optional + * + + + + com.sun.istack:istack-commons-runtime:jar:3.0.8 + true + false + + + + com.sun.xml.ws:jaxws-rt:jar:${xml.ws.version} + true + false + + + com.sun.xml.bind:jaxb-impl:jar:${xml.ws.version} + true + false + + + + jakarta.xml.bind:jakarta.xml.bind-api:jar:${xml.ws.version} + true + false + + + + jakarta.xml.ws:jakarta.xml.ws-api:jar:${xml.ws.version} + true + false + + + + jakarta.jws:jakarta.jws-api:jar:1.1.1 + true + false + + + + jakarta.xml.soap:jakarta.xml.soap-api:1.4.1 + true + false + + + + com.sun.xml.messaging.saaj:saaj-impl:1.5.1 + true + false + + + + + + + + + + + diff --git a/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/pom.xml index 14a0e6172e..d8edb14075 100644 --- a/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/pom.xml @@ -13,6 +13,7 @@ org.idempiere.maven.to.p2 + org.idempiere.webservice.client diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 43edbc0866..72f3694b64 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1303,6 +1303,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From fb1ebefdf22f343d7834da02655b2e93183ca6c4 Mon Sep 17 00:00:00 2001 From: hieplq Date: Sat, 2 Mar 2019 20:22:16 +0700 Subject: [PATCH 3/8] IDEMPIERE-3909:update webservice library to jdk-11 --- org.adempiere.base-feature/feature.xml | 14 +- .../model.generator.launch | 2 +- .../packinfolder.app.launch | 2 +- .../sign.database.build.launch | 2 +- .../synchronize-terminology.app.launch | 2 +- .../translation.app.launch | 2 +- org.adempiere.install/install.app.launch | 2 +- .../install.console.app.launch | 2 +- .../server.product.functionaltest.launch | 2 +- .../server.product.launch | 4 +- .../feature.xml | 44 +++--- .../swingclient.product.launch | 2 +- .../org.idempiere.maven.to.p2/pom.xml | 65 +++------ .../org.idempiere.p2.targetplatform.target | 127 +++++++++--------- .../META-INF/MANIFEST.MF | 5 +- 15 files changed, 114 insertions(+), 163 deletions(-) diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 790782fdff..26098cebe3 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -351,13 +351,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 213fe3ccc9..92519e6a46 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 3b416a2547..99cae03665 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index f9f5fa65ce..e16fcc8624 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index bc231f8dd0..81c8e223e6 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index d164700bb7..161f2f3ad9 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 436c7c6d48..59ed8e5772 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -24,7 +24,7 @@ - + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index 73cf7a940b..addecca52c 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -24,7 +24,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 29f4e1baa4..50f794609b 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 9077da2154..555d81ae77 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index e6036ab506..f5b54b17f4 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -370,40 +370,12 @@ version="0.0.0" unpack="false"/> - - - - - - - - + + + + - + 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 caeba240f8..337367352a 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,7 +10,7 @@ org.idempiere.maven.to.p2 pom - https://sourceforge.net/project/zk1/ZK/zk-8.6.0.1/zk-bin-osgi-8.6.0.1.zip + 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 @@ -26,7 +26,7 @@ 5.0.3 20171018 1.7.25 - 2.3.1 + 2.3.2 2.4 3.2.6 3.1.17 @@ -427,12 +427,15 @@ + com.sun.activation:jakarta.activation:jar:${activation.version} true false - javax.xml.bind:jaxb-api:jar:${xml.ws.version} + + jakarta.xml.bind:jakarta.xml.bind-api:jar:${xml.ws.version} true false @@ -452,34 +455,10 @@ false - javax.xml.ws:jaxws-api:jar:${xml.ws.version} + + com.sun.xml.bind:jaxb-osgi:jar:${xml.ws.version} true false - true - - jaxws-api - ${xml.ws.version} - - javax.xml.ws;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.bind.anno - tation,javax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,j - avax.xml.ws.spi,javax.xml.ws.spi.http,org.w3c.dom",javax.xml.ws.handl - er;version="${xml.ws.export.version}";uses:="javax.xml.namespace,javax.xml.ws",javax.xml.ws.handler.soap - ;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.namespace,javax.xml.soap,javax.xml.w - s.handler",javax.xml.ws.http;version="${xml.ws.export.version}";uses:="javax.xml.ws",javax.xml.ws.soap;version="${xml.ws.export.version}";u - ses:="javax.xml.soap,javax.xml.ws,javax.xml.ws.spi",javax.xml.ws.spi;version="${xml.ws.export.version}"; - uses:="javax.xml.bind,javax.xml.namespace,javax.xml.transform,javax.x - ml.ws,javax.xml.ws.handler,javax.xml.ws.wsaddressing,org.w3c.dom",jav - ax.xml.ws.spi.http;version="${xml.ws.export.version}",javax.xml.ws.wsaddressing;version="${xml.ws.export.version}";uses:="javax.xml.bind.an - notation,javax.xml.namespace,javax.xml.transform,javax.xml.ws,org.w3c - .dom" - - org.glassfish.hk2.osgiresourcelocator - - javax.xml.bind;version="[2.3,3)",javax.xml.bind.annota - tion;version="[2.3,3)",javax.xml.namespace,javax.xml.soap;version="[1 - .4,2)",javax.xml.transform,javax.xml.transform.stream,org.w3c.dom - osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9.0))" - javax.interceptor:javax.interceptor-api:jar:1.2.2 @@ -632,12 +611,13 @@ false - jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.3 + jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.5 true false - javax.jws:javax.jws-api:jar:1.1 + + jakarta.jws:jakarta.jws-api:jar:1.1.1 true false @@ -647,12 +627,14 @@ false + jakarta.xml.rpc:jakarta.xml.rpc-api:jar:1.1.3 true false - jakarta.persistence:jakarta.persistence-api:jar:2.2.1 + + jakarta.persistence:jakarta.persistence-api:jar:2.2.2 true false @@ -797,24 +779,7 @@ org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version} false - false - + falses org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version} diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 72f3694b64..6b66fec459 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,4 +1,4 @@ - + @@ -879,6 +879,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -934,10 +981,12 @@ - - - - + + + + + + @@ -974,36 +1023,34 @@ + + + + + + + + - - - - - - - - - - @@ -1113,6 +1160,7 @@ + @@ -1301,54 +1349,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index b436dc804c..28db788636 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -88,10 +88,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.springframework.spring-jcl;bundle-version="5.1.1", org.apache.servicemix.bundles.spring-web, org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", - javax.xml.soap-api;bundle-version="1.4.0", org.apache.axis;bundle-version="1.4.0", javax.xml.soap;bundle-version="1.3.0", - jaxws-api;bundle-version="2.3.1", javax.annotation-api;bundle-version="1.3.2", org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6", @@ -100,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.glassfish.hk2.locator;bundle-version="2.5.0", org.glassfish.hk2.utils;bundle-version="2.5.0", org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1", - javax.ws.rs-api;bundle-version="2.1.3" + jakarta.ws.rs-api;bundle-version="2.1.5", + jakarta.xml.ws-api;bundle-version="2.3.2" Bundle-ClassPath: ., WEB-INF/lib/idempiere-xmlbeans.jar Export-Package: org.compiere.model, From 9d5e5212e77e6179607a1a121f446b6ac987419f Mon Sep 17 00:00:00 2001 From: hieplq Date: Sun, 3 Mar 2019 23:42:44 +0700 Subject: [PATCH 4/8] IDEMPIERE-3908:webservice client example add feature to load library use on webservice client --- org.adempiere.base-feature/feature.xml | 4 + .../server.product.launch | 4 +- .../.hgignore | 2 + .../.project | 23 +++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../build.properties | 1 + .../feature.xml | 174 ++++++++++++++++++ .../pom.xml | 11 ++ pom.xml | 1 + 10 files changed, 224 insertions(+), 2 deletions(-) create mode 100644 org.idempiere.webservices.client-feature/.hgignore create mode 100644 org.idempiere.webservices.client-feature/.project create mode 100644 org.idempiere.webservices.client-feature/.settings/org.eclipse.core.resources.prefs create mode 100644 org.idempiere.webservices.client-feature/.settings/org.eclipse.m2e.core.prefs create mode 100644 org.idempiere.webservices.client-feature/build.properties create mode 100644 org.idempiere.webservices.client-feature/feature.xml create mode 100644 org.idempiere.webservices.client-feature/pom.xml diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index 26098cebe3..87f1f45ffd 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -37,6 +37,10 @@ id="org.adempiere.report.jasper.feature" version="0.0.0"/> + + - - + + diff --git a/org.idempiere.webservices.client-feature/.hgignore b/org.idempiere.webservices.client-feature/.hgignore new file mode 100644 index 0000000000..c82d673286 --- /dev/null +++ b/org.idempiere.webservices.client-feature/.hgignore @@ -0,0 +1,2 @@ +syntax: glob +target diff --git a/org.idempiere.webservices.client-feature/.project b/org.idempiere.webservices.client-feature/.project new file mode 100644 index 0000000000..a60cfb48ef --- /dev/null +++ b/org.idempiere.webservices.client-feature/.project @@ -0,0 +1,23 @@ + + + org.idempiere.webservices.client-feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.FeatureNature + + diff --git a/org.idempiere.webservices.client-feature/.settings/org.eclipse.core.resources.prefs b/org.idempiere.webservices.client-feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/org.idempiere.webservices.client-feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.idempiere.webservices.client-feature/.settings/org.eclipse.m2e.core.prefs b/org.idempiere.webservices.client-feature/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000000..f897a7f1cb --- /dev/null +++ b/org.idempiere.webservices.client-feature/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.idempiere.webservices.client-feature/build.properties b/org.idempiere.webservices.client-feature/build.properties new file mode 100644 index 0000000000..64f93a9f0b --- /dev/null +++ b/org.idempiere.webservices.client-feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/org.idempiere.webservices.client-feature/feature.xml b/org.idempiere.webservices.client-feature/feature.xml new file mode 100644 index 0000000000..c25b2ab790 --- /dev/null +++ b/org.idempiere.webservices.client-feature/feature.xml @@ -0,0 +1,174 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.idempiere.webservices.client-feature/pom.xml b/org.idempiere.webservices.client-feature/pom.xml new file mode 100644 index 0000000000..9dea7f87bc --- /dev/null +++ b/org.idempiere.webservices.client-feature/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + + org.idempiere + org.idempiere.parent + 6.2.0-SNAPSHOT + ../org.idempiere.parent/pom.xml + + org.idempiere.webservices.client-feature + eclipse-feature + \ No newline at end of file diff --git a/pom.xml b/pom.xml index dd28c72bfb..007902fa51 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,7 @@ org.idempiere.hazelcast.service-feature org.adempiere.payment.processor-feature org.idempiere.zk-feature + org.idempiere.webservices.client-feature org.idempiere.p2 ${idempiere.target} From 32d4d189f97e8947335267adecd8a2913467c4d6 Mon Sep 17 00:00:00 2001 From: hieplq Date: Mon, 4 Mar 2019 04:46:08 +0700 Subject: [PATCH 5/8] IDEMPIERE-3908:webservice client example fix to can build with maven --- .../server.product.launch | 4 +-- .../org.idempiere.maven.to.p2/pom.xml | 25 +++++++++++++++---- .../org.idempiere.p2.targetplatform.target | 5 ++-- .../feature.xml | 3 ++- .../pom.xml | 2 +- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index bba06d14f1..86b30192e8 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + 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 337367352a..71f1099bfe 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 @@ -439,11 +439,6 @@ true false - - com.sun.xml.bind:jaxb-core:jar:2.3.0.1 - true - false - com.sun.xml.bind:jaxb-impl:jar:${xml.ws.version} true @@ -1754,6 +1749,26 @@ true + + + download-sun-package + package + + wget + + + ${url.file.srv}/extra.jar/com.diffplug.osgi.extension.sun.misc_0.0.0.jar + false + com.diffplug.osgi.extension.sun.misc_0.0.0.jar + ${project.build.directory}/repository/plugins + 5 + true + true + + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 6b66fec459..0629838e54 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -935,6 +935,7 @@ + @@ -979,8 +980,6 @@ - - @@ -1349,7 +1348,7 @@ - + diff --git a/org.idempiere.webservices.client-feature/feature.xml b/org.idempiere.webservices.client-feature/feature.xml index c25b2ab790..80bcf6432c 100644 --- a/org.idempiere.webservices.client-feature/feature.xml +++ b/org.idempiere.webservices.client-feature/feature.xml @@ -165,10 +165,11 @@ unpack="false"/> diff --git a/org.idempiere.webservices.client-feature/pom.xml b/org.idempiere.webservices.client-feature/pom.xml index 9dea7f87bc..7c64e55320 100644 --- a/org.idempiere.webservices.client-feature/pom.xml +++ b/org.idempiere.webservices.client-feature/pom.xml @@ -6,6 +6,6 @@ 6.2.0-SNAPSHOT ../org.idempiere.parent/pom.xml - org.idempiere.webservices.client-feature + org.idempiere.webservices.client.feature eclipse-feature \ No newline at end of file From 735ffd81d47556a9a840b81e8eec8a72f7dbeba2 Mon Sep 17 00:00:00 2001 From: hieplq Date: Mon, 4 Mar 2019 17:55:08 +0700 Subject: [PATCH 6/8] IDEMPIERE-3908:webservice client example finally --- .../server.product.launch | 4 +- .../setup/configuration/config.ini | 2 +- .../org.idempiere.maven.to.p2/pom.xml | 6 - .../org.idempiere.webservice.client/pom.xml | 326 ++++++++++++++++++ .../org.idempiere.p2.targetplatform.target | 106 +++--- .../feature.xml | 7 + pom.xml | 1 + 7 files changed, 394 insertions(+), 58 deletions(-) diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 86b30192e8..b408966498 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -4,7 +4,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index a04de95291..8a07636251 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -61,7 +61,7 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.passay,\ groovy,\ org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\ - jaxb-api,\ + jakarta.xml.bind-api,\ org.eclipse.osgi@start osgi.framework.extensions= osgi.bundles.defaultStartLevel=4 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 71f1099bfe..3b91b718d3 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 @@ -449,12 +449,6 @@ true false - - - com.sun.xml.bind:jaxb-osgi:jar:${xml.ws.version} - true - false - javax.interceptor:javax.interceptor-api:jar:1.2.2 true 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 2981921f65..5040a93e22 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 @@ -184,6 +184,332 @@ true false + + + com.sun.xml.bind:jaxb-xjc:jar:${xml.ws.version} + true + false + + + + com.sun.xml.bind:jaxb-jxc:jar:${xml.ws.version} + true + false + + + + com.sun.xml.bind.external:rngom:jar:${xml.ws.version} + true + false + + *;resolution:=optional + * + + + + + org.glassfish.jaxb:txw2:jar:${xml.ws.version} + true + false + + *;resolution:=optional + * + + + + + com.sun.xml.bind:jaxb-osgi:jar:${xml.ws.version} + true + false + true + + + lazy + JAXB OSGI + com.sun.xml.bind.jaxb-osgi + 2.3.2 + com.sun.codemodel;version="2.3.2",com.sun.codemodel.fmt; + version="2.3.2";uses:="com.sun.codemodel",com.sun.codemodel.util;versio + n="2.3.2";uses:="com.sun.codemodel",com.sun.codemodel.writer;version="2 + .3.2";uses:="com.sun.codemodel",com.sun.istack;version="3.0.8";uses:="j + avax.activation,javax.xml.stream,org.xml.sax,org.xml.sax.helpers",com.s + un.istack.localization;version="3.0.8",com.sun.istack.logging;version=" + 3.0.8",com.sun.istack.tools;version="3.0.8";uses:="org.apache.tools.ant + ,org.xml.sax",com.sun.tools.jxc;version="2.3.2";uses:="com.sun.tools.jx + c.gen.config,com.sun.tools.xjc.api,javax.annotation.processing,javax.la + ng.model.element,javax.xml.bind,org.apache.tools.ant.taskdefs,org.apach + e.tools.ant.types,org.xml.sax",com.sun.tools.jxc.ap;version="2.3.2";use + s:="com.sun.tools.xjc,com.sun.xml.bind.v2.model.annotation,javax.annota + tion.processing,javax.lang.model,javax.lang.model.element,javax.lang.mo + del.type",com.sun.tools.jxc.api;version="2.3.2";uses:="com.sun.tools.xj + c.api",com.sun.tools.jxc.api.impl.j2s;version="2.3.2";uses:="com.sun.to + ols.xjc.api,javax.annotation.processing,javax.xml.namespace",com.sun.to + ols.jxc.gen.config;version="2.3.2";uses:="com.sun.tools.jxc,org.xml.sax + ",com.sun.tools.jxc.model.nav;version="2.3.2";uses:="com.sun.xml.bind.v + 2.model.nav,com.sun.xml.bind.v2.runtime,javax.annotation.processing,jav + ax.lang.model.element,javax.lang.model.type",com.sun.tools.rngdatatype; + version="2.3.2",com.sun.tools.rngdatatype.helpers;version="2.3.2";uses: + ="com.sun.tools.rngdatatype",com.sun.tools.rngom.ast.builder;version="2 + .3.2";uses:="com.sun.tools.rngom.ast.om,com.sun.tools.rngom.parse",com. + sun.tools.rngom.ast.om;version="2.3.2",com.sun.tools.rngom.ast.util;ver + sion="2.3.2";uses:="com.sun.tools.rngdatatype,com.sun.tools.rngom.ast.b + uilder,com.sun.tools.rngom.ast.om,com.sun.tools.rngom.parse,com.sun.too + ls.rngom.parse.host,org.xml.sax",com.sun.tools.rngom.binary;version="2. + 3.2";uses:="com.sun.tools.rngdatatype,com.sun.tools.rngom.ast.builder,c + om.sun.tools.rngom.ast.om,com.sun.tools.rngom.binary.visitor,com.sun.to + ols.rngom.nc,com.sun.tools.rngom.parse,org.xml.sax",com.sun.tools.rngom + .binary.visitor;version="2.3.2";uses:="com.sun.tools.rngdatatype,com.su + n.tools.rngom.binary,com.sun.tools.rngom.nc",com.sun.tools.rngom.digest + ed;version="2.3.2";uses:="com.sun.tools.rngom.ast.builder,com.sun.tools + .rngom.ast.om,com.sun.tools.rngom.ast.util,com.sun.tools.rngom.nc,com.s + un.tools.rngom.parse,javax.xml.namespace,javax.xml.stream,org.w3c.dom,o + rg.xml.sax",com.sun.tools.rngom.dt;version="2.3.2";uses:="com.sun.tools + .rngdatatype",com.sun.tools.rngom.dt.builtin;version="2.3.2";uses:="com + .sun.tools.rngdatatype",com.sun.tools.rngom.nc;version="2.3.2";uses:="c + om.sun.tools.rngom.ast.builder,com.sun.tools.rngom.ast.om,javax.xml.nam + espace",com.sun.tools.rngom.parse;version="2.3.2";uses:="com.sun.tools. + rngdatatype,com.sun.tools.rngom.ast.builder,com.sun.tools.rngom.ast.om" + ,com.sun.tools.rngom.parse.compact;version="2.3.2";uses:="com.sun.tools + .rngom.ast.builder,com.sun.tools.rngom.ast.om,com.sun.tools.rngom.parse + ,org.xml.sax",com.sun.tools.rngom.parse.host;version="2.3.2";uses:="com + .sun.tools.rngom.ast.builder,com.sun.tools.rngom.ast.om,com.sun.tools.r + ngom.parse",com.sun.tools.rngom.parse.xml;version="2.3.2";uses:="com.su + n.tools.rngdatatype,com.sun.tools.rngom.ast.builder,com.sun.tools.rngom + .ast.om,com.sun.tools.rngom.parse,com.sun.tools.rngom.xml.sax,org.xml.s + ax",com.sun.tools.rngom.util;version="2.3.2",com.sun.tools.rngom.xml.sa + x;version="2.3.2";uses:="javax.xml.parsers,org.xml.sax,org.xml.sax.ext" + ,com.sun.tools.rngom.xml.util;version="2.3.2",com.sun.tools.xjc;version + ="2.3.2";uses:="com.sun.codemodel,com.sun.istack.tools,com.sun.tools.xj + c.api,com.sun.tools.xjc.generator.bean.field,com.sun.tools.xjc.model,co + m.sun.tools.xjc.outline,com.sun.tools.xjc.reader.internalizer,com.sun.x + ml.bind.api.impl,com.sun.xml.xsom,com.sun.xml.xsom.parser,javax.xml.val + idation,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.apache.t + ools.ant.types,org.xml.sax",com.sun.tools.xjc.addon.accessors;version=" + 2.3.2";uses:="com.sun.tools.xjc,com.sun.tools.xjc.outline,org.xml.sax", + com.sun.tools.xjc.addon.at_generated;version="2.3.2";uses:="com.sun.too + ls.xjc,com.sun.tools.xjc.outline,org.xml.sax",com.sun.tools.xjc.addon.c + ode_injector;version="2.3.2";uses:="com.sun.tools.xjc,com.sun.tools.xjc + .outline,org.xml.sax",com.sun.tools.xjc.addon.episode;version="2.3.2";u + ses:="com.sun.tools.xjc,com.sun.tools.xjc.outline,org.xml.sax",com.sun. + tools.xjc.addon.locator;version="2.3.2";uses:="com.sun.tools.xjc,com.su + n.tools.xjc.outline,org.xml.sax",com.sun.tools.xjc.addon.sync;version=" + 2.3.2";uses:="com.sun.tools.xjc,com.sun.tools.xjc.outline,org.xml.sax", + com.sun.tools.xjc.api;version="2.3.2";uses:="com.sun.codemodel,com.sun. + tools.xjc,com.sun.xml.bind.api,javax.annotation.processing,javax.lang.m + odel.element,javax.lang.model.type,javax.xml.bind,javax.xml.namespace,j + avax.xml.stream,javax.xml.transform,org.w3c.dom,org.xml.sax",com.sun.to + ols.xjc.api.impl.s2j;version="2.3.2";uses:="com.sun.codemodel,com.sun.t + ools.xjc,com.sun.tools.xjc.api,com.sun.tools.xjc.model,com.sun.tools.xj + c.outline,com.sun.tools.xjc.reader.internalizer,javax.xml.namespace,jav + ax.xml.stream,org.w3c.dom,org.xml.sax",com.sun.tools.xjc.generator.anno + tation.spec;version="2.3.2";uses:="com.sun.codemodel,javax.xml.bind.ann + otation,javax.xml.bind.annotation.adapters",com.sun.tools.xjc.generator + .bean;version="2.3.2";uses:="com.sun.codemodel,com.sun.tools.xjc,com.su + n.tools.xjc.model,com.sun.tools.xjc.outline,com.sun.tools.xjc.util,java + x.xml.bind.annotation",com.sun.tools.xjc.generator.bean.field;version=" + 2.3.2";uses:="com.sun.codemodel,com.sun.tools.xjc.generator.bean,com.su + n.tools.xjc.model,com.sun.tools.xjc.outline",com.sun.tools.xjc.generato + r.util;version="2.3.2";uses:="com.sun.codemodel",com.sun.tools.xjc.mode + l;version="2.3.2";uses:="com.sun.codemodel,com.sun.tools.xjc,com.sun.to + ols.xjc.api,com.sun.tools.xjc.generator.bean,com.sun.tools.xjc.generato + r.bean.field,com.sun.tools.xjc.model.nav,com.sun.tools.xjc.outline,com. + sun.tools.xjc.reader.xmlschema.bindinfo,com.sun.xml.bind.api.impl,com.s + un.xml.bind.v2.model.annotation,com.sun.xml.bind.v2.model.core,com.sun. + xml.bind.v2.model.nav,com.sun.xml.bind.v2.runtime,com.sun.xml.xsom,java + x.activation,javax.xml.bind.annotation,javax.xml.bind.annotation.adapte + rs,javax.xml.namespace,javax.xml.transform,org.w3c.dom,org.xml.sax",com + .sun.tools.xjc.model.nav;version="2.3.2";uses:="com.sun.codemodel,com.s + un.tools.xjc.outline,com.sun.xml.bind.v2.model.nav,com.sun.xml.bind.v2. + runtime",com.sun.tools.xjc.outline;version="2.3.2";uses:="com.sun.codem + odel,com.sun.tools.xjc,com.sun.tools.xjc.generator.bean,com.sun.tools.x + jc.model,com.sun.tools.xjc.util,javax.xml.bind.annotation",com.sun.tool + s.xjc.reader;version="2.3.2";uses:="com.sun.codemodel,com.sun.tools.xjc + ,com.sun.tools.xjc.model,com.sun.tools.xjc.util,com.sun.xml.bind.v2.mod + el.core,javax.activation,org.xml.sax,org.xml.sax.helpers",com.sun.tools + .xjc.reader.dtd;version="2.3.2";uses:="com.sun.tools.xjc,com.sun.tools. + xjc.model,com.sun.xml.dtdparser,org.xml.sax",com.sun.tools.xjc.reader.d + td.bindinfo;version="2.3.2";uses:="com.sun.codemodel,com.sun.tools.xjc, + com.sun.tools.xjc.generator.bean.field,com.sun.tools.xjc.model,org.w3c. + dom,org.xml.sax",com.sun.tools.xjc.reader.gbind;version="2.3.2",com.sun + .tools.xjc.reader.internalizer;version="2.3.2";uses:="com.sun.tools.xjc + ,com.sun.xml.xsom,com.sun.xml.xsom.parser,javax.xml.parsers,javax.xml.s + tream,javax.xml.transform.sax,javax.xml.validation,org.w3c.dom,org.xml. + sax,org.xml.sax.helpers",com.sun.tools.xjc.reader.relaxng;version="2.3. + 2";uses:="com.sun.codemodel,com.sun.tools.rngom.digested,com.sun.tools. + xjc,com.sun.tools.xjc.model,com.sun.tools.xjc.reader,com.sun.tools.xjc. + reader.internalizer,org.w3c.dom,org.xml.sax.helpers",com.sun.tools.xjc. + reader.xmlschema;version="2.3.2";uses:="com.sun.codemodel,com.sun.tools + .rngom.nc,com.sun.tools.xjc,com.sun.tools.xjc.generator.bean.field,com. + sun.tools.xjc.model,com.sun.tools.xjc.reader,com.sun.tools.xjc.reader.g + bind,com.sun.tools.xjc.reader.xmlschema.bindinfo,com.sun.xml.bind.api.i + mpl,com.sun.xml.bind.v2.model.core,com.sun.xml.xsom,com.sun.xml.xsom.vi + sitor,javax.activation,javax.xml.namespace,javax.xml.transform",com.sun + .tools.xjc.reader.xmlschema.bindinfo;version="2.3.2";uses:="com.sun.cod + emodel,com.sun.tools.xjc,com.sun.tools.xjc.generator.bean,com.sun.tools + .xjc.model,com.sun.tools.xjc.reader,com.sun.tools.xjc.reader.xmlschema, + com.sun.xml.bind.api.impl,com.sun.xml.xsom,com.sun.xml.xsom.parser,java + x.xml.bind,javax.xml.bind.annotation,javax.xml.namespace,javax.xml.tran + sform.sax,org.w3c.dom,org.xml.sax,org.xml.sax.helpers",com.sun.tools.xj + c.reader.xmlschema.ct;version="2.3.2";uses:="com.sun.tools.xjc.reader.x + mlschema,com.sun.xml.xsom",com.sun.tools.xjc.reader.xmlschema.parser;ve + rsion="2.3.2";uses:="com.sun.tools.xjc,com.sun.tools.xjc.reader.interna + lizer,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.helpers",com.s + un.tools.xjc.runtime;version="2.3.2";uses:="javax.xml.bind,javax.xml.bi + nd.annotation.adapters",com.sun.tools.xjc.util;version="2.3.2";uses:="c + om.sun.codemodel,com.sun.tools.xjc,com.sun.tools.xjc.api,com.sun.xml.xs + om,javax.activation,javax.xml.bind.annotation.adapters,javax.xml.namesp + ace,org.w3c.dom,org.xml.sax,org.xml.sax.helpers",com.sun.tools.xjc.writ + er;version="2.3.2";uses:="com.sun.tools.xjc.outline",com.sun.xml.bind;v + ersion="2.3.2";uses:="com.sun.xml.bind.v2.runtime.reflect,javax.xml.bin + d,javax.xml.bind.annotation.adapters,javax.xml.datatype,javax.xml.names + pace,javax.xml.stream,org.xml.sax",com.sun.xml.bind.annotation;version= + "2.3.2",com.sun.xml.bind.api;version="2.3.2";uses:="com.sun.xml.bind.v2 + .model.annotation,com.sun.xml.bind.v2.model.runtime,com.sun.xml.bind.v2 + .runtime,javax.xml.bind,javax.xml.bind.attachment,javax.xml.namespace,j + avax.xml.stream,javax.xml.transform,org.w3c.dom,org.xml.sax",com.sun.xm + l.bind.api.impl;version="2.3.2",com.sun.xml.bind.marshaller;version="2. + 3.2";uses:="javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpe + rs",com.sun.xml.bind.unmarshaller;version="2.3.2";uses:="com.sun.xml.bi + nd.v2.runtime.unmarshaller,javax.xml.bind,org.w3c.dom,org.xml.sax",com. + sun.xml.bind.util;version="2.3.2";uses:="com.sun.xml.bind,javax.xml.bin + d.helpers,org.xml.sax",com.sun.xml.bind.v2;version="2.3.2";uses:="com.s + un.xml.bind.api,com.sun.xml.bind.v2.model.annotation,javax.xml.bind",co + m.sun.xml.bind.v2.bytecode;version="2.3.2",com.sun.xml.bind.v2.model.an + notation;version="2.3.2";uses:="com.sun.xml.bind.v2.model.core,com.sun. + xml.bind.v2.model.nav,com.sun.xml.bind.v2.runtime",com.sun.xml.bind.v2. + model.core;version="2.3.2";uses:="com.sun.xml.bind.v2.model.annotation, + com.sun.xml.bind.v2.model.impl,com.sun.xml.bind.v2.model.nav,com.sun.xm + l.bind.v2.runtime,javax.activation,javax.xml.bind,javax.xml.bind.annota + tion,javax.xml.bind.annotation.adapters,javax.xml.namespace,javax.xml.t + ransform",com.sun.xml.bind.v2.model.impl;version="2.3.2";uses:="com.sun + .xml.bind.api,com.sun.xml.bind.v2.model.annotation,com.sun.xml.bind.v2. + model.core,com.sun.xml.bind.v2.model.nav,com.sun.xml.bind.v2.model.runt + ime,com.sun.xml.bind.v2.runtime,javax.activation,javax.xml.namespace",c + om.sun.xml.bind.v2.model.nav;version="2.3.2";uses:="com.sun.xml.bind.v2 + .runtime",com.sun.xml.bind.v2.model.runtime;version="2.3.2";uses:="com. + sun.xml.bind.v2.model.core,com.sun.xml.bind.v2.runtime,com.sun.xml.bind + .v2.runtime.reflect,javax.xml.bind,javax.xml.namespace,org.xml.sax",com + .sun.xml.bind.v2.model.util;version="2.3.2";uses:="javax.xml.namespace" + ,com.sun.xml.bind.v2.runtime;version="2.3.2";uses:="com.sun.istack,com. + sun.xml.bind.api,com.sun.xml.bind.marshaller,com.sun.xml.bind.v2.model. + annotation,com.sun.xml.bind.v2.model.core,com.sun.xml.bind.v2.model.run + time,com.sun.xml.bind.v2.runtime.output,com.sun.xml.bind.v2.runtime.pro + perty,com.sun.xml.bind.v2.runtime.unmarshaller,javax.activation,javax.x + ml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,ja + vax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.namespace,java + x.xml.stream,javax.xml.transform,javax.xml.transform.sax,javax.xml.vali + dation,org.w3c.dom,org.xml.sax",com.sun.xml.bind.v2.runtime.output;vers + ion="2.3.2";uses:="com.sun.xml.bind.marshaller,com.sun.xml.bind.v2.runt + ime,com.sun.xml.fastinfoset.stax,javax.xml.stream,org.jvnet.staxex,org. + w3c.dom,org.xml.sax",com.sun.xml.bind.v2.runtime.property;version="2.3. + 2";uses:="com.sun.xml.bind.api,com.sun.xml.bind.v2.model.core,com.sun.x + ml.bind.v2.model.runtime,com.sun.xml.bind.v2.runtime,com.sun.xml.bind.v + 2.runtime.reflect,com.sun.xml.bind.v2.runtime.unmarshaller,com.sun.xml. + bind.v2.util,javax.xml.namespace,javax.xml.stream,org.xml.sax",com.sun. + xml.bind.v2.runtime.reflect;version="2.3.2";uses:="com.sun.xml.bind.api + ,com.sun.xml.bind.v2.model.core,com.sun.xml.bind.v2.model.runtime,com.s + un.xml.bind.v2.runtime,com.sun.xml.bind.v2.runtime.unmarshaller,javax.x + ml.bind,javax.xml.bind.annotation.adapters,javax.xml.stream,org.xml.sax + ",com.sun.xml.bind.v2.runtime.reflect.opt;version="2.3.2";uses:="com.su + n.xml.bind.api,com.sun.xml.bind.v2.runtime,com.sun.xml.bind.v2.runtime. + reflect,javax.xml.stream,org.xml.sax",com.sun.xml.bind.v2.runtime.unmar + shaller;version="2.3.2";uses:="com.sun.xml.bind,com.sun.xml.bind.api,co + m.sun.xml.bind.unmarshaller,com.sun.xml.bind.util,com.sun.xml.bind.v2.m + odel.core,com.sun.xml.bind.v2.runtime,com.sun.xml.bind.v2.runtime.outpu + t,com.sun.xml.bind.v2.runtime.reflect,javax.activation,javax.xml.bind,j + avax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.b + ind.attachment,javax.xml.bind.helpers,javax.xml.namespace,javax.xml.str + eam,javax.xml.transform,javax.xml.transform.sax,javax.xml.validation,or + g.w3c.dom,org.xml.sax",com.sun.xml.bind.v2.schemagen;version="2.3.2";us + es:="com.sun.xml.bind.api,com.sun.xml.bind.v2.model.core,com.sun.xml.bi + nd.v2.model.nav,com.sun.xml.txw2.output,javax.xml.bind,javax.xml.namesp + ace",com.sun.xml.bind.v2.schemagen.episode;version="2.3.2";uses:="com.s + un.xml.txw2,com.sun.xml.txw2.annotation",com.sun.xml.bind.v2.schemagen. + xmlschema;version="2.3.2";uses:="com.sun.xml.txw2,com.sun.xml.txw2.anno + tation,javax.xml.namespace",com.sun.xml.bind.v2.util;version="2.3.2";us + es:="com.sun.xml.bind.v2.runtime,com.sun.xml.bind.v2.runtime.unmarshall + er,javax.activation,javax.xml.namespace,javax.xml.parsers,javax.xml.tra + nsform,javax.xml.transform.stream,javax.xml.validation,javax.xml.xpath, + org.xml.sax",com.sun.xml.dtdparser;version="1.4.1";uses:="org.xml.sax", + com.sun.xml.dtdparser.resources;version="1.4.1",com.sun.xml.fastinfoset + ;version="1.2.16";uses:="com.sun.xml.fastinfoset.util,com.sun.xml.fasti + nfoset.vocab,javax.xml.namespace,org.jvnet.fastinfoset,org.xml.sax.help + ers",com.sun.xml.fastinfoset.algorithm;version="1.2.16";uses:="org.jvne + t.fastinfoset",com.sun.xml.fastinfoset.alphabet;version="1.2.16",com.su + n.xml.fastinfoset.dom;version="1.2.16";uses:="com.sun.xml.fastinfoset,c + om.sun.xml.fastinfoset.util,org.jvnet.fastinfoset,org.w3c.dom",com.sun. + xml.fastinfoset.org.apache.xerces.util;version="1.2.16",com.sun.xml.fas + tinfoset.resources;version="1.2.16",com.sun.xml.fastinfoset.sax;version + ="1.2.16";uses:="com.sun.xml.fastinfoset,com.sun.xml.fastinfoset.algori + thm,com.sun.xml.fastinfoset.util,org.jvnet.fastinfoset,org.jvnet.fastin + foset.sax,org.xml.sax,org.xml.sax.ext",com.sun.xml.fastinfoset.stax;ver + sion="1.2.16";uses:="com.sun.xml.fastinfoset,com.sun.xml.fastinfoset.sa + x,com.sun.xml.fastinfoset.util,javax.xml.namespace,javax.xml.stream,org + .jvnet.fastinfoset,org.jvnet.fastinfoset.stax",com.sun.xml.fastinfoset. + stax.events;version="1.2.16";uses:="javax.xml.namespace,javax.xml.strea + m,javax.xml.stream.events,javax.xml.stream.util",com.sun.xml.fastinfose + t.stax.factory;version="1.2.16";uses:="javax.xml.namespace,javax.xml.st + ream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform" + ,com.sun.xml.fastinfoset.stax.util;version="1.2.16";uses:="javax.xml.na + mespace,javax.xml.stream",com.sun.xml.fastinfoset.tools;version="1.2.16 + ";uses:="com.sun.xml.fastinfoset.util,com.sun.xml.fastinfoset.vocab,jav + ax.xml.stream,org.jvnet.fastinfoset,org.xml.sax,org.xml.sax.ext,org.xml + .sax.helpers",com.sun.xml.fastinfoset.util;version="1.2.16";uses:="com. + sun.xml.fastinfoset,javax.xml.namespace,org.jvnet.fastinfoset",com.sun. + xml.fastinfoset.vocab;version="1.2.16";uses:="com.sun.xml.fastinfoset.u + til,org.jvnet.fastinfoset",com.sun.xml.txw2;version="2.3.2";uses:="com. + sun.xml.txw2.output,javax.xml.namespace",com.sun.xml.txw2.annotation;ve + rsion="2.3.2",com.sun.xml.txw2.output;version="2.3.2";uses:="com.sun.xm + l.txw2,javax.xml.namespace,javax.xml.stream,javax.xml.transform,javax.x + ml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stream,org + .w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers",com.sun.xml.x + som;version="2.3.2";uses:="com.sun.tools.rngdatatype,com.sun.xml.xsom.p + arser,com.sun.xml.xsom.visitor,javax.xml.namespace,org.xml.sax",com.sun + .xml.xsom.impl;version="2.3.2";uses:="com.sun.tools.rngdatatype,com.sun + .xml.xsom,com.sun.xml.xsom.impl.parser,com.sun.xml.xsom.parser,com.sun. + xml.xsom.visitor,javax.xml.namespace,org.xml.sax,org.xml.sax.helpers",c + om.sun.xml.xsom.impl.parser;version="2.3.2";uses:="com.sun.tools.rngdat + atype,com.sun.xml.xsom,com.sun.xml.xsom.impl,com.sun.xml.xsom.impl.pars + er.state,com.sun.xml.xsom.parser,javax.xml.parsers,org.xml.sax",com.sun + .xml.xsom.impl.parser.state;version="2.3.2";uses:="com.sun.xml.xsom.imp + l.parser,org.xml.sax",com.sun.xml.xsom.impl.scd;version="2.3.2";uses:=" + com.sun.xml.xsom,com.sun.xml.xsom.impl,javax.xml.namespace",com.sun.xml + .xsom.impl.util;version="2.3.2";uses:="com.sun.xml.xsom,com.sun.xml.xso + m.visitor,javax.swing,javax.swing.tree,org.xml.sax",com.sun.xml.xsom.pa + rser;version="2.3.2";uses:="com.sun.xml.xsom,javax.xml.parsers,org.xml. + sax",com.sun.xml.xsom.util;version="2.3.2";uses:="com.sun.xml.xsom,com. + sun.xml.xsom.parser,com.sun.xml.xsom.visitor",com.sun.xml.xsom.visitor; + version="2.3.2";uses:="com.sun.xml.xsom",org.jvnet.fastinfoset;version= + "1.2.16";uses:="javax.xml.transform.sax,org.xml.sax,org.xml.sax.ext",or + g.jvnet.fastinfoset.sax;version="1.2.16";uses:="org.jvnet.fastinfoset,o + rg.xml.sax,org.xml.sax.ext",org.jvnet.fastinfoset.sax.helpers;version=" + 1.2.16";uses:="org.jvnet.fastinfoset.sax,org.xml.sax,org.xml.sax.ext,or + g.xml.sax.helpers",org.jvnet.fastinfoset.stax;version="1.2.16";uses:="j + avax.xml.stream",org.jvnet.staxex;version="1.8.1";uses:="javax.activati + on,javax.xml.namespace,javax.xml.stream",org.jvnet.staxex.util;version= + "1.8.1";uses:="javax.xml.bind.attachment,javax.xml.namespace,javax.xml. + stream,org.w3c.dom",com.sun.xml.bind.external;version="2.3.2" + javax.xml.bind;version="2.3";resolution:=optional,javax. + xml.bind.annotation;version="2.3";resolution:=optional,javax.xml.bind.a + nnotation.adapters;version="2.3";resolution:=optional,javax.xml.bind.at + tachment;version="2.3";resolution:=optional,javax.xml.bind.helpers;vers + ion="2.3";resolution:=optional,javax.activation;resolution:=optional,ja + vax.annotation.processing,javax.imageio,javax.imageio.stream,javax.lang + .model,javax.lang.model.element,javax.lang.model.type,javax.lang.model. + util,javax.swing,javax.swing.border,javax.swing.tree,javax.tools,javax. + xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.stream,jav + ax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xm + l.transform.dom,javax.xml.transform.sax,javax.xml.transform.stream,java + x.xml.validation,javax.xml.xpath,org.w3c.dom,org.w3c.dom.ls,org.xml.sax + ,org.xml.sax.ext,org.xml.sax.helpers,com.sun.org.apache.xml.internal.re + solver;resolution:=optional,com.sun.org.apache.xml.internal.resolver.to + ols;resolution:=optional,com.sun.source.tree;resolution:=optional,com.sun.source.util;resolution:=optional,org.ap + ache.tools.ant;resolution:=optional,org.apache.tools.ant.taskdefs;resol + ution:=optional,org.apache.tools.ant.taskdefs.compilers;resolution:=opt + ional,org.apache.tools.ant.types;resolution:=optional + + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 0629838e54..73ec2aa70a 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -879,53 +879,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -982,8 +935,6 @@ - - @@ -1350,6 +1301,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 80bcf6432c..b868c430f4 100644 --- a/org.idempiere.webservices.client-feature/feature.xml +++ b/org.idempiere.webservices.client-feature/feature.xml @@ -172,4 +172,11 @@ fragment="true" unpack="false"/> + + diff --git a/pom.xml b/pom.xml index 007902fa51..83ba769cc9 100644 --- a/pom.xml +++ b/pom.xml @@ -68,6 +68,7 @@ org.adempiere.payment.processor-feature org.idempiere.zk-feature org.idempiere.webservices.client-feature + org.globalqss.idempiere.test.fe org.idempiere.p2 ${idempiere.target} From 599f0a90dd3f8576b0390eab6f31c9fbcaaea587 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 4 Mar 2019 16:02:17 +0100 Subject: [PATCH 7/8] IDEMPIERE-3909 update webservice library to jdk-11 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83ba769cc9..007902fa51 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,6 @@ org.adempiere.payment.processor-feature org.idempiere.zk-feature org.idempiere.webservices.client-feature - org.globalqss.idempiere.test.fe org.idempiere.p2 ${idempiere.target} From d0ca3eb7beaea0634bfa63cb6835845a066db4ab Mon Sep 17 00:00:00 2001 From: hieplq Date: Tue, 5 Mar 2019 11:33:04 +0700 Subject: [PATCH 8/8] IDEMPIERE-3908:webservice client example fix conflict of javax.xml.soap from axis https://idempiere.atlassian.net/browse/IDEMPIERE-3908?focusedCommentId=43048&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-43048 --- .../model.generator.launch | 2 +- .../packinfolder.app.launch | 2 +- .../sign.database.build.launch | 2 +- .../synchronize-terminology.app.launch | 2 +- .../translation.app.launch | 2 +- .../server.product.functionaltest.launch | 2 +- .../server.product.launch | 4 ++-- .../feature.xml | 13 ++++++------ .../swingclient.product.launch | 2 +- .../org.idempiere.maven.to.p2/pom.xml | 20 +++++++++++++++++++ .../org.idempiere.p2.targetplatform.target | 3 ++- .../META-INF/MANIFEST.MF | 4 ++-- 12 files changed, 40 insertions(+), 18 deletions(-) diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 92519e6a46..322ef86f9f 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch index 99cae03665..d870be788e 100644 --- a/org.adempiere.base-feature/packinfolder.app.launch +++ b/org.adempiere.base-feature/packinfolder.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index e16fcc8624..4d86177e8e 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index 81c8e223e6..cab1b0d925 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index 161f2f3ad9..55bbc36693 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 50f794609b..529ce5cf21 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -27,7 +27,7 @@ - + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index b408966498..f5df4ed57f 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -27,8 +27,8 @@ - - + + diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index f5b54b17f4..00b4497148 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -370,12 +370,6 @@ version="0.0.0" unpack="false"/> - - + + diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch index 2c4c6e3bd1..2e9c656bd5 100644 --- a/org.adempiere.ui.swing-feature/swingclient.product.launch +++ b/org.adempiere.ui.swing-feature/swingclient.product.launch @@ -27,7 +27,7 @@ - + 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 3b91b718d3..37abad15c7 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 @@ -1763,6 +1763,26 @@ true + + + download-axis + package + + wget + + + ${url.file.srv}/extra.jar/org.apache.axis_1.4.0.v201903052030.jar + false + org.apache.axis_1.4.0.v201903052030.jar + ${project.build.directory}/repository/plugins + 5 + true + true + + diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target index 73ec2aa70a..013f435439 100644 --- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target +++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target @@ -1,4 +1,4 @@ - + @@ -1300,6 +1300,7 @@ + diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 28db788636..934f31c93e 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -89,7 +89,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.servicemix.bundles.spring-web, org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", org.apache.axis;bundle-version="1.4.0", - javax.xml.soap;bundle-version="1.3.0", javax.annotation-api;bundle-version="1.3.2", org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6", @@ -99,7 +98,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.glassfish.hk2.utils;bundle-version="2.5.0", org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1", jakarta.ws.rs-api;bundle-version="2.1.5", - jakarta.xml.ws-api;bundle-version="2.3.2" + jakarta.xml.ws-api;bundle-version="2.3.2", + jakarta.xml.soap-api;bundle-version="1.4.1" Bundle-ClassPath: ., WEB-INF/lib/idempiere-xmlbeans.jar Export-Package: org.compiere.model,