From f65f6f5d19315f15453cf1240ab0e899019c92cc Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 31 Oct 2018 21:58:21 +0100 Subject: [PATCH] IDEMPIERE-3798 Fix launchers --- .../model.generator.launch | 58 ++++++++-------- .../sign.database.build.launch | 61 +++++++++-------- .../synchronize-terminology.app.launch | 61 +++++++++-------- .../translation.app.launch | 61 +++++++++-------- .../src/org/compiere/util/Login.java | 4 +- org.adempiere.install/install.app.launch | 3 + .../install.console.app.launch | 59 ++++++++-------- .../server.product.eventtest.launch | 34 ---------- .../server.product.functionaltest.launch | 67 ++++++++++--------- .../server.product.launch | 4 +- .../swingclient.product.launch | 67 ++++++++++--------- 11 files changed, 234 insertions(+), 245 deletions(-) delete mode 100644 org.adempiere.server-feature/server.product.eventtest.launch diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch index 8b5bcca936..8199867839 100644 --- a/org.adempiere.base-feature/model.generator.launch +++ b/org.adempiere.base-feature/model.generator.launch @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch index 6394255b5c..36060fe89b 100644 --- a/org.adempiere.base-feature/sign.database.build.launch +++ b/org.adempiere.base-feature/sign.database.build.launch @@ -1,32 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch index 4031586bcc..d6eefa3f11 100644 --- a/org.adempiere.base-feature/synchronize-terminology.app.launch +++ b/org.adempiere.base-feature/synchronize-terminology.app.launch @@ -1,32 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch index f05271891b..aa2ed159cb 100644 --- a/org.adempiere.base-feature/translation.app.launch +++ b/org.adempiere.base-feature/translation.app.launch @@ -1,32 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java index 37b99a26d2..9ca1beea23 100644 --- a/org.adempiere.base/src/org/compiere/util/Login.java +++ b/org.adempiere.base/src/org/compiere/util/Login.java @@ -121,13 +121,13 @@ public class Login { // Java System version check String jVersion = System.getProperty("java.version"); - if (jVersion.startsWith("1.8.0")) + if (jVersion.startsWith("1.8.0") || jVersion.startsWith("9.") || jVersion.startsWith("10.")) return true; // Error Message StringBuilder msg = new StringBuilder(); msg.append(System.getProperty("java.vm.name")).append(" - ").append(jVersion); - msg.append(" <> 1.8.0"); + msg.append(" <> 1.8.0 | 9 | 10"); // if (isClient) JOptionPane.showMessageDialog(null, msg.toString(), diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index 9f5c0cf049..ffbf7268a8 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -14,6 +14,9 @@ + + + diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch index 6018f28da0..d1878f48b5 100644 --- a/org.adempiere.install/install.console.app.launch +++ b/org.adempiere.install/install.console.app.launch @@ -1,32 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.server-feature/server.product.eventtest.launch b/org.adempiere.server-feature/server.product.eventtest.launch deleted file mode 100644 index 59c9aca21c..0000000000 --- a/org.adempiere.server-feature/server.product.eventtest.launch +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch index 7dfd74ef46..5c4ba9f3fa 100644 --- a/org.adempiere.server-feature/server.product.functionaltest.launch +++ b/org.adempiere.server-feature/server.product.functionaltest.launch @@ -1,34 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 78c1751957..ff70375960 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.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch index cbe72f64bc..29a6652993 100644 --- a/org.adempiere.ui.swing-feature/swingclient.product.launch +++ b/org.adempiere.ui.swing-feature/swingclient.product.launch @@ -1,34 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +