[kaffe] CVS kaffe (robilad): resynced with GNU Classpath: corba
fixes
Kaffe CVS
cvs-commits at kaffe.org
Mon Jul 4 08:37:46 PDT 2005
PatchSet 6695
Date: 2005/07/04 15:29:52
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with GNU Classpath: corba fixes
2005-07-04 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
2005-07-03 Audrius Meskauskas, <AudriusA at Bioinformatics.org>
* org/omg/PortableServer/ServantLocatorPackage/package.html,
org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java:
New files.
2005-07-02 Audrius Meskauskas, <AudriusA at Bioinformatics.org>
* gnu/CORBA/_PolicyImplBase.java: Ihnerit from Policy.
(ids): Made final non static, new constructor.
(type, value, policyCode): New fields.
(_invoke): Handle value operation.
(getValue, getCode, destroy, toString, copy, equals, hashCode):
New methods.
* org/omg/CORBA/PolicyHelper.java (narrow): Removed check for
repository for repository id.
2005-07-02 Audrius Meskauskas, <AudriusA at Bioinformatics.org>
* org/omg/PortableServer/IdAssignmentPolicyValue.java,
org/omg/PortableServer/IdUniquenessPolicyValue.java,
org/omg/PortableServer/ImplicitActivationPolicyValue.java,
org/omg/PortableServer/LifespanPolicyValue.java,
org/omg/PortableServer/ServantRetentionPolicyValue.java,
org/omg/PortableServer/RequestProcessingPolicyValue.java:
Documentation update.
Members:
ChangeLog:1.4219->1.4220
libltdl/configure:1.82->1.83
libraries/javalib/Makefile.am:1.368->1.369
libraries/javalib/Makefile.in:1.458->1.459
libraries/javalib/all.files:1.139->1.140
libraries/javalib/gnu/CORBA/_PolicyImplBase.java:1.1->1.2
libraries/javalib/org/omg/CORBA/PolicyHelper.java:1.1->1.2
libraries/javalib/org/omg/PortableServer/IdAssignmentPolicyValue.java:1.1->1.2
libraries/javalib/org/omg/PortableServer/IdUniquenessPolicyValue.java:1.1->1.2
libraries/javalib/org/omg/PortableServer/ImplicitActivationPolicyValue.java:1.1->1.2
libraries/javalib/org/omg/PortableServer/LifespanPolicyValue.java:1.1->1.2
libraries/javalib/org/omg/PortableServer/RequestProcessingPolicyValue.java:1.1->1.2
libraries/javalib/org/omg/PortableServer/ServantRetentionPolicyValue.java:1.1->1.2
libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java:INITIAL->1.1
libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/package.html:INITIAL->1.1
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4219 kaffe/ChangeLog:1.4220
--- kaffe/ChangeLog:1.4219 Mon Jul 4 01:59:01 2005
+++ kaffe/ChangeLog Mon Jul 4 15:29:52 2005
@@ -1,3 +1,34 @@
+2005-07-04 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
+ 2005-07-03 Audrius Meskauskas, <AudriusA at Bioinformatics.org>
+
+ * org/omg/PortableServer/ServantLocatorPackage/package.html,
+ org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java:
+ New files.
+
+ 2005-07-02 Audrius Meskauskas, <AudriusA at Bioinformatics.org>
+
+ * gnu/CORBA/_PolicyImplBase.java: Ihnerit from Policy.
+ (ids): Made final non static, new constructor.
+ (type, value, policyCode): New fields.
+ (_invoke): Handle "value" operation.
+ (getValue, getCode, destroy, toString, copy, equals, hashCode):
+ New methods.
+ * org/omg/CORBA/PolicyHelper.java (narrow): Removed check for
+ repository for repository id.
+
+ 2005-07-02 Audrius Meskauskas, <AudriusA at Bioinformatics.org>
+
+ * org/omg/PortableServer/IdAssignmentPolicyValue.java,
+ org/omg/PortableServer/IdUniquenessPolicyValue.java,
+ org/omg/PortableServer/ImplicitActivationPolicyValue.java,
+ org/omg/PortableServer/LifespanPolicyValue.java,
+ org/omg/PortableServer/ServantRetentionPolicyValue.java,
+ org/omg/PortableServer/RequestProcessingPolicyValue.java:
+ Documentation update.
+
2005-07-04 Michael Franz <mvfranz at gmail.com>
* kaffe/kaffevm/support.h (callMethodInfo): Improved and fixed docs.
Index: kaffe/libltdl/configure
diff -u kaffe/libltdl/configure:1.82 kaffe/libltdl/configure:1.83
--- kaffe/libltdl/configure:1.82 Sun Jul 3 01:32:18 2005
+++ kaffe/libltdl/configure Mon Jul 4 15:29:58 2005
@@ -7330,12 +7330,11 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
+ whole_archive_flag_spec=
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
+ whole_archive_flag_spec=
+ tmp_addflag=' -fpic -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -8499,7 +8498,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -8564,8 +8563,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -9355,7 +9354,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9358 "configure"
+#line 9357 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9453,7 +9452,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9456 "configure"
+#line 9455 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10951,12 +10950,12 @@
;;
pgCC*)
# Portland Group C++ compiler
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX=''
;;
cxx*)
# Compaq C++
@@ -11705,11 +11704,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11708: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11707: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11712: \$? = $ac_status" >&5
+ echo "$as_me:11711: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11767,11 +11766,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11770: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11774: \$? = $ac_status" >&5
+ echo "$as_me:11773: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12280,7 +12279,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -12345,8 +12344,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -13136,7 +13135,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13139 "configure"
+#line 13138 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13234,7 +13233,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13237 "configure"
+#line 13236 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14119,11 +14118,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14126: \$? = $ac_status" >&5
+ echo "$as_me:14125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14181,11 +14180,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14184: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14183: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14188: \$? = $ac_status" >&5
+ echo "$as_me:14187: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14396,12 +14395,11 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
+ whole_archive_flag_spec_F77=
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
+ whole_archive_flag_spec_F77=
+ tmp_addflag=' -fpic -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -15545,7 +15543,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -15610,8 +15608,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -16307,11 +16305,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16310: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16308: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16314: \$? = $ac_status" >&5
+ echo "$as_me:16312: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16569,11 +16567,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16572: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16570: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16576: \$? = $ac_status" >&5
+ echo "$as_me:16574: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16631,11 +16629,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16634: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16638: \$? = $ac_status" >&5
+ echo "$as_me:16636: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16846,12 +16844,11 @@
tmp_addflag=
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
+ whole_archive_flag_spec_GCJ=
;;
pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
+ whole_archive_flag_spec_GCJ=
+ tmp_addflag=' -fpic -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
@@ -18015,7 +18012,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -18080,8 +18077,8 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -18871,7 +18868,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18874 "configure"
+#line 18871 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18969,7 +18966,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18972 "configure"
+#line 18969 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -21235,7 +21232,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 21238 "configure"
+#line 21235 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.368 kaffe/libraries/javalib/Makefile.am:1.369
--- kaffe/libraries/javalib/Makefile.am:1.368 Sun Jul 3 16:28:33 2005
+++ kaffe/libraries/javalib/Makefile.am Mon Jul 4 15:29:59 2005
@@ -334,6 +334,7 @@
$(org_omg_PortableServer_CurrentPackage_SRCS) \
$(org_omg_PortableServer_POAManagerPackage_SRCS) \
$(org_omg_PortableServer_POAPackage_SRCS) \
+ $(org_omg_PortableServer_ServantLocatorPackage_SRCS) \
$(org_omg_SendingContext_SRCS) \
$(org_omg_stub_java_rmi_SRCS) \
$(org_tritonus_core_SRCS) \
@@ -4686,6 +4687,8 @@
org/omg/PortableServer/POAPackage/WrongAdapterHelper.java \
org/omg/PortableServer/POAPackage/WrongPolicy.java \
org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
+org_omg_PortableServer_ServantLocatorPackage_SRCS = \
+ org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
org_omg_SendingContext_SRCS = \
org/omg/SendingContext/RunTime.java \
org/omg/SendingContext/RunTimeOperations.java
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.458 kaffe/libraries/javalib/Makefile.in:1.459
--- kaffe/libraries/javalib/Makefile.in:1.458 Sun Jul 3 16:28:36 2005
+++ kaffe/libraries/javalib/Makefile.in Mon Jul 4 15:29:59 2005
@@ -689,6 +689,7 @@
$(org_omg_PortableServer_CurrentPackage_SRCS) \
$(org_omg_PortableServer_POAManagerPackage_SRCS) \
$(org_omg_PortableServer_POAPackage_SRCS) \
+ $(org_omg_PortableServer_ServantLocatorPackage_SRCS) \
$(org_omg_SendingContext_SRCS) \
$(org_omg_stub_java_rmi_SRCS) \
$(org_tritonus_core_SRCS) \
@@ -5324,6 +5325,9 @@
org/omg/PortableServer/POAPackage/WrongAdapterHelper.java \
org/omg/PortableServer/POAPackage/WrongPolicy.java \
org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
+
+org_omg_PortableServer_ServantLocatorPackage_SRCS = \
+ org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
org_omg_SendingContext_SRCS = \
org/omg/SendingContext/RunTime.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.139 kaffe/libraries/javalib/all.files:1.140
--- kaffe/libraries/javalib/all.files:1.139 Sun Jul 3 16:28:37 2005
+++ kaffe/libraries/javalib/all.files Mon Jul 4 15:30:02 2005
@@ -4031,6 +4031,7 @@
org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java
org/omg/PortableServer/RequestProcessingPolicyValue.java
org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java
+org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
org/omg/PortableServer/ServantRetentionPolicyValue.java
org/omg/PortableServer/THREAD_POLICY_ID.java
org/omg/SendingContext/RunTime.java
Index: kaffe/libraries/javalib/gnu/CORBA/_PolicyImplBase.java
diff -u kaffe/libraries/javalib/gnu/CORBA/_PolicyImplBase.java:1.1 kaffe/libraries/javalib/gnu/CORBA/_PolicyImplBase.java:1.2
--- kaffe/libraries/javalib/gnu/CORBA/_PolicyImplBase.java:1.1 Sun Jul 3 01:32:24 2005
+++ kaffe/libraries/javalib/gnu/CORBA/_PolicyImplBase.java Mon Jul 4 15:30:03 2005
@@ -40,8 +40,8 @@
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.CompletionStatus;
+import org.omg.CORBA.Policy;
import org.omg.CORBA.PolicyHelper;
-import org.omg.CORBA.PolicyOperations;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.InvokeHandler;
import org.omg.CORBA.portable.ObjectImpl;
@@ -49,7 +49,7 @@
import org.omg.CORBA.portable.ResponseHandler;
/**
- * The server side implementatin base for the {@link Policy}.
+ * The server side implementation base for the {@link Policy}.
*
* @specnote The java 1.4 API does not define the server side policy
* implementation base, but it defines the policy client side stub.
@@ -61,7 +61,7 @@
*/
public abstract class _PolicyImplBase
extends ObjectImpl
- implements PolicyOperations, InvokeHandler
+ implements Policy, InvokeHandler
{
/**
* Use serialVersionUID for interoperability.
@@ -69,14 +69,60 @@
private static final long serialVersionUID = 1;
/**
- * The binding interator repository ids.
+ * The policy repository ids.
*/
- private static String[] ids = { PolicyHelper.id() };
+ private final String[] ids;
+
+ /**
+ * The type of this policy.
+ */
+ private final int type;
+
+ /**
+ * The value of this policy. The value object is never the same
+ * for different policies.
+ */
+ private final java.lang.Object value;
+
+ /**
+ * The policy integer code, written in request to write
+ * the policy value.
+ */
+ private final int policyCode;
+
+ /**
+ * Create the new policy of the given type, having the given value.
+ * For security reasons, the method is kept package private.
+ *
+ * @param p_type the type of this policy.
+ * @param p_value the value of this policy.
+ * @param p_code the integer code of this policy.
+ * @param p_idl the policy IDL type string. The {@link #_ids()}
+ * will return array, first line being this string and another
+ * being PolicyHelper.id().
+ */
+ public _PolicyImplBase(int p_type, java.lang.Object p_value, int p_code,
+ String p_idl
+ )
+ {
+ type = p_type;
+ value = p_value;
+ policyCode = p_code;
+ ids = new String[] { p_idl, PolicyHelper.id() };
+ }
+
+ /**
+ * Get the integer code of the type of this policy.
+ */
+ public final int policy_type()
+ {
+ return type;
+ }
/**
* Return the list of repository ids.
*/
- public String[] _ids()
+ public final String[] _ids()
{
return ids;
}
@@ -84,9 +130,9 @@
/**
* Call the required method.
*/
- public OutputStream _invoke(String method, InputStream input,
- ResponseHandler rh
- )
+ public final OutputStream _invoke(String method, InputStream input,
+ ResponseHandler rh
+ )
{
OutputStream output = null;
@@ -101,7 +147,7 @@
// The "copy" has been invoked.
org.omg.CORBA.Object returns = copy();
output = rh.createReply();
- output.write_Object(returns);
+ output.write_Object(this);
}
else if (method.equals("policy_type"))
{
@@ -110,9 +156,76 @@
output = rh.createReply();
output.write_long(returns);
}
+ else if (method.equals("value"))
+ {
+ // The "value" can be invoked on the children types
+ // and must return an integer, representing the policy value
+ // (CORBA enumeration).
+ output = rh.createReply();
+ output.write_long(policyCode);
+ }
else
throw new BAD_OPERATION(method, 0, CompletionStatus.COMPLETED_MAYBE);
return output;
+ }
+
+ /**
+ * Get the value of this policy
+ */
+ public final java.lang.Object getValue()
+ {
+ return value;
+ }
+
+ /**
+ * Get the integer code of this policy value.
+ */
+ public final int getCode()
+ {
+ return policyCode;
+ }
+
+ /**
+ * Returns without action. It is a work of garbage collector
+ * to remove the unused objects.
+ */
+ public final void destroy()
+ {
+ }
+
+ /**
+ * Returns the string representation of the given policy.
+ */
+ public final String toString()
+ {
+ return value.toString();
+ }
+
+ /**
+ * Create a copy of this policy. The object is not mutable, so
+ * <code>this</code> can be returned.
+ *
+ * @return <code>this</code>
+ */
+ public Policy copy()
+ {
+ return this;
+ }
+
+ /**
+ * Use the value to get a hash code.
+ */
+ public int hashCode()
+ {
+ return getValue().hashCode();
+ }
+
+ /**
+ * Check the values for equality.
+ */
+ public boolean equals(Object x)
+ {
+ return x == null ? false : getValue().equals(x);
}
}
Index: kaffe/libraries/javalib/org/omg/CORBA/PolicyHelper.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/PolicyHelper.java:1.1 kaffe/libraries/javalib/org/omg/CORBA/PolicyHelper.java:1.2
--- kaffe/libraries/javalib/org/omg/CORBA/PolicyHelper.java:1.1 Sun Jul 3 01:32:28 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/PolicyHelper.java Mon Jul 4 15:30:03 2005
@@ -130,10 +130,12 @@
return null;
else if (obj instanceof Policy)
return (Policy) obj;
- else if (!obj._is_a(id()))
- throw new BAD_PARAM("Not a Policy");
else
{
+ // Check for the policy id cannot be performed because
+ // this helper must read various subclasses of the Policy,
+ // and the IOR profile currently supports only one id.
+
Delegate delegate = ((ObjectImpl) obj)._get_delegate();
return new _PolicyStub(delegate);
}
Index: kaffe/libraries/javalib/org/omg/PortableServer/IdAssignmentPolicyValue.java
diff -u kaffe/libraries/javalib/org/omg/PortableServer/IdAssignmentPolicyValue.java:1.1 kaffe/libraries/javalib/org/omg/PortableServer/IdAssignmentPolicyValue.java:1.2
--- kaffe/libraries/javalib/org/omg/PortableServer/IdAssignmentPolicyValue.java:1.1 Sun Jul 3 01:32:36 2005
+++ kaffe/libraries/javalib/org/omg/PortableServer/IdAssignmentPolicyValue.java Mon Jul 4 15:30:03 2005
@@ -143,9 +143,8 @@
}
/**
- * Returns the value, representing the completion
- * status of this object.
- * @return one of USER_ID, SYSTEM_ID.
+ * Returns the integer code of the policy value.
+ * @return _USER_ID or _SYSTEM_ID.
*/
public int value()
{
Index: kaffe/libraries/javalib/org/omg/PortableServer/IdUniquenessPolicyValue.java
diff -u kaffe/libraries/javalib/org/omg/PortableServer/IdUniquenessPolicyValue.java:1.1 kaffe/libraries/javalib/org/omg/PortableServer/IdUniquenessPolicyValue.java:1.2
--- kaffe/libraries/javalib/org/omg/PortableServer/IdUniquenessPolicyValue.java:1.1 Sun Jul 3 01:32:36 2005
+++ kaffe/libraries/javalib/org/omg/PortableServer/IdUniquenessPolicyValue.java Mon Jul 4 15:30:03 2005
@@ -143,9 +143,8 @@
}
/**
- * Returns the value, representing the completion
- * status of this object.
- * @return one of UNIQUE_ID, MULTIPLE_ID.
+ * Returns the integer code of the policy value.
+ * @return _UNIQUE_ID or _MULTIPLE_ID.
*/
public int value()
{
Index: kaffe/libraries/javalib/org/omg/PortableServer/ImplicitActivationPolicyValue.java
diff -u kaffe/libraries/javalib/org/omg/PortableServer/ImplicitActivationPolicyValue.java:1.1 kaffe/libraries/javalib/org/omg/PortableServer/ImplicitActivationPolicyValue.java:1.2
--- kaffe/libraries/javalib/org/omg/PortableServer/ImplicitActivationPolicyValue.java:1.1 Sun Jul 3 01:32:36 2005
+++ kaffe/libraries/javalib/org/omg/PortableServer/ImplicitActivationPolicyValue.java Mon Jul 4 15:30:03 2005
@@ -143,9 +143,8 @@
}
/**
- * Returns the value, representing the completion
- * status of this object.
- * @return one of IMPLICIT_ACTIVATION, NO_IMPLICIT_ACTIVATION.
+ * Returns the integer code of the policy value.
+ * @return _IMPLICIT_ACTIVATION or _NO_IMPLICIT_ACTIVATION.
*/
public int value()
{
Index: kaffe/libraries/javalib/org/omg/PortableServer/LifespanPolicyValue.java
diff -u kaffe/libraries/javalib/org/omg/PortableServer/LifespanPolicyValue.java:1.1 kaffe/libraries/javalib/org/omg/PortableServer/LifespanPolicyValue.java:1.2
--- kaffe/libraries/javalib/org/omg/PortableServer/LifespanPolicyValue.java:1.1 Sun Jul 3 01:32:37 2005
+++ kaffe/libraries/javalib/org/omg/PortableServer/LifespanPolicyValue.java Mon Jul 4 15:30:03 2005
@@ -140,9 +140,8 @@
}
/**
- * Returns the value, representing the completion
- * status of this object.
- * @return one of TRANSIENT, PERSISTENT.
+ * Returns the integer code of the policy value.
+ * @return _TRANSIENT or _PERSISTENT.
*/
public int value()
{
Index: kaffe/libraries/javalib/org/omg/PortableServer/RequestProcessingPolicyValue.java
diff -u kaffe/libraries/javalib/org/omg/PortableServer/RequestProcessingPolicyValue.java:1.1 kaffe/libraries/javalib/org/omg/PortableServer/RequestProcessingPolicyValue.java:1.2
--- kaffe/libraries/javalib/org/omg/PortableServer/RequestProcessingPolicyValue.java:1.1 Sun Jul 3 01:32:37 2005
+++ kaffe/libraries/javalib/org/omg/PortableServer/RequestProcessingPolicyValue.java Mon Jul 4 15:30:03 2005
@@ -165,9 +165,9 @@
}
/**
- * Returns the value, representing the completion
- * status of this object.
- * @return one of USE_ACTIVE_OBJECT_MAP_ONLY, USE_DEFAULT_SERVANT, USE_SERVANT_MANAGER.
+ * Returns the integer code of the policy value.
+ * @return one of _USE_ACTIVE_OBJECT_MAP_ONLY,
+ * _USE_DEFAULT_SERVANT, _USE_SERVANT_MANAGER.
*/
public int value()
{
Index: kaffe/libraries/javalib/org/omg/PortableServer/ServantRetentionPolicyValue.java
diff -u kaffe/libraries/javalib/org/omg/PortableServer/ServantRetentionPolicyValue.java:1.1 kaffe/libraries/javalib/org/omg/PortableServer/ServantRetentionPolicyValue.java:1.2
--- kaffe/libraries/javalib/org/omg/PortableServer/ServantRetentionPolicyValue.java:1.1 Sun Jul 3 01:32:37 2005
+++ kaffe/libraries/javalib/org/omg/PortableServer/ServantRetentionPolicyValue.java Mon Jul 4 15:30:03 2005
@@ -140,9 +140,8 @@
}
/**
- * Returns the value, representing the completion
- * status of this object.
- * @return one of RETAIN, NON_RETAIN.
+ * Returns the integer code of the policy value.
+ * @return _RETAIN or _NON_RETAIN.
*/
public int value()
{
===================================================================
Checking out kaffe/libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java Mon Jul 4 15:37:46 2005
@@ -0,0 +1,114 @@
+/* CookieHolder.java --
+ Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package org.omg.PortableServer.ServantLocatorPackage;
+
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+import org.omg.CORBA.portable.Streamable;
+
+/**
+ * The CookieHolder is used together with the
+ * {@link org.omg.PortableServer.ServantLocator}, allowing the
+ * {@link org.omg.PortableServer.ServantLocatorOperations#preinvoke}
+ * to return an arbitrary java.lang.Object that will be later passed to
+ * {@link org.omg.PortableServer.ServantLocatorOperations#postinvoke}.
+ *
+ * @see org.omg.PortableServer.ServantLocatorOperations
+ * @see org.omg.PortableServer.ServantManager
+ *
+ * @author Audrius Meskauskas, Lithuania (AudriusA at Bioinformatics.org)
+ */
+public class CookieHolder
+ implements Streamable
+{
+ /**
+ * The wrapped java.lang.Object.
+ */
+ public java.lang.Object value;
+
+ /**
+ * Create the unitialised instance of this holder.
+ */
+ public CookieHolder()
+ {
+ }
+
+ /**
+ * Create the instance, intialising the {@link #value} field to the passed
+ * value.
+ */
+ public CookieHolder(java.lang.Object initial)
+ {
+ value = initial;
+ }
+
+ /**
+ * java.lang.Object is outside the scope of the CORBA standards and the read
+ * operation cannot be supported in a language-neutral way.
+ *
+ * @throws NO_IMPLEMENT always.
+ */
+ public void _read(InputStream input)
+ {
+ throw new NO_IMPLEMENT();
+ }
+
+ /**
+ * There is no CORBA typecode that would specifically match a java.lang.Object.
+ *
+ * @throws NO_IMPLEMENT always.
+ */
+ public TypeCode _type()
+ {
+ throw new NO_IMPLEMENT();
+ }
+
+ /**
+ * java.lang.Object is outside the scope of the CORBA standards and the write
+ * operation cannot be supported in a language-neutral way.
+ *
+ * @throws NO_IMPLEMENT always.
+ */
+ public void _write(OutputStream output)
+ {
+ throw new NO_IMPLEMENT();
+ }
+}
\ No newline at end of file
===================================================================
Checking out kaffe/libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/package.html
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/package.html,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/org/omg/PortableServer/ServantLocatorPackage/package.html Mon Jul 4 15:37:46 2005
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html -
+ Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - org.omg.PortableServer.ServantLocatorPackage</title>
+</head>
+
+<body>
+<p>Contains a holder, transferring the data between subsequent
+ calls of the Servant Manager methods.</p>
+
+ at author Audrius Meskauskas, Lithuania (AudriusA at Bioinformatics.org)
+</body>
+</html>
More information about the kaffe
mailing list