mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-20 07:15:31 +00:00
Merge
This commit is contained in:
Lana Steuck
commit
0e2a91bb79
43
.hgtags
43
.hgtags
@ -1,3 +1,27 @@
|
||||
e2b70be325bd10dae4c06f74c46d70d480854916 jdk-9+179
|
||||
5b16a1c3ccffff2a82c88bb7ea894c4ff1c9ebde jdk-9+180
|
||||
43bf6f30fcba031ecf0cc7e511efe3a8179d0f77 jdk-9+176
|
||||
d9f6bc6ba599d0487dc18b2fbdb6c34eedf6f958 jdk-9+177
|
||||
bc9df7dd63ec76f50fafeb4acc44465044662f0a jdk-9+178
|
||||
994036e74ab805bcc09afa0646be17a725bec42f jdk-9+175
|
||||
94680c6d60ecd9ed3ffd1847706efde7eb947afc jdk-9+174
|
||||
6dd7fda42bab7ecf648cafb0a4e9b4ca11b3094f jdk-9+173
|
||||
dad6746278facbbea57dd462cb56fb743dc0a5f0 jdk-9+172
|
||||
643b5f18c2656fe91b69fea85b07b98d5fad394d jdk-9+171
|
||||
898cbe31fbdae2d25d141384fac746cc244a730c jdk-9+170
|
||||
c7efde2b60fc1ec04630be769d9ad60efb39c39c jdk-9+169
|
||||
8fd0a4569191f33c98ee90c2709174a342fefb0d jdk-9+167
|
||||
fcabc74bd44e56c7419d111d59b95669ecb33c55 jdk-9+168
|
||||
d3e973f1809606c67412361041ad197e50fe8cec jdk-9+166
|
||||
3965b747cfe1e6cbd66b8739da5a1ea6ec6985e9 jdk-9+165
|
||||
d16aebbb56d37f12e0c0b0a4fb427db65e1fb1a8 jdk-9+162
|
||||
18c41483a082e097ac2f5f983c1226ed94aa4215 jdk-9+163
|
||||
32db52c675e7d5bc413605d2e89b68b608b19be0 jdk-9+164
|
||||
fd1497902bbe3aa24b21f270ecdcb8de5f7aa9ac jdk-9+159
|
||||
6aa8be0c4e054fe8b3ab016ae00d16d680f92145 jdk-9+160
|
||||
f6883b1a5a6478437cd4181c4bd45328ab24feaf jdk-9+161
|
||||
fa3e76b477829afc4476f0b725cfaa440a6fd917 jdk-9+157
|
||||
b5015f742ba648184bb7fc547197bd33ebfde30d jdk-9+158
|
||||
1cc8dd79fd1cd13d36b385196271a29632c67c3b jdk7-b24
|
||||
bf2517e15f0c0f950e5b3143c4ca11e2df73dcc1 jdk7-b25
|
||||
5ae7db536e3fcf6be78e45b240a9058095e0ed38 jdk7-b26
|
||||
@ -399,3 +423,22 @@ d7034ff7f8e257e81c9f95c7785dd4eaaa3c2afc jdk-9+153
|
||||
8c70d170e62c0c58b5bc3ba666bd140399b98c9c jdk-10+0
|
||||
45b751afd11e6c05991cf4913c5a0ac3304fcc4e jdk-9+154
|
||||
f4aff695ffe05cfdb69d8af25a4ddc6a029754ea jdk-9+155
|
||||
06bce0388880b5ff8e040e4a9d72a3ea11dac321 jdk-9+156
|
||||
74116beae88a8f17a80301aa6c83865c82f10ece jdk-10+1
|
||||
4a79ad46e578112fce68f1af9dd931025cc235cb jdk-10+2
|
||||
d1cab6c7e608479be4ebfad48a25b0ed48600f62 jdk-10+3
|
||||
02253db2ace1422f576f58502fc7831ead77424b jdk-10+4
|
||||
f113ce12fe24fbd24acf02711372d9f1e1c12426 jdk-10+5
|
||||
1407b19a2ddf6baae162f5a1a5b96af473f4d7d1 jdk-10+6
|
||||
30e75693ae99fd8e47fd2f5116527aff1b59aff9 jdk-10+7
|
||||
c42dc7b58b4d4301ea676a76326fd9bbd403d595 jdk-10+8
|
||||
aa5b01f5e5620438fd39efdb2e2f6365a2c7d898 jdk-10+9
|
||||
b0f2b8ff25a2209b2c807785d75f20e5086bbfc2 jdk-10+10
|
||||
036dbf8b381798e5d31065109714d04d97bf98a4 jdk-10+11
|
||||
e6d70017f5b9adbb2ec82d826973d0251800a3c3 jdk-10+12
|
||||
9927a9f16738e240ab7014f0118f41e314ef8f99 jdk-10+13
|
||||
9ef5029b247b4d940080417a287440bbdbab995b jdk-10+14
|
||||
878e216039322cb3f0ecbd0944642a2b4e2593f3 jdk-10+15
|
||||
4bbea012e5676e8025ade2bcfab4d6581e6e9f4b jdk-10+16
|
||||
7db699468b4f84abbcc01647e5a964409737411a jdk-10+17
|
||||
3739654290616e533fc6f51bf9ad69ed47a6abba jdk-10+18
|
||||
|
||||
@ -396,9 +396,11 @@ b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149
|
||||
71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151
|
||||
ef056360ddf3977d7d2ddbeb456a4d612d19ea05 jdk-9+152
|
||||
816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153
|
||||
8d22611ffb6540bc1ace64a00c048c8b82d8c69a jdk-10+0
|
||||
8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154
|
||||
688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155
|
||||
783ec7542cf7154e5d2b87f55bb97d28f81e9ada jdk-9+156
|
||||
4df5f619c9ead4604d2f97ed231b3a35ec688c41 jdk-10+1
|
||||
4eb77fb98952dc477a4229575c81d2263a9ce711 jdk-9+157
|
||||
a4087bc10a88a43ea3ad0919b5b4af1c86977221 jdk-9+158
|
||||
fe8466adaef8178dba94be53c789a0aaa87d13bb jdk-9+159
|
||||
@ -411,16 +413,34 @@ aff4f339acd40942d3dab499846b52acd87b3af1 jdk-9+165
|
||||
ba5b16c9c6d80632b61959a33d424b1c3398ce62 jdk-9+166
|
||||
35017c286513ddcbcc6b63b99679c604993fc639 jdk-9+167
|
||||
143d4c87bc1ef1ed6dadd613cd9dd4488fdefc29 jdk-9+168
|
||||
9c7248b787c39b034d4f48d4aa48df903836cca7 jdk-10+2
|
||||
06373236a30801f72e2a31ee5c691c2a1e500f57 jdk-10+3
|
||||
8ec175c61fc3f58328a3324f07d7ded00e060be3 jdk-10+4
|
||||
111e2e7d00f45c983cdbc9c59ae40552152fcc23 jdk-10+5
|
||||
03fe61bb7670644cf6e46b5cfafb6b27c0e0157e jdk-10+6
|
||||
b25838a28195f4b6dab34668411eedd2d366a16c jdk-9+169
|
||||
4d163ec59d989a9261ed7f848bc6303f90869af5 jdk-9+170
|
||||
aa3c97810d7c484c93a2fd75d3c76ff574deb6d8 jdk-10+7
|
||||
df33ef1dc163f994177fd97d4d0e73a1e3cb5d85 jdk-10+8
|
||||
b94be69cbb1d2943b886bf2d458745756df146e4 jdk-10+9
|
||||
4c12464a907db4656c1033f56fa49cba643ac629 jdk-9+171
|
||||
6558c37afe832582238d338578d598f30c6fdd75 jdk-10+10
|
||||
2c25fc24103251f9711a1c280c31e1e41016d90f jdk-9+172
|
||||
6b750cdb823a029a25ff2e560302cc2d28a86cb6 jdk-10+11
|
||||
88d7fd969e7df0e07a53b201cfd29393ca33ede9 jdk-9+173
|
||||
5466f409346e0446ee9a6daeb7f5d75c8fc76823 jdk-9+174
|
||||
8d4ed1e06fe184c9cb08c5b708e7d6f5c066644f jdk-10+12
|
||||
8f7227c6012b0051ea4e0bcee040c627bf699b88 jdk-9+175
|
||||
d67a3f1f057f7e31e12f33ebe3667cb73d252268 jdk-10+13
|
||||
1fd5901544acc50bb30fde9388c8e53cb7c449e4 jdk-10+14
|
||||
84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176
|
||||
a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177
|
||||
a6c830ee8a6798b186730475e700027cdf4598aa jdk-10+15
|
||||
2fe66ca1e2b3c361f949de9cb2894661dc0a3fa2 jdk-10+16
|
||||
ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178
|
||||
252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179
|
||||
a133a7d1007b1456bc62824382fd8ac93b45d329 jdk-10+17
|
||||
536b81db8075486ca0fe3225d8e59313df5b936c jdk-10+18
|
||||
b803e6cff41e72a1e6d8782e1ef7c25a6e3e5ee3 jdk-10+19
|
||||
d2982a786f53814367698e63efe6349c9128e1db jdk-9+180
|
||||
b656dea9398ef601f7fc08d1a5157a560e0ccbe0 jdk-9+181
|
||||
|
||||
@ -1 +1,2 @@
|
||||
project=jdk9
|
||||
project=jdk10
|
||||
bugids=dup
|
||||
|
||||
@ -1099,6 +1099,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
|
||||
BASIC_PATH_PROGS(HG, hg)
|
||||
BASIC_PATH_PROGS(STAT, stat)
|
||||
BASIC_PATH_PROGS(TIME, time)
|
||||
BASIC_PATH_PROGS(FLOCK, flock)
|
||||
# Dtrace is usually found in /usr/sbin on Solaris, but that directory may not
|
||||
# be in the user path.
|
||||
BASIC_PATH_PROGS(DTRACE, dtrace, $PATH:/usr/sbin)
|
||||
|
||||
@ -318,7 +318,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
|
||||
AC_SUBST(JAVAC_FLAGS)
|
||||
|
||||
# Check if the boot jdk is 32 or 64 bit
|
||||
if "$JAVA" -d64 -version > /dev/null 2>&1; then
|
||||
if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then
|
||||
BOOT_JDK_BITS="64"
|
||||
else
|
||||
BOOT_JDK_BITS="32"
|
||||
|
||||
@ -417,10 +417,8 @@ AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
|
||||
AC_SUBST(SJAVAC_SERVER_JAVA)
|
||||
|
||||
if test "$MEMORY_SIZE" -gt "3000"; then
|
||||
ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
|
||||
if test "$JVM_ARG_OK" = true; then
|
||||
if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then
|
||||
JVM_64BIT=true
|
||||
JVM_ARG_OK=false
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -996,14 +996,18 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
|
||||
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
|
||||
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -fno-rtti -fno-exceptions -fvisibility=hidden \
|
||||
-mno-omit-leaf-frame-pointer -mstack-alignment=16 -pipe -fno-strict-aliasing \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -mmacosx-version-min=10.7.0 \
|
||||
-fno-omit-frame-pointer"
|
||||
elif test "x$OPENJDK_$1_OS" = xaix; then
|
||||
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -DAIX"
|
||||
# We may need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -qtune=balanced \
|
||||
-qalias=noansi -qstrict -qtls=default -qlanglvl=c99vla \
|
||||
-qlanglvl=noredefmac -qnortti -qnoeh -qignerrno"
|
||||
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
# Hotspot now overflows its 64K TOC (currently only for slowdebug),
|
||||
# so for slowdebug we build with '-qpic=large -bbigtoc'.
|
||||
if test "x$DEBUG_LEVEL" = xslowdebug; then
|
||||
$2JVM_CFLAGS="[$]$2JVM_CFLAGS -qpic=large"
|
||||
fi
|
||||
elif test "x$OPENJDK_$1_OS" = xbsd; then
|
||||
$2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE"
|
||||
elif test "x$OPENJDK_$1_OS" = xwindows; then
|
||||
@ -1081,18 +1085,50 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
|
||||
|
||||
# Additional macosx handling
|
||||
if test "x$OPENJDK_$1_OS" = xmacosx; then
|
||||
# Setting these parameters makes it an error to link to macosx APIs that are
|
||||
# newer than the given OS version and makes the linked binaries compatible
|
||||
# even if built on a newer version of the OS.
|
||||
# The expected format is X.Y.Z
|
||||
# MACOSX_VERSION_MIN is the c++ and ld is -mmacosx-version-min argument. The expected
|
||||
# format is X.Y.Z. It's hard-coded to the minimum OSX version on which the
|
||||
# JDK can be built and makes the linked binaries compatible even if built on
|
||||
# a newer version of the OS.
|
||||
MACOSX_VERSION_MIN=10.7.0
|
||||
AC_SUBST(MACOSX_VERSION_MIN)
|
||||
|
||||
# The macro takes the version with no dots, ex: 1070
|
||||
# Setting --with-macosx-version-max=<version> makes it an error to build or
|
||||
# link to macosx APIs that are newer than the given OS version. The expected
|
||||
# format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
|
||||
AC_ARG_WITH([macosx-version-max], [AS_HELP_STRING([--with-macosx-version-max],
|
||||
[error on use of newer functionality. @<:@macosx@:>@])],
|
||||
[
|
||||
if echo "$with_macosx_version_max" | $GREP -q "^[[0-9]][[0-9]]\.[[0-9]]\.[[0-9]]\$"; then
|
||||
MACOSX_VERSION_MAX=$with_macosx_version_max
|
||||
elif echo "$with_macosx_version_max" | $GREP -q "^[[0-9]][[0-9]]\.[[0-9]][[0-9]]\.[[0-9]][[0-9]]\$"; then
|
||||
MACOSX_VERSION_MAX=$with_macosx_version_max
|
||||
elif test "x$with_macosx_version_max" = "xno"; then
|
||||
# Use build system default
|
||||
MACOSX_VERSION_MAX=
|
||||
else
|
||||
AC_MSG_ERROR([osx version format must be nn.n.n or nn.nn.nn])
|
||||
fi
|
||||
],
|
||||
[MACOSX_VERSION_MAX=]
|
||||
)
|
||||
AC_SUBST(MACOSX_VERSION_MAX)
|
||||
|
||||
# Let the flags variables get resolved in make for easier override on make
|
||||
# command line.
|
||||
$2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
# command line. AvailabilityMacros.h versions have no dots, ex: 1070.
|
||||
$2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
|
||||
-DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
|
||||
-mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
$2LDFLAGS_JDK="[$]$2LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
$2JVM_CFLAGS="[$]$2JVM_CFLAGS \
|
||||
-DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
|
||||
-mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
|
||||
if test -n "$MACOSX_VERSION_MAX"; then
|
||||
$2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
|
||||
$2JVM_CFLAGS="[$]$2JVM_CFLAGS \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Setup some hard coded includes
|
||||
@ -1218,6 +1254,12 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
|
||||
LDFLAGS_XLC="-b64 -brtl -bnolibpath -bexpall -bernotok"
|
||||
$2LDFLAGS_JDK="${$2LDFLAGS_JDK} $LDFLAGS_XLC"
|
||||
$2JVM_LDFLAGS="[$]$2JVM_LDFLAGS $LDFLAGS_XLC"
|
||||
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
# Hotspot now overflows its 64K TOC (currently only for slowdebug),
|
||||
# so for slowdebug we build with '-qpic=large -bbigtoc'.
|
||||
if test "x$DEBUG_LEVEL" = xslowdebug; then
|
||||
$2JVM_LDFLAGS="[$]$2JVM_LDFLAGS -bbigtoc"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Customize LDFLAGS for executables
|
||||
|
||||
@ -749,6 +749,7 @@ CXXFLAGS_JDKEXE
|
||||
CXXFLAGS_JDKLIB
|
||||
CFLAGS_JDKEXE
|
||||
CFLAGS_JDKLIB
|
||||
MACOSX_VERSION_MAX
|
||||
MACOSX_VERSION_MIN
|
||||
CXXSTD_CXXFLAG
|
||||
JDK_ARCH_ABI_PROP_NAME
|
||||
@ -934,6 +935,7 @@ DSYMUTIL
|
||||
IS_GNU_TIME
|
||||
PATCH
|
||||
DTRACE
|
||||
FLOCK
|
||||
TIME
|
||||
STAT
|
||||
HG
|
||||
@ -1181,6 +1183,7 @@ with_toolchain_version
|
||||
with_build_devkit
|
||||
with_jtreg
|
||||
with_abi_profile
|
||||
with_macosx_version_max
|
||||
enable_warnings_as_errors
|
||||
with_native_debug_symbols
|
||||
enable_debug_symbols
|
||||
@ -1299,6 +1302,7 @@ DOT
|
||||
HG
|
||||
STAT
|
||||
TIME
|
||||
FLOCK
|
||||
DTRACE
|
||||
PATCH
|
||||
DSYMUTIL
|
||||
@ -2130,6 +2134,8 @@ Optional Packages:
|
||||
(arm-vfp-sflt,arm-vfp-hflt,arm-sflt,
|
||||
armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64)
|
||||
[toolchain dependent]
|
||||
--with-macosx-version-max
|
||||
error on use of newer functionality. [macosx]
|
||||
--with-native-debug-symbols
|
||||
set the native debug symbol configuration (none,
|
||||
internal, external, zipped) [varying]
|
||||
@ -2267,6 +2273,7 @@ Some influential environment variables:
|
||||
HG Override default value for HG
|
||||
STAT Override default value for STAT
|
||||
TIME Override default value for TIME
|
||||
FLOCK Override default value for FLOCK
|
||||
DTRACE Override default value for DTRACE
|
||||
PATCH Override default value for PATCH
|
||||
DSYMUTIL Override default value for DSYMUTIL
|
||||
@ -5007,7 +5014,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
|
||||
|
||||
# Minimum supported versions, empty means unspecified
|
||||
TOOLCHAIN_MINIMUM_VERSION_clang="3.2"
|
||||
TOOLCHAIN_MINIMUM_VERSION_gcc="4.3"
|
||||
TOOLCHAIN_MINIMUM_VERSION_gcc="4.7"
|
||||
TOOLCHAIN_MINIMUM_VERSION_microsoft="16.00.30319.01" # VS2010
|
||||
TOOLCHAIN_MINIMUM_VERSION_solstudio="5.13"
|
||||
TOOLCHAIN_MINIMUM_VERSION_xlc=""
|
||||
@ -5186,7 +5193,7 @@ VS_SDK_PLATFORM_NAME_2013=
|
||||
#CUSTOM_AUTOCONF_INCLUDE
|
||||
|
||||
# Do not change or remove the following line, it is needed for consistency checks:
|
||||
DATE_WHEN_GENERATED=1496926402
|
||||
DATE_WHEN_GENERATED=1500423205
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@ -23274,6 +23281,203 @@ $as_echo "$tool_specified" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Publish this variable in the help.
|
||||
|
||||
|
||||
if [ -z "${FLOCK+x}" ]; then
|
||||
# The variable is not set by user, try to locate tool using the code snippet
|
||||
for ac_prog in flock
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_FLOCK+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $FLOCK in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_FLOCK="$FLOCK" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_FLOCK="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
FLOCK=$ac_cv_path_FLOCK
|
||||
if test -n "$FLOCK"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLOCK" >&5
|
||||
$as_echo "$FLOCK" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$FLOCK" && break
|
||||
done
|
||||
|
||||
else
|
||||
# The variable is set, but is it from the command line or the environment?
|
||||
|
||||
# Try to remove the string !FLOCK! from our list.
|
||||
try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!FLOCK!/}
|
||||
if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
|
||||
# If it failed, the variable was not from the command line. Ignore it,
|
||||
# but warn the user (except for BASH, which is always set by the calling BASH).
|
||||
if test "xFLOCK" != xBASH; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of FLOCK from the environment. Use command line variables instead." >&5
|
||||
$as_echo "$as_me: WARNING: Ignoring value of FLOCK from the environment. Use command line variables instead." >&2;}
|
||||
fi
|
||||
# Try to locate tool using the code snippet
|
||||
for ac_prog in flock
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_FLOCK+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $FLOCK in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_FLOCK="$FLOCK" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_FLOCK="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
FLOCK=$ac_cv_path_FLOCK
|
||||
if test -n "$FLOCK"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLOCK" >&5
|
||||
$as_echo "$FLOCK" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$FLOCK" && break
|
||||
done
|
||||
|
||||
else
|
||||
# If it succeeded, then it was overridden by the user. We will use it
|
||||
# for the tool.
|
||||
|
||||
# First remove it from the list of overridden variables, so we can test
|
||||
# for unknown variables in the end.
|
||||
CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
|
||||
|
||||
# Check if we try to supply an empty value
|
||||
if test "x$FLOCK" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Setting user supplied tool FLOCK= (no value)" >&5
|
||||
$as_echo "$as_me: Setting user supplied tool FLOCK= (no value)" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLOCK" >&5
|
||||
$as_echo_n "checking for FLOCK... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
|
||||
$as_echo "disabled" >&6; }
|
||||
else
|
||||
# Check if the provided tool contains a complete path.
|
||||
tool_specified="$FLOCK"
|
||||
tool_basename="${tool_specified##*/}"
|
||||
if test "x$tool_basename" = "x$tool_specified"; then
|
||||
# A command without a complete path is provided, search $PATH.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool FLOCK=$tool_basename" >&5
|
||||
$as_echo "$as_me: Will search for user supplied tool FLOCK=$tool_basename" >&6;}
|
||||
# Extract the first word of "$tool_basename", so it can be a program name with args.
|
||||
set dummy $tool_basename; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_FLOCK+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $FLOCK in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_FLOCK="$FLOCK" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_FLOCK="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
FLOCK=$ac_cv_path_FLOCK
|
||||
if test -n "$FLOCK"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLOCK" >&5
|
||||
$as_echo "$FLOCK" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test "x$FLOCK" = x; then
|
||||
as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
|
||||
fi
|
||||
else
|
||||
# Otherwise we believe it is a complete path. Use it as it is.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool FLOCK=$tool_specified" >&5
|
||||
$as_echo "$as_me: Will use user supplied tool FLOCK=$tool_specified" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLOCK" >&5
|
||||
$as_echo_n "checking for FLOCK... " >&6; }
|
||||
if test ! -x "$tool_specified"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
|
||||
$as_echo "not found" >&6; }
|
||||
as_fn_error $? "User supplied tool FLOCK=$tool_specified does not exist or is not executable" "$LINENO" 5
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
|
||||
$as_echo "$tool_specified" >&6; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Dtrace is usually found in /usr/sbin on Solaris, but that directory may not
|
||||
# be in the user path.
|
||||
|
||||
@ -31219,7 +31423,7 @@ $as_echo "no" >&6; }
|
||||
|
||||
|
||||
# Check if the boot jdk is 32 or 64 bit
|
||||
if "$JAVA" -d64 -version > /dev/null 2>&1; then
|
||||
if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then
|
||||
BOOT_JDK_BITS="64"
|
||||
else
|
||||
BOOT_JDK_BITS="32"
|
||||
@ -51261,14 +51465,18 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
|
||||
JVM_CFLAGS="$JVM_CFLAGS -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
|
||||
JVM_CFLAGS="$JVM_CFLAGS -fno-rtti -fno-exceptions -fvisibility=hidden \
|
||||
-mno-omit-leaf-frame-pointer -mstack-alignment=16 -pipe -fno-strict-aliasing \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -mmacosx-version-min=10.7.0 \
|
||||
-fno-omit-frame-pointer"
|
||||
elif test "x$OPENJDK_TARGET_OS" = xaix; then
|
||||
JVM_CFLAGS="$JVM_CFLAGS -DAIX"
|
||||
# We may need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
JVM_CFLAGS="$JVM_CFLAGS -qtune=balanced \
|
||||
-qalias=noansi -qstrict -qtls=default -qlanglvl=c99vla \
|
||||
-qlanglvl=noredefmac -qnortti -qnoeh -qignerrno"
|
||||
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
# Hotspot now overflows its 64K TOC (currently only for slowdebug),
|
||||
# so for slowdebug we build with '-qpic=large -bbigtoc'.
|
||||
if test "x$DEBUG_LEVEL" = xslowdebug; then
|
||||
JVM_CFLAGS="$JVM_CFLAGS -qpic=large"
|
||||
fi
|
||||
elif test "x$OPENJDK_TARGET_OS" = xbsd; then
|
||||
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE"
|
||||
elif test "x$OPENJDK_TARGET_OS" = xwindows; then
|
||||
@ -51435,18 +51643,54 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
|
||||
|
||||
# Additional macosx handling
|
||||
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
||||
# Setting these parameters makes it an error to link to macosx APIs that are
|
||||
# newer than the given OS version and makes the linked binaries compatible
|
||||
# even if built on a newer version of the OS.
|
||||
# The expected format is X.Y.Z
|
||||
# MACOSX_VERSION_MIN is the c++ and ld is -mmacosx-version-min argument. The expected
|
||||
# format is X.Y.Z. It's hard-coded to the minimum OSX version on which the
|
||||
# JDK can be built and makes the linked binaries compatible even if built on
|
||||
# a newer version of the OS.
|
||||
MACOSX_VERSION_MIN=10.7.0
|
||||
|
||||
|
||||
# The macro takes the version with no dots, ex: 1070
|
||||
# Setting --with-macosx-version-max=<version> makes it an error to build or
|
||||
# link to macosx APIs that are newer than the given OS version. The expected
|
||||
# format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
|
||||
|
||||
# Check whether --with-macosx-version-max was given.
|
||||
if test "${with_macosx_version_max+set}" = set; then :
|
||||
withval=$with_macosx_version_max;
|
||||
if echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9]\.[0-9]\$"; then
|
||||
MACOSX_VERSION_MAX=$with_macosx_version_max
|
||||
elif echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\$"; then
|
||||
MACOSX_VERSION_MAX=$with_macosx_version_max
|
||||
elif test "x$with_macosx_version_max" = "xno"; then
|
||||
# Use build system default
|
||||
MACOSX_VERSION_MAX=
|
||||
else
|
||||
as_fn_error $? "osx version format must be nn.n.n or nn.nn.nn" "$LINENO" 5
|
||||
fi
|
||||
|
||||
else
|
||||
MACOSX_VERSION_MAX=
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Let the flags variables get resolved in make for easier override on make
|
||||
# command line.
|
||||
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
# command line. AvailabilityMacros.h versions have no dots, ex: 1070.
|
||||
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
|
||||
-DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
|
||||
-mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
JVM_CFLAGS="$JVM_CFLAGS \
|
||||
-DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
|
||||
-mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
|
||||
if test -n "$MACOSX_VERSION_MAX"; then
|
||||
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
|
||||
JVM_CFLAGS="$JVM_CFLAGS \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Setup some hard coded includes
|
||||
@ -51572,6 +51816,12 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
|
||||
LDFLAGS_XLC="-b64 -brtl -bnolibpath -bexpall -bernotok"
|
||||
LDFLAGS_JDK="${LDFLAGS_JDK} $LDFLAGS_XLC"
|
||||
JVM_LDFLAGS="$JVM_LDFLAGS $LDFLAGS_XLC"
|
||||
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
# Hotspot now overflows its 64K TOC (currently only for slowdebug),
|
||||
# so for slowdebug we build with '-qpic=large -bbigtoc'.
|
||||
if test "x$DEBUG_LEVEL" = xslowdebug; then
|
||||
JVM_LDFLAGS="$JVM_LDFLAGS -bbigtoc"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Customize LDFLAGS for executables
|
||||
@ -52079,14 +52329,18 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
|
||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
|
||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -fno-rtti -fno-exceptions -fvisibility=hidden \
|
||||
-mno-omit-leaf-frame-pointer -mstack-alignment=16 -pipe -fno-strict-aliasing \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -mmacosx-version-min=10.7.0 \
|
||||
-fno-omit-frame-pointer"
|
||||
elif test "x$OPENJDK_BUILD_OS" = xaix; then
|
||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -DAIX"
|
||||
# We may need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -qtune=balanced \
|
||||
-qalias=noansi -qstrict -qtls=default -qlanglvl=c99vla \
|
||||
-qlanglvl=noredefmac -qnortti -qnoeh -qignerrno"
|
||||
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
# Hotspot now overflows its 64K TOC (currently only for slowdebug),
|
||||
# so for slowdebug we build with '-qpic=large -bbigtoc'.
|
||||
if test "x$DEBUG_LEVEL" = xslowdebug; then
|
||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS -qpic=large"
|
||||
fi
|
||||
elif test "x$OPENJDK_BUILD_OS" = xbsd; then
|
||||
OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE"
|
||||
elif test "x$OPENJDK_BUILD_OS" = xwindows; then
|
||||
@ -52253,18 +52507,54 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
|
||||
|
||||
# Additional macosx handling
|
||||
if test "x$OPENJDK_BUILD_OS" = xmacosx; then
|
||||
# Setting these parameters makes it an error to link to macosx APIs that are
|
||||
# newer than the given OS version and makes the linked binaries compatible
|
||||
# even if built on a newer version of the OS.
|
||||
# The expected format is X.Y.Z
|
||||
# MACOSX_VERSION_MIN is the c++ and ld is -mmacosx-version-min argument. The expected
|
||||
# format is X.Y.Z. It's hard-coded to the minimum OSX version on which the
|
||||
# JDK can be built and makes the linked binaries compatible even if built on
|
||||
# a newer version of the OS.
|
||||
MACOSX_VERSION_MIN=10.7.0
|
||||
|
||||
|
||||
# The macro takes the version with no dots, ex: 1070
|
||||
# Setting --with-macosx-version-max=<version> makes it an error to build or
|
||||
# link to macosx APIs that are newer than the given OS version. The expected
|
||||
# format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
|
||||
|
||||
# Check whether --with-macosx-version-max was given.
|
||||
if test "${with_macosx_version_max+set}" = set; then :
|
||||
withval=$with_macosx_version_max;
|
||||
if echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9]\.[0-9]\$"; then
|
||||
MACOSX_VERSION_MAX=$with_macosx_version_max
|
||||
elif echo "$with_macosx_version_max" | $GREP -q "^[0-9][0-9]\.[0-9][0-9]\.[0-9][0-9]\$"; then
|
||||
MACOSX_VERSION_MAX=$with_macosx_version_max
|
||||
elif test "x$with_macosx_version_max" = "xno"; then
|
||||
# Use build system default
|
||||
MACOSX_VERSION_MAX=
|
||||
else
|
||||
as_fn_error $? "osx version format must be nn.n.n or nn.nn.nn" "$LINENO" 5
|
||||
fi
|
||||
|
||||
else
|
||||
MACOSX_VERSION_MAX=
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Let the flags variables get resolved in make for easier override on make
|
||||
# command line.
|
||||
OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
# command line. AvailabilityMacros.h versions have no dots, ex: 1070.
|
||||
OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
|
||||
-DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
|
||||
-mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
OPENJDK_BUILD_LDFLAGS_JDK="$OPENJDK_BUILD_LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS \
|
||||
-DMAC_OS_X_VERSION_MIN_REQUIRED=\$(subst .,,\$(MACOSX_VERSION_MIN)) \
|
||||
-mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
|
||||
|
||||
if test -n "$MACOSX_VERSION_MAX"; then
|
||||
OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
|
||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS \
|
||||
-DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MAX))"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Setup some hard coded includes
|
||||
@ -52390,6 +52680,12 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
|
||||
LDFLAGS_XLC="-b64 -brtl -bnolibpath -bexpall -bernotok"
|
||||
OPENJDK_BUILD_LDFLAGS_JDK="${OPENJDK_BUILD_LDFLAGS_JDK} $LDFLAGS_XLC"
|
||||
OPENJDK_BUILD_JVM_LDFLAGS="$OPENJDK_BUILD_JVM_LDFLAGS $LDFLAGS_XLC"
|
||||
# We need '-qminimaltoc' or '-qpic=large -bbigtoc' if the TOC overflows.
|
||||
# Hotspot now overflows its 64K TOC (currently only for slowdebug),
|
||||
# so for slowdebug we build with '-qpic=large -bbigtoc'.
|
||||
if test "x$DEBUG_LEVEL" = xslowdebug; then
|
||||
OPENJDK_BUILD_JVM_LDFLAGS="$OPENJDK_BUILD_JVM_LDFLAGS -bbigtoc"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Customize LDFLAGS for executables
|
||||
@ -66218,24 +66514,8 @@ fi
|
||||
|
||||
|
||||
if test "$MEMORY_SIZE" -gt "3000"; then
|
||||
|
||||
$ECHO "Check if jvm arg is ok: -d64" >&5
|
||||
$ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5
|
||||
OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1`
|
||||
FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn`
|
||||
FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""`
|
||||
if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
|
||||
SJAVAC_SERVER_JAVA_FLAGS="$SJAVAC_SERVER_JAVA_FLAGS -d64"
|
||||
JVM_ARG_OK=true
|
||||
else
|
||||
$ECHO "Arg failed:" >&5
|
||||
$ECHO "$OUTPUT" >&5
|
||||
JVM_ARG_OK=false
|
||||
fi
|
||||
|
||||
if test "$JVM_ARG_OK" = true; then
|
||||
if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then
|
||||
JVM_64BIT=true
|
||||
JVM_ARG_OK=false
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -48,7 +48,7 @@ MAKE := @MAKE@
|
||||
|
||||
# The default make arguments
|
||||
MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
|
||||
MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" LOG_LEVEL=$(LOG_LEVEL)
|
||||
MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)
|
||||
|
||||
OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
|
||||
OUTPUT_SYNC:=@OUTPUT_SYNC@
|
||||
@ -335,8 +335,10 @@ GCOV_ENABLED=@GCOV_ENABLED@
|
||||
X_CFLAGS:=@X_CFLAGS@
|
||||
X_LIBS:=@X_LIBS@
|
||||
|
||||
# The lowest required version of macosx to enforce compatiblity for
|
||||
# The lowest required version of macosx
|
||||
MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
|
||||
# The highest allowed version of macosx
|
||||
MACOSX_VERSION_MAX=@MACOSX_VERSION_MAX@
|
||||
|
||||
# Toolchain type: gcc, clang, solstudio, lxc, microsoft...
|
||||
TOOLCHAIN_TYPE:=@TOOLCHAIN_TYPE@
|
||||
@ -639,6 +641,7 @@ DIRNAME:=@DIRNAME@
|
||||
DSYMUTIL:=@DSYMUTIL@
|
||||
FIND:=@FIND@
|
||||
FIND_DELETE:=@FIND_DELETE@
|
||||
FLOCK:=@FLOCK@
|
||||
ECHO:=@ECHO@
|
||||
EGREP:=@EGREP@
|
||||
FGREP:=@FGREP@
|
||||
|
||||
@ -52,7 +52,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
|
||||
|
||||
# Minimum supported versions, empty means unspecified
|
||||
TOOLCHAIN_MINIMUM_VERSION_clang="3.2"
|
||||
TOOLCHAIN_MINIMUM_VERSION_gcc="4.3"
|
||||
TOOLCHAIN_MINIMUM_VERSION_gcc="4.7"
|
||||
TOOLCHAIN_MINIMUM_VERSION_microsoft="16.00.30319.01" # VS2010
|
||||
TOOLCHAIN_MINIMUM_VERSION_solstudio="5.13"
|
||||
TOOLCHAIN_MINIMUM_VERSION_xlc=""
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2011, 2017, 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
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
# Default version numbers to use unless overridden by configure
|
||||
|
||||
DEFAULT_VERSION_MAJOR=9
|
||||
DEFAULT_VERSION_MAJOR=10
|
||||
DEFAULT_VERSION_MINOR=0
|
||||
DEFAULT_VERSION_SECURITY=0
|
||||
DEFAULT_VERSION_PATCH=0
|
||||
|
||||
69
common/bin/shell-profiler.sh
Normal file
69
common/bin/shell-profiler.sh
Normal file
@ -0,0 +1,69 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (c) 2012, 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.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# Usage: sh shell-tracer.sh <TIME_CMD_TYPE> <TIME_CMD> <OUTPUT_FILE> <shell command line>
|
||||
#
|
||||
# This shell script is supposed to be set as a replacement for SHELL in make,
|
||||
# causing it to be called whenever make wants to execute shell commands.
|
||||
# The <shell command line> is suitable for passing on to the old shell,
|
||||
# typically beginning with -c.
|
||||
#
|
||||
# This script will run the shell command line and it will also store a simple
|
||||
# log of the the time it takes to execute the command in the OUTPUT_FILE, using
|
||||
# utility for time measure specified with TIME_CMD option.
|
||||
#
|
||||
# Type of time measure utility is specified with TIME_CMD_TYPE option.
|
||||
# Recognized options values of TIME_CMD_TYPE option: "gnutime", "flock".
|
||||
|
||||
TIME_CMD_TYPE="$1"
|
||||
TIME_CMD="$2"
|
||||
OUTPUT_FILE="$3"
|
||||
shift
|
||||
shift
|
||||
shift
|
||||
if [ "$TIME_CMD_TYPE" = "gnutime" ]; then
|
||||
# Escape backslashes (\) and percent chars (%). See man for GNU 'time'.
|
||||
msg=${@//\\/\\\\}
|
||||
msg=${msg//%/%%}
|
||||
"$TIME_CMD" -f "[TIME:%E] $msg" -a -o "$OUTPUT_FILE" "$@"
|
||||
elif [ "$TIME_CMD_TYPE" = "flock" ]; then
|
||||
# Emulated GNU 'time' with 'flock' and 'date'.
|
||||
ts=`date +%s%3N`
|
||||
"$@"
|
||||
status=$?
|
||||
ts2=`date +%s%3N`
|
||||
millis=$((ts2 - ts))
|
||||
ms=$(($millis % 1000))
|
||||
seconds=$((millis / 1000))
|
||||
ss=$(($seconds % 60))
|
||||
minutes=$(($seconds / 60))
|
||||
mm=$(($minutes % 60))
|
||||
hh=$(($minutes / 60)):
|
||||
[ $hh != "0:" ] || hh=
|
||||
# Synchronize on this script.
|
||||
flock -w 10 "$0" printf "[TIME:${hh}${mm}:${ss}.%.2s] %s\n" $ms "$*" >> "$OUTPUT_FILE" || true
|
||||
exit $status
|
||||
else
|
||||
"$@"
|
||||
fi
|
||||
@ -1,47 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright (c) 2012, 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.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# Usage: sh shell-tracer.sh <TIME_CMD> <OUTPUT_FILE> <OLD_SHELL> <shell command line>
|
||||
#
|
||||
# This shell script is supposed to be set as a replacement for SHELL in make,
|
||||
# causing it to be called whenever make wants to execute shell commands.
|
||||
# The <shell command line> is suitable for passing on to the old shell,
|
||||
# typically beginning with -c.
|
||||
#
|
||||
# This script will make sure the shell command line is executed with
|
||||
# OLD_SHELL -x, and it will also store a simple log of the the time it takes to
|
||||
# execute the command in the OUTPUT_FILE, using the "time" utility as pointed
|
||||
# to by TIME_CMD. If TIME_CMD is "-", no timestamp will be stored.
|
||||
|
||||
TIME_CMD="$1"
|
||||
OUTPUT_FILE="$2"
|
||||
OLD_SHELL="$3"
|
||||
shift
|
||||
shift
|
||||
shift
|
||||
if [ "$TIME_CMD" != "-" ]; then
|
||||
"$TIME_CMD" -f "[TIME:%E] $*" -a -o "$OUTPUT_FILE" "$OLD_SHELL" -x "$@"
|
||||
else
|
||||
"$OLD_SHELL" -x "$@"
|
||||
fi
|
||||
@ -387,7 +387,7 @@ var getJibProfilesCommon = function (input, data) {
|
||||
// on such hardware.
|
||||
if (input.build_cpu == "sparcv9") {
|
||||
var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\"");
|
||||
if (cpu_brand.trim().match('SPARC-.7')) {
|
||||
if (cpu_brand.trim().match('SPARC-.[78]')) {
|
||||
boot_jdk_revision = "8u20";
|
||||
boot_jdk_subdirpart = "1.8.0_20";
|
||||
}
|
||||
@ -436,7 +436,8 @@ var getJibProfilesProfiles = function (input, common, data) {
|
||||
target_os: "macosx",
|
||||
target_cpu: "x64",
|
||||
dependencies: ["devkit"],
|
||||
configure_args: concat(common.configure_args_64bit, "--with-zlib=system"),
|
||||
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
|
||||
"--with-macosx-version-max=10.7.0"),
|
||||
},
|
||||
|
||||
"solaris-x64": {
|
||||
@ -615,6 +616,8 @@ var getJibProfilesProfiles = function (input, common, data) {
|
||||
}
|
||||
var testOnlyProfilesPrebuilt = {
|
||||
"run-test-prebuilt": {
|
||||
target_os: input.build_os,
|
||||
target_cpu: input.build_cpu,
|
||||
src: "src.conf",
|
||||
dependencies: [ "jtreg", "gnumake", "boot_jdk", testedProfile + ".jdk",
|
||||
testedProfile + ".test", "src.full"
|
||||
@ -635,13 +638,14 @@ var getJibProfilesProfiles = function (input, common, data) {
|
||||
if (input.profile == "run-test-prebuilt") {
|
||||
if (profiles[testedProfile] == null) {
|
||||
error("testedProfile is not defined: " + testedProfile);
|
||||
} else {
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
|
||||
= profiles[testedProfile]["target_os"];
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
|
||||
= profiles[testedProfile]["target_cpu"];
|
||||
}
|
||||
}
|
||||
if (profiles[testedProfile] != null) {
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
|
||||
= profiles[testedProfile]["target_os"];
|
||||
testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
|
||||
= profiles[testedProfile]["target_cpu"];
|
||||
}
|
||||
profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);
|
||||
|
||||
// On macosx add the devkit bin dir to the path in all the run-test profiles.
|
||||
|
||||
@ -392,11 +392,8 @@ issues.
|
||||
|
||||
### gcc
|
||||
|
||||
The minimum accepted version of gcc is 4.3. Older versions will not be accepted
|
||||
by `configure`.
|
||||
|
||||
However, gcc 4.3 is quite old and OpenJDK is not regularly tested on this
|
||||
version, so it is recommended to use a more modern gcc.
|
||||
The minimum accepted version of gcc is 4.7. Older versions will generate a warning
|
||||
by `configure` and are unlikely to work.
|
||||
|
||||
OpenJDK 9 includes patches that should allow gcc 6 to compile, but this should
|
||||
be considered experimental.
|
||||
|
||||
@ -34,13 +34,16 @@
|
||||
</nav>
|
||||
<h2 id="using-the-run-test-framework">Using the run-test framework</h2>
|
||||
<p>This new way of running tests is developer-centric. It assumes that you have built a jdk locally and want to test it. Running common test targets is simple, and more complex ad-hoc combination of tests is possible. The user interface is forgiving, and clearly report errors it cannot resolve.</p>
|
||||
<p>The main target "run-test" uses the jdk-image as the tested product. There is also an alternate target "exploded-run-test" that uses the exploded image instead. Not all tests will run successfully on the exploded image, but using this target can greatly improve rebuild times for certain workflows.</p>
|
||||
<p>Some example command-lines:</p>
|
||||
<pre><code>$ make run-test-tier1
|
||||
$ make run-test-jdk_lang JTREG="JOBS=8"
|
||||
$ make run-test TEST=jdk_lang
|
||||
$ make run-test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
|
||||
$ make run-test TEST="hotspot/test:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug"
|
||||
$ make run-test TEST="jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java"</code></pre>
|
||||
$ make run-test TEST="jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java"
|
||||
$ make exploded-run-test TEST=hotspot_tier1</code></pre>
|
||||
|
||||
<h3 id="configuration">Configuration</h3>
|
||||
<p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=<path to jtreg home></code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
|
||||
<h2 id="test-selection">Test selection</h2>
|
||||
|
||||
@ -7,6 +7,11 @@ built a jdk locally and want to test it. Running common test targets is simple,
|
||||
and more complex ad-hoc combination of tests is possible. The user interface is
|
||||
forgiving, and clearly report errors it cannot resolve.
|
||||
|
||||
The main target "run-test" uses the jdk-image as the tested product. There is
|
||||
also an alternate target "exploded-run-test" that uses the exploded image
|
||||
instead. Not all tests will run successfully on the exploded image, but using
|
||||
this target can greatly improve rebuild times for certain workflows.
|
||||
|
||||
Some example command-lines:
|
||||
|
||||
$ make run-test-tier1
|
||||
@ -15,6 +20,7 @@ Some example command-lines:
|
||||
$ make run-test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
|
||||
$ make run-test TEST="hotspot/test:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug"
|
||||
$ make run-test TEST="jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java"
|
||||
$ make exploded-run-test TEST=hotspot_tier1
|
||||
|
||||
### Configuration
|
||||
|
||||
|
||||
@ -3517,7 +3517,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -10570,7 +10569,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -18227,7 +18225,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -20787,7 +20784,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -21531,7 +21527,6 @@
|
||||
<Elem>ARCHPROPNAME="x86_64"</Elem>
|
||||
<Elem>DEBUG</Elem>
|
||||
<Elem>MACOSX</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>THIS_FILE="java_props_macosx.c"</Elem>
|
||||
<Elem>_ALLBSD_SOURCE</Elem>
|
||||
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
|
||||
@ -23025,7 +23020,6 @@
|
||||
<Elem>ARCHPROPNAME="x86_64"</Elem>
|
||||
<Elem>DEBUG</Elem>
|
||||
<Elem>MACOSX</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>THIS_FILE="java_props_md.c"</Elem>
|
||||
<Elem>_ALLBSD_SOURCE</Elem>
|
||||
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
|
||||
@ -23104,7 +23098,6 @@
|
||||
<Elem>ARCH="x86_64"</Elem>
|
||||
<Elem>DEBUG</Elem>
|
||||
<Elem>MACOSX</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>THIS_FILE="ExtendedOptionsImpl.c"</Elem>
|
||||
<Elem>_ALLBSD_SOURCE</Elem>
|
||||
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
|
||||
@ -23481,7 +23474,6 @@
|
||||
<Elem>ARCH="x86_64"</Elem>
|
||||
<Elem>DEBUG</Elem>
|
||||
<Elem>MACOSX</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>THIS_FILE="SocketDispatcher.c"</Elem>
|
||||
<Elem>_ALLBSD_SOURCE</Elem>
|
||||
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
|
||||
@ -29987,7 +29979,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -30069,7 +30060,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -30104,7 +30094,6 @@
|
||||
<Elem>ARCH="x86_64"</Elem>
|
||||
<Elem>DEBUG</Elem>
|
||||
<Elem>MACOSX</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>_ALLBSD_SOURCE</Elem>
|
||||
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
|
||||
<Elem>_GNU_SOURCE</Elem>
|
||||
@ -30147,7 +30136,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -30211,7 +30199,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -30274,7 +30261,6 @@
|
||||
<Elem>COMPILER2</Elem>
|
||||
<Elem>DTRACE_ENABLED</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
|
||||
<Elem>TARGET_ARCH_x86</Elem>
|
||||
<Elem>TARGET_COMPILER_gcc</Elem>
|
||||
@ -30341,7 +30327,6 @@
|
||||
<preprocessorList>
|
||||
<Elem>ARCH="x86_64"</Elem>
|
||||
<Elem>MACOSX</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>THIS_FILE="agent_util.c"</Elem>
|
||||
<Elem>_ALLBSD_SOURCE</Elem>
|
||||
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
|
||||
@ -30354,7 +30339,6 @@
|
||||
<preprocessorList>
|
||||
<Elem>ARCH="x86_64"</Elem>
|
||||
<Elem>MACOSX</Elem>
|
||||
<Elem>MAC_OS_X_VERSION_MAX_ALLOWED=1070</Elem>
|
||||
<Elem>THIS_FILE="Agent.cpp"</Elem>
|
||||
<Elem>_ALLBSD_SOURCE</Elem>
|
||||
<Elem>_DARWIN_UNLIMITED_SELECT</Elem>
|
||||
|
||||
@ -396,5 +396,48 @@ f95cc86b6ac22ec1ade5d4f825dc7782adeea228 jdk-9+148
|
||||
77f827f5bbad3ef795664bc675f72d98d156b9f8 jdk-9+151
|
||||
ff8cb43c07c069b1debdee44cb88ca22db1ec757 jdk-9+152
|
||||
68a8e8658511093b322a46ed04b2a321e1da2a43 jdk-9+153
|
||||
d66f97a610a6beac987740edc2bf6a70f46ba574 jdk-10+0
|
||||
078ebe23b584466dc8346e620d7821d91751e5a9 jdk-9+154
|
||||
a545f54babfa31aa7eb611f36031609acd617cbc jdk-9+155
|
||||
907c26240cd481579e919bfd23740797ff8ce1c8 jdk-9+156
|
||||
37c9962586a4d3498fa673d93eab1a336acd7652 jdk-10+1
|
||||
9383da04b385cca46b7ca67f3a39ac1b673e09fe jdk-9+157
|
||||
de6bdf38935fa753183ca288bed5c06a23c0bb12 jdk-9+158
|
||||
6feea77d2083c99e44aa3e272d07b7fb3b801683 jdk-9+159
|
||||
c7688f2fa07936b089ca0e9a0a0eff68ff37a542 jdk-9+160
|
||||
18f02bc43fe96aef36791d0df7aca748485210cc jdk-9+161
|
||||
18ffcf99a3b4a10457853d94190e825bdf07e39b jdk-9+162
|
||||
493011dee80e51c2a2b064d049183c047df36d80 jdk-9+163
|
||||
965bbae3072702f7c0d95c240523b65e6bb19261 jdk-9+164
|
||||
a510b2201154abdd12ede42788086b5283bfb9a6 jdk-9+165
|
||||
934c18145915b06d3fcc0de1a30f91f5aab8a192 jdk-9+166
|
||||
56a8bf5322684e9a31cda64c336c32bcdb592211 jdk-10+2
|
||||
3813c94c8585dd7507887916c6943f45051f1b55 jdk-10+3
|
||||
5d6d891bb36dbeeacaffa06b5a3e3b4e44b35fbd jdk-10+4
|
||||
7c5328012799923d45d1cf87e8725e725b3d298b jdk-10+5
|
||||
c7358d703e1282af3dcd8af6c037dc4342de9054 jdk-10+6
|
||||
43de67f51801b9e16507865fcb7e8344f4ca4aa9 jdk-9+167
|
||||
03a2cc9c8a1e8f87924c9863e917bc8b91770d5f jdk-9+168
|
||||
b2218d41edef02ee8f94bb438f885b2ba79bfa08 jdk-9+169
|
||||
8a4ab3b0ab9a86df73d9a1e337134f2dbe006725 jdk-9+170
|
||||
aed5a4edc8275c1c50195503756ff92bfe0197f5 jdk-10+7
|
||||
648b0a00824eb29e71936bc3258d309a25e3b8c0 jdk-10+8
|
||||
54c6621f7b34cc6ce6c0882d047f61fe0962c257 jdk-10+9
|
||||
c62e5964cfcf144d8f72e9ba69757897785349a9 jdk-9+171
|
||||
080c37fd77e2c4629b91059298e37758afbdbc46 jdk-10+10
|
||||
95ed14547ca9246baed34f90ef3ca13217538a8c jdk-9+172
|
||||
8ef8a0f1c4dfea17e10125e1f885920538e63085 jdk-10+11
|
||||
534ba4f8cfcf12accc5b9adb943103f2ff79fe16 jdk-9+173
|
||||
3615768c12904e29bb2ec1b506cd4633cd8a9ced jdk-9+174
|
||||
00ae6307d78bac49883ddc85d687aa88c49f3971 jdk-10+12
|
||||
dc78a3dd6b3a4f11cdae8a3e3d160e6a78bc7838 jdk-9+175
|
||||
564fced058bd2c8375e9104aa8f9494642cd7bdd jdk-10+13
|
||||
25d991a67cba240eeaf15c19c5857b40fdd71561 jdk-10+14
|
||||
40fb9f229471ef357d493813d34b15afcce9f32b jdk-9+176
|
||||
c72e9d3823f04cb3ef3166646dfea9e4c2769133 jdk-9+177
|
||||
15f59cfc6fbe9387423fb173e962265c7b5d357e jdk-10+15
|
||||
b82b62ed5debda2d98dda597506ef29cf947fbae jdk-10+16
|
||||
9c1e9712648921ae389d623042d22561fad82d75 jdk-9+178
|
||||
24390da83c5ee9e23ceafbcaff4460a01e37bb3a jdk-9+179
|
||||
50ff1fd66362f212a8db6de76089d9d0ffa4df0f jdk-10+17
|
||||
a923b3f30e7bddb4f960059ddfc7978fc63e2e6e jdk-10+18
|
||||
|
||||
@ -1 +1,2 @@
|
||||
project=jdk9
|
||||
project=jdk10
|
||||
bugids=dup
|
||||
|
||||
14
corba/README
14
corba/README
@ -1,14 +0,0 @@
|
||||
README:
|
||||
This file should be located at the top of the corba Mercurial repository.
|
||||
|
||||
See http://openjdk.java.net/ for more information about the OpenJDK.
|
||||
|
||||
See ../README-builds.html for complete details on build machine requirements.
|
||||
|
||||
Simple Build Instructions:
|
||||
|
||||
cd make && gnumake
|
||||
|
||||
The files that will be imported into the jdk build will be in the "dist"
|
||||
directory.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||
@ -6,7 +6,7 @@
|
||||
<title>package</title>
|
||||
<!--
|
||||
|
||||
Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
|
||||
Copyright (c) 2003, 2017, 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
|
||||
|
||||
@ -62,6 +62,8 @@ import com.sun.corba.se.impl.orbutil.GetPropertyAction;
|
||||
* attempts to narrow it to conform to
|
||||
* the given interface. If the operation is successful the result will be an
|
||||
* object of the specified type, otherwise an exception will be thrown.
|
||||
*
|
||||
* <p>See also {@extLink rmi_iiop_guides RMI-IIOP developer's guides}.</p>
|
||||
*/
|
||||
public class PortableRemoteObject {
|
||||
|
||||
|
||||
@ -25,16 +25,22 @@
|
||||
|
||||
/**
|
||||
* Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API.
|
||||
*
|
||||
* <p> This module is upgradeable.
|
||||
*
|
||||
* @moduleGraph
|
||||
* @since 9
|
||||
*/
|
||||
@Deprecated(since="9", forRemoval=true)
|
||||
module java.corba {
|
||||
requires transitive java.desktop;
|
||||
requires transitive java.rmi;
|
||||
requires java.logging;
|
||||
requires java.naming;
|
||||
requires java.transaction;
|
||||
requires jdk.unsupported;
|
||||
|
||||
requires transitive java.desktop;
|
||||
requires transitive java.rmi;
|
||||
|
||||
exports javax.activity;
|
||||
exports javax.rmi;
|
||||
exports javax.rmi.CORBA;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* the Activity, or that the Activity completed in a manner other than that
|
||||
* originally requested.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since J2SE 1.5
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2017, 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
|
||||
@ -31,8 +31,8 @@ package org.omg.CORBA;
|
||||
* Activity context was necessary to perform the invoked operation, but one
|
||||
* was not found associated with the calling thread.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since J2SE 1.5
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, 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
|
||||
@ -52,7 +52,7 @@ import org.omg.CORBA.portable.IDLEntity;
|
||||
* </OL>
|
||||
*
|
||||
* <P>
|
||||
* <a name="anyOps"></a>
|
||||
* <a id="anyOps"></a>
|
||||
* A large part of the <code>Any</code> class consists of pairs of methods
|
||||
* for inserting values into and extracting values from an
|
||||
* <code>Any</code> object.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -32,8 +32,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -34,8 +34,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -32,8 +32,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -37,10 +37,9 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">meaning of
|
||||
* minor codes</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions},
|
||||
* {@extLink jidlexception_minorcodes meaning of minor codes}
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2017, 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
|
||||
@ -30,8 +30,8 @@ package org.omg.CORBA;
|
||||
* support the quality of service required by an invocation parameter that
|
||||
* has a quality of service semantics associated with it.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since J2SE 1.5
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -32,8 +32,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, 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
|
||||
@ -30,8 +30,8 @@ package org.omg.CORBA;
|
||||
* the legal bounds for the object that a method is trying
|
||||
* to access.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class Bounds extends org.omg.CORBA.UserException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2014, 2017, 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
|
||||
@ -29,7 +29,7 @@ package org.omg.CORBA;
|
||||
/**
|
||||
* This Helper class is used to facilitate the marshalling of {@code Bounds}.
|
||||
* For more information on Helper files, see
|
||||
* <a href="doc-files/generatedfiles.html#helper">
|
||||
* <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
|
||||
* "Generated Files: Helper Files"</a>.
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2017, 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
|
||||
@ -29,8 +29,8 @@ package org.omg.CORBA;
|
||||
* This exception is raised whenever meaningful communication is not possible
|
||||
* between client and server native code sets.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since J2SE 1.5
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -33,11 +33,11 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">meaning
|
||||
* of minor codes</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes Minor Code Meanings}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">meaning of
|
||||
* minor codes</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -35,11 +35,11 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">meaning
|
||||
* of minor codes</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes Minor Code Meanings}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -36,8 +36,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -34,8 +34,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -33,11 +33,11 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">meaning
|
||||
* of minor codes</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes meaning of minor codes}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -34,8 +34,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2017, 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
|
||||
@ -32,8 +32,8 @@ package org.omg.CORBA;
|
||||
* suspended. It is also raised when an attempted invocation is made that
|
||||
* is incompatible with the Activity's current state.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since J2SE 1.5
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, 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
|
||||
@ -34,8 +34,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*
|
||||
*/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -34,8 +34,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -37,11 +37,11 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">Minor
|
||||
* Code Meanings</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes Minor Code Meanings}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class INV_POLICY extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -39,8 +39,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">Minor
|
||||
* Code Meanings</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes Minor Code Meanings}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
@ -36,8 +36,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">Minor
|
||||
* Code Meanings</A> to see the minor codes for this exception.
|
||||
* See the section {extLink jidlexception_minorcodes Minor Code Meanings}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -32,8 +32,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -32,8 +32,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -39,11 +39,11 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">Minor
|
||||
* Code Meanings</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes Minor Code Meanings}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -34,11 +34,11 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">Minor
|
||||
* Code Meanings</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes Minor Code Meanings}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since JDK1.2
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -85,13 +85,17 @@ import java.security.PrivilegedAction;
|
||||
* three {@code init} methods. Two of the three methods use the properties
|
||||
* (associations of a name with a value) shown in the
|
||||
* table below.<BR>
|
||||
* <TABLE BORDER=1 SUMMARY="Standard Java CORBA Properties">
|
||||
* <TR><TH>Property Name</TH> <TH>Property Value</TH></TR>
|
||||
* <TABLE class="plain">
|
||||
* <CAPTION>Standard Java CORBA Properties:</CAPTION>
|
||||
* <thead>
|
||||
* <TR><TH>Property Name</TH> <TH>Property Value</TH></TR>
|
||||
* </thead>
|
||||
* <tbody>
|
||||
* <TR><TD>org.omg.CORBA.ORBClass</TD>
|
||||
* <TD>class name of an ORB implementation</TD></TR>
|
||||
* <TR><TD>org.omg.CORBA.ORBSingletonClass</TD>
|
||||
* <TD>class name of the ORB returned by {@code init()}</TD></TR>
|
||||
* </tbody>
|
||||
* </TABLE>
|
||||
* <P>
|
||||
* These properties allow a different vendor's {@code ORB}
|
||||
@ -106,13 +110,13 @@ import java.security.PrivilegedAction;
|
||||
*
|
||||
* <LI>check in properties parameter, if any
|
||||
*
|
||||
* <LI>check in the System properties
|
||||
* <LI>check in the System properties, if any
|
||||
*
|
||||
* <LI>check in the orb.properties file located in the user.home
|
||||
* directory (if any)
|
||||
* directory, if any
|
||||
*
|
||||
* <LI>check in the orb.properties file located in the java.home/lib
|
||||
* directory (if any)
|
||||
* <LI>check in the orb.properties file located in the run-time image,
|
||||
* if any
|
||||
*
|
||||
* <LI>fall back on a hardcoded default behavior (use the Java IDL
|
||||
* implementation)
|
||||
@ -170,9 +174,17 @@ import java.security.PrivilegedAction;
|
||||
* Thus, where appropriate, it is necessary that
|
||||
* the classes for this alternative ORBSingleton are available on the application's class path.
|
||||
* It should be noted that the singleton ORB is system wide.
|
||||
*
|
||||
* <P>
|
||||
* When a per-application ORB is created via the 2-arg init methods,
|
||||
* then it will be located using the thread context class loader.
|
||||
* <P>
|
||||
* The IDL to Java Language OMG specification documents the ${java.home}/lib directory as the location,
|
||||
* in the Java run-time image, to search for orb.properties.
|
||||
* This location is not intended for user editable configuration files.
|
||||
* Therefore, the implementation first checks the ${java.home}/conf directory for orb.properties,
|
||||
* and thereafter the ${java.home}/lib directory.
|
||||
*
|
||||
* <p>See also {@extLink idl_guides IDL developer's guide}.</p>
|
||||
*
|
||||
* @since JDK1.2
|
||||
*/
|
||||
@ -271,14 +283,25 @@ abstract public class ORB {
|
||||
}
|
||||
|
||||
String javaHome = System.getProperty("java.home");
|
||||
fileName = javaHome + File.separator
|
||||
+ "lib" + File.separator + "orb.properties";
|
||||
props = getFileProperties( fileName ) ;
|
||||
|
||||
fileName = javaHome + File.separator + "conf"
|
||||
+ File.separator + "orb.properties";
|
||||
props = getFileProperties(fileName);
|
||||
|
||||
if (props != null) {
|
||||
String value = props.getProperty(name);
|
||||
if (value != null)
|
||||
return value;
|
||||
}
|
||||
|
||||
fileName = javaHome + File.separator + "lib"
|
||||
+ File.separator + "orb.properties";
|
||||
props = getFileProperties(fileName);
|
||||
|
||||
if (props == null)
|
||||
return null ;
|
||||
return null;
|
||||
else
|
||||
return props.getProperty( name ) ;
|
||||
return props.getProperty(name);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2014, 2017, 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
|
||||
@ -30,7 +30,7 @@ package org.omg.CORBA.ORBPackage;
|
||||
* This Helper class is used to facilitate the marshalling of
|
||||
* {@code ORBPackage/InvalidName}.
|
||||
* For more information on Helper files, see
|
||||
* <a href="doc-files/generatedfiles.html#helper">
|
||||
* <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
|
||||
* "Generated Files: Helper Files"</a>.
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class PERSIST_STORE extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* This exception is also raised if the current effective RebindPolicy has
|
||||
* a value of NO_RECONNECT and a connection must be reopened.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since J2SE 1.5
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -44,8 +44,8 @@ import com.sun.corba.se.impl.util.SUNVMCID;
|
||||
* declared in signatures of the Java methods mapped from operations in
|
||||
* IDL interfaces.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public abstract class SystemException extends java.lang.RuntimeException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2004, 2017, 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
|
||||
@ -30,8 +30,8 @@ package org.omg.CORBA;
|
||||
* specified time-to-live period has been exceeded. It is a standard system
|
||||
* exception because time-to-live QoS can be applied to any invocation.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @since J2SE 1.5
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2000, 2017, 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
|
||||
@ -35,8 +35,8 @@ package org.omg.CORBA;
|
||||
* a string describing the exception.
|
||||
* The OMG CORBA core 2.4 specification has details.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class TRANSACTION_MODE extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, 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
|
||||
@ -33,8 +33,8 @@ package org.omg.CORBA;
|
||||
* a string describing the exception.
|
||||
* The OMG Transaction Service specfication has details.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class TRANSACTION_REQUIRED extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, 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
|
||||
@ -36,8 +36,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class TRANSACTION_ROLLEDBACK extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2000, 2017, 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
|
||||
@ -35,8 +35,8 @@ package org.omg.CORBA;
|
||||
* a string describing the exception.
|
||||
* The OMG CORBA core 2.4 specification has details.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class TRANSACTION_UNAVAILABLE extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -36,8 +36,8 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class TRANSIENT extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2014, 2017, 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
|
||||
@ -30,7 +30,7 @@ package org.omg.CORBA.TypeCodePackage;
|
||||
* This Helper class is used to facilitate the marshalling of
|
||||
* {@code TypeCodePackage/BadKind}.
|
||||
* For more information on Helper files, see
|
||||
* <a href="doc-files/generatedfiles.html#helper">
|
||||
* <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
|
||||
* "Generated Files: Helper Files"</a>.
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2014, 2017, 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
|
||||
@ -30,7 +30,7 @@ package org.omg.CORBA.TypeCodePackage;
|
||||
* This Helper class is used to facilitate the marshalling of
|
||||
* {@code TypeCodePackage/Bounds}.
|
||||
* For more information on Helper files, see
|
||||
* <a href="doc-files/generatedfiles.html#helper">
|
||||
* <a href="{@docRoot}/org/omg/CORBA/doc-files/generatedfiles.html#helper">
|
||||
* "Generated Files: Helper Files"</a>.
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -39,11 +39,11 @@ package org.omg.CORBA;
|
||||
* what caused the exception, and a completion status. It may also contain
|
||||
* a string describing the exception.
|
||||
* <P>
|
||||
* See the section <A href="../../../../technotes/guides/idl/jidlExceptions.html#minorcodemeanings">Minor
|
||||
* Code Meanings</A> to see the minor codes for this exception.
|
||||
* See the section {@extLink jidlexception_minorcodes Minor Code Meaning}
|
||||
* to see the minor codes for this exception.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class UNKNOWN extends SystemException {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, 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
|
||||
@ -32,8 +32,8 @@ package org.omg.CORBA;
|
||||
* <code>UnknownUserException</code> object. This is available from the
|
||||
* <code>Environment</code> object returned by the method <code>Request.env</code>.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
* @see Request
|
||||
*/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1995, 2017, 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
|
||||
@ -31,8 +31,8 @@ package org.omg.CORBA;
|
||||
* means that they need to
|
||||
* be declared in method signatures.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
public abstract class UserException extends java.lang.Exception implements org.omg.CORBA.portable.IDLEntity {
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, 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
|
||||
@ -34,8 +34,8 @@ package org.omg.CORBA;
|
||||
* which the client originally sent the request.
|
||||
* See the OMG Transaction Service Specification for details.
|
||||
*
|
||||
* @see <A href="../../../../technotes/guides/idl/jidlExceptions.html">documentation on
|
||||
* Java IDL exceptions</A>
|
||||
* <p>See also {@extLink jidlexception documentation on Java IDL exceptions}.
|
||||
* </p>
|
||||
*/
|
||||
|
||||
public final class WrongTransaction extends UserException {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html">
|
||||
@ -42,7 +42,7 @@ is the name of an IDL interface.
|
||||
</UL>
|
||||
|
||||
|
||||
<H2><a name="helper">Helper Files</a></H2>
|
||||
<H2><a id="helper">Helper Files</a></H2>
|
||||
|
||||
<P>Helper files supply several static methods needed to manipulate the type.
|
||||
These include <code>Any</code> insert and extract operations for the type,
|
||||
@ -57,7 +57,7 @@ the object reference does not support the requested type. A different system exc
|
||||
is raised to indicate other kinds of errors. Trying to narrow
|
||||
a null will always succeed with a return value of null.
|
||||
|
||||
<H2><a name="holder">Holder Files</a></H2>
|
||||
<H2><a id="holder">Holder Files</a></H2>
|
||||
|
||||
<P>Support for out and inout parameter passing modes requires the use of additional holder classes.
|
||||
These classes are available for all of the basic IDL datatypes in the <code>org.omg.CORBA</code> package
|
||||
@ -74,7 +74,7 @@ false for boolean, 0 for numeric and char types, null for strings, null for obje
|
||||
the <code>org.omg.CORBA.portable.Streamable</code> interface.
|
||||
|
||||
|
||||
<H2><a name="operations">Operations Files</a></H2>
|
||||
<H2><a id="operations">Operations Files</a></H2>
|
||||
|
||||
<P>A non abstract IDL interface is mapped to two public Java interfaces:
|
||||
a <em>signature</em> interface and an <em>operations</em> interface.
|
||||
@ -96,7 +96,7 @@ expressed in IDL is reflected in both the Java signature
|
||||
interface and operations interface hierarchies.
|
||||
|
||||
|
||||
<H2><a name="stub">Stubs</a></H2>
|
||||
<H2><a id="stub">Stubs</a></H2>
|
||||
|
||||
<P>For the mapping of a non-object-oriented language, there will be
|
||||
a programming interface to the stubs for each interface type. Generally, the stubs
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
<!doctype html>
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
|
||||
@ -6,7 +7,7 @@
|
||||
<TITLE>package</TITLE>
|
||||
<!--
|
||||
/*
|
||||
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2017, 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
|
||||
@ -31,9 +32,8 @@
|
||||
*/
|
||||
-->
|
||||
</HEAD>
|
||||
<BODY BGCOLOR="#FFFFFF">
|
||||
Provides the mapping of the OMG CORBA APIs to the Java<SUP><FONT
|
||||
SIZE=-2>TM</FONT></SUP>
|
||||
<BODY>
|
||||
Provides the mapping of the OMG CORBA APIs to the Java™
|
||||
programming language, including the class <code>ORB</code>, which is implemented
|
||||
so that a programmer can use it as a fully-functional Object Request Broker
|
||||
(ORB).
|
||||
@ -147,9 +147,7 @@ resolve initial object references. These are:
|
||||
<code><b>register_initial_reference</b>(String id, org.omg.CORBA.Object obj)</code>
|
||||
</UL>
|
||||
|
||||
<P>An example that uses some of these methods is <A
|
||||
HREF="{@docRoot}/../technotes/guides/idl/GShome.html">
|
||||
<em>Getting Started with Java IDL</em></A>.
|
||||
<P>An example that uses some of these methods is {@extLink idl_getting_started Getting Started with Java IDL}.
|
||||
|
||||
<H2>
|
||||
Exceptions</H2>
|
||||
@ -158,9 +156,8 @@ Java programming language. If a method is defined to throw an exception,
|
||||
then any code using that method must have a <code>try</code>/<code>catch</code>
|
||||
block and handle that exception when it is thrown.
|
||||
|
||||
<P>The documentation on <A
|
||||
HREF="{@docRoot}/../technotes/guides/idl/jidlExceptions.html"><em>Java
|
||||
IDL exceptions</em></A> has more information and explains the difference between
|
||||
<P>The documentation on {@extLink jidlexception Java IDL exceptions }
|
||||
has more information and explains the difference between
|
||||
system exceptions and user-defined exceptions.
|
||||
|
||||
<P>The following is a list of the system exceptions (which are unchecked
|
||||
@ -427,7 +424,7 @@ will contain the static methods needed for manipulating instances of the type,
|
||||
in this case, <code>Account</code> objects.
|
||||
|
||||
|
||||
<a name="narrow"></a>
|
||||
<a id="narrow"></a>
|
||||
<h3>The <code>narrow</code> Method</h3>
|
||||
When an object is the return value for a method, it is returned in the
|
||||
form of a generic object, either an <code>org.omg.CORBA.Object</code> object
|
||||
@ -447,8 +444,8 @@ object, whereas the <code>narrow</code> method for an interface that is abstract
|
||||
will take an object in the Java programming language. The helper class for a
|
||||
non-abstract interface that has at least one abstract base interface will provide
|
||||
both versions of the <code>narrow</code> method.
|
||||
<P>The <A HREF="{@docRoot}/../technotes/guides/idl/jidlExample.html"><em>Hello World</em></A>
|
||||
tutorial uses a <code>narrow</code> method that looks like this:
|
||||
<P>The {@extLink idl_guides Hello World tutorial}
|
||||
uses a <code>narrow</code> method that looks like this:
|
||||
<PRE>
|
||||
// create and initialize the ORB
|
||||
ORB orb = ORB.init(args, null);
|
||||
@ -465,7 +462,7 @@ tutorial uses a <code>narrow</code> method that looks like this:
|
||||
helloImpl = HelloHelper.narrow(ncRef.resolve_str(name));
|
||||
</PRE>
|
||||
|
||||
<a name="basic"></a>
|
||||
<a id="basic"></a>
|
||||
<h3>Example of a Basic Helper Class</h3>
|
||||
A basic helper class, for purposes of this explanation, is one with
|
||||
the methods that are provided by every helper class, plus a <code>narrow</code>
|
||||
@ -548,6 +545,7 @@ abstract public class AccountHelper
|
||||
}
|
||||
</PRE>
|
||||
|
||||
<a id="value"></a>
|
||||
<h3>Value Type Helper Classes</h3>
|
||||
A helper class for a value type includes different renderings of
|
||||
the same methods generated for non-value type methods. The main difference
|
||||
@ -671,7 +669,7 @@ abstract public class AddressHelper
|
||||
WStringSeqHelper
|
||||
WStringValueHelper
|
||||
</code></PRE>
|
||||
<a name="adv"></a>
|
||||
<a id="adv"></a>
|
||||
<H1>
|
||||
Other Classes</H1>
|
||||
The other classes and interfaces in the <code>CORBA</code> package, which are
|
||||
@ -861,24 +859,24 @@ ValueMember
|
||||
Related Documentation</H1>
|
||||
For overviews, guides, and a tutorial, please see:
|
||||
<UL>
|
||||
<LI>
|
||||
<A HREF="{@docRoot}/../technotes/guides/idl/index.html">Java IDL home page</A>
|
||||
<LI> {@extLink idl_guides Java IDL tutorial page}.</LI>
|
||||
<LI> {@extLink rmi_iiop_guides RMI-IIOP developer's guide}.</LI>
|
||||
</UL>
|
||||
|
||||
|
||||
|
||||
|
||||
<P><A NAME="unimpl"></A>
|
||||
<P><A id="unimpl"></A>
|
||||
<H1>
|
||||
CORBA Features Not Implemented in Java IDL</H1>
|
||||
|
||||
<P>Some of the API included in <code>org.omg</code> subpackages is provided for
|
||||
conformance with the current OMG CORBA specification but is not implemented
|
||||
in Sun's release of the JDK<SUP><FONT SIZE=-2>TM</FONT></SUP>. This enables
|
||||
in Sun's release of the JDK™. This enables
|
||||
other JDK licensees to provide implementations of this API in standard
|
||||
extensions and products.
|
||||
|
||||
<P><A NAME="NO_IMPLEMENT"></A>
|
||||
<P><A id="NO_IMPLEMENT"></A>
|
||||
<h2>Features That Throw NO_IMPLEMENT</h2>
|
||||
|
||||
<P>Some of the API included in <code>org.omg</code> subpackages throw
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<!--
|
||||
Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
Copyright (c) 1998, 2017, 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
|
||||
@ -26,7 +26,7 @@ or visit www.oracle.com if you need additional information or have any
|
||||
questions.
|
||||
-->
|
||||
</head>
|
||||
<body bgcolor="white">
|
||||
<body>
|
||||
|
||||
Provides a portability layer, that is, a set of ORB APIs
|
||||
that makes it possible for code generated
|
||||
@ -38,7 +38,7 @@ can call into these ORB APIs.
|
||||
|
||||
|
||||
<p>
|
||||
<a name="unimpl"></a>
|
||||
<a id="unimpl"></a>
|
||||
<hr>
|
||||
<h1>CORBA Features Throwing NO_IMPLEMENT() Exceptions</h1>
|
||||
<hr>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||
@ -6,7 +6,7 @@
|
||||
<title>package</title>
|
||||
<!--
|
||||
/*
|
||||
* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1999, 2017, 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
|
||||
@ -31,7 +31,7 @@
|
||||
*/
|
||||
-->
|
||||
</head>
|
||||
<body bgcolor="#FFFFFF">
|
||||
<body>
|
||||
The CORBA_2_3 package defines additions to existing CORBA interfaces
|
||||
in the Java[tm] Standard Edition 6. These changes occurred in recent
|
||||
revisions to the CORBA API defined by the OMG. The new methods were
|
||||
@ -46,7 +46,7 @@ the Java[tm] Platform, Standard Edition 6, ORB complies, see <A
|
||||
HREF="../CORBA/doc-files/compliance.html">Official Specifications for CORBA
|
||||
support in Java[tm] SE 6</A>.
|
||||
<P>
|
||||
<a name="unimpl"></a>
|
||||
<a id="unimpl"></a>
|
||||
The following methods in the abstract class
|
||||
<code>org.omg.CORBA_2_3.ORB</code> are unimplemented:
|
||||
<UL>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<!--
|
||||
/*
|
||||
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1998, 2017, 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
|
||||
@ -334,14 +334,12 @@ href="http://www.omg.org/cgi-bin/doc?ptc/00-08-07">ptc/00-08-07</a>)
|
||||
For an overview and examples of how to use the
|
||||
<code>CosNaming</code> API, please see:
|
||||
<ul>
|
||||
<li><a href="../../../../technotes/guides/idl/tnameserv.html">
|
||||
Naming Service</a>
|
||||
<li>{@extLink tnameserv NamingService}
|
||||
</ul>
|
||||
<p>
|
||||
For an overview of Java IDL, please see:
|
||||
<ul>
|
||||
<li><a href="../../../../technotes/guides/idl/index.html">
|
||||
Java IDL home page</a>
|
||||
<li>{@extLink idl_guides Java IDL developer's home page}
|
||||
</ul>
|
||||
|
||||
@since JDK1.3
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2000, 2017, 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
|
||||
@ -425,7 +425,7 @@ module IOP {
|
||||
* encoded using GIOP 1.2 with a TCS-W of UTF-16. This service context
|
||||
* may be sent on Reply messages with a reply_status of SYSTEM_EXCEPTION
|
||||
* or USER_EXCEPTION. The usage of this service context is defined
|
||||
* by language mappings. <br/> <br/>
|
||||
* by language mappings. <br> <br>
|
||||
*
|
||||
* IDL/Java: ptc/02-01-22: 1.15.2:
|
||||
* When a System Exception is marshaled, its GIOP Reply message shall
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2000, 2017, 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
|
||||
@ -580,7 +580,8 @@ module PortableInterceptor {
|
||||
* to access it will result in a <code>BAD_INV_ORDER</code> being thrown
|
||||
* with a standard minor code of 14.
|
||||
*
|
||||
* <table border=1 summary="Shows the validity of each attribute or operation">
|
||||
* <table class="plain">
|
||||
* <caption style="display:none">Shows the validity of each attribute or operation</caption>
|
||||
* <thead>
|
||||
* <tr>
|
||||
* <th> </th>
|
||||
@ -597,42 +598,42 @@ module PortableInterceptor {
|
||||
* <td id="ri" colspan=6><i>Inherited from RequestInfo:</i></td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="req_id"><p align="left">request_id</p></th>
|
||||
* <tr><th id="req_id"><p style="text-align:left">request_id</p></th>
|
||||
* <td headers="ri req_id send_req">yes</td>
|
||||
* <td headers="ri req_id send_poll">yes</td>
|
||||
* <td headers="ri req_id rec_reply">yes</td>
|
||||
* <td headers="ri req_id rec_ex">yes</td>
|
||||
* <td headers="ri req_id rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="op"><p align="left">operation</p></th>
|
||||
* <tr><th id="op"><p style="text-align:left">operation</p></th>
|
||||
* <td headers="ri op send_req">yes</td>
|
||||
* <td headers="ri op send_poll">yes</td>
|
||||
* <td headers="ri op rec_reply">yes</td>
|
||||
* <td headers="ri op rec_ex">yes</td>
|
||||
* <td headers="ri op rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="arg"><p align="left">arguments</p></th>
|
||||
* <tr><th id="arg"><p style="text-align:left">arguments</p></th>
|
||||
* <td headers="ri arg send_req">yes<sub>1</sub></td>
|
||||
* <td headers="ri arg send_poll">no </td>
|
||||
* <td headers="ri arg rec_reply">yes</td>
|
||||
* <td headers="ri arg rec_ex">no </td>
|
||||
* <td headers="ri arg rec_oth">no </td></tr>
|
||||
*
|
||||
* <tr><th id="exc"><p align="left">exceptions</p></th>
|
||||
* <tr><th id="exc"><p style="text-align:left">exceptions</p></th>
|
||||
* <td headers="ri exc send_req">yes</td>
|
||||
* <td headers="ri exc send_poll">no </td>
|
||||
* <td headers="ri exc rec_reply">yes</td>
|
||||
* <td headers="ri exc rec_ex">yes</td>
|
||||
* <td headers="ri exc rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="con"><p align="left">contexts</p></th>
|
||||
* <tr><th id="con"><p style="text-align:left">contexts</p></th>
|
||||
* <td headers="ri con send_req">yes</td>
|
||||
* <td headers="ri con send_poll">no </td>
|
||||
* <td headers="ri con rec_reply">yes</td>
|
||||
* <td headers="ri con rec_ex">yes</td>
|
||||
* <td headers="ri con rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="op_con"><p align="left">operation_context</p></th>
|
||||
* <tr><th id="op_con"><p style="text-align:left">operation_context</p></th>
|
||||
* <td headers="ri op_con send_req">yes</td>
|
||||
* <td headers="ri op_con send_poll">no </td>
|
||||
* <td headers="ri op_con rec_reply">yes</td>
|
||||
@ -640,7 +641,7 @@ module PortableInterceptor {
|
||||
* <td headers="ri op_con rec_oth">yes</td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="result"><p align="left">result</p></th>
|
||||
* <tr><th id="result"><p style="text-align:left">result</p></th>
|
||||
* <td headers="ri result send_req">no </td>
|
||||
* <td headers="ri result send_poll">no </td>
|
||||
* <td headers="ri result rec_reply">yes</td>
|
||||
@ -648,14 +649,14 @@ module PortableInterceptor {
|
||||
* <td headers="ri result rec_oth">no </td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="res_exp"><p align="left">response_expected</p></th>
|
||||
* <tr><th id="res_exp"><p style="text-align:left">response_expected</p></th>
|
||||
* <td headers="ri res_exp send_req">yes</td>
|
||||
* <td headers="ri res_exp send_poll">yes</td>
|
||||
* <td headers="ri res_exp rec_reply">yes</td>
|
||||
* <td headers="ri res_exp rec_ex">yes</td>
|
||||
* <td headers="ri res_exp rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="sync_sco"><p align="left">sync_scope</p></th>
|
||||
* <tr><th id="sync_sco"><p style="text-align:left">sync_scope</p></th>
|
||||
* <td headers="ri sync_sco send_req">yes</td>
|
||||
* <td headers="ri sync_sco send_poll">no </td>
|
||||
* <td headers="ri sync_sco rec_reply">yes</td>
|
||||
@ -663,14 +664,14 @@ module PortableInterceptor {
|
||||
* <td headers="ri sync_sco rec_oth">yes</td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="rep_stat"><p align="left">reply_status</p></th>
|
||||
* <tr><th id="rep_stat"><p style="text-align:left">reply_status</p></th>
|
||||
* <td headers="ri rep_stat send_req">no </td>
|
||||
* <td headers="ri rep_stat send_poll">no </td>
|
||||
* <td headers="ri rep_stat rec_reply">yes</td>
|
||||
* <td headers="ri rep_stat rec_ex">yes</td>
|
||||
* <td headers="ri rep_stat rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="for_ref"><p align="left">forward_reference</p></th>
|
||||
* <tr><th id="for_ref"><p style="text-align:left">forward_reference</p></th>
|
||||
* <td headers="ri for_ref send_req">no </td>
|
||||
* <td headers="ri for_ref send_poll">no </td>
|
||||
* <td headers="ri for_ref rec_reply">no </td>
|
||||
@ -678,21 +679,21 @@ module PortableInterceptor {
|
||||
* <td headers="ri for_ref rec_oth">yes<sub>2</sub>
|
||||
* </td></tr>
|
||||
*
|
||||
* <tr><th id="get_slot"><p align="left">get_slot</p></th>
|
||||
* <tr><th id="get_slot"><p style="text-align:left">get_slot</p></th>
|
||||
* <td headers="ri get_slot send_req">yes</td>
|
||||
* <td headers="ri get_slot send_poll">yes</td>
|
||||
* <td headers="ri get_slot rec_reply">yes</td>
|
||||
* <td headers="ri get_slot rec_ex">yes</td>
|
||||
* <td headers="ri get_slot rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="grsc"><p align="left">get_request_service_context</p></th>
|
||||
* <tr><th id="grsc"><p style="text-align:left">get_request_service_context</p></th>
|
||||
* <td headers="ri grsc send_req">yes</td>
|
||||
* <td headers="ri grsc send_poll">no </td>
|
||||
* <td headers="ri grsc rec_reply">yes</td>
|
||||
* <td headers="ri grsc rec_ex">yes</td>
|
||||
* <td headers="ri grsc rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="gpsc"><p align="left">get_reply_service_context</p></th>
|
||||
* <tr><th id="gpsc"><p style="text-align:left">get_reply_service_context</p></th>
|
||||
* <td headers="ri gpsc send_req">no </td>
|
||||
* <td headers="ri gpsc send_poll">no </td>
|
||||
* <td headers="ri gpsc rec_reply">yes</td>
|
||||
@ -704,14 +705,14 @@ module PortableInterceptor {
|
||||
* <td id="cri" colspan=6><i>ClientRequestInfo-specific:</i></td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="target"><p align="left">target</p></th>
|
||||
* <tr><th id="target"><p style="text-align:left">target</p></th>
|
||||
* <td headers="cri target send_req">yes</td>
|
||||
* <td headers="cri target send_poll">yes</td>
|
||||
* <td headers="cri target rec_reply">yes</td>
|
||||
* <td headers="cri target rec_ex">yes</td>
|
||||
* <td headers="cri target rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="eftarget"><p align="left">effective_target</p></th>
|
||||
* <tr><th id="eftarget"><p style="text-align:left">effective_target</p></th>
|
||||
* <td headers="cri eftarget send_req">yes</td>
|
||||
* <td headers="cri eftarget send_poll">yes</td>
|
||||
* <td headers="cri eftarget rec_reply">yes</td>
|
||||
@ -719,49 +720,49 @@ module PortableInterceptor {
|
||||
* <td headers="cri eftarget rec_oth">yes</td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="efprof"><p align="left">effective_profile</p></th>
|
||||
* <tr><th id="efprof"><p style="text-align:left">effective_profile</p></th>
|
||||
* <td headers="cri efprof send_req">yes</td>
|
||||
* <td headers="cri efprof send_poll">yes</td>
|
||||
* <td headers="cri efprof rec_reply">yes</td>
|
||||
* <td headers="cri efprof rec_ex">yes</td>
|
||||
* <td headers="cri efprof rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="rxp"><p align="left">received_exception</p></th>
|
||||
* <tr><th id="rxp"><p style="text-align:left">received_exception</p></th>
|
||||
* <td headers="cri rxp send_req">no </td>
|
||||
* <td headers="cri rxp send_poll">no </td>
|
||||
* <td headers="cri rxp rec_reply">no </td>
|
||||
* <td headers="cri rxp rec_ex">yes</td>
|
||||
* <td headers="cri rxp rec_oth">no </td></tr>
|
||||
*
|
||||
* <tr><th id="rei"><p align="left">received_exception_id</p></th>
|
||||
* <tr><th id="rei"><p style="text-align:left">received_exception_id</p></th>
|
||||
* <td headers="cri rei send_req">no </td>
|
||||
* <td headers="cri rei send_poll">no </td>
|
||||
* <td headers="cri rei rec_reply">no </td>
|
||||
* <td headers="cri rei rec_ex">yes</td>
|
||||
* <td headers="cri rei rec_oth">no </td></tr>
|
||||
*
|
||||
* <tr><th id="gec"><p align="left">get_effective_component</p></th>
|
||||
* <tr><th id="gec"><p style="text-align:left">get_effective_component</p></th>
|
||||
* <td headers="cri gec send_req">yes</td>
|
||||
* <td headers="cri gec send_poll">no </td>
|
||||
* <td headers="cri gec rec_reply">yes</td>
|
||||
* <td headers="cri gec rec_ex">yes</td>
|
||||
* <td headers="cri gec rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="gecs"><p align="left">get_effective_components</p></th>
|
||||
* <tr><th id="gecs"><p style="text-align:left">get_effective_components</p></th>
|
||||
* <td headers="cri gecs send_req">yes</td>
|
||||
* <td headers="cri gecs send_poll">no </td>
|
||||
* <td headers="cri gecs rec_reply">yes</td>
|
||||
* <td headers="cri gecs rec_ex">yes</td>
|
||||
* <td headers="cri gecs rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="grpcy"><p align="left">get_request_policy</p></th>
|
||||
* <tr><th id="grpcy"><p style="text-align:left">get_request_policy</p></th>
|
||||
* <td headers="cri grpcy send_req">yes</td>
|
||||
* <td headers="cri grpcy send_poll">no </td>
|
||||
* <td headers="cri grpcy rec_reply">yes</td>
|
||||
* <td headers="cri grpcy rec_ex">yes</td>
|
||||
* <td headers="cri grpcy rec_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="arsc"><p align="left">add_request_service_context</p></th>
|
||||
* <tr><th id="arsc"><p style="text-align:left">add_request_service_context</p></th>
|
||||
* <td headers="cri arsc send_req">yes</td>
|
||||
* <td headers="cri arsc send_poll">no </td>
|
||||
* <td headers="cri arsc rec_reply">no </td>
|
||||
@ -935,7 +936,8 @@ module PortableInterceptor {
|
||||
* standard minor code of 14.
|
||||
*
|
||||
*
|
||||
* <table border=1 summary="Shows the validity of each attribute or operation">
|
||||
* <table class="plain">
|
||||
* <caption style="display:none">Shows the validity of each attribute or operation</caption>
|
||||
* <thead>
|
||||
* <tr>
|
||||
* <th> </th>
|
||||
@ -953,21 +955,21 @@ module PortableInterceptor {
|
||||
* <td id="ri" colspan=6><i>Inherited from RequestInfo:</i></td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="req_id"><p align="left">request_id</p></th>
|
||||
* <tr><th id="req_id"><p style="text-align:left">request_id</p></th>
|
||||
* <td headers="ri req_id rec_req_ser_con">yes</td>
|
||||
* <td headers="ri req_id rec_req">yes</td>
|
||||
* <td headers="ri req_id send_rep">yes</td>
|
||||
* <td headers="ri req_id send_exc">yes</td>
|
||||
* <td headers="ri req_id send_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="op"><p align="left">operation</p></th>
|
||||
* <tr><th id="op"><p style="text-align:left">operation</p></th>
|
||||
* <td headers="ri op rec_req_ser_con">yes</td>
|
||||
* <td headers="ri op rec_req">yes</td>
|
||||
* <td headers="ri op send_rep">yes</td>
|
||||
* <td headers="ri op send_exc">yes</td>
|
||||
* <td headers="ri op send_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="args"><p align="left">arguments</p></th>
|
||||
* <tr><th id="args"><p style="text-align:left">arguments</p></th>
|
||||
* <td headers="ri args rec_req_ser_con">no </td>
|
||||
* <td headers="ri args rec_req">yes<sub>1</sub></td>
|
||||
* <td headers="ri args send_rep">yes</td>
|
||||
@ -975,21 +977,21 @@ module PortableInterceptor {
|
||||
* <td headers="ri args send_oth">no<sub>2</sub>
|
||||
* </td></tr>
|
||||
*
|
||||
* <tr><th id="exps"><p align="left">exceptions</p></th>
|
||||
* <tr><th id="exps"><p style="text-align:left">exceptions</p></th>
|
||||
* <td headers="ri exps rec_req_ser_con">no </td>
|
||||
* <td headers="ri exps rec_req">yes</td>
|
||||
* <td headers="ri exps send_rep">yes</td>
|
||||
* <td headers="ri exps send_exc">yes</td>
|
||||
* <td headers="ri exps send_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="contexts"><p align="left">contexts</p></th>
|
||||
* <tr><th id="contexts"><p style="text-align:left">contexts</p></th>
|
||||
* <td headers="ri contexts rec_req_ser_con">no </td>
|
||||
* <td headers="ri contexts rec_req">yes</td>
|
||||
* <td headers="ri contexts send_rep">yes</td>
|
||||
* <td headers="ri contexts send_exc">yes</td>
|
||||
* <td headers="ri contexts send_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="op_con"><p align="left">operation_context</p></th>
|
||||
* <tr><th id="op_con"><p style="text-align:left">operation_context</p></th>
|
||||
* <td headers="ri op_con rec_req_ser_con">no </td>
|
||||
* <td headers="ri op_con rec_req">yes</td>
|
||||
* <td headers="ri op_con send_rep">yes</td>
|
||||
@ -997,7 +999,7 @@ module PortableInterceptor {
|
||||
* <td headers="ri op_con send_oth">no </td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="result"><p align="left">result</p></th>
|
||||
* <tr><th id="result"><p style="text-align:left">result</p></th>
|
||||
* <td headers="ri result rec_req_ser_con">no </td>
|
||||
* <td headers="ri result rec_req">no </td>
|
||||
* <td headers="ri result send_rep">yes</td>
|
||||
@ -1005,14 +1007,14 @@ module PortableInterceptor {
|
||||
* <td headers="ri result send_oth">no </td>
|
||||
* </tr>
|
||||
*
|
||||
* <tr><th id="res_ex"><p align="left">response_expected</p></th>
|
||||
* <tr><th id="res_ex"><p style="text-align:left">response_expected</p></th>
|
||||
* <td headers="ri res_ex rec_req_ser_con">yes</td>
|
||||
* <td headers="ri res_ex rec_req">yes</td>
|
||||
* <td headers="ri res_ex send_rep">yes</td>
|
||||
* <td headers="ri res_ex send_exc">yes</td>
|
||||
* <td headers="ri res_ex send_oth">yes</td></tr>
|
||||
*
|
||||
* <tr><th id="syn_scp"><p align="left">sync_scope</p></th>
|
||||
* <tr><th id="syn_scp"><p style="text-align:left">sync_scope</p></th>
|
||||
* <td headers="ri syn_scp rec_req_ser_con">yes</td>
|
||||
* <td headers="ri syn_scp rec_req">yes</td>
|
||||
* <td headers="ri syn_scp send_rep">yes</td>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<!--
|
||||
|
||||
Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
Copyright (c) 2000, 2017, 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
|
||||
@ -29,7 +29,7 @@ questions.
|
||||
-->
|
||||
|
||||
</head>
|
||||
<body bgcolor="white">
|
||||
<body>
|
||||
|
||||
Provides a mechanism to register ORB hooks through which ORB services
|
||||
can intercept the normal flow of execution of the ORB.
|
||||
@ -52,7 +52,7 @@ See the javadocs for class <code>
|
||||
{@link org.omg.PortableInterceptor.ORBInitializer ORBInitializer}</code>
|
||||
for how to go about registering interceptors.
|
||||
|
||||
<a name="unimpl"></a>
|
||||
<a id="unimpl"></a>
|
||||
<h2>Known limitations / unimplemented methods in package
|
||||
<code>org.omg.PortableInterceptor</code></h2>
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
|
||||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<!--
|
||||
|
||||
Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
Copyright (c) 2000, 2017, 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
|
||||
@ -30,7 +30,7 @@
|
||||
-->
|
||||
|
||||
</head>
|
||||
<body bgcolor="white">
|
||||
<body>
|
||||
Provides classes and interfaces for making the server side of your applications
|
||||
portable across multivendor ORBs.
|
||||
|
||||
@ -157,10 +157,10 @@ follows exactly the same pattern as the other holder classes for basic types.
|
||||
<H2>Related Documentation</H2>
|
||||
|
||||
<P>For an overview of Java IDL, please see:
|
||||
<A HREF="../../../../technotes/guides/idl/index.html">Java IDL home page</A>.
|
||||
{@extLink idl_guides Java IDL home page}.
|
||||
|
||||
<H2>Example Code</H2>
|
||||
<a name="sampleserver"></a>
|
||||
<a id="sampleserver"></a>
|
||||
<H3>Example Server Code</H3>
|
||||
<PRE>
|
||||
import javax.naming.InitialContext;
|
||||
|
||||
@ -59,10 +59,10 @@ import sun.reflect.ReflectionFactory;
|
||||
* </ul>
|
||||
* The code that calls Bridge.get() must have the following Permissions:
|
||||
* <ul>
|
||||
* <li>RuntimePermission "reflectionFactoryAccess"</li>
|
||||
* <li>BridgePermission "getBridge"</li>
|
||||
* <li>ReflectPermission "suppressAccessChecks"</li>
|
||||
* <li>StackFramePermission "retainClassReference"</li>
|
||||
* <li>RuntimePermission "getStackWalkerWithClassReference"</li>
|
||||
* <li>RuntimePermission "reflectionFactoryAccess"</li>
|
||||
* </ul>
|
||||
* <p>
|
||||
* All of these permissions are required to obtain and correctly initialize
|
||||
@ -105,10 +105,10 @@ public final class Bridge
|
||||
/** Fetch the Bridge singleton. This requires the following
|
||||
* permissions:
|
||||
* <ul>
|
||||
* <li>RuntimePermission "reflectionFactoryAccess"</li>
|
||||
* <li>BridgePermission "getBridge"</li>
|
||||
* <li>ReflectPermission "suppressAccessChecks"</li>
|
||||
* <li>StackFramePermission "retainClassReference"</li>
|
||||
* <li>RuntimePermission "getStackWalkerWithClassReference"</li>
|
||||
* <li>RuntimePermission "reflectionFactoryAccess"</li>
|
||||
* </ul>
|
||||
* @return The singleton instance of the Bridge class
|
||||
* @throws SecurityException if the caller does not have the
|
||||
|
||||
@ -15,10 +15,10 @@
|
||||
^\.mx.jvmci/hotspot/eclipse/.*
|
||||
^\.idea/
|
||||
^workingsets.xml
|
||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/.*\.xml
|
||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/.*\.iml
|
||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/nbproject
|
||||
^src/jdk.vm.ci/share/classes/\w[\w\.]*/\..*
|
||||
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/.*\.xml
|
||||
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/.*\.iml
|
||||
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/nbproject
|
||||
^src/jdk.internal.vm.ci/share/classes/\w[\w\.]*/\..*
|
||||
^test/compiler/jvmci/\w[\w\.]*/.*\.xml
|
||||
^test/compiler/jvmci/\w[\w\.]*/.*\.iml
|
||||
^test/compiler/jvmci/\w[\w\.]*/nbproject
|
||||
@ -27,15 +27,15 @@
|
||||
^test/compiler/aot/\w[\w\.]*/.*\.iml
|
||||
^test/compiler/aot/\w[\w\.]*/nbproject
|
||||
^test/compiler/aot/\w[\w\.]*/\..*
|
||||
^src/jdk.vm.compiler/\.mx.graal/env
|
||||
^src/jdk.vm.compiler/\.mx.graal/.*\.pyc
|
||||
^src/jdk.vm.compiler/\.mx.graal/eclipse-launches/.*
|
||||
^src/jdk.internal.vm.compiler/\.mx.graal/env
|
||||
^src/jdk.internal.vm.compiler/\.mx.graal/.*\.pyc
|
||||
^src/jdk.internal.vm.compiler/\.mx.graal/eclipse-launches/.*
|
||||
^src/jdk.aot/share/classes/\w[\w\.]*/.*\.xml
|
||||
^src/jdk.aot/share/classes/\w[\w\.]*/.*\.iml
|
||||
^src/jdk.aot/share/classes/\w[\w\.]*/nbproject
|
||||
^src/jdk.aot/share/classes/\w[\w\.]*/\..*
|
||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/.*\.xml
|
||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/.*\.iml
|
||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/nbproject
|
||||
^src/jdk.vm.compiler/share/classes/\w[\w\.]*/\..*
|
||||
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/.*\.xml
|
||||
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/.*\.iml
|
||||
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/nbproject
|
||||
^src/jdk.internal.vm.compiler/share/classes/\w[\w\.]*/\..*
|
||||
|
||||
|
||||
@ -556,5 +556,48 @@ a82cb5350cad96a0b4de496afebe3ded89f27efa jdk-9+146
|
||||
2a2ac7d9f52c8cb2b80077e515b5840b947e640c jdk-9+151
|
||||
31f1d26c60df7b2e516a4f84160d76ba017d4e09 jdk-9+152
|
||||
217ba81b9a4ce8698200370175aa2db86a39f66c jdk-9+153
|
||||
fc7e94cb748507366b839e859f865f724467446a jdk-10+0
|
||||
a9fdfd55835ef9dccb7f317b07249bd66653b874 jdk-9+154
|
||||
f3b3d77a1751897413aae43ac340a130b6fa2ae1 jdk-9+155
|
||||
43139c588ea48b6504e52b6c3dec530b17b1fdb4 jdk-9+156
|
||||
1ea217626ba0995dd03127f8322ba3687926a085 jdk-10+1
|
||||
b2d0a906afd73dcf27f572217eb1be0f196ec16c jdk-9+157
|
||||
4e78f30935229f13ce7c43089621cf7169f5abac jdk-9+158
|
||||
9211c2e89c1cd11ec2d5752b0f97131a7d7525c7 jdk-9+159
|
||||
94b4e2e5331d38eab6a3639c3511b2e0715df0e9 jdk-9+160
|
||||
191ffbdb3d7b734288daa7fb76b37a0a85dfe7eb jdk-9+161
|
||||
b01c519b715ef6f785d0631adee0a6537cf6c12e jdk-9+162
|
||||
983fe207555724d98f4876991e1cbafbcf2733e8 jdk-9+163
|
||||
0af429be8bbaeaaf0cb838e9af28c953dda6a9c8 jdk-9+164
|
||||
c92c6416ca03b1464d5ed99cf6201e52b5ba0a70 jdk-9+165
|
||||
560d7aa083a24b6a56443feb8de0f40435d33aa9 jdk-9+166
|
||||
48809c513ed5ebb4d4dbf2f454afcce2780db6db jdk-10+2
|
||||
6c3b6b3438c4a63e619f00bd5732d1260ffd5600 jdk-10+3
|
||||
8295ca08f5cb09c090eb048bbdd338d7e270c8bf jdk-10+4
|
||||
7b5ca2ff1f78873ca3ee99b6589d3cb4dde2e454 jdk-10+5
|
||||
762465099d938fd96cd1efda193bc1fa23d070d3 jdk-10+6
|
||||
1ca7ed1b17b5776930d641d1379834f3140a74e4 jdk-9+167
|
||||
fbb9c802649585d19f6d7e81b4a519d44806225a jdk-9+168
|
||||
16d692be099c5c38eb48cc9aca78b0c900910d5b jdk-9+169
|
||||
38a240fd58a287acb1963920b92ed4d9c2fd39e3 jdk-9+170
|
||||
9d4746eca95aec3e5a344bf2520745dcc1d17eed jdk-10+7
|
||||
f5ded0cf954c770deeecb80f2ba1ba6a05cd979b jdk-10+8
|
||||
233647e3d3800e76d7612014b745b37a88098f63 jdk-10+9
|
||||
d53171650a2cc6c6f699c966c533b914ca9c0602 jdk-9+171
|
||||
c6cd3ec8d46b034e57c86399380ffcf7f25706e4 jdk-10+10
|
||||
1ae9e84f68b359420d2d153ecfe5ee2903e33a2e jdk-9+172
|
||||
7f14e550f1e8abea41c223e5fdad2261e99ba929 jdk-10+11
|
||||
e64b1cb48d6e7703928a9d1da106fc27f8cb65fd jdk-9+173
|
||||
944791f8160185bffa13fbb821fc09b6198f1f25 jdk-9+174
|
||||
070aa7a2eb14c4645f7eb31384cba0a2ba72a4b5 jdk-10+12
|
||||
8f04d457168b9f1f4a1b2c37f49e0513ca9d33a7 jdk-9+175
|
||||
a9da03357f190807591177fe9846d6e68ad64fc0 jdk-10+13
|
||||
e920b4d008d914f3414bd4630b58837cf0b7f08d jdk-10+14
|
||||
2ab74e5dbdc2b6a962c865500cafd23cf387dc60 jdk-9+176
|
||||
1ca8f038fceb88c640badf9bd18905205bc63b43 jdk-9+177
|
||||
c1f3649a3a42f124b418a5a916dbad13d059b757 jdk-10+15
|
||||
2fe2a593e8ebf3a9e4dcd9ba3333a7b43126589d jdk-10+16
|
||||
9d032191f82fca5ba0aac98682f69c4ff0f1283d jdk-9+178
|
||||
d2661aa42bff322badbe6c1337fc638d2e0f5730 jdk-9+179
|
||||
73e2cb8700bfa51304bd4b02f224620859a3f600 jdk-10+17
|
||||
c9d3317623d48da3327232c81e3f8cfc0d29d888 jdk-10+18
|
||||
|
||||
@ -1 +1,2 @@
|
||||
project=jdk9
|
||||
project=jdk10
|
||||
bugids=dup
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
|
||||
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
|
||||
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
|
||||
<path>/.mx.jvmci</path>
|
||||
<path>/mx.jvmci</path>
|
||||
</pydev_pathproperty>
|
||||
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
|
||||
<path>/mx</path>
|
||||
|
||||
@ -158,8 +158,8 @@ To build hotspot and import it into the JDK: "mx make hotspot import-hotspot"
|
||||
# JDK9 must be bootstrapped with a JDK8
|
||||
compliance = mx.JavaCompliance('8')
|
||||
jdk8 = mx.get_jdk(compliance.exactMatch, versionDescription=compliance.value)
|
||||
cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=external', '--disable-precompiled-headers',
|
||||
'--with-jvm-variants=' + _vm.jvmVariant, '--disable-warnings-as-errors', '--with-boot-jdk=' + jdk8.home]
|
||||
cmd = ['sh', 'configure', '--with-debug-level=' + _vm.debugLevel, '--with-native-debug-symbols=external', '--disable-precompiled-headers', '--with-jvm-features=graal',
|
||||
'--with-jvm-variants=' + _vm.jvmVariant, '--disable-warnings-as-errors', '--with-boot-jdk=' + jdk8.home, '--with-jvm-features=graal']
|
||||
mx.run(cmd, cwd=_jdkSourceRoot)
|
||||
cmd = [mx.gmake_cmd(), 'CONF=' + _vm.debugLevel]
|
||||
if mx.get_opts().verbose:
|
||||
@ -176,66 +176,6 @@ To build hotspot and import it into the JDK: "mx make hotspot import-hotspot"
|
||||
|
||||
mx.run(cmd, cwd=_jdkSourceRoot)
|
||||
|
||||
if 'images' in cmd:
|
||||
jdkImageDir = join(jdkBuildDir, 'images', 'jdk')
|
||||
|
||||
# The OpenJDK build creates an empty cacerts file so copy one from
|
||||
# the default JDK (which is assumed to be an OracleJDK)
|
||||
srcCerts = join(mx.get_jdk(tag='default').home, 'lib', 'security', 'cacerts')
|
||||
if not exists(srcCerts):
|
||||
# Might be building with JDK8 which has cacerts under jre/
|
||||
srcCerts = join(mx.get_jdk(tag='default').home, 'jre', 'lib', 'security', 'cacerts')
|
||||
dstCerts = join(jdkImageDir, 'lib', 'security', 'cacerts')
|
||||
if srcCerts != dstCerts:
|
||||
shutil.copyfile(srcCerts, dstCerts)
|
||||
|
||||
_create_jdk_bundle(jdkBuildDir, _vm.debugLevel, jdkImageDir)
|
||||
|
||||
def _get_jdk_bundle_arches():
|
||||
"""
|
||||
Gets a list of names that will be the part of a JDK bundle's file name denoting the architecture.
|
||||
The first element in the list is the canonical name. Symlinks should be created for the
|
||||
remaining names.
|
||||
"""
|
||||
cpu = mx.get_arch()
|
||||
if cpu == 'amd64':
|
||||
return ['x64', 'x86_64', 'amd64']
|
||||
elif cpu == 'sparcv9':
|
||||
return ['sparcv9']
|
||||
mx.abort('Unsupported JDK bundle arch: ' + cpu)
|
||||
|
||||
def _create_jdk_bundle(jdkBuildDir, debugLevel, jdkImageDir):
|
||||
"""
|
||||
Creates a tar.gz JDK archive, an accompanying tar.gz.sha1 file with its
|
||||
SHA1 signature plus symlinks to the archive for non-canonical architecture names.
|
||||
"""
|
||||
|
||||
arches = _get_jdk_bundle_arches()
|
||||
jdkTgzPath = join(_suite.get_output_root(), 'jdk-bundles', 'jdk9-{}-{}-{}.tar.gz'.format(debugLevel, _get_openjdk_os(), arches[0]))
|
||||
with mx.Archiver(jdkTgzPath, kind='tgz') as arc:
|
||||
mx.log('Creating ' + jdkTgzPath)
|
||||
for root, _, filenames in os.walk(jdkImageDir):
|
||||
for name in filenames:
|
||||
f = join(root, name)
|
||||
arcname = 'jdk1.9.0/' + os.path.relpath(f, jdkImageDir)
|
||||
arc.zf.add(name=f, arcname=arcname, recursive=False)
|
||||
|
||||
with open(jdkTgzPath + '.sha1', 'w') as fp:
|
||||
mx.log('Creating ' + jdkTgzPath + '.sha1')
|
||||
fp.write(mx.sha1OfFile(jdkTgzPath))
|
||||
|
||||
def _create_link(source, link_name):
|
||||
if exists(link_name):
|
||||
os.remove(link_name)
|
||||
mx.log('Creating ' + link_name + ' -> ' + source)
|
||||
os.symlink(source, link_name)
|
||||
|
||||
for arch in arches[1:]:
|
||||
link_name = join(_suite.get_output_root(), 'jdk-bundles', 'jdk9-{}-{}-{}.tar.gz'.format(debugLevel, _get_openjdk_os(), arch))
|
||||
jdkTgzName = os.path.basename(jdkTgzPath)
|
||||
_create_link(jdkTgzName, link_name)
|
||||
_create_link(jdkTgzName + '.sha1', link_name + '.sha1')
|
||||
|
||||
def _runmultimake(args):
|
||||
"""run the JDK make process for one or more configurations"""
|
||||
|
||||
@ -363,9 +303,9 @@ class HotSpotProject(mx.NativeProject):
|
||||
out.close('link')
|
||||
|
||||
out.open('link')
|
||||
out.element('name', data='generated')
|
||||
out.element('name', data='gensrc')
|
||||
out.element('type', data='2')
|
||||
generated = join(_get_hotspot_build_dir(jvmVariant, debugLevel), 'generated')
|
||||
generated = join(_get_hotspot_build_dir(jvmVariant, debugLevel), 'gensrc')
|
||||
out.element('locationURI', data=mx.get_eclipse_project_rel_locationURI(generated, eclProjectDir))
|
||||
out.close('link')
|
||||
|
||||
@ -680,18 +620,12 @@ _jvmci_bootclasspath_prepends = []
|
||||
def _get_hotspot_build_dir(jvmVariant=None, debugLevel=None):
|
||||
"""
|
||||
Gets the directory in which a particular HotSpot configuration is built
|
||||
(e.g., <JDK_REPO_ROOT>/build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2)
|
||||
(e.g., <JDK_REPO_ROOT>/build/macosx-x86_64-normal-server-release/hotspot/variant-<variant>)
|
||||
"""
|
||||
if jvmVariant is None:
|
||||
jvmVariant = _vm.jvmVariant
|
||||
|
||||
os = mx.get_os()
|
||||
if os == 'darwin':
|
||||
os = 'bsd'
|
||||
arch = mx.get_arch()
|
||||
buildname = {'client': 'compiler1', 'server': 'compiler2'}.get(jvmVariant, jvmVariant)
|
||||
|
||||
name = '{}_{}_{}'.format(os, arch, buildname)
|
||||
name = 'variant-{}'.format(jvmVariant)
|
||||
return join(_get_jdk_build_dir(debugLevel=debugLevel), 'hotspot', name)
|
||||
|
||||
class JVMCI9JDKConfig(mx.JDKConfig):
|
||||
|
||||
@ -43,7 +43,7 @@ suite = {
|
||||
# ------------- JVMCI:Service -------------
|
||||
|
||||
"jdk.vm.ci.services" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"javaCompliance" : "9",
|
||||
"workingSets" : "API,JVMCI",
|
||||
@ -52,7 +52,7 @@ suite = {
|
||||
# ------------- JVMCI:API -------------
|
||||
|
||||
"jdk.vm.ci.common" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"checkstyle" : "jdk.vm.ci.services",
|
||||
"javaCompliance" : "9",
|
||||
@ -60,7 +60,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.meta" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"checkstyle" : "jdk.vm.ci.services",
|
||||
"javaCompliance" : "9",
|
||||
@ -68,7 +68,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.code" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : ["jdk.vm.ci.meta"],
|
||||
"checkstyle" : "jdk.vm.ci.services",
|
||||
@ -92,7 +92,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.runtime" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : [
|
||||
"jdk.vm.ci.code",
|
||||
@ -119,7 +119,7 @@ suite = {
|
||||
# ------------- JVMCI:HotSpot -------------
|
||||
|
||||
"jdk.vm.ci.aarch64" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : ["jdk.vm.ci.code"],
|
||||
"checkstyle" : "jdk.vm.ci.services",
|
||||
@ -128,7 +128,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.amd64" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : ["jdk.vm.ci.code"],
|
||||
"checkstyle" : "jdk.vm.ci.services",
|
||||
@ -137,7 +137,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.sparc" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : ["jdk.vm.ci.code"],
|
||||
"checkstyle" : "jdk.vm.ci.services",
|
||||
@ -146,7 +146,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.hotspot" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : [
|
||||
"jdk.vm.ci.common",
|
||||
@ -175,7 +175,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.hotspot.aarch64" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : [
|
||||
"jdk.vm.ci.aarch64",
|
||||
@ -187,7 +187,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.hotspot.amd64" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : [
|
||||
"jdk.vm.ci.amd64",
|
||||
@ -199,7 +199,7 @@ suite = {
|
||||
},
|
||||
|
||||
"jdk.vm.ci.hotspot.sparc" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"sourceDirs" : ["src"],
|
||||
"dependencies" : [
|
||||
"jdk.vm.ci.sparc",
|
||||
@ -221,12 +221,12 @@ suite = {
|
||||
# ------------- Distributions -------------
|
||||
|
||||
"JVMCI_SERVICES" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"dependencies" : ["jdk.vm.ci.services"],
|
||||
},
|
||||
|
||||
"JVMCI_API" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"dependencies" : [
|
||||
"jdk.vm.ci.runtime",
|
||||
"jdk.vm.ci.common",
|
||||
@ -240,7 +240,7 @@ suite = {
|
||||
},
|
||||
|
||||
"JVMCI_HOTSPOT" : {
|
||||
"subDir" : "src/jdk.vm.ci/share/classes",
|
||||
"subDir" : "src/jdk.internal.vm.ci/share/classes",
|
||||
"dependencies" : [
|
||||
"jdk.vm.ci.hotspot.aarch64",
|
||||
"jdk.vm.ci.hotspot.amd64",
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
README:
|
||||
This file should be located at the top of the hotspot Mercurial repository.
|
||||
|
||||
See http://openjdk.java.net/ for more information about the OpenJDK.
|
||||
|
||||
See ../README-builds.html for complete details on build machine requirements.
|
||||
|
||||
Simple Build Instructions:
|
||||
|
||||
cd make && gnumake
|
||||
|
||||
The files that will be imported into the jdk build will be in the "build"
|
||||
directory.
|
||||
|
||||
@ -38,9 +38,9 @@ TARGETS :=
|
||||
$(eval $(call IncludeCustomExtension, hotspot, CompileTools.gmk))
|
||||
|
||||
ifeq ($(INCLUDE_GRAAL), true)
|
||||
VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes
|
||||
VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.ci/share/classes
|
||||
|
||||
SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.vm.compiler/share/classes
|
||||
SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.compiler/share/classes
|
||||
|
||||
##############################################################################
|
||||
# Compile the annotation processors
|
||||
|
||||
153
hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
Normal file
153
hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
Normal file
@ -0,0 +1,153 @@
|
||||
#
|
||||
# Copyright (c) 2016, 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.
|
||||
#
|
||||
|
||||
default: all
|
||||
|
||||
include $(SPEC)
|
||||
include MakeBase.gmk
|
||||
|
||||
$(eval $(call IncludeCustomExtension, hotspot, gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
|
||||
|
||||
GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
|
||||
SRC_DIR := $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes
|
||||
|
||||
################################################################################
|
||||
|
||||
PROC_SRC_SUBDIRS := \
|
||||
org.graalvm.compiler.code \
|
||||
org.graalvm.compiler.common \
|
||||
org.graalvm.compiler.core \
|
||||
org.graalvm.compiler.core.aarch64 \
|
||||
org.graalvm.compiler.core.amd64 \
|
||||
org.graalvm.compiler.core.common \
|
||||
org.graalvm.compiler.core.sparc \
|
||||
org.graalvm.compiler.debug \
|
||||
org.graalvm.compiler.hotspot \
|
||||
org.graalvm.compiler.hotspot.aarch64 \
|
||||
org.graalvm.compiler.hotspot.amd64 \
|
||||
org.graalvm.compiler.hotspot.sparc \
|
||||
org.graalvm.compiler.graph \
|
||||
org.graalvm.compiler.java \
|
||||
org.graalvm.compiler.lir \
|
||||
org.graalvm.compiler.lir.amd64 \
|
||||
org.graalvm.compiler.loop \
|
||||
org.graalvm.compiler.loop.phases \
|
||||
org.graalvm.compiler.nodes \
|
||||
org.graalvm.compiler.replacements \
|
||||
org.graalvm.compiler.replacements.aarch64 \
|
||||
org.graalvm.compiler.replacements.amd64 \
|
||||
org.graalvm.compiler.phases \
|
||||
org.graalvm.compiler.phases.common \
|
||||
org.graalvm.compiler.printer \
|
||||
org.graalvm.compiler.virtual \
|
||||
#
|
||||
|
||||
PROC_SRC_DIRS := $(patsubst %, $(SRC_DIR)/%/src, $(PROC_SRC_SUBDIRS))
|
||||
|
||||
PROC_SRCS := $(filter %.java, $(call CacheFind, $(PROC_SRC_DIRS)))
|
||||
|
||||
ALL_SRC_DIRS := $(wildcard $(SRC_DIR)/*/src)
|
||||
SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS))
|
||||
|
||||
PROCESSOR_JARS := \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar \
|
||||
#
|
||||
PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
|
||||
|
||||
ADD_EXPORTS := \
|
||||
--add-modules jdk.internal.vm.ci \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.events=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspotvmconfig=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.inittimer=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.services=ALL-UNNAMED \
|
||||
--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=ALL-UNNAMED \
|
||||
#
|
||||
|
||||
$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
|
||||
$(call MakeDir, $(@D))
|
||||
$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
|
||||
$(JAVA_SMALL) $(NEW_JAVAC) \
|
||||
-XDignore.symbol.file \
|
||||
--upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none \
|
||||
$(ADD_EXPORTS) \
|
||||
-sourcepath $(SOURCEPATH) \
|
||||
-implicit:none \
|
||||
-proc:only \
|
||||
-processorpath $(PROCESSOR_PATH) \
|
||||
-d $(GENSRC_DIR) \
|
||||
-s $(GENSRC_DIR) \
|
||||
@$(@D)/_gensrc_proc_files
|
||||
$(TOUCH) $@
|
||||
|
||||
TARGETS += $(GENSRC_DIR)/_gensrc_proc_done
|
||||
|
||||
################################################################################
|
||||
|
||||
$(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
|
||||
($(CD) $(GENSRC_DIR)/META-INF/providers && \
|
||||
p=""; \
|
||||
for i in $$($(LS)); do \
|
||||
c=$$($(CAT) $$i | $(TR) -d '\n\r'); \
|
||||
if test x$$p != x$$c; then \
|
||||
if test x$$p != x; then \
|
||||
$(ECHO) " ;" >> $@; \
|
||||
fi; \
|
||||
$(ECHO) "provides $$c with" >> $@; \
|
||||
p=$$c; \
|
||||
fi; \
|
||||
$(ECHO) " $$i," >> $@; \
|
||||
done); \
|
||||
$(ECHO) " ;" >> $@; \
|
||||
$(ECHO) "uses org.graalvm.compiler.options.OptionDescriptors;" >> $@; \
|
||||
$(ECHO) "provides org.graalvm.compiler.options.OptionDescriptors with" >> $@; \
|
||||
for i in $$($(FIND) $(GENSRC_DIR) -name '*_OptionDescriptors.java'); do \
|
||||
c=$$($(ECHO) $$i | $(SED) 's:.*/jdk\.internal\.vm\.compiler/\(.*\)\.java:\1:' | $(TR) '/' '.'); \
|
||||
$(ECHO) " $$c," >> $@; \
|
||||
done; \
|
||||
$(ECHO) " ;" >> $@;
|
||||
|
||||
TARGETS += $(GENSRC_DIR)/module-info.java.extra
|
||||
|
||||
################################################################################
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
.PHONY: default all
|
||||
@ -1,152 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2016, 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.
|
||||
#
|
||||
|
||||
default: all
|
||||
|
||||
include $(SPEC)
|
||||
include MakeBase.gmk
|
||||
|
||||
$(eval $(call IncludeCustomExtension, hotspot, gensrc/Gensrc-jdk.vm.compiler.gmk))
|
||||
|
||||
GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
|
||||
SRC_DIR := $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes
|
||||
|
||||
################################################################################
|
||||
|
||||
PROC_SRC_SUBDIRS := \
|
||||
org.graalvm.compiler.code \
|
||||
org.graalvm.compiler.common \
|
||||
org.graalvm.compiler.core \
|
||||
org.graalvm.compiler.core.aarch64 \
|
||||
org.graalvm.compiler.core.amd64 \
|
||||
org.graalvm.compiler.core.common \
|
||||
org.graalvm.compiler.core.sparc \
|
||||
org.graalvm.compiler.debug \
|
||||
org.graalvm.compiler.hotspot \
|
||||
org.graalvm.compiler.hotspot.aarch64 \
|
||||
org.graalvm.compiler.hotspot.amd64 \
|
||||
org.graalvm.compiler.hotspot.sparc \
|
||||
org.graalvm.compiler.graph \
|
||||
org.graalvm.compiler.java \
|
||||
org.graalvm.compiler.lir \
|
||||
org.graalvm.compiler.lir.amd64 \
|
||||
org.graalvm.compiler.loop \
|
||||
org.graalvm.compiler.loop.phases \
|
||||
org.graalvm.compiler.nodes \
|
||||
org.graalvm.compiler.replacements \
|
||||
org.graalvm.compiler.replacements.aarch64 \
|
||||
org.graalvm.compiler.replacements.amd64 \
|
||||
org.graalvm.compiler.phases \
|
||||
org.graalvm.compiler.phases.common \
|
||||
org.graalvm.compiler.printer \
|
||||
org.graalvm.compiler.virtual \
|
||||
#
|
||||
|
||||
PROC_SRC_DIRS := $(patsubst %, $(SRC_DIR)/%/src, $(PROC_SRC_SUBDIRS))
|
||||
|
||||
PROC_SRCS := $(filter %.java, $(call CacheFind, $(PROC_SRC_DIRS)))
|
||||
|
||||
ALL_SRC_DIRS := $(wildcard $(SRC_DIR)/*/src)
|
||||
SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS))
|
||||
|
||||
PROCESSOR_JARS := \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
|
||||
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar \
|
||||
#
|
||||
PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
|
||||
|
||||
ADD_EXPORTS := \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.aarch64=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.amd64=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.code=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.code.site=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.aarch64=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.amd64=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.events=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspot.sparc=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.hotspotvmconfig=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.inittimer=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.runtime=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.services=ALL-UNNAMED \
|
||||
--add-exports jdk.vm.ci/jdk.vm.ci.sparc=ALL-UNNAMED \
|
||||
#
|
||||
|
||||
$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
|
||||
$(call MakeDir, $(@D))
|
||||
$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
|
||||
$(JAVA_SMALL) $(NEW_JAVAC) \
|
||||
-XDignore.symbol.file \
|
||||
--upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none \
|
||||
$(ADD_EXPORTS) \
|
||||
-sourcepath $(SOURCEPATH) \
|
||||
-implicit:none \
|
||||
-proc:only \
|
||||
-processorpath $(PROCESSOR_PATH) \
|
||||
-d $(GENSRC_DIR) \
|
||||
-s $(GENSRC_DIR) \
|
||||
@$(@D)/_gensrc_proc_files
|
||||
$(TOUCH) $@
|
||||
|
||||
TARGETS += $(GENSRC_DIR)/_gensrc_proc_done
|
||||
|
||||
################################################################################
|
||||
|
||||
$(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
|
||||
($(CD) $(GENSRC_DIR)/META-INF/providers && \
|
||||
p=""; \
|
||||
for i in $$($(LS)); do \
|
||||
c=$$($(CAT) $$i | $(TR) -d '\n\r'); \
|
||||
if test x$$p != x$$c; then \
|
||||
if test x$$p != x; then \
|
||||
$(ECHO) " ;" >> $@; \
|
||||
fi; \
|
||||
$(ECHO) "provides $$c with" >> $@; \
|
||||
p=$$c; \
|
||||
fi; \
|
||||
$(ECHO) " $$i," >> $@; \
|
||||
done); \
|
||||
$(ECHO) " ;" >> $@; \
|
||||
$(ECHO) "uses org.graalvm.compiler.options.OptionDescriptors;" >> $@; \
|
||||
$(ECHO) "provides org.graalvm.compiler.options.OptionDescriptors with" >> $@; \
|
||||
for i in $$($(FIND) $(GENSRC_DIR) -name '*_OptionDescriptors.java'); do \
|
||||
c=$$($(ECHO) $$i | $(SED) 's:.*/jdk\.vm\.compiler/\(.*\)\.java:\1:' | $(TR) '/' '.'); \
|
||||
$(ECHO) " $$c," >> $@; \
|
||||
done; \
|
||||
$(ECHO) " ;" >> $@;
|
||||
|
||||
TARGETS += $(GENSRC_DIR)/module-info.java.extra
|
||||
|
||||
################################################################################
|
||||
|
||||
all: $(TARGETS)
|
||||
|
||||
.PHONY: default all
|
||||
@ -112,8 +112,10 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
-relativeSrcInclude src \
|
||||
-hidePath .hg \
|
||||
-hidePath .jcheck \
|
||||
-hidePath jdk.aot \
|
||||
-hidePath jdk.hotspot.agent \
|
||||
-hidePath jdk.vm.ci \
|
||||
-hidePath jdk.internal.vm.ci \
|
||||
-hidePath jdk.internal.vm.compiler \
|
||||
-hidePath jdk.jfr \
|
||||
-compiler VC10 \
|
||||
-jdkTargetRoot $(call FixPath, $(JDK_OUTPUTDIR)) \
|
||||
|
||||
@ -118,6 +118,12 @@ ifeq ($(OPENJDK_TARGET_CPU), x86_64)
|
||||
OPENJDK_TARGET_CPU_VM_VERSION := amd64
|
||||
else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
|
||||
OPENJDK_TARGET_CPU_VM_VERSION := sparc
|
||||
else ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm)
|
||||
ifeq ($(OPENJDK_TARGET_CPU), aarch64)
|
||||
# This sets the Oracle Aarch64 port to use arm64
|
||||
# while the original Aarch64 port uses aarch64
|
||||
OPENJDK_TARGET_CPU_VM_VERSION := arm64
|
||||
endif
|
||||
else
|
||||
OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU)
|
||||
endif
|
||||
|
||||
@ -188,7 +188,6 @@ JVM_Yield
|
||||
JVM_AddModuleExports
|
||||
JVM_AddModuleExportsToAll
|
||||
JVM_AddModuleExportsToAllUnnamed
|
||||
JVM_AddModulePackage
|
||||
JVM_AddReadsModule
|
||||
JVM_DefineModule
|
||||
JVM_SetBootLoaderUnnamedModule
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
Copyright (c) %YEARS%, 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.
|
||||
@ -1,20 +0,0 @@
|
||||
Copyright (c) %YEARS%, 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.
|
||||
|
||||
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.
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user