svn commit: r321655 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Sun Jun 23 20:45:15 UTC 2013
Author: glewis
Date: Sun Jun 23 20:45:14 2013
New Revision: 321655
URL: http://svnweb.freebsd.org/changeset/ports/321655
Log:
. Update to 7u25.
. Unbreak the port by committing the other half of the patch-set split.
Modified:
head/java/openjdk7/Makefile
head/java/openjdk7/files/patch-set
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Sun Jun 23 20:44:24 2013 (r321654)
+++ head/java/openjdk7/Makefile Sun Jun 23 20:45:14 2013 (r321655)
@@ -40,8 +40,8 @@ DEBUG_DESC= Enable extra debugging info
POLICY_DESC= Install the Unlimited Strength Policy Files
TZUPDATE_DESC= Update the time zone data
-PORT_MINOR_VERSION= 21
-PORT_BUILD_NUMBER= 11
+PORT_MINOR_VERSION= 25
+PORT_BUILD_NUMBER= 15
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 6
JDK_BUILD_NUMBER= 24
@@ -62,6 +62,8 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archiver
RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+USE_DOS2UNIX= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
+
OPENJDK_OSARCH= bsd-${ARCH:S/i386/i586/}
INSTALLDIR= ${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}
@@ -104,6 +106,19 @@ BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \
${LOCALBASE}/openjdk6 \
${LOCALBASE}/bootstrap-openjdk
+SECURITY_ICONS= security-icon-bw16.png \
+ security-icon-bw24.png \
+ security-icon-bw32.png \
+ security-icon-bw48.png \
+ security-icon-interim16.png \
+ security-icon-interim24.png \
+ security-icon-interim32.png \
+ security-icon-interim48.png \
+ security-icon-yellow16.png \
+ security-icon-yellow24.png \
+ security-icon-yellow32.png \
+ security-icon-yellow48.png
+
.include <bsd.port.options.mk>
.if empty(PORT_OPTIONS:MDEBUG)
@@ -132,6 +147,14 @@ PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel
PATCH= gpatch
.endif
+post-extract:
+ # Move icons to their new home.
+ @${MKDIR} ${WRKSRC}/jdk/src/share/classes/sun/awt/resources
+.for icon in ${SECURITY_ICONS}
+ @${MV} ${WRKSRC}/jdk/src/solaris/classes/sun/awt/X11/${icon} \
+ ${WRKSRC}/jdk/src/share/classes/sun/awt/resources/
+.endfor
+
post-patch:
@${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp
Modified: head/java/openjdk7/files/patch-set
==============================================================================
--- head/java/openjdk7/files/patch-set Sun Jun 23 20:44:24 2013 (r321654)
+++ head/java/openjdk7/files/patch-set Sun Jun 23 20:45:14 2013 (r321655)
@@ -1,5 +1,5 @@
--- .hgtags 2012-08-10 09:07:00.000000000 -0700
-+++ .hgtags 2013-05-05 09:39:37.000000000 -0700
++++ .hgtags 2013-06-22 09:41:03.000000000 -0700
@@ -123,6 +123,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -8,7 +8,7 @@
34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -197,5 +198,69 @@
+@@ -197,5 +198,79 @@
29f6fb1833eb2a696b95e8985126f2d70f511a82 jdk7u6-b21
31cdab09d719fe60876c7f3a472386c1455d93e2 jdk7u6-b22
d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23
@@ -68,6 +68,7 @@
+8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02
+933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30
+790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31
++941539a9f6441f053e8e7f31064944b2fc08879f jdk7u17-b32
+527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01
+bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02
+20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03
@@ -80,8 +81,17 @@
+602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10
+fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11
+450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30
++170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12
++50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03
++a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04
++29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05
++8a7c657b7536006633b5e961d93e2173712a64fa jdk7u25-b06
++d45374e7c7eeb4e01d9f239e71e8a8aff453d55a jdk7u25-b07
++b01002577912b89306e88a9973b6f3bc049a2a69 jdk7u25-b08
++84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
++aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
--- corba/.hgtags 2012-08-10 09:09:50.000000000 -0700
-+++ corba/.hgtags 2013-05-05 09:39:37.000000000 -0700
++++ corba/.hgtags 2013-06-22 09:41:22.000000000 -0700
@@ -123,6 +123,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -90,7 +100,7 @@
9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -197,5 +198,69 @@
+@@ -197,5 +198,81 @@
353c15c4bc371f2f8258344c988d1403477cc140 jdk7u6-b21
793b80c0316fcafa18668bced26acb41af3be07d jdk7u6-b22
2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23
@@ -150,6 +160,7 @@
+e82d31e1f1189ae6f02d6855f0cd78074599b2e1 jdk7u17-b02
+d4366e557c4c5af62a94fc9885aed87c99abc848 jdk7u17-b30
+a6f066dd2cd526da73070d1e46c9b1e1ab1a6756 jdk7u17-b31
++6401c6b99d2d43ed4f0e2d38dce496069f6e91f8 jdk7u17-b32
+f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u21-b01
+17ecd70a2247ed86a095aae9f1a201fa7feea861 jdk7u21-b02
+bf0877613aeba816d5f18ea6316d535819f628e9 jdk7u21-b03
@@ -162,12 +173,23 @@
+b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10
+61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11
+3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30
++fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12
++3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01
++cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02
++2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03
++b180f1282ad221bde0d4d865c879c0fa7f8ef4c8 jdk7u25-b04
++d97e6c162735798fe0c9f1dd582aa1114b6c5447 jdk7u25-b05
++da9301dac56c26846212db33bb20001652b6ce60 jdk7u25-b06
++aa2dc8d3bb2cdd726ec97bc2bf130eec46467f28 jdk7u25-b07
++550d43da7fe2f85bbce88cc94066c589480b1221 jdk7u25-b08
++161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
++c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2012-08-10 09:09:53.000000000 -0700
-+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2013-05-05 09:39:34.000000000 -0700
++++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2013-06-22 09:39:21.000000000 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
++# Copyright (c) 2000, 2013, 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
@@ -182,9 +204,11 @@
com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \
com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \
com/sun/corba/se/impl/orbutil/LogKeywords.java \
-@@ -45,19 +41,11 @@
+@@ -43,21 +39,12 @@
+ com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \
+ com/sun/corba/se/impl/orbutil/ORBConstants.java \
com/sun/corba/se/impl/orbutil/ORBUtility.java \
- com/sun/corba/se/impl/orbutil/ORBClassLoader.java \
+- com/sun/corba/se/impl/orbutil/ORBClassLoader.java \
com/sun/corba/se/impl/orbutil/RepIdDelegator.java \
- com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java \
- com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java \
@@ -203,7 +227,7 @@
com/sun/corba/se/impl/orbutil/closure/Constant.java \
com/sun/corba/se/impl/orbutil/concurrent/Sync.java \
--- corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2012-08-10 09:10:11.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2013-03-09 18:08:34.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
@@ -224,16 +248,57 @@
private Object methodArgs[] ;
ServerCallback(ORB orb, Method installMethod, Method uninstallMethod,
+--- corba/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java 2012-08-10 09:10:12.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, 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
+@@ -81,7 +81,6 @@
+
+ import com.sun.corba.se.impl.oa.poa.BadServerIdHandler;
+ import com.sun.corba.se.impl.orbutil.ORBConstants;
+-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
+ import com.sun.corba.se.impl.orbutil.ORBUtility;
+ import com.sun.corba.se.impl.util.Utility;
+
--- corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2012-08-10 09:10:12.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-06-22 09:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, 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
-@@ -1218,7 +1218,7 @@
+@@ -33,6 +33,8 @@
+
+ import java.io.Serializable;
+ import java.math.BigDecimal;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.List ;
+ import java.util.ArrayList ;
+
+@@ -504,7 +506,13 @@
+ public org.omg.CORBA.portable.OutputStream create_output_stream()
+ {
+ //debug.log ("create_output_stream");
+- return new AnyOutputStream(orb);
++ final ORB finalorb = this.orb;
++ return AccessController.doPrivileged(new PrivilegedAction<AnyOutputStream>() {
++ @Override
++ public AnyOutputStream run() {
++ return new AnyOutputStream(finalorb);
++ }
++ });
+ }
+
+ /**
+@@ -1218,7 +1226,7 @@
// See bug 4391648 for more info about the tcORB in this
// case.
RepositoryIdStrings repStrs
@@ -242,7 +307,7 @@
// Assertion: c instanceof Serializable?
-@@ -1251,7 +1251,7 @@
+@@ -1251,7 +1259,7 @@
// Anything else
// We know that this is a TypeCodeImpl since it is our ORB
classTC = (TypeCodeImpl)ValueUtility.createTypeCodeForClass(
@@ -251,8 +316,27 @@
// Intruct classTC to store its buffer
classTC.setCaching(true);
// Update the cache
+--- corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java 2012-08-10 09:10:13.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 2013, 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
+@@ -600,7 +600,8 @@
+ }
+
+ public static CDROutputStream newOutputStream(ORB orb) {
+- TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb);
++ TypeCodeOutputStream tcos =
++ sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb);
+ //if (debug) System.out.println("Created TypeCodeOutputStream " + tcos +
+ // " with no parent");
+ return tcos;
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2012-08-10 09:10:15.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2013-03-09 18:08:34.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -348,7 +432,7 @@
value = valueHandler.readValue(parent,
indirection,
--- corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2012-08-10 09:10:15.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2013-03-09 18:08:34.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -395,8 +479,157 @@
Serializable key = object;
+--- corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java 2012-08-10 09:10:16.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2004, 2013, 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
+@@ -66,7 +66,7 @@
+ *
+ * @author Ram Jeyaraman
+ */
+-public class IDLJavaSerializationOutputStream extends CDROutputStreamBase {
++final class IDLJavaSerializationOutputStream extends CDROutputStreamBase {
+
+ private ORB orb;
+ private byte encodingVersion;
+--- corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2012-08-10 09:10:16.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2013, 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
+@@ -196,7 +196,8 @@
+ }
+
+ public TypeCodeOutputStream createEncapsulation(org.omg.CORBA.ORB _orb) {
+- TypeCodeOutputStream encap = new TypeCodeOutputStream((ORB)_orb, isLittleEndian());
++ TypeCodeOutputStream encap =
++ sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)_orb, isLittleEndian());
+ encap.setEnclosingOutputStream(this);
+ encap.makeEncapsulation();
+ //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + encap + " with parent " + this);
+@@ -211,7 +212,8 @@
+
+ public static TypeCodeOutputStream wrapOutputStream(OutputStream os) {
+ boolean littleEndian = ((os instanceof CDROutputStream) ? ((CDROutputStream)os).isLittleEndian() : false);
+- TypeCodeOutputStream tos = new TypeCodeOutputStream((ORB)os.orb(), littleEndian);
++ TypeCodeOutputStream tos =
++ sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)os.orb(), littleEndian);
+ tos.setEnclosingOutputStream(os);
+ //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + tos + " with parent " + os);
+ return tos;
+--- corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2012-08-10 09:10:17.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2013, 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
+@@ -155,7 +155,8 @@
+ // be versioned. This can be handled once this work is complete.
+
+ // Create output stream with default endianness.
+- EncapsOutputStream cdrOut = new EncapsOutputStream(
++ EncapsOutputStream cdrOut =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(
+ (com.sun.corba.se.spi.orb.ORB)orb, giopVersion );
+
+ // This is an encapsulation, so put out the endian:
+--- corba/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java 2012-08-10 09:10:18.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2013, 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
+@@ -77,7 +77,6 @@
+ import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+ import com.sun.corba.se.impl.logging.OMGSystemException;
+ import com.sun.corba.se.impl.corba.RequestImpl;
+-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
+ import com.sun.corba.se.impl.orbutil.ORBConstants;
+ import com.sun.corba.se.impl.orbutil.ORBUtility;
+ import com.sun.corba.se.impl.orbutil.StackImpl;
+--- corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java 2012-08-10 09:10:18.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2013, 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
+@@ -86,13 +86,14 @@
+ import com.sun.corba.se.impl.encoding.EncapsOutputStream;
+
+ import com.sun.corba.se.impl.orbutil.ORBUtility;
+-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
+
+ import com.sun.corba.se.impl.util.RepositoryId;
+
+ import com.sun.corba.se.impl.logging.InterceptorsSystemException;
+ import com.sun.corba.se.impl.logging.OMGSystemException;
+
++import sun.corba.SharedSecrets;
++
+ /**
+ * Implementation of the RequestInfo interface as specified in
+ * orbos/99-12-02 section 5.4.1.
+@@ -452,7 +453,8 @@
+
+ // Find the read method on the helper class:
+ String helperClassName = className + "Helper";
+- Class helperClass = ORBClassLoader.loadClass( helperClassName );
++ Class<?> helperClass =
++ SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName );
+ Class[] readParams = new Class[1];
+ readParams[0] = org.omg.CORBA.portable.InputStream.class;
+ Method readMethod = helperClass.getMethod( "read", readParams );
+@@ -512,7 +514,8 @@
+ Class exceptionClass = userException.getClass();
+ String className = exceptionClass.getName();
+ String helperClassName = className + "Helper";
+- Class helperClass = ORBClassLoader.loadClass( helperClassName );
++ Class<?> helperClass =
++ SharedSecrets.getJavaCorbaAccess().loadClass( helperClassName );
+
+ // Find insert( Any, class ) method
+ Class[] insertMethodParams = new Class[2];
+@@ -656,7 +659,8 @@
+ // Convert the "core" service context to an
+ // "IOP" ServiceContext by writing it to a
+ // CDROutputStream and reading it back.
+- EncapsOutputStream out = new EncapsOutputStream(myORB);
++ EncapsOutputStream out =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB);
+
+ context.write( out, GIOPVersion.V1_2 );
+ InputStream inputStream = out.create_input_stream();
+@@ -692,8 +696,8 @@
+ {
+ int id = 0 ;
+ // Convert IOP.service_context to core.ServiceContext:
+- EncapsOutputStream outputStream = new EncapsOutputStream(
+- myORB );
++ EncapsOutputStream outputStream =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB);
+ InputStream inputStream = null;
+ UnknownServiceContext coreServiceContext = null;
+ ServiceContextHelper.write( outputStream, service_context );
--- corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java 2012-08-10 09:10:18.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java 2013-03-09 18:08:34.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
@@ -431,8 +664,82 @@
}
Stack repIds = new Stack();
+--- corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2012-08-10 09:10:18.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2013-06-22 09:39:21.000000000 -0700
+@@ -300,11 +300,11 @@
+ resetStream();
+ }
+
+- public final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) {
++ final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) {
+ orbStream = os;
+ }
+
+- public final org.omg.CORBA_2_3.portable.InputStream getOrbStream() {
++ final org.omg.CORBA_2_3.portable.InputStream getOrbStream() {
+ return orbStream;
+ }
+
+@@ -327,11 +327,11 @@
+ return (javax.rmi.CORBA.ValueHandler) vhandler;
+ }
+
+- public final void increaseRecursionDepth(){
++ final void increaseRecursionDepth(){
+ recursionDepth++;
+ }
+
+- public final int decreaseRecursionDepth(){
++ final int decreaseRecursionDepth(){
+ return --recursionDepth;
+ }
+
+--- corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java 2012-08-10 09:10:18.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1998, 2013, 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
+@@ -124,19 +124,19 @@
+ }
+ }
+
+- public final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) {
++ final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) {
+ orbStream = os;
+ }
+
+- public final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() {
++ final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() {
+ return orbStream;
+ }
+
+- public final void increaseRecursionDepth(){
++ final void increaseRecursionDepth(){
+ recursionDepth++;
+ }
+
+- public final int decreaseRecursionDepth(){
++ final int decreaseRecursionDepth(){
+ return --recursionDepth;
+ }
+
+--- corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2012-08-10 09:10:18.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2013-06-22 09:39:21.000000000 -0700
+@@ -251,7 +251,7 @@
+ }
+
+ protected abstract byte getStreamFormatVersion();
+- protected abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream();
++ abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream();
+
+ // Description of possible actions
+ protected static class ReadObjectState {
--- corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2012-08-10 09:10:18.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-03-09 18:08:34.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -617,8 +924,19 @@
private Constructor cons ;
/**
+--- corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2012-08-10 09:10:19.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2013-06-22 09:39:21.000000000 -0700
+@@ -179,7 +179,7 @@
+ putFields.write(this);
+ }
+
+- public abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream();
++ abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream();
+
+ protected abstract void beginOptionalCustomData();
+
--- corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2012-08-10 09:10:19.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2013-03-09 18:08:34.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
@@ -774,15 +1092,15 @@
}
}
--- corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java 2012-08-10 09:10:19.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java 2013-05-05 09:39:34.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java 2013-06-22 09:39:21.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2013, 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
-@@ -93,6 +93,14 @@
+@@ -93,6 +93,22 @@
null, // tk_abstract_interface 32
};
@@ -791,25 +1109,172 @@
+ public ValueHandlerImpl newValueHandlerImpl() {
+ return ValueHandlerImpl.getInstance();
+ }
++ public Class<?> loadClass(String className) throws ClassNotFoundException {
++ if (Thread.currentThread().getContextClassLoader() != null) {
++ return Thread.currentThread().getContextClassLoader().
++ loadClass(className);
++ } else {
++ return ClassLoader.getSystemClassLoader().loadClass(className);
++ }
++ }
+ });
+ }
+
public static String getSignature(ValueMember member)
throws ClassNotFoundException {
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2012-08-10 09:10:19.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2013-06-22 09:39:21.000000000 -0700
+@@ -128,7 +128,8 @@
+ static public void writeEncapsulation( WriteContents obj,
+ OutputStream os )
+ {
+- EncapsOutputStream out = new EncapsOutputStream( (ORB)os.orb() ) ;
++ EncapsOutputStream out =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)os.orb());
+
+ out.putEndian() ;
+
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java 2012-08-10 09:10:19.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2013, 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
+@@ -95,7 +95,8 @@
+
+ public org.omg.IOP.TaggedProfile getIOPProfile()
+ {
+- EncapsOutputStream os = new EncapsOutputStream( orb ) ;
++ EncapsOutputStream os =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(orb);
+ write( os ) ;
+ InputStream is = (InputStream)(os.create_input_stream()) ;
+ return org.omg.IOP.TaggedProfileHelper.read( is ) ;
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java 2012-08-10 09:10:19.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2013, 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
+@@ -213,7 +213,8 @@
+ {
+ StringWriter bs;
+
+- MarshalOutputStream s = new EncapsOutputStream(factory);
++ MarshalOutputStream s =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(factory);
+ s.putEndian();
+ write( (OutputStream)s );
+ bs = new StringWriter();
+@@ -237,7 +238,8 @@
+ }
+
+ public org.omg.IOP.IOR getIOPIOR() {
+- EncapsOutputStream os = new EncapsOutputStream(factory);
++ EncapsOutputStream os =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(factory);
+ write(os);
+ InputStream is = (InputStream) (os.create_input_stream());
+ return org.omg.IOP.IORHelper.read(is);
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java 2012-08-10 09:10:20.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -87,7 +87,8 @@
+
+ public byte[] getBytes( org.omg.CORBA.ORB orb )
+ {
+- EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ;
++ EncapsOutputStream os =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb);
+ write( os ) ;
+ return os.toByteArray() ;
+ }
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java 2012-08-10 09:10:21.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2013, 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
+@@ -61,7 +61,8 @@
+ public TaggedComponent create( org.omg.CORBA.ORB orb,
+ org.omg.IOP.TaggedComponent comp )
+ {
+- EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ;
++ EncapsOutputStream os =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb);
+ org.omg.IOP.TaggedComponentHelper.write( os, comp ) ;
+ InputStream is = (InputStream)(os.create_input_stream() ) ;
+ // Skip the component ID: we just wrote it out above
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2012-08-10 09:10:22.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2013, 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
+@@ -247,7 +247,8 @@
+
+ public org.omg.IOP.TaggedProfile getIOPProfile()
+ {
+- EncapsOutputStream os = new EncapsOutputStream( orb ) ;
++ EncapsOutputStream os =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(orb);
+ os.write_long( getId() ) ;
+ write( os ) ;
+ InputStream is = (InputStream)(os.create_input_stream()) ;
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java 2012-08-10 09:10:22.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2013, 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
+@@ -132,8 +132,9 @@
+ // Note that this cannot be accomplished with a codec!
+
+ // Use the byte order of the given stream
+- OutputStream encapsulatedOS = new EncapsOutputStream( (ORB)os.orb(),
+- ((CDROutputStream)os).isLittleEndian() ) ;
++ OutputStream encapsulatedOS =
++ sun.corba.OutputStreamFactory.newEncapsOutputStream(
++ (ORB)os.orb(), ((CDROutputStream)os).isLittleEndian() ) ;
+
+ okeyTemplate.write( id, encapsulatedOS ) ;
+ EncapsulationUtility.writeOutputStream( encapsulatedOS, os ) ;
--- corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2012-08-10 09:10:23.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2013-05-05 09:39:34.000000000 -0700
-@@ -112,6 +112,9 @@
- import com.sun.corba.se.impl.orbutil.ORBClassLoader;
++++ corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2013, 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
+@@ -109,9 +109,9 @@
+ import com.sun.corba.se.impl.util.Utility;
+ import com.sun.corba.se.impl.util.IdentityHashtable;
+ import com.sun.corba.se.impl.util.JDKBridge;
+-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
import com.sun.corba.se.impl.logging.UtilSystemException;
import com.sun.corba.se.spi.logging.CORBALogDomains;
+import sun.corba.SharedSecrets;
-+import sun.corba.JavaCorbaAccess;
-+
/**
* Provides utility methods that can be used by stubs and ties to
-@@ -125,7 +128,8 @@
+@@ -125,7 +125,8 @@
// Maps targets to ties.
private static IdentityHashtable exportedServants = new IdentityHashtable();
@@ -819,9 +1284,77 @@
private UtilSystemException utilWrapper = UtilSystemException.get(
CORBALogDomains.RPC_ENCODING);
+@@ -259,7 +260,7 @@
+ return new MarshalException(message,inner);
+ } else if (ex instanceof ACTIVITY_REQUIRED) {
+ try {
+- Class cl = ORBClassLoader.loadClass(
++ Class<?> cl = SharedSecrets.getJavaCorbaAccess().loadClass(
+ "javax.activity.ActivityRequiredException");
+ Class[] params = new Class[2];
+ params[0] = java.lang.String.class;
+@@ -275,7 +276,7 @@
+ }
+ } else if (ex instanceof ACTIVITY_COMPLETED) {
+ try {
+- Class cl = ORBClassLoader.loadClass(
++ Class<?> cl = SharedSecrets.getJavaCorbaAccess().loadClass(
+ "javax.activity.ActivityCompletedException");
+ Class[] params = new Class[2];
+ params[0] = java.lang.String.class;
+@@ -291,7 +292,7 @@
+ }
+ } else if (ex instanceof INVALID_ACTIVITY) {
+ try {
+- Class cl = ORBClassLoader.loadClass(
++ Class<?> cl = SharedSecrets.getJavaCorbaAccess().loadClass(
+ "javax.activity.InvalidActivityException");
+ Class[] params = new Class[2];
+ params[0] = java.lang.String.class;
+--- corba/src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java 2012-08-10 09:10:31.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2013, 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
+@@ -48,7 +48,6 @@
+
+ import com.sun.corba.se.impl.encoding.CodeSetComponentInfo ;
+ import com.sun.corba.se.impl.legacy.connection.USLPort;
+-import com.sun.corba.se.impl.orbutil.ORBClassLoader ;
+ import com.sun.corba.se.impl.orbutil.ORBConstants ;
+ import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
+
--- corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2012-08-10 09:10:31.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-05-05 09:39:34.000000000 -0700
-@@ -840,7 +840,7 @@
++++ corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2013, 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
+@@ -152,7 +152,6 @@
+ import com.sun.corba.se.impl.oa.poa.BadServerIdHandler;
+ import com.sun.corba.se.impl.oa.poa.DelegateImpl;
+ import com.sun.corba.se.impl.oa.poa.POAFactory;
+-import com.sun.corba.se.impl.orbutil.ORBClassLoader;
+ import com.sun.corba.se.impl.orbutil.ORBConstants;
+ import com.sun.corba.se.impl.orbutil.ORBUtility;
+ import com.sun.corba.se.impl.orbutil.StackImpl;
+@@ -551,7 +550,7 @@
+ public synchronized org.omg.CORBA.portable.OutputStream create_output_stream()
+ {
+ checkShutdownState();
+- return new EncapsOutputStream(this);
++ return sun.corba.OutputStreamFactory.newEncapsOutputStream(this);
+ }
+
+ /**
+@@ -840,7 +839,7 @@
// backward compatability 4365188
CodeBase cb;
@@ -830,6 +1363,102 @@
cb = (CodeBase)vh.getRunTimeCodeBase();
return ORBUtility.connectAndGetIOR( this, cb ) ;
+--- corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java 2012-08-10 09:10:31.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1997, 2013, 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
+@@ -149,7 +149,7 @@
+ }
+
+ public OutputStream create_output_stream() {
+- return new EncapsOutputStream(this);
++ return sun.corba.OutputStreamFactory.newEncapsOutputStream(this);
+ }
+
+ public TypeCode create_struct_tc(String id,
+--- corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java 2012-08-10 09:10:31.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java 2013-06-22 09:39:21.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2002, 2013, 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
+@@ -78,7 +78,6 @@
+ import com.sun.corba.se.impl.legacy.connection.USLPort ;
+ import com.sun.corba.se.impl.logging.ORBUtilSystemException ;
+ import com.sun.corba.se.impl.oa.poa.BadServerIdHandler ;
+-import com.sun.corba.se.impl.orbutil.ORBClassLoader ;
+ import com.sun.corba.se.impl.orbutil.ORBConstants ;
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.KeyAddr ;
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.ProfileAddr ;
+@@ -86,6 +85,8 @@
+ import com.sun.corba.se.impl.transport.DefaultIORToSocketInfoImpl;
+ import com.sun.corba.se.impl.transport.DefaultSocketFactoryImpl;
+
++import sun.corba.SharedSecrets;
++
+ /** Initialize the parser data for the standard ORB parser. This is used both
+ * to implement ORBDataParserImpl and to provide the basic testing framework
+ * for ORBDataParserImpl.
+@@ -640,8 +641,8 @@
+ String param = (String)value ;
+
+ try {
+- Class legacySocketFactoryClass =
+- ORBClassLoader.loadClass(param);
++ Class<?> legacySocketFactoryClass =
++ SharedSecrets.getJavaCorbaAccess().loadClass(param);
+ // For security reasons avoid creating an instance if
+ // this socket factory class is not one that would fail
+ // the class cast anyway.
+@@ -670,7 +671,8 @@
+ String param = (String)value ;
+
+ try {
+- Class socketFactoryClass = ORBClassLoader.loadClass(param);
++ Class<?> socketFactoryClass =
++ SharedSecrets.getJavaCorbaAccess().loadClass(param);
+ // For security reasons avoid creating an instance if
+ // this socket factory class is not one that would fail
+ // the class cast anyway.
+@@ -699,7 +701,8 @@
+ String param = (String)value ;
+
+ try {
+- Class iorToSocketInfoClass = ORBClassLoader.loadClass(param);
++ Class<?> iorToSocketInfoClass =
++ SharedSecrets.getJavaCorbaAccess().loadClass(param);
+ // For security reasons avoid creating an instance if
+ // this socket factory class is not one that would fail
+ // the class cast anyway.
+@@ -728,7 +731,8 @@
+ String param = (String)value ;
+
+ try {
+- Class iiopPrimaryToContactInfoClass = ORBClassLoader.loadClass(param);
++ Class<?> iiopPrimaryToContactInfoClass =
++ SharedSecrets.getJavaCorbaAccess().loadClass(param);
+ // For security reasons avoid creating an instance if
+ // this socket factory class is not one that would fail
+ // the class cast anyway.
+@@ -757,8 +761,8 @@
+ String param = (String)value ;
+
+ try {
+- Class contactInfoListFactoryClass =
+- ORBClassLoader.loadClass(param);
++ Class<?> contactInfoListFactoryClass =
++ SharedSecrets.getJavaCorbaAccess().loadClass(param);
+ // For security reasons avoid creating an instance if
+ // this socket factory class is not one that would fail
+ // the class cast anyway.
--- corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java 2012-08-10 09:10:32.000000000 -0700
+++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,57 +0,0 @@
@@ -1087,30 +1716,89 @@
- putFields_1_3_1.write(this);
- }
-}
---- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java 2012-08-10 09:10:33.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java 2013-05-05 09:39:34.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -160,45 +160,13 @@
- }
-
- /**
-- * Creates the correct ValueHandler for the given ORB,
-- * querying ORBVersion information. If the ORB or
-- * ORBVersion is null, gets the ValueHandler from
-- * Util.createValueHandler.
-+ * Return default ValueHandler
- */
-- public static ValueHandler createValueHandler(ORB orb) {
--
-- if (orb == null)
-- return Util.createValueHandler();
--
+--- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBClassLoader.java 2012-08-10 09:10:33.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBClassLoader.java 1969-12-31 16:00:00.000000000 -0800
+@@ -1,47 +0,0 @@
+-/*
+- * Copyright (c) 2001, 2002, 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.
+- */
+-package com.sun.corba.se.impl.orbutil;
+-
+-/**
+- * Based on feedback from bug report 4452016, all class loading
+- * in the ORB is isolated here. It is acceptable to use
+- * Class.forName only when one is certain that the desired class
+- * should come from the core JDK.
+- */
+-public class ORBClassLoader
+-{
+- public static Class loadClass(String className)
+- throws ClassNotFoundException
+- {
+- return ORBClassLoader.getClassLoader().loadClass(className);
+- }
+-
+- public static ClassLoader getClassLoader() {
+- if (Thread.currentThread().getContextClassLoader() != null)
+- return Thread.currentThread().getContextClassLoader();
+- else
+- return ClassLoader.getSystemClassLoader();
+- }
+-}
+--- corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java 2012-08-10 09:10:33.000000000 -0700
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list