diff options
| author | Richard PALO <richard@netbsd.org> | 2014-12-17 14:22:16 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-05-05 12:02:30 -0400 |
| commit | 4d0eb50e691de4c20b1dd9976ad6839fede8a42d (patch) | |
| tree | 0becc84a73e9354e2102742371f71b78e0cb845a /usr/src/cmd/java | |
| parent | 37bbd7cc85ebfd31fbf68569b8b098e5448c9ce9 (diff) | |
| download | illumos-gate-4d0eb50e691de4c20b1dd9976ad6839fede8a42d.tar.gz | |
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>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Diffstat (limited to 'usr/src/cmd/java')
| -rw-r--r-- | usr/src/cmd/java/Makefile | 61 | ||||
| -rw-r--r-- | usr/src/cmd/java/default_java | 31 |
2 files changed, 0 insertions, 92 deletions
diff --git a/usr/src/cmd/java/Makefile b/usr/src/cmd/java/Makefile deleted file mode 100644 index ead561c3d4..0000000000 --- a/usr/src/cmd/java/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# Despite the name, this directory doesn't contain the Java Virtual Machine. -# It only contains base OS/Solaris files for improved integration of a -# Java Virtual Machine. -# - -include ../Makefile.cmd - -ADMINFILES= default_java - -DIRMODE= 755 -FILEMODE= 444 - -SADM_DIR= $(ROOT)/var/sadm -SYSTEM_DIR= $(SADM_DIR)/system -ADMIN_DIR= $(SYSTEM_DIR)/admin - -ROOTDIRS= $(SADM_DIR) $(SYSTEM_DIR) $(ADMIN_DIR) - -ROOTADMINFILES= $(ADMINFILES:%=$(ADMIN_DIR)/%) - -.KEEP_STATE: - -all: - -install: all $(ROOTDIRS) $(ROOTADMINFILES) - -clean: - -lint: - -$(ROOTDIRS): - $(INS.dir) - -$(ADMIN_DIR)/%: % - $(INS.file) - -include ../Makefile.targ diff --git a/usr/src/cmd/java/default_java b/usr/src/cmd/java/default_java deleted file mode 100644 index b80dbfed3c..0000000000 --- a/usr/src/cmd/java/default_java +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#ident "%Z%%M% %I% %E% SMI" -# -# Java system configuration file. Do not edit. -# -# Shell syntax. -# -DEFAULT_MIN=1.6 -DEFAULT_MAX=1.6 |