trinidad_init_services 1.2.3 → 1.3.0

data/jsvc-unix-src/support/config.sub

@@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2013-02-04'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +116,17 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -154,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -223,6 +218,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,20 +248,27 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 | ia64[nw] \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -278,20 +286,21 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +309,7 @@ case $basic_machine in
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +324,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -329,7 +337,10 @@ case $basic_machine in
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -352,11 +363,13 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -365,12 +378,15 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* | ia64[nw]-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -388,19 +404,20 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +425,11 @@ case $basic_machine in
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -711,7 +729,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -769,9 +786,13 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -808,10 +829,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -992,7 +1021,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1120,13 +1153,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1324,21 +1352,21 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1470,9 +1498,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1521,6 +1546,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1548,9 +1576,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout

data/lib/trinidad/daemon.rb

@@ -7,7 +7,7 @@ end
 
 module Trinidad
   module Daemon
-    
+
     def init
     end
 
@@ -21,9 +21,16 @@ module Trinidad
     # called from com.msp.jsvc.JRubyDaemon.start
     # as Trinidad::Daemon#start
     def start(args = ARGV)
-      Trinidad::CommandLineParser.parse(args)
-      Trinidad.configuration.trap = false
-      @server = Trinidad::Server.new
+      if Trinidad.const_defined?(:CLI)
+        config = Trinidad::CLI.parse(args)
+        config[:trap] = false
+        @server = Trinidad::Server.new(config)
+      else # backwards (< 1.5) compatibility :
+        Trinidad::CommandLineParser.parse(args)
+        Trinidad.configuration.trap = false
+        @server = Trinidad::Server.new
+      end
+
       @server.start
     end
 

data/lib/trinidad_init_services/configuration.rb

@@ -1,4 +1,3 @@
-require 'erb'
 require 'java'
 require 'jruby'
 require 'fileutils'
@@ -8,7 +7,7 @@ require 'shellwords'
 module Trinidad
   module InitServices
     class Configuration
-      
+
       def self.windows?
         RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i
       end
@@ -16,166 +15,483 @@ module Trinidad
       def self.macosx?
         RbConfig::CONFIG['host_os'] =~ /darwin/i
       end
-      
+
       def initialize(stdin = STDIN, stdout = STDOUT)
         @stdin, @stdout = stdin, stdout
       end
 
-      def initialize_paths(jruby_home = default_jruby_home)
-        @trinidad_daemon_path = File.expand_path('../../trinidad/daemon.rb', __FILE__)
-        @jars_path = File.expand_path('../../../trinidad-libs', __FILE__)
-
-        @classpath = ['jruby-jsvc.jar', 'commons-daemon.jar'].map { |jar| File.join(@jars_path, jar) }
-        @classpath << File.join(jruby_home, 'lib', 'jruby.jar')
-      end
+      SERVICE_DESC = 'JRuby on Rails/Rack server'
 
       def configure(defaults = {})
-        @app_path = defaults["app_path"] || ask_path('Application path', false)
-        @trinidad_options = ["-d #{@app_path}"]
+        if ( @app_path = defaults["app_path"] ).nil?
+          unless @base_path = defaults["base_path"]
+            @app_path = ask_path('Application (base - in case of multiple apps) path', false) do
+              raise "application/base path not provided (try . if current directory is the app)"
+            end
+          end
+        end
+
         options_ask = 'Trinidad options?'
-        options_default = '-e production'
-        collect_windows_opts(options_ask, defaults) if windows?
-
-        @trinidad_options << (defaults["trinidad_options"] || ask(options_ask, options_default))
-        @trinidad_options.map! { |opt| Shellwords.shellsplit(opt) }.flatten!
-        @jruby_home = defaults["jruby_home"] || ask_path('JRuby home', default_jruby_home)
-        @ruby_compat_version = defaults["ruby_compat_version"] || ask('Ruby 1.8.x or 1.9.x compatibility', default_ruby_compat_version)
-        @jruby_opts = configure_jruby_opts
+
+        @service_id = defaults['service_id'] || defaults['trinidad_service_id']
+        @service_name = defaults['service_name'] || defaults['trinidad_name']
+        @service_desc = defaults['service_desc'] || defaults['trinidad_service_desc']
+
+        if windows?
+          options_ask << ' (separated by `;`)'
+
+          @service_id ||= ask('Service ID? {alphanumeric and underscores only}', default_service_id)
+          name_default = @service_id.gsub('_', ' ')
+          @service_name ||= ask('Service (display) name? {alphanumeric and spaces only}', name_default)
+          @service_desc ||= ask('Service description? {alphanumeric and spaces only}', SERVICE_DESC)
+        else
+          @service_id ||= default_service_id
+          @service_name ||= @service_id
+          @service_desc ||= SERVICE_DESC
+        end
+
+        @trinidad_opts = defaults["trinidad_options"] || defaults["trinidad_opts"]
+
+        if @trinidad_opts.is_a?(String) # leave 'em as are
+          if @app_path && ! @trinidad_opts.index('-d') && ! @trinidad_opts.index('--dir')
+            @trinidad_opts = "--dir #{@app_path} #{@trinidad_opts}"
+          end
+        elsif @trinidad_opts
+          if @app_path && ! @trinidad_opts.find { |opt| opt.index('-d') || opt.index('--dir') }
+            @trinidad_opts.unshift("--dir #{@app_path}")
+          end
+        else
+          @trinidad_opts = [ ask(options_ask, '-e production') ]
+        end
+
+        if @trinidad_opts.is_a?(Array)
+          @trinidad_opts.map! { |opt| Shellwords.shellsplit(opt) }
+          @trinidad_opts.flatten! # split: 'opt' -> [ 'opt' ]
+        end
+
+        @jruby_home = defaults['jruby_home'] || ask_path('JRuby home', default_jruby_home)
+        @ruby_compat_version = defaults["ruby_compat_version"] || default_ruby_compat_version
+        @jruby_opts = configure_jruby_opts(@jruby_home, @ruby_compat_version)
         initialize_paths(@jruby_home)
 
-        message = windows? ? configure_windows_service : configure_unix_daemon(defaults)
+        @java_home = defaults['java_home'] || ask_path('Java home', default_java_home)
+
+        @java_opts = defaults['java_opts'] || []
+        @java_opts = @java_opts.strip if @java_opts.is_a?(String)
+
+        # can be disabled with *configure_memory: false*
+        configure_memory_requirements(defaults, @java_home)
+
+        message = windows? ?
+          configure_windows_service(defaults, @java_home) :
+            configure_unix_daemon(defaults, @java_home)
         say message if message.is_a?(String)
       end
 
-      def configure_jruby_opts
+      MEMORY_DEFAULT = 720
+
+      def configure_memory_requirements(defaults, java_home)
+        return if defaults.key?('configure_memory') && ! defaults['configure_memory']
+
+        if defaults['configure_memory'] || ask('Configure JVM memory (JAVA_OPTS)? y/n', 'n') == 'y'
+
+          total_memory = defaults['total_memory'] ||
+            ask('Total (max) memory dedicated to Trinidad? (in MB)', MEMORY_DEFAULT)
+          total_memory = total_memory.to_i
+          if total_memory <= 0
+            warn "changing total_memory to '#{MEMORY_DEFAULT}' default (provided value <= 0)"
+            total_memory = MEMORY_DEFAULT
+          end
+          if total_memory <= 160
+            warn "provided total_memory '#{total_memory}' seems low (server migh not start)"
+          end
+
+          if current_java_home?(java_home) && current_java_vendor_sun_or_oracle?
+            # 720 total memory: (Max) 144M PermGen, 72M CodeCache, 504M Heap
+
+            add_java_opt('-XX:+UseCodeCacheFlushing')
+            cache_size = total_memory >= 800 ? 80 : ( total_memory / 10 )
+            cache_size = 100 if total_memory >= 2000
+            cache_size = 120 if total_memory >= 3000
+            cache_size = 140 if total_memory >= 4000
+            add_java_opt('-XX:ReservedCodeCacheSize=', "#{cache_size}m")
+
+            heap_size = total_memory - cache_size
+
+            if ! defaults.key?('hot_deployment') || ! defaults['hot_deployment']
+              hot_deploy = ask('Support hot (re-)deployment? y/n', 'n') == 'y'
+            else
+              hot_deploy = true
+            end
+
+            if hot_deploy && current_java_version_6?
+              # on Java 7 G1 sweeps PermGen on full GC
+              add_java_opt('-XX:+UseConcMarkSweepGC') if hot_deploy
+              add_java_opt('-XX:+CMSClassUnloadingEnabled') if hot_deploy
+            end
+
+            if current_java_version_at_least_8?
+              # probably a good idea to limit meta-space size :
+              meta_size = heap_size / 5 # 20% (unlimited by default)
+              meta_size = min(heap_size / 4, meta_size + 100) if hot_deploy
+
+              unless defaults['total_memory'] # do not ask if configured
+                meta = ask('Confirm meta-space size limit: (-XX:MaxMetaspaceSize in MB)', meta_size)
+                meta_size = parse_memory_setting(meta, meta_size)
+              end
+
+              add_java_opt('-XX:MaxMetaspaceSize=', "#{meta_size}m") if meta_size
+              heap_size -= meta_size.to_i
+            else
+              perm_size = heap_size / 5 # 20%
+              perm_size = min(heap_size / 4, perm_size + 100) if hot_deploy
+
+              unless defaults['total_memory'] # do not ask if configured
+                perm = ask('Confirm perm-gen size limit: (-XX:MaxPermSize in MB)', perm_size)
+                perm_size = parse_memory_setting(perm, perm_size)
+              end
+
+              add_java_opt('-XX:MaxPermSize=', "#{perm_size}m") if perm_size
+              heap_size -= perm_size.to_i
+            end
+
+            heap_size = ( heap_size / 10 ) * 10
+            add_java_opt('-Xmx', "#{heap_size}m")
+            min_heap_size = min(heap_size / 2, 500)
+            add_java_opt('-Xms', "#{min_heap_size}m")
+
+          else # only try to limit heap (vendors such as IBM support it) :
+
+            heap_size = total_memory - ( total_memory / 15 ) # just a guess
+
+            heap_size = ( heap_size / 10 ) * 10
+            add_java_opt('-Xmx', "#{heap_size}m")
+
+          end
+
+          add_java_opt('-XX:+UseCompressedOops') if current_java_version_6? && os_arch =~ /64/
+
+        end
+      end
+
+      def add_java_opt(java_opt, opt_suffix = nil)
+        if @java_opts.is_a?(String)
+          return false if @java_opts.index(java_opt)
+          @java_opts << ( windows? ? ';' : ' ' ) unless @java_opts.strip.empty?
+        else
+          return false if @java_opts.find { |opt| opt.index(java_opt) }
+        end
+        @java_opts << "#{java_opt}#{opt_suffix}"
+      end
+
+      def configure_jruby_opts(jruby_home = @jruby_home, ruby_compat_version = @ruby_compat_version)
         opts = []
-        opts << "-Djruby.home=#{@jruby_home}"
-        opts << "-Djruby.lib=#{File.join(@jruby_home, 'lib')}"
+        opts << "-Djruby.home=#{jruby_home}"
+        opts << "-Djruby.lib=#{File.join(jruby_home, 'lib')}"
         opts << "-Djruby.script=jruby"
         opts << "-Djruby.daemon.module.name=Trinidad"
-        opts << "-Djruby.compat.version=#{@ruby_compat_version}"
+        opts << "-Djruby.compat.version=#{ruby_compat_version}"
         opts
       end
-      
-      def configure_unix_daemon(defaults)
-        @java_home = defaults["java_home"] || ask_path('Java home', default_java_home)
+
+      def initialize_paths(jruby_home = default_jruby_home)
+        @trinidad_daemon_path = File.expand_path('../../trinidad/daemon.rb', __FILE__)
+        @jars_path = File.expand_path('../../../trinidad-libs', __FILE__)
+
+        @classpath = ['jruby-jsvc.jar', 'commons-daemon.jar'].map { |jar| File.join(@jars_path, jar) }
+        @classpath << File.join(jruby_home, 'lib', 'jruby.jar')
+      end
+
+      def configure_unix_daemon(defaults, java_home = default_java_home)
         unless @jsvc = defaults["jsvc_path"] || detect_jsvc_path
           @jsvc = ask_path("path to jsvc binary (leave blank and we'll try to compile)", '')
           if @jsvc.empty? # unpack and compile :
             jsvc_unpack_dir = defaults["jsvc_unpack_dir"] || ask_path("dir where jsvc dist should be unpacked", '/usr/local/src')
-            @jsvc = compile_jsvc(jsvc_unpack_dir, @java_home)
-            say "jsvc binary available at: #{@jsvc} " + 
+            @jsvc = compile_jsvc(jsvc_unpack_dir, java_home)
+            say "jsvc binary available at: #{@jsvc} " +
                  "(consider adding it to $PATH if you plan to re-run trinidad_init_service)"
           end
         end
-        @output_path = defaults["output_path"] || ask_path('init.d output path', '/etc/init.d')
-        @pid_file = defaults["pid_file"] || ask_path('pid file', '/var/run/trinidad/trinidad.pid')
-        @log_file = defaults["log_file"] || ask_path('log file', '/var/log/trinidad/trinidad.log')
-        @run_user = defaults["run_user"] || ask('run daemon as user (enter a non-root username or leave blank)', '')
-        
-        if @run_user != '' && `id -u #{@run_user}` == ''
-          raise ArgumentError, "user '#{@run_user}' does not exist (leave blank if you're planning to `useradd' later)"
-        end
-        
+
+        @pid_file = defaults['pid_file'] || ask_path('pid file', '/var/run/trinidad/trinidad.pid')
+        @out_file = defaults['out_file'] || defaults['log_file'] ||
+          ask_path('out file (where system out/err gets redirected)', '/var/log/trinidad/trinidad.out')
+
         @pid_file = File.join(@pid_file, 'trinidad.pid') if File.exist?(@pid_file) && File.directory?(@pid_file)
         make_path_dir(@pid_file, "could not create dir for '#{@pid_file}', make sure dir exists before running daemon")
-        @log_file = File.join(@log_file, 'trinidad.log') if File.exist?(@log_file) && File.directory?(@log_file)
-        make_path_dir(@log_file, "could not create dir for '#{@log_file}', make sure dir exists before running daemon")
-        
-        daemon = ERB.new(
+        @out_file = File.join(@out_file, 'trinidad.out') if File.exist?(@out_file) && File.directory?(@out_file)
+        make_path_dir(@out_file, "could not create dir for '#{@out_file}', make sure dir exists before running daemon")
+
+        @run_user = defaults['run_user'] || ask('run daemon as user (enter a non-root username or leave blank)', '')
+        if ! @run_user.empty? && `id -u #{@run_user}` == ''
+          raise ArgumentError, "user '#{@run_user}' does not exist (leave blank if you're planning to `useradd' later)"
+        end
+
+        @output_path = defaults['output_path'] || ask_path('init.d output path', '/etc/init.d')
+
+        require('erb'); daemon = ERB.new(
           File.read(
             File.expand_path('../../init.d/trinidad.erb', File.dirname(__FILE__))
-          )
+          ), nil, '-' # safe_level=nil, trim_mode=nil
         ).result(binding)
 
-        say "moving trinidad to #{@output_path}"
-        trinidad_file = File.join(@output_path, "trinidad")
-        File.open(trinidad_file, 'w') { |file| file.write(daemon) }
-        FileUtils.chmod(@run_user == '' ? 0744 : 0755, trinidad_file)
-        
-        "\nNOTE: you might want to: `[sudo] update-rc.d -f #{@output_path} defaults`"
+        service_file = File.join(@output_path, @service_id ||= 'trinidad')
+        begin
+          File.open(service_file, 'w') { |file| file.write(daemon) }
+        rescue Errno::EACCES => e
+          begin
+            service_file = File.basename(service_file) # leave in current WD
+            service_file = File.expand_path(service_file)
+            File.open(service_file, 'w') { |file| file.write(daemon) }
+            warn "#{e.message} left init.d script at #{service_file}"
+          rescue
+            raise e
+          end
+        end
+        FileUtils.chmod @run_user.empty? ? 0744 : 0755, service_file
+
+        if chkconfig?
+          command = "chkconfig #{@service_id} on"
+        else
+          command = "update-rc.d -f #{@service_id} remove"
+        end
+        if service_file.start_with?('/etc')
+          unless exec_system(command, :allow_failure)
+            warn "\nNOTE: run `#{command}` as a super-used to enable service"
+          end
+        else
+          warn "\nNOTE: run `cp #{service_file} /etc/init.d` and `#{command}` as a super-used to enable service"
+        end
       end
 
-      def collect_windows_opts(options_ask, defaults)
-        options_ask << '(separated by `;`)'
-        name_ask = 'Service name? {Alphanumeric and spaces only}'
-        name_default = 'Trinidad'
-        @trinidad_name = defaults["trinidad_name"] || ask(name_ask, name_default)
+      def configure_windows_service(defaults, java_home = default_java_home)
+        srv_path = detect_prunsrv_path
 
-        id_ask = 'Service ID? {Alphanumeric and underscores only}'
-        id_default = @trinidad_name.gsub(/\s+/, '_').gsub(/\W/, '')
-        @trinidad_service_id = defaults["trinidad_service_id"] || ask(id_ask, id_default)
+        classpath = escape_windows_options(@classpath)
+        trinidad_options = escape_windows_options(@trinidad_opts, :split)
 
-        desc_ask = 'Service description? {Alphanumeric and spaces only}'
-        desc_default = 'Embedded Apache Tomcat running Rack and Rails applications'
-        @trinidad_service_desc = defaults["trinidad_service_desc"] || ask(desc_ask, desc_default)
+        jvm_options = escape_windows_options(@jruby_opts)
+        unless @java_opts.empty?
+          jvm_options << ';' << escape_windows_options(@java_opts)
+        end
+
+        log_path = defaults['log_path'] || "%SystemRoot%\\System32\\LogFiles\\#{@service_id}"
+        @out_file = defaults['out_file'] || defaults['log_file'] ||
+          ask_path('out file (where system out/err gets redirected), leave blank for prunsrv default', '')
+        @pid_file = defaults['pid_file'] || "#{@service_id}.pid"
+
+        #stop_timeout = defaults['stop_timeout'] || 5
+
+        # //TS  Run the service as a console application
+        #       This is the default operation (if no option is provided).
+        # //RS  Run the service 	Called only from ServiceManager
+        # //ES  Start (execute) the service
+        # //SS  Stop the service
+        # //US  Update service parameters
+        # //IS  Install service
+        # //DS  Delete service 	Stops the service first if it is currently running
+        # //PP[//seconds]  Pause 	Default is 60 seconds
+
+        if service_listed_windows?(@service_id)
+          say "service '#{@service_id}' already installed, will update instead of install"
+          command = %Q{//US//#{@service_id} --DisplayName="#{@service_name}"}
+        else
+          command = %Q{//IS//#{@service_id} --DisplayName="#{@service_name}"}
+        end
+
+        command << " --Description=\"#{@service_desc}\""
+        command << " --Install=#{srv_path} --Jvm=auto"
+        command << " --JavaHome=\"#{escape_windows_path(java_home)}\""
+        command << " --StartMode=jvm --StopMode=jvm"
+        command << " --StartClass=com.msp.procrun.JRubyService --StartMethod=start"
+        command << " --StartParams=\"#{escape_windows_path(@trinidad_daemon_path)};#{trinidad_options}\""
+        command << " --StopClass=com.msp.procrun.JRubyService --StopMethod=stop"
+        command << " --Classpath=\"#{classpath}\""
+        command << " ++JvmOptions=\"#{jvm_options}\""
+        command << " --LogPath=\"#{escape_windows_path(log_path)}\""
+        command << " --PidFile=#{@pid_file}" # always assumed log_path relative
+
+        if @out_file && ! @out_file.empty?
+          out_file = escape_windows_path(@out_file)
+          command << " --StdOutput=\"#{out_file}\" --StdError=\"#{out_file}\""
+        else
+          command << " --StdOutput=auto --StdError=auto"
+        end
+
+        exec_system "#{srv_path} #{command}"
+
+        warn "\nNOTE: service needs to be started manually, to start during boot run:\n" <<
+          "#{srv_path} //US//#{@service_id} --Startup=auto"
+
+        "\nHINT: you may use prunsrv to manage your service, try running:\n#{srv_path} help"
       end
-      
-      def configure_windows_service
-        srv_path = detect_prunsrv_path
 
-        command = %Q{//IS//#{@trinidad_service_id} --DisplayName="#{@trinidad_name}" \
---Description="#{@trinidad_service_desc}" \
---Install=#{srv_path} --Jvm=auto --StartMode=jvm --StopMode=jvm \
---StartClass=com.msp.procrun.JRubyService --StartMethod=start \
---StartParams="#{escape_path(@trinidad_daemon_path)};#{format_options(@trinidad_options)}" \
---StopClass=com.msp.procrun.JRubyService --StopMethod=stop --Classpath="#{format_options(@classpath)}" \
---StdOutput=auto --StdError=auto \
---LogPrefix="#{@trinidad_service_id.downcase}" \
-++JvmOptions="#{format_options(@jruby_opts)}"
-}
-        system "#{srv_path} #{command}"
-        
-        "\nNOTE: you may use prunsrv to manage your service, try running:\n" +
-        "#{srv_path} help"
-      end
-
-      def uninstall(service)
+      def uninstall(service = nil)
+        initialize_paths
+        service ||= default_service_id
         windows? ? uninstall_windows_service(service) : uninstall_unix_daemon(service)
       end
-      
-      def uninstall_windows_service(service_name)
+
+      def uninstall_windows_service(service)
         srv_path = detect_prunsrv_path
-        system "#{srv_path} stop #{service_name}"
-        system "#{srv_path} delete #{service_name}"
+        exec_system "#{srv_path} //DS//#{service}" # does stop first if needed
+      end
+
+      def service_listed_windows?(service)
+        # *sc* will allow SERVICE_NAME only (DISPLAY_NAME won't work)
+        out = `sc queryex type= service state= all | find "#{service}"`
+        return false if out.chomp.empty?
+        # "SERVICE_NAME: Trinidad\nDISPLAY_NAME: Trinidad\n"
+        !! ( out =~ /SERVICE_NAME: #{service}$/i )
       end
 
       def uninstall_unix_daemon(service)
-        name = File.basename(service) # e.g. /etc/init.d/trinidad
-        command = "update-rc.d -f #{name} remove"
-        system command
-      rescue => e
-        say "uninstall failed, try `sudo #{command}`"
-        raise e
-      ensure
         unless File.exist?(service)
           service = File.expand_path(service, '/etc/init.d')
         end
+        name = File.basename(service) # e.g. /etc/init.d/trinidad
+
+        unless service_listed_unix?(service)
+          warn "service '#{service}' seems to be NOT installed/configured"
+        end
+
+        if chkconfig?
+          exec_system command = "chkconfig #{name} stop", :allow_failure
+          exec_system command = "chkconfig #{name} off"
+        else # assuming Debian based
+          exec_system command = "service #{name} stop", :allow_failure
+          exec_system command = "update-rc.d -f #{name} remove"
+        end
+      rescue => e
+        say "uninstall failed, maybe try running `#{command}` as super-user"
+        raise e
+      else
         FileUtils.rm(service) if File.exist?(service)
       end
-      
+
+      def service_listed_unix?(service)
+        if chkconfig?
+          ! `chkconfig --list | grep #{service}`.chomp.empty?
+        else
+          ! `service --status-all | grep #{service}`.chomp.empty?
+        end
+      end
+
       private
 
-      def escape_path(path)
+      def exec_system(command, allow_failure = nil)
+        log_command command
+        ok = system command
+        unless allow_failure
+          raise "could not execute `#{command}`" if ok.nil?
+          raise "`#{command}` failed" unless ok
+        end
+        ok
+      end
+
+      def log_command(command)
+        say command
+        log && (log.puts "#{command}\n\n"; log.flush)
+      end
+
+      def log
+        return @_log || nil if defined?(@_log) && ! @_log.nil?
+        ( @_log = File.open('trinidad_init_service.log', 'w') rescue false ) || nil
+      end
+
+      def log?; defined?(@_log) ? !! @_log : nil end
+
+      def escape_windows_path(path)
         path.gsub(%r{/}, '\\')
       end
-      
-      def format_options(options)
-        options.map { |opt| escape_path(opt) }.join(';')
+
+      def escape_windows_options(options, split = nil)
+        if options.is_a?(String)
+          return escape_windows_path(options) unless split
+          options = options.split(' ')
+        end
+        options.map { |opt| escape_windows_path(opt) }.join(';')
       end
 
-      def default_jruby_home
+      def min(num1, num2); num1 <= num2 ? num1 : num2 end
+
+      def empty?(arg)
+        return true unless arg
+        ! arg.respond_to?(:empty) || arg.empty?
+      end
+
+      def parse_memory_setting(memory, default = nil)
+        return default if empty?(memory)
+        return false if memory == 'n'
+        return default if memory == 'y'
+        memory = memory[0...-1] if memory.is_a?(String) && memory =~ /m$/i
+        memory
+      end
+
+      def chkconfig? # available in RH based distributions
+        return @chkconfig unless (@chkconfig ||= nil).nil?
+        @chkconfig = ! `which chkconfig`.chomp.empty?
+      end
+
+      def default_service_id; windows? ? 'Trinidad' : 'trinidad' end
+
+      def default_jruby_home; current_jruby_home end
+
+      def current_jruby_home
         Java::JavaLang::System.get_property("jruby.home")
       end
 
       def default_java_home
-        ENV['JAVA_HOME'] || Java::JavaLang::System.get_property("java.home")
+        ENV['JAVA_HOME'] || current_java_home
+      end
+
+      def current_java_home
+        ENV_JAVA['java.home']
+      end
+
+      def current_java_home?(java_home)
+        java_home == current_java_home || begin
+          real_java_home = java.io.File.new(java_home).canonical_path
+          real_java_home == current_java_home || "#{real_java_home}/jre" == current_java_home
+        end
+      end
+
+      def current_java_vendor_sun_or_oracle?
+        ENV_JAVA['java.vendor'] =~ /^(Oracle|Sun)/
+      end
+
+      def current_java_version(split = nil)
+        version = ENV_JAVA['java.version']
+        return version unless split
+        @current_java_version ||= begin
+          # e.g. "1.7.0_51" -> [ 1, 7, 0 ]
+          # but  "1.8.0"    -> [ 1, 8, 0 ]
+          if i = version.index('_')
+            version = version[0, i]
+          end
+          version.split('.').map(&:to_i)
+        end
       end
-      
-      def default_ruby_compat_version
-        JRuby.runtime.is1_9 ? "RUBY1_9" : "RUBY1_8"
+
+      def current_java_version_6?
+        current_java_version(true)[1] == 6
+      end
+
+      def current_java_version_7?
+        current_java_version(true)[1] == 7
+      end
+
+      def current_java_version_at_least_8?
+        current_java_version(true)[1] >= 8
+      end
+
+      def default_ruby_compat_version; current_ruby_compat_version end
+
+      def current_ruby_compat_version
+        # deprecated on 9k but still working (returns RUBY2_1)
+        JRuby.runtime.getInstanceConfig.getCompatVersion.to_s
       end
-      
+
       def windows?
         self.class.windows?
       end
@@ -183,11 +499,11 @@ module Trinidad
       def macosx?
         self.class.macosx?
       end
-      
+
       def bundled_jsvc_path # only called on *nix
         jsvc = 'jsvc_' + (macosx? ? 'darwin' : 'linux')
         jsvc_path = File.join(@jars_path, jsvc)
-        # linux version is no longer bundled - as long as it is not present jsvc 
+        # linux version is no longer bundled - as long as it is not present jsvc
         # will be compiled from src (if not installed already #detect_jsvc_path)
         File.exist?(jsvc_path) ? jsvc_path : nil
       end
@@ -197,7 +513,7 @@ module Trinidad
         jsvc_path.chomp!
         jsvc_path.empty? ? bundled_jsvc_path : jsvc_path
       end
-      
+
       def compile_jsvc(jsvc_unpack_dir, java_home = default_java_home)
         unless File.exist?(jsvc_unpack_dir)
           begin
@@ -212,10 +528,10 @@ module Trinidad
         unless File.writable?(jsvc_unpack_dir)
           raise "specified path: #{jsvc_unpack_dir.inspect} is not writable"
         end
-        
+
         jsvc_unix_src = File.expand_path('../../jsvc-unix-src', File.dirname(__FILE__))
         FileUtils.cp_r(jsvc_unix_src, jsvc_unpack_dir)
-        
+
         jsvc_dir = File.expand_path('jsvc-unix-src', jsvc_unpack_dir)
         File.chmod(0755, File.join(jsvc_dir, "configure"))
         # ./configure
@@ -230,7 +546,7 @@ module Trinidad
           say command_output
           raise "`#{command}` failed with status: #{$?.exitstatus}"
         end
-        
+
         # make
         command = "cd #{jsvc_dir} && make"
         say "compiling jsvc ..."
@@ -239,10 +555,10 @@ module Trinidad
           say command_output
           raise "`#{command}` failed with status: #{$?.exitstatus}"
         end
-        
+
         File.expand_path('jsvc', jsvc_dir) # return path to compiled jsvc binary
       end
-      
+
       def detect_jdk_home(java_home = default_java_home)
         # JDK has an include directory with headers :
         if File.directory?(File.join(java_home, 'include'))
@@ -255,26 +571,30 @@ module Trinidad
         end
         nil
       end
-      
+
       def detect_prunsrv_path # only called on windows
         prunsrv_path = `for %i in (prunsrv.exe) do @echo.%~$PATH:i` rescue ''
         # a kind of `which prunsrv.exe` (if not found returns "\n")
         prunsrv_path.chomp!
         prunsrv_path.empty? ? bundled_prunsrv_path : prunsrv_path
       end
-      
-      def bundled_prunsrv_path(arch = java.lang.System.getProperty("os.arch"))
+
+      def bundled_prunsrv_path(arch = os_arch)
         # "amd64", "i386", "x86", "x86_64"
         path = 'windows'
         if arch =~ /amd64/i # amd64
-          path += '/amd64'
+          path << '/amd64'
         elsif arch =~ /64/i # x86_64
-          path += '/ia64'
+          path << '/ia64'
         # else "i386", "x86"
         end
         File.join(@jars_path, path, 'prunsrv.exe')
       end
 
+      def os_arch
+        ENV_JAVA['os.arch']
+      end
+
       def make_path_dir(path, error = nil)
         dir = File.dirname(path)
         return if File.exist?(dir)
@@ -285,21 +605,23 @@ module Trinidad
           say "#{error} (#{e})"
         end
       end
-      
+
+      public
+
       def ask_path(question, default = nil)
-        path = ask(question, default)
-        unless path # nil, false
-          raise "#{question.inspect} not provided!" if path == false
-          return path # nil
+        unless path = ask(question, default) # nil, false
+          return path if path.nil?
+          block_given? ? yield : raise("#{question.inspect} not provided!")
         end
         path.empty? ? path : File.expand_path(path)
       end
 
       def ask(question, default = nil)
-        return default if ! @stdin.tty? || @ask == false
-        
-        question = "#{question}?" unless question.index('?')
-        question += " [#{default}]" if default && ! default.empty?
+        return default if ! @stdin.tty? || ! ask?
+
+        question = "#{question}?" if ! question.index('?') || ! question.index(':')
+        question += " [#{default}]" if default &&
+          ( ! default.is_a?(String) || ! default.empty? )
 
         result = nil
         while result.nil?
@@ -310,29 +632,30 @@ module Trinidad
 
           if result
             result.chomp!
-            case result
-            when /^$/
-              result = default
-            end
+            result = default if result.size == 0
           end
         end
         result
       end
-      
-      def ask=(flag)
-        @ask = !!flag
+
+      def ask?
+        @ask = true unless defined? @ask; return @ask
       end
+
+      def ask=(flag); @ask = !!flag end
       public :ask=
-      
+
       def say(msg)
-        puts msg unless @say == false
+        puts msg if say?
       end
-      
-      def say=(flag)
-        @say = !!flag
+
+      def say?
+        @say = true unless defined? @say; return @say
       end
+
+      def say=(flag); @say = !!flag end
       public :say=
-      
+
     end
   end
 end