trinidad_init_services 1.1.3 → 1.1.4

data/jsvc-unix-src/support/install.sh

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+##
+##  install.sh -- install a program, script or datafile
+##
+##  Based on `install-sh' from the X Consortium's X11R5 distribution
+##  as of 89/12/18 which is freely available.
+##  Cleaned up for Apache's Autoconf-style Interface (APACI)
+##  by Ralf S. Engelschall <rse@apache.org>
+##
+#
+# This script falls under the Apache License.
+# See http://www.apache.org/docs/LICENSE
+
+
+#
+#   put in absolute paths if you don't have them in your path; 
+#   or use env. vars.
+#
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+
+#
+#   parse argument line
+#
+instcmd="$mvprog"
+chmodcmd=""
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+ext=""
+src=""
+dst=""
+while [ "x$1" != "x" ]; do
+    case $1 in
+        -c) instcmd="$cpprog"
+            shift; continue
+            ;;
+        -m) chmodcmd="$chmodprog $2"
+            shift; shift; continue
+            ;;
+        -o) chowncmd="$chownprog $2"
+            shift; shift; continue
+            ;;
+        -g) chgrpcmd="$chgrpprog $2"
+            shift; shift; continue
+            ;;
+        -s) stripcmd="$stripprog"
+            shift; continue
+            ;;
+        -S) stripcmd="$stripprog $2"
+            shift; shift; continue
+            ;;
+        -e) ext="$2"
+            shift; shift; continue
+            ;;
+        *)  if [ "x$src" = "x" ]; then
+                src=$1
+            else
+                dst=$1
+            fi
+            shift; continue
+            ;;
+    esac
+done
+if [ "x$src" = "x" ]; then
+     echo "install.sh: no input file specified"
+     exit 1
+fi
+if [ "x$dst" = "x" ]; then
+     echo "install.sh: no destination specified"
+     exit 1
+fi
+
+#
+#  If destination is a directory, append the input filename; if
+#  your system does not like double slashes in filenames, you may
+#  need to add some logic
+#
+if [ -d $dst ]; then
+    dst="$dst/`basename $src`"
+fi
+
+#  Add a possible extension (such as ".exe") to src and dst
+src="$src$ext"
+dst="$dst$ext"
+
+#  Make a temp file name in the proper directory.
+dstdir=`dirname $dst`
+dsttmp=$dstdir/#inst.$$#
+
+#  Move or copy the file name to the temp name
+$instcmd $src $dsttmp
+
+#  And set any options; do chmod last to preserve setuid bits
+if [ "x$chowncmd" != "x" ]; then $chowncmd $dsttmp; fi
+if [ "x$chgrpcmd" != "x" ]; then $chgrpcmd $dsttmp; fi
+if [ "x$stripcmd" != "x" ]; then $stripcmd $dsttmp; fi
+if [ "x$chmodcmd" != "x" ]; then $chmodcmd $dsttmp; fi
+
+#  Now rename the file to the real destination.
+$rmcmd $dst
+$mvcmd $dsttmp $dst
+
+exit 0
+

data/jsvc-unix-src/support/mkdist.sh

@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Create Commons Daemon native package distribution on UNIX systems.
+# You should execute this script from the src/native/unix directory
+#
+# support/mkdist.sh <arch> [os]
+#
+# This will create something like commons-daemon-1.2.3-bin-os-arch.tar.gz
+# The version numbers are parsed from the native/version.h file.
+# If the os argument is not provided current os name will be used.
+#
+#
+gpgopts="-ba"
+arch=""
+for o
+do
+    case "$o" in
+    *=*) a=`echo "$o" | sed 's/^[-_a-zA-Z0-9]*=//'`
+     ;;
+    *) a=''
+     ;;
+    esac
+    case "$o" in
+        --passphrase=*  )
+            gpgopts="$gpgopts --passphrase $a"
+            shift
+        ;;
+        --arch=*  )
+            arch="$a"
+            shift
+        ;;
+        --os=*  )
+            osname="$a"
+            shift
+        ;;
+        * )
+            break
+        ;;
+    esac
+done
+
+
+if [ ".$arch" = . ];then
+  arch=`uname -m 2>/dev/null | tr '[A-Z]' '[a-z]'` || arch="unknown"
+  echo "No architecture provided. Using $arch"
+fi
+if [ ".$osname" = . ];then
+  osname=`uname -s 2>/dev/null | tr '[A-Z]' '[a-z]'` || osname="unknown"
+  echo "No OS name provided. Using $osname"
+fi
+topdir=.
+major_sed='/#define.*JSVC_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
+minor_sed='/#define.*JSVC_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
+patch_sed='/#define.*JSVC_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
+vmajor="`sed -n $major_sed $topdir/native/version.h`"
+vminor="`sed -n $minor_sed $topdir/native/version.h`"
+vpatch="`sed -n $patch_sed $topdir/native/version.h`"
+verdst="commons-daemon-$vmajor.$vminor.$vpatch-bin-$osname-$arch"
+extfiles="LICENSE.txt NOTICE.txt RELEASE-NOTES.txt"
+for i in $extfiles
+do
+  cp ../../../$i .
+done
+# Try to locate a MD5 binary
+md5_bin="`which md5sum 2>/dev/null || type md5sum 2>&1`"
+if [ -x "$md5_bin" ]; then
+    MD5SUM="$md5_bin --binary "
+else
+    MD5SUM="echo 00000000000000000000000000000000 "
+fi
+# Try to locate a SHA1 binary
+sha1_bin="`which sha1sum 2>/dev/null || type sha1sum 2>&1`"
+if [ -x "$sha1_bin" ]; then
+    SHA1SUM="$sha1_bin --binary "
+else
+    SHA1SUM="echo 0000000000000000000000000000000000000000 "
+fi
+dstfile=$verdst.tar.gz
+echo "Creating $dstfile ..."
+tar cfz $dstfile jsvc $extfiles
+if [ ".$?" = .0 ]; then
+  echo "Signing $dstfile"
+  gpg $gpgopts $dstfile
+  $MD5SUM $dstfile > $dstfile.md5
+  $SHA1SUM $dstfile > $dstfile.sha1
+else
+  rm $verdst.tar.gz >/dev/null 2>&1
+fi
+rm $extfiles

data/lib/trinidad/daemon.rb

@@ -0,0 +1,31 @@
+require 'rubygems'
+require 'trinidad'
+
+module Trinidad
+  module Daemon
+    require 'trinidad_init_services/version'
+    VERSION = Trinidad::InitServices::VERSION
+
+    def init
+    end
+
+    def setup?
+      true
+    end
+
+    def start(args = ARGV)
+      Trinidad::CommandLineParser.parse(args)
+      Trinidad.configuration.trap = false
+      @server = Trinidad::Server.new
+      @server.start
+    end
+
+    def stop
+      @server.stop
+    end
+
+    extend self
+  end
+end
+
+Trinidad::Daemon.init

data/lib/trinidad_init_services.rb

@@ -1,30 +1,2 @@
-require 'rubygems'
-require 'trinidad'
-
-module Trinidad
-  module Daemon
-    VERSION = '1.1.3'
-
-    def init
-    end
-
-    def setup?
-      true
-    end
-
-    def start(args = ARGV)
-      Trinidad::CommandLineParser.parse(args)
-      Trinidad.configuration.trap = false
-      @server = Trinidad::Server.new
-      @server.start
-    end
-
-    def stop
-      @server.stop
-    end
-
-    extend self
-  end
-end
-
-Trinidad::Daemon.init
+require 'trinidad_init_services/version'
+require 'trinidad_init_services/configuration'

data/lib/trinidad_init_services/configuration.rb

@@ -1,9 +1,11 @@
+require 'erb'
+require 'java'
+require 'jruby'
+require 'rbconfig'
+require 'fileutils'
+
 module Trinidad
   module InitServices
-    require 'erb'
-    require 'java'
-    require 'rbconfig'
-    require 'fileutils'
 
     class Configuration
       def initialize(stdin = STDIN, stdout = STDOUT)
@@ -12,7 +14,7 @@ module Trinidad
       end
 
       def initialize_paths
-        @trinidad_daemon_path = File.expand_path('../../trinidad_init_services.rb', __FILE__)
+        @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) }
@@ -54,8 +56,16 @@ module Trinidad
       end
 
       def configure_unix_daemon(defaults)
-        @jsvc = defaults["jsvc_path"] || jsvc_path
         @java_home = defaults["java_home"] || ask_path('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)
+            puts "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')
@@ -65,7 +75,9 @@ module Trinidad
           raise ArgumentError, "user '#{@run_user}' does not exist (leave blank if you're planning to `useradd' later)"
         end
         
+        @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(
@@ -81,7 +93,7 @@ module Trinidad
       end
 
       def configure_windows_service
-        srv_path = prunsrv_path
+        srv_path = bundled_prunsrv_path
         trinidad_service_id = @trinidad_name.gsub(/\W/, '')
 
         command = %Q{//IS//#{trinidad_service_id} --DisplayName="#{@trinidad_name}" \
@@ -111,11 +123,11 @@ module Trinidad
       end
 
       def default_java_home
-        Java::JavaLang::System.get_property("java.home")
+        ENV['JAVA_HOME'] || Java::JavaLang::System.get_property("java.home")
       end
-
+      
       def default_ruby_compat_version
-        "RUBY1_8"
+        JRuby.runtime.is1_9 ? "RUBY1_9" : "RUBY1_8"
       end
 
       def windows?
@@ -130,12 +142,75 @@ module Trinidad
         RbConfig::CONFIG['arch'] =~ /i686|ia64/i
       end
 
-      def jsvc_path
+      def bundled_jsvc_path
         jsvc = 'jsvc_' + (macosx? ? 'darwin' : 'linux')
-        File.join(@jars_path, jsvc)
+        jsvc_path = File.join(@jars_path, 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
 
-      def prunsrv_path
+      def detect_jsvc_path
+        jsvc_path = `which jsvc` # "/usr/bin/jsvc\n"
+        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)
+          raise "specified path does not exist: #{jsvc_unpack_dir.inspect}"
+        end
+        unless File.directory?(jsvc_unpack_dir)
+          raise "specified path: #{jsvc_unpack_dir.inspect} is not a directory"
+        end
+        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
+        unless jdk_home = detect_jdk_home(java_home)
+          warn "seems you only have a JRE installed, a JDK is needed to compile jsvc"
+          jdk_home = java_home # it's still worth trying
+        end
+        command = "cd #{jsvc_dir} && ./configure --with-java=#{jdk_home}"
+        puts "configuring jsvc ..."
+        command_output = `#{command}`
+        if $?.exitstatus != 0
+          puts command_output
+          raise "`#{command}` failed with status: #{$?.exitstatus}"
+        end
+        
+        # make
+        command = "cd #{jsvc_dir} && make"
+        puts "compiling jsvc ..."
+        command_output = `#{command}`
+        if $?.exitstatus != 0
+          puts 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'))
+          return java_home
+        end
+        # java_home might be a nested JDK path e.g. /opt/java/jdk/jre
+        jdk_home = File.dirname(java_home) # /opt/jdk/jre -> /opt/jdk
+        if File.exist?(File.join(jdk_home, 'bin/java'))
+          return jdk_home
+        end
+        nil
+      end
+      
+      def bundled_prunsrv_path
         prunsrv = 'prunsrv_' + (ia64? ? 'ia64' : 'amd64') + '.exe'
         File.join(@jars_path, prunsrv)
       end
@@ -152,7 +227,8 @@ module Trinidad
       end
       
       def ask_path(question, default = nil)
-        File.expand_path(ask(question, default))
+        path = ask(question, default)
+        path.empty? ? path : File.expand_path(path)
       end
 
       def ask(question, default = nil)
@@ -181,6 +257,7 @@ module Trinidad
         end
         return result
       end
+      
     end
   end
 end