6512052: Remove java-rmi.exe and java-rmi.cgi
Reviewed-by: alanb
This commit is contained in:
Magnus Ihse Bursie
parent
dc711078d4
commit
4671194aaf
jdk
@ -30,34 +30,3 @@ $(eval $(call SetupLauncher,rmid, \
|
|||||||
|
|
||||||
$(eval $(call SetupLauncher,rmiregistry, \
|
$(eval $(call SetupLauncher,rmiregistry, \
|
||||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
|
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
|
||||||
|
|
||||||
##########################################################################################
|
|
||||||
|
|
||||||
#
|
|
||||||
# The java-rmi.cgi script in bin/ only gets delivered in certain situations
|
|
||||||
#
|
|
||||||
JAVA_RMI_CGI := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/java-rmi.cgi
|
|
||||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
|
||||||
TARGETS += $(JAVA_RMI_CGI)
|
|
||||||
endif
|
|
||||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
|
||||||
TARGETS += $(JAVA_RMI_CGI)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# TODO:
|
|
||||||
# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
|
|
||||||
# this time anyway. Since jdk6, it has been built from the wrong source and resulted
|
|
||||||
# in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in
|
|
||||||
# the final images bin dir. This weird behavior is mimicked here in the converted
|
|
||||||
# makefiles for now. Should probably just be deleted.
|
|
||||||
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
|
|
||||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
|
||||||
$(eval $(call SetupLauncher,java-rmi, , \
|
|
||||||
$(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/make/java/main/java/mapfile-$(OPENJDK_TARGET_CPU)),,,,,,,,,RMI))
|
|
||||||
else
|
|
||||||
$(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/java.rmi/unix/bin/java-rmi.cgi.sh
|
|
||||||
$(call install-file)
|
|
||||||
$(CHMOD) a+x $@
|
|
||||||
endif
|
|
||||||
|
|
||||||
##########################################################################################
|
|
||||||
|
|||||||
@ -1,74 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright (c) 1996, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
#
|
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
|
||||||
# under the terms of the GNU General Public License version 2 only, as
|
|
||||||
# published by the Free Software Foundation. Oracle designates this
|
|
||||||
# particular file as subject to the "Classpath" exception as provided
|
|
||||||
# by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
#
|
|
||||||
# This code 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
|
|
||||||
# version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
# accompanied this code).
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License version
|
|
||||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# This script executes the Java interpreter, defines properties
|
|
||||||
# that correspond to the CGI 1.0 environment variables, and executes
|
|
||||||
# the class "sun.rmi.transport.proxy.CGIHandler". It should be
|
|
||||||
# installed in the directory to which the HTTP server maps the
|
|
||||||
# URL path "/cgi-bin".
|
|
||||||
#
|
|
||||||
# (Configuration is necessary as noted below.)
|
|
||||||
#
|
|
||||||
# This class will support a QUERY_STRING of the form "forward=<port>"
|
|
||||||
# with a REQUEST_METHOD "POST". The body of the request will be
|
|
||||||
# forwarded (as another POST request) to the server listening on the
|
|
||||||
# specified port (must be >= 1024). The response from this forwarded
|
|
||||||
# request will be the response to the original request.
|
|
||||||
#
|
|
||||||
# CONFIGURATION:
|
|
||||||
#
|
|
||||||
# Fill in correct absolute path to Java interpreter below. For example,
|
|
||||||
# the "PATH=" line might be changed to the follow if the JDK is installed
|
|
||||||
# at the path "/home/peter/java":
|
|
||||||
#
|
|
||||||
# PATH=/home/peter/java/bin:$PATH
|
|
||||||
#
|
|
||||||
PATH=/usr/local/java/bin:$PATH
|
|
||||||
exec java \
|
|
||||||
-DAUTH_TYPE="$AUTH_TYPE" \
|
|
||||||
-DCONTENT_LENGTH="$CONTENT_LENGTH" \
|
|
||||||
-DCONTENT_TYPE="$CONTENT_TYPE" \
|
|
||||||
-DGATEWAY_INTERFACE="$GATEWAY_INTERFACE" \
|
|
||||||
-DHTTP_ACCEPT="$HTTP_ACCEPT" \
|
|
||||||
-DPATH_INFO="$PATH_INFO" \
|
|
||||||
-DPATH_TRANSLATED="$PATH_TRANSLATED" \
|
|
||||||
-DQUERY_STRING="$QUERY_STRING" \
|
|
||||||
-DREMOTE_ADDR="$REMOTE_ADDR" \
|
|
||||||
-DREMOTE_HOST="$REMOTE_HOST" \
|
|
||||||
-DREMOTE_IDENT="$REMOTE_IDENT" \
|
|
||||||
-DREMOTE_USER="$REMOTE_USER" \
|
|
||||||
-DREQUEST_METHOD="$REQUEST_METHOD" \
|
|
||||||
-DSCRIPT_NAME="$SCRIPT_NAME" \
|
|
||||||
-DSERVER_NAME="$SERVER_NAME" \
|
|
||||||
-DSERVER_PORT="$SERVER_PORT" \
|
|
||||||
-DSERVER_PROTOCOL="$SERVER_PROTOCOL" \
|
|
||||||
-DSERVER_SOFTWARE="$SERVER_SOFTWARE" \
|
|
||||||
sun.rmi.transport.proxy.CGIHandler
|
|
||||||
Loading…
x
Reference in New Issue
Block a user