From 9b654043e5dd04c869f0b41b8243fd018efc41bd Mon Sep 17 00:00:00 2001 From: Gaurav Gupta Date: Fri, 30 Nov 2018 16:27:29 +0530 Subject: [PATCH] NP-4 Disable JavaDB startup by default from Payara Server plugin --- .../src/org/netbeans/modules/payara/common/PayaraInstance.java | 3 +-- .../payara/common/registration/AutomaticRegistration.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java b/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java index db91ae4..60e33c4 100644 --- a/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java +++ b/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java @@ -1547,8 +1547,7 @@ private Map prepareProperties( DEFAULT_ADMIN_PORT); updateString(properties, PayaraModule.SESSION_PRESERVATION_FLAG, "true"); - updateString(properties, PayaraModule.START_DERBY_FLAG, - isRemote ? "false" : "true"); + updateString(properties, PayaraModule.START_DERBY_FLAG, "false"); updateString(properties, PayaraModule.USE_IDE_PROXY_FLAG, "true"); updateString(properties, PayaraModule.DRIVER_DEPLOY_FLAG, "true"); updateString(properties, PayaraModule.HTTPHOST_ATTR, "localhost"); diff --git a/payara.common/src/org/netbeans/modules/payara/common/registration/AutomaticRegistration.java b/payara.common/src/org/netbeans/modules/payara/common/registration/AutomaticRegistration.java index caa762e..21a61d8 100644 --- a/payara.common/src/org/netbeans/modules/payara/common/registration/AutomaticRegistration.java +++ b/payara.common/src/org/netbeans/modules/payara/common/registration/AutomaticRegistration.java @@ -224,7 +224,7 @@ private static boolean registerServerInstanceFO(FileObject serverInstanceDir, St instanceFO.setAttribute(PayaraModule.HTTPHOST_ATTR, "localhost"); // NOI18N instanceFO.setAttribute(PayaraModule.JVM_MODE, PayaraModule.NORMAL_MODE); instanceFO.setAttribute(PayaraModule.SESSION_PRESERVATION_FLAG, true); - instanceFO.setAttribute(PayaraModule.START_DERBY_FLAG, true); + instanceFO.setAttribute(PayaraModule.START_DERBY_FLAG, false); instanceFO.setAttribute(PayaraModule.USE_IDE_PROXY_FLAG, true); instanceFO.setAttribute(PayaraModule.USE_SHARED_MEM_ATTR, false);