Copy startserv and stopserv scripts to top-level bin directory.

Copy configuration part from asadmin script to startserv script to align them.
Signed-off-by:Ondro Mihalyi <mihalyi@omnifish.ee>

appserver/distributions/glassfish-common/src/main/resources/bin/startserv

@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+
+AS_INSTALL=`dirname "$0"`/../glassfish
+case "`uname`" in
+  CYGWIN*) AS_INSTALL=`cygpath --windows $AS_INSTALL`
+esac
+AS_INSTALL_LIB="$AS_INSTALL/lib"
+. "${AS_INSTALL}/config/asenv.conf"
+JAVA=java
+#Depends upon Java from ../config/asenv.conf
+if [ ${AS_JAVA} ]; then
+    JAVA=${AS_JAVA}/bin/java
+fi
+
+start_as_main_process () {
+    local COMMAND
+
+    # Execute start-domain --dry-run and store the output line by line into an array.
+    # If it fails, the array will contain a single element FAILED
+    readarray -t COMMAND < <(java -jar "$AS_INSTALL_LIB/client/appserver-cli.jar" start-domain --dry-run "$@" 2> /dev/null || echo -e 'FAILED' )
+
+    # If asadmin command failed, we execute it again to show the output to the user and exit
+    # If all OK, we filter and execute the command
+    if [ "${COMMAND[1]}" = FAILED ]
+      then
+
+        "$JAVA" -jar "$AS_INSTALL_LIB/client/appserver-cli.jar" start-domain --dry-run "$@"
+
+      else
+        # Filter the command
+        #   - remove 1st line (Dump of JVM Invocation line...)
+        #   - remove line with "-read-stdin" and the following line with "true"
+        #     to prevent waiting for master password in stdin
+        #   - remove last line (Command executed successfully)
+
+        COMMAND=("${COMMAND[@]:1}")
+        unset 'COMMAND[-1]'
+
+        # Execute the command to start GlassFish
+        exec "${COMMAND[@]}"
+    fi
+
+}
+
+start_as_main_process "$@"
+
+# Alternatively, run the following:
+# exec "$JAVA" -jar "$AS_INSTALL_LIB/client/appserver-cli.jar" start-domain --verbose "$@"

appserver/distributions/glassfish-common/src/main/resources/bin/startserv.bat

@@ -0,0 +1,19 @@
+@echo off
+REM
+REM  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+REM
+REM  This program and the accompanying materials are made available under the
+REM  terms of the Eclipse Public License v. 2.0, which is available at
+REM  http://www.eclipse.org/legal/epl-2.0.
+REM
+REM  This Source Code may also be made available under the following Secondary
+REM  Licenses when the conditions for such availability set forth in the
+REM  Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+REM  version 2 with the GNU Classpath Exception, which is available at
+REM  https://www.gnu.org/software/classpath/license.html.
+REM
+REM  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+REM
+
+
+java -jar "%~dp0..\glassfish\modules\admin-cli.jar" start-domain --verbose %*

appserver/distributions/glassfish-common/src/main/resources/bin/stopserv

@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0, which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the
+# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+# version 2 with the GNU Classpath Exception, which is available at
+# https://www.gnu.org/software/classpath/license.html.
+#
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+#
+
+AS_INSTALL=`dirname "$0"`/../glassfish
+AS_INSTALL_LIB="$AS_INSTALL/modules"
+
+exec java -jar "$AS_INSTALL_LIB/admin-cli.jar" stop-domain "$@"

appserver/distributions/glassfish-common/src/main/resources/bin/stopserv.bat

@@ -0,0 +1,19 @@
+@echo off
+REM
+REM  Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+REM
+REM  This program and the accompanying materials are made available under the
+REM  terms of the Eclipse Public License v. 2.0, which is available at
+REM  http://www.eclipse.org/legal/epl-2.0.
+REM
+REM  This Source Code may also be made available under the following Secondary
+REM  Licenses when the conditions for such availability set forth in the
+REM  Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+REM  version 2 with the GNU Classpath Exception, which is available at
+REM  https://www.gnu.org/software/classpath/license.html.
+REM
+REM  SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+REM
+
+
+java -jar "%~dp0..\glassfish\modules\admin-cli.jar" stop-domain %*

nucleus/distributions/nucleus-common/src/main/resources/bin/startserv

@@ -16,7 +16,16 @@
 #
 
 AS_INSTALL=`dirname "$0"`/..
+case "`uname`" in
+  CYGWIN*) AS_INSTALL=`cygpath --windows $AS_INSTALL`
+esac
 AS_INSTALL_LIB="$AS_INSTALL/lib"
+. "${AS_INSTALL}/config/asenv.conf"
+JAVA=java
+#Depends upon Java from ../config/asenv.conf
+if [ ${AS_JAVA} ]; then
+    JAVA=${AS_JAVA}/bin/java
+fi
 
 start_as_main_process () {
     local COMMAND
@@ -30,7 +39,7 @@ start_as_main_process () {
     if [ "${COMMAND[1]}" = FAILED ]
       then
 
-        java -jar "$AS_INSTALL_LIB/client/appserver-cli.jar" start-domain --dry-run "$@"
+        "$JAVA" -jar "$AS_INSTALL_LIB/client/appserver-cli.jar" start-domain --dry-run "$@"
 
       else
         # Filter the command
@@ -43,12 +52,12 @@ start_as_main_process () {
         unset 'COMMAND[-1]'
 
         # Execute the command to start GlassFish
-        echo "${COMMAND[@]}"
+        exec "${COMMAND[@]}"
     fi
 
 }
 
 start_as_main_process "$@"
 
 # Alternatively, run the following:
-# exec java -jar "$AS_INSTALL_LIB/client/appserver-cli.jar" start-domain --verbose "$@"
+# exec "$JAVA" -jar "$AS_INSTALL_LIB/client/appserver-cli.jar" start-domain --verbose "$@"