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>

*** 21,31 ****
  #
  #
  # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
- #ident  "%Z%%M% %I%     %E% SMI"
  #
  # Service Method Support Script for the SLP service
  #
  # - operates a proxy for slpd which brings up the JVM to run slpd
  #   when required by a client; this prevents keeping JVM's alive
--- 21,30 ----
*** 33,43 ****
  #
  
  . /lib/svc/share/smf_include.sh
  
  CONF=/etc/inet/slp.conf
! JAVA_BIN=/usr/j2se/bin/java
  CLASSPATH=/usr/share/lib/slp/slpd.jar
  MAIN_CLASS=com.sun.slp.slpd
  SLPD_HOME=/usr/lib/inet
  SLPD=slpd
  SLPD_BIN=$SLPD_HOME/$SLPD
--- 32,42 ----
  #
  
  . /lib/svc/share/smf_include.sh
  
  CONF=/etc/inet/slp.conf
! JAVA_BIN=/usr/java/bin/java
  CLASSPATH=/usr/share/lib/slp/slpd.jar
  MAIN_CLASS=com.sun.slp.slpd
  SLPD_HOME=/usr/lib/inet
  SLPD=slpd
  SLPD_BIN=$SLPD_HOME/$SLPD