From faac96eb398d1fbbca6b33b6ba786b8f9c1c7697 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 7 Nov 2018 11:18:38 -0200 Subject: [PATCH 1/4] IDEMPIERE-3655 Improve installer to include migration scripts and syncApplied / Fix issue with oracle migration script --- org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh b/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh index ea6bff708a..ed6a40b4ac 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh @@ -28,7 +28,7 @@ ADEMPIERE_DB_USER=$1 ADEMPIERE_DB_PASSWORD=$2 ADEMPIERE_DB_PATH=$3 CMD="sqlplus $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME" -SILENTCMD="$CMD -S" +SILENTCMD="sqlplus -S $ADEMPIERE_DB_USER/$ADEMPIERE_DB_PASSWORD@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME" ERROR_STRINGS="^(ORA-[0-9]+:|TNS-|PLS-)" cd $IDEMPIERE_HOME/migration From 30311f6b0a28f713e6fc1fa8b9beb9b25b7abce9 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 7 Nov 2018 17:44:23 -0200 Subject: [PATCH 2/4] IDEMPIERE-3810 New IDs display type (AD_Reference) created via 2pack are created as String --- org.adempiere.base/src/org/compiere/util/DisplayType.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.adempiere.base/src/org/compiere/util/DisplayType.java b/org.adempiere.base/src/org/compiere/util/DisplayType.java index 517d8f0d72..e7c5fb5c96 100644 --- a/org.adempiere.base/src/org/compiere/util/DisplayType.java +++ b/org.adempiere.base/src/org/compiere/util/DisplayType.java @@ -655,6 +655,9 @@ public final class DisplayType if (!DisplayType.isText(displayType)) s_log.severe("Unhandled Data Type = " + displayType); + if (columnName.endsWith("_ID")) + return "NUMBER(10)"; + return "VARCHAR2(" + fieldLength + ")"; } // getSQLDataType From 56d065cfacb55310210389cd43666f64d48b7e74 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 8 Nov 2018 09:29:01 -0200 Subject: [PATCH 3/4] IDEMPIERE-3812 2Pack creating inactive columns in database --- .../src/org/adempiere/pipo2/handler/ColumnElementHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java index 50bd809429..763e77c17b 100644 --- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java +++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ColumnElementHandler.java @@ -163,7 +163,7 @@ public class ColumnElementHandler extends AbstractElementHandler { throw new POSaveFailedException("Failed to save column " + mColumn.getName()); } - if (recreateColumn || syncDatabase) { + if (mColumn.isActive() && (recreateColumn || syncDatabase)) { deferFK(element, mColumn); syncColumn(ctx, mColumn, action, recreateColumn); } From 9c5a53db6f42d39f575c829f0ff304570310e5d4 Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 9 Nov 2018 13:02:20 +0700 Subject: [PATCH 4/4] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (spi-fly) from warning: No classloader found for java.util.ServiceLoader:load(interface org.eclipse.jetty.websocket.api.extensions.Extension) reason: spi-fly on idempiere use Dynamic Weaving to lookup service provide it use Bundle.ACTIVE event to start lookup service provide (see org.apache.aries.spifly.BaseActivator and ProviderBundleTrackerCustomizer) so service provide need to active before it's used solution: active and set start level to 3 for some bundle relate websocket to plan support websocket remain some warning: 10:39:31.747-----------> BaseActivator.log: No classloader found for java.util.ServiceLoader:load(interface org.atmosphere.inject.Injectable) don't fix because it still work well, in case active this bundle will encounter issue relase package "org.atmosphere.annotation" not yet export https://github.com/Atmosphere/atmosphere/issues/1896 WARNING: No classloader found for java.util.ServiceLoader:load(interface org.eclipse.jetty.xml.ConfigurationProcessorFactory) WARNING: No classloader found for java.util.ServiceLoader:load(interface org.eclipse.jetty.xml.ConfigurationProcessorFactory) just find SpringConfigurationProcessorFactory and SpringConfigurationProcessorFactory implement that service, it look for spring so don't need resolve refer:http://aries.apache.org/modules/spi-fly.html --- org.adempiere.server-feature/server.product | 6 +++++- org.adempiere.server-feature/server.product.launch | 4 ++-- org.idempiere.p2/server.product | 7 ++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index 981a462bcb..489bdd6af2 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -41,7 +41,7 @@ - + @@ -60,6 +60,10 @@ + + + + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index ff70375960..e35a28c593 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.p2/server.product b/org.idempiere.p2/server.product index 981a462bcb..33fd8328de 100644 --- a/org.idempiere.p2/server.product +++ b/org.idempiere.p2/server.product @@ -17,6 +17,7 @@ + @@ -41,7 +42,7 @@ - + @@ -60,6 +61,10 @@ + + + +