4719 update gate build environment to [open]jdk7 4742 update manifests for javadoc7 4743 Fix deprecated /usr/j2se usage in slp and remove from filesystem(5) manpage 4744 remove traces of /var/sadm/system/admin/default_java Reviewed by: Dan McDonald <danmcd@omniti.com> Reviewed by: Richard Lowe <richlowe@richlowe.net>

          --- old/usr/src/cmd/cmd-inet/usr.lib/slpd/slp
          +++ new/usr/src/cmd/cmd-inet/usr.lib/slpd/slp

   1    1  #!/sbin/sh
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License (the "License").
   7    7  # You may not use this file except in compliance with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  16   16  # If applicable, add the following below this CDDL HEADER, with the
  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  22   22  #
  23   23  # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26      -#ident  "%Z%%M% %I%     %E% SMI"
  27   26  #
  28   27  # Service Method Support Script for the SLP service
  29   28  #
  30   29  # - operates a proxy for slpd which brings up the JVM to run slpd
  31   30  #   when required by a client; this prevents keeping JVM's alive
  32   31  #   when the service is not in use.
  33   32  #
  34   33  
  35   34  . /lib/svc/share/smf_include.sh
  36   35  
  37   36  CONF=/etc/inet/slp.conf
  38      -JAVA_BIN=/usr/j2se/bin/java
       37 +JAVA_BIN=/usr/java/bin/java
  39   38  CLASSPATH=/usr/share/lib/slp/slpd.jar
  40   39  MAIN_CLASS=com.sun.slp.slpd
  41   40  SLPD_HOME=/usr/lib/inet
  42   41  SLPD=slpd
  43   42  SLPD_BIN=$SLPD_HOME/$SLPD
  44   43  
  45   44  case "$1" in
  46   45  'start')
  47   46          # Start slpd proxy (as a fragile dependency, conf file must exist)
  48   47          $SLPD_BIN -f $CONF >/dev/msglog 2>&1 &

  49   48          ;;
  50   49  
  51   50  'stop')
  52   51          # Kill the slpd proxy.
  53   52          /usr/bin/pkill -x -u 0 -P 1 -z `smf_zonename` $SLPD
  54   53  
  55   54          # If a configuration file exists signal a shutdown to the real slpd.
  56   55          [ -f $CONF  ] && {
  57   56                  $JAVA_BIN -classpath $CLASSPATH \
  58   57                      $MAIN_CLASS stop -f $CONF >/dev/msglog 2>&1 &
  59   58  
  60   59                  # Give the above slpd instance a chance to signal
  61   60                  # a shutdown to the real slpd instance. If after
  62   61                  # this time it has hung kill it.
  63   62                  sleep 5
  64   63  
  65   64                  # The pattern must not exceed 80 chars!
  66   65                  /usr/bin/pkill -x -f -u 0 -P 1,$$  -z `smf_zonename` \
  67   66                      "${JAVA_BIN}.*-classpath ${CLASSPATH} .*"           
  68   67          }
  69   68  
  70   69          # Kill the slpd proxy service contract
  71   70          smf_kill_contract $2 TERM 1
  72   71          [ $? -ne 0 ] && exit 1
  73   72          ;;
  74   73  *)
  75   74          echo "Usage: $0 { start | stop }"
  76   75          exit 1
  77   76          ;;
  78   77  esac
  79   78  exit 0

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX