svn commit: r356958 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Sat Jun 7 23:37:25 UTC 2014
Author: glewis
Date: Sat Jun 7 23:37:24 2014
New Revision: 356958
URL: http://svnweb.freebsd.org/changeset/ports/356958
QAT: https://qat.redports.org/buildarchive/r356958/
Log:
Update to 7u60.
Deleted:
head/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile
head/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c
Modified:
head/java/openjdk7/Makefile
head/java/openjdk7/files/patch-set
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Sat Jun 7 23:36:37 2014 (r356957)
+++ head/java/openjdk7/Makefile Sat Jun 7 23:37:24 2014 (r356958)
@@ -3,7 +3,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@@ -37,8 +36,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= 55
-PORT_BUILD_NUMBER= 13
+PORT_MINOR_VERSION= 60
+PORT_BUILD_NUMBER= 19
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 40
JDK_BUILD_NUMBER= 43
Modified: head/java/openjdk7/files/patch-set
==============================================================================
--- head/java/openjdk7/files/patch-set Sat Jun 7 23:36:37 2014 (r356957)
+++ head/java/openjdk7/files/patch-set Sat Jun 7 23:37:24 2014 (r356958)
@@ -1,5 +1,5 @@
---- .hgtags 2013-09-06 11:20:33.000000000 -0700
-+++ .hgtags 2014-04-20 12:39:52.000000000 -0700
+--- ./.hgtags 2013-09-06 11:20:33.000000000 -0700
++++ ./.hgtags 2014-06-06 19:56:10.000000000 -0700
@@ -123,6 +123,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -40,10 +40,11 @@
da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
-@@ -341,3 +358,59 @@
+@@ -341,3 +358,83 @@
3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
++11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
+6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
+a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
+07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
@@ -84,6 +85,8 @@
+6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13
+d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30
+626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31
++472d67871307433bf3e2687c48237c48ffbf068e jdk7u51-b33
++503f1d094a1bbbd94386f5c3342130dc5f4ba6ee jdk7u51-b34
+df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u55-b00
+15bc13cd7f5d0bb06ab59935e25944fa7cb15bc8 jdk7u55-b01
+b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02
@@ -100,8 +103,29 @@
+de268da51b54a4f36bcc1a9af60faea285e94330 jdk7u55-b12
+d972a2d9e4f3f864d26c33ccfdacd8269e0f29a8 jdk7u55-b13
+0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30
---- Makefile 2013-09-06 11:20:33.000000000 -0700
-+++ Makefile 2014-04-20 12:39:52.000000000 -0700
++997ab3897d6ede80b0decdda94b569e57dd7dd90 jdk7u55-b14
++1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31
++11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
++88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01
++6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02
++87f2193da40d3a2eedca95108ae78403c7bdcd49 jdk7u60-b03
++d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u60-b04
++ea798405286d97f643ef809abcb1e13024b4f951 jdk7u60-b05
++b0940b205cab942512b5bca1338ab96a45a67832 jdk7u60-b06
++cae7bacaa13bb8c42a42fa35b156a7660874e907 jdk7u60-b07
++1af0560611469ad2a068a03774ecd0d7790db7b7 jdk7u60-b08
++662dc3b6467488b8c175a4423ba7a4991ad87d94 jdk7u60-b09
++023f8eb40d371d5cb761f7e60ba7b396b3fdf886 jdk7u60-b10
++798468b91bcbb81684aea8620dbb31eaceb24c6c jdk7u60-b11
++e40360c10b2ce5b24b1eea63160b78e112aa5d3f jdk7u60-b12
++5e540a4d55916519f5604a422bfbb7a0967d0594 jdk7u60-b13
++1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14
++a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15
++19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16
++472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18
++472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17
+--- ./Makefile 2013-09-06 11:20:33.000000000 -0700
++++ ./Makefile 2013-12-01 11:13:37.000000000 -0800
@@ -264,7 +264,7 @@
DEBUG_NAME=$(DEBUG_NAME) \
GENERATE_DOCS=false \
@@ -111,8 +135,8 @@
$(BOOT_CYCLE_DEBUG_SETTINGS) \
generic_build_repo_series
---- corba/.hgtags 2013-09-06 11:20:46.000000000 -0700
-+++ corba/.hgtags 2014-04-20 12:39:46.000000000 -0700
+--- ./corba/.hgtags 2013-09-06 11:20:46.000000000 -0700
++++ ./corba/.hgtags 2014-06-06 19:56:11.000000000 -0700
@@ -123,6 +123,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -144,7 +168,7 @@
ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
-@@ -343,3 +360,60 @@
+@@ -343,3 +360,83 @@
b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
@@ -189,6 +213,8 @@
+e2f0036f712aa636cfd55334ac21ea7ca2587a7b jdk7u51-b13
+6563d12c48c92af39a27ca46b4515fad8e994667 jdk7u51-b30
+0ad990211737fe1b1e2737a3498ab266146d2c53 jdk7u51-b31
++ee7d9f5d18fb67564e88a10f1bd682660db60aa2 jdk7u51-b33
++65ef96a075a43e9201866d1c9b8ee3138ebcc424 jdk7u51-b34
+55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u55-b00
+aabfdc799c0799837dcbbf9ea8d6df1511978b1f jdk7u55-b01
+db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02
@@ -205,8 +231,29 @@
+3cce2a49d18d93dfca2634db32368486ebbb1590 jdk7u55-b12
+8efa6e66c13a5329c312d1a521ffab75d9a330e3 jdk7u55-b13
+e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30
---- corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700
-+++ corba/make/Makefile 2014-04-20 12:39:43.000000000 -0700
++a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14
++55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
++c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00
++a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01
++d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
++d7e98ed925a3885380226f8375fe109a9a25397f jdk7u60-b03
++1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u60-b04
++753698a910167cc29c01490648a2adbcea1314cc jdk7u60-b05
++9852efe6d6b992b73fdbf59e36fb3547a9535051 jdk7u60-b06
++84a18429f247774fc7f1bc81de271da20b40845b jdk7u60-b07
++8469bc00ddca4de366b20b32d42548c882656cd8 jdk7u60-b08
++7abca119f9543489280d560dc11256d439004f0f jdk7u60-b09
++1861f1f599728c4f15a85a5980edef916552747b jdk7u60-b10
++a429ff635395688ded6c52cd21c0b4ce75e62168 jdk7u60-b11
++d581875525aaf618afe901da31d679195ee35f4b jdk7u60-b12
++2c8ba5f9487b0ac085874afd38f4c10a4127f62c jdk7u60-b13
++02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14
++e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15
++e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16
++b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18
++b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17
+--- ./corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700
++++ ./corba/make/Makefile 2014-01-18 12:16:05.000000000 -0800
@@ -160,7 +160,7 @@
#
# CORBA
@@ -216,8 +263,977 @@
build:
$(SUBDIRS-loop)
---- corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-09-06 11:20:47.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-04-20 12:39:43.000000000 -0700
+--- ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaInputStream.sjava 2013-09-06 11:20:47.000000000 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaInputStream.sjava 1969-12-31 16:00:00.000000000 -0800
+@@ -1,528 +0,0 @@
+-/*
+- * Copyright (c) 2004, 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.encoding;
+-
+-import java.io.IOException;
+-import java.io.Serializable;
+-import java.math.BigDecimal;
+-import java.nio.ByteBuffer;
+-
+-import org.omg.CORBA.TypeCode;
+-import org.omg.CORBA.Principal;
+-import org.omg.CORBA.Any;
+-
+-import com.sun.org.omg.SendingContext.CodeBase;
+-
+-import com.sun.corba.se.pept.protocol.MessageMediator;
+-
+-import com.sun.corba.se.spi.logging.CORBALogDomains;
+-import com.sun.corba.se.spi.orb.ORB;
+-import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
+-import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
+-
+-import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+-import com.sun.corba.se.impl.encoding.CodeSetConversion;
+-import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
+-
+-/**
+- * This is delegates to the real implementation.
+- *
+- * NOTE:
+- *
+- * Before using the stream for valuetype unmarshaling, one must call
+- * performORBVersionSpecificInit().
+- */
+-public abstract class CDRInputStream
+- extends org.omg.CORBA_2_3.portable.InputStream
+- implements com.sun.corba.se.impl.encoding.MarshalInputStream,
+- org.omg.CORBA.DataInputStream, org.omg.CORBA.portable.ValueInputStream
+-{
+- protected CorbaMessageMediator messageMediator;
+- private CDRInputStreamBase impl;
+-
+- // We can move this out somewhere later. For now, it serves its purpose
+- // to create a concrete CDR delegate based on the GIOP version.
+- private static class InputStreamFactory {
+-
+- public static CDRInputStreamBase newInputStream(ORB orb, GIOPVersion version)
+- {
+- switch(version.intValue()) {
+- case GIOPVersion.VERSION_1_0:
+- return new CDRInputStream_1_0();
+- case GIOPVersion.VERSION_1_1:
+- return new CDRInputStream_1_1();
+- case GIOPVersion.VERSION_1_2:
+- return new CDRInputStream_1_2();
+- default:
+- ORBUtilSystemException wrapper = ORBUtilSystemException.get( orb,
+- CORBALogDomains.RPC_ENCODING ) ;
+- throw wrapper.unsupportedGiopVersion( version ) ;
+- }
+- }
+- }
+-
+- // Required for the case when a ClientResponseImpl is
+- // created with a SystemException due to a dead server/closed
+- // connection with no warning. Note that the stream will
+- // not be initialized in this case.
+- //
+- // Probably also required by ServerRequestImpl.
+- //
+- // REVISIT.
+- public CDRInputStream() {
+- }
+-
+- public CDRInputStream(CDRInputStream is) {
+- impl = is.impl.dup();
+- impl.setParent(this);
+- }
+-
+- public CDRInputStream(org.omg.CORBA.ORB orb,
+- ByteBuffer byteBuffer,
+- int size,
+- boolean littleEndian,
+- GIOPVersion version,
+- BufferManagerRead bufMgr)
+- {
+- impl = InputStreamFactory.newInputStream( (ORB)orb, version);
+-
+- impl.init(orb, byteBuffer, size, littleEndian, bufMgr);
+-
+- impl.setParent(this);
+- }
+-
+- // org.omg.CORBA.portable.InputStream
+- public final boolean read_boolean() {
+- return impl.read_boolean();
+- }
+-
+- public final char read_char() {
+- return impl.read_char();
+- }
+-
+- public final char read_wchar() {
+- return impl.read_wchar();
+- }
+-
+- public final byte read_octet() {
+- return impl.read_octet();
+- }
+-
+- public final short read_short() {
+- return impl.read_short();
+- }
+-
+- public final short read_ushort() {
+- return impl.read_ushort();
+- }
+-
+- public final int read_long() {
+- return impl.read_long();
+- }
+-
+- public final int read_ulong() {
+- return impl.read_ulong();
+- }
+-
+- public final long read_longlong() {
+- return impl.read_longlong();
+- }
+-
+- public final long read_ulonglong() {
+- return impl.read_ulonglong();
+- }
+-
+- public final float read_float() {
+- return impl.read_float();
+- }
+-
+- public final double read_double() {
+- return impl.read_double();
+- }
+-
+- public final String read_string() {
+- return impl.read_string();
+- }
+-
+- public final String read_wstring() {
+- return impl.read_wstring();
+- }
+-
+- public final void read_boolean_array(boolean[] value, int offset, int length) {
+- impl.read_boolean_array(value, offset, length);
+- }
+-
+- public final void read_char_array(char[] value, int offset, int length) {
+- impl.read_char_array(value, offset, length);
+- }
+-
+- public final void read_wchar_array(char[] value, int offset, int length) {
+- impl.read_wchar_array(value, offset, length);
+- }
+-
+- public final void read_octet_array(byte[] value, int offset, int length) {
+- impl.read_octet_array(value, offset, length);
+- }
+-
+- public final void read_short_array(short[] value, int offset, int length) {
+- impl.read_short_array(value, offset, length);
+- }
+-
+- public final void read_ushort_array(short[] value, int offset, int length) {
+- impl.read_ushort_array(value, offset, length);
+- }
+-
+- public final void read_long_array(int[] value, int offset, int length) {
+- impl.read_long_array(value, offset, length);
+- }
+-
+- public final void read_ulong_array(int[] value, int offset, int length) {
+- impl.read_ulong_array(value, offset, length);
+- }
+-
+- public final void read_longlong_array(long[] value, int offset, int length) {
+- impl.read_longlong_array(value, offset, length);
+- }
+-
+- public final void read_ulonglong_array(long[] value, int offset, int length) {
+- impl.read_ulonglong_array(value, offset, length);
+- }
+-
+- public final void read_float_array(float[] value, int offset, int length) {
+- impl.read_float_array(value, offset, length);
+- }
+-
+- public final void read_double_array(double[] value, int offset, int length) {
+- impl.read_double_array(value, offset, length);
+- }
+-
+- public final org.omg.CORBA.Object read_Object() {
+- return impl.read_Object();
+- }
+-
+- public final TypeCode read_TypeCode() {
+- return impl.read_TypeCode();
+- }
+- public final Any read_any() {
+- return impl.read_any();
+- }
+-
+- public final Principal read_Principal() {
+- return impl.read_Principal();
+- }
+-
+- public final int read() throws java.io.IOException {
+- return impl.read();
+- }
+-
+- public final java.math.BigDecimal read_fixed() {
+- return impl.read_fixed();
+- }
+-
+- public final org.omg.CORBA.Context read_Context() {
+- return impl.read_Context();
+- }
+-
+- public final org.omg.CORBA.Object read_Object(java.lang.Class clz) {
+- return impl.read_Object(clz);
+- }
+-
+- public final org.omg.CORBA.ORB orb() {
+- return impl.orb();
+- }
+-
+- // org.omg.CORBA_2_3.portable.InputStream
+- public final java.io.Serializable read_value() {
+- return impl.read_value();
+- }
+-
+- public final java.io.Serializable read_value(java.lang.Class clz) {
+- return impl.read_value(clz);
+- }
+-
+- public final java.io.Serializable read_value(org.omg.CORBA.portable.BoxedValueHelper factory) {
+- return impl.read_value(factory);
+- }
+-
+- public final java.io.Serializable read_value(java.lang.String rep_id) {
+- return impl.read_value(rep_id);
+- }
+-
+- public final java.io.Serializable read_value(java.io.Serializable value) {
+- return impl.read_value(value);
+- }
+-
+- public final java.lang.Object read_abstract_interface() {
+- return impl.read_abstract_interface();
+- }
+-
+- public final java.lang.Object read_abstract_interface(java.lang.Class clz) {
+- return impl.read_abstract_interface(clz);
+- }
+- // com.sun.corba.se.impl.encoding.MarshalInputStream
+-
+- public final void consumeEndian() {
+- impl.consumeEndian();
+- }
+-
+- public final int getPosition() {
+- return impl.getPosition();
+- }
+-
+- // org.omg.CORBA.DataInputStream
+-
+- public final java.lang.Object read_Abstract () {
+- return impl.read_Abstract();
+- }
+-
+- public final java.io.Serializable read_Value () {
+- return impl.read_Value();
+- }
+-
+- public final void read_any_array (org.omg.CORBA.AnySeqHolder seq, int offset, int length) {
+- impl.read_any_array(seq, offset, length);
+- }
+-
+- public final void read_boolean_array (org.omg.CORBA.BooleanSeqHolder seq, int offset, int length) {
+- impl.read_boolean_array(seq, offset, length);
+- }
+-
+- public final void read_char_array (org.omg.CORBA.CharSeqHolder seq, int offset, int length) {
+- impl.read_char_array(seq, offset, length);
+- }
+-
+- public final void read_wchar_array (org.omg.CORBA.WCharSeqHolder seq, int offset, int length) {
+- impl.read_wchar_array(seq, offset, length);
+- }
+-
+- public final void read_octet_array (org.omg.CORBA.OctetSeqHolder seq, int offset, int length) {
+- impl.read_octet_array(seq, offset, length);
+- }
+-
+- public final void read_short_array (org.omg.CORBA.ShortSeqHolder seq, int offset, int length) {
+- impl.read_short_array(seq, offset, length);
+- }
+-
+- public final void read_ushort_array (org.omg.CORBA.UShortSeqHolder seq, int offset, int length) {
+- impl.read_ushort_array(seq, offset, length);
+- }
+-
+- public final void read_long_array (org.omg.CORBA.LongSeqHolder seq, int offset, int length) {
+- impl.read_long_array(seq, offset, length);
+- }
+-
+- public final void read_ulong_array (org.omg.CORBA.ULongSeqHolder seq, int offset, int length) {
+- impl.read_ulong_array(seq, offset, length);
+- }
+-
+- public final void read_ulonglong_array (org.omg.CORBA.ULongLongSeqHolder seq, int offset, int length) {
+- impl.read_ulonglong_array(seq, offset, length);
+- }
+-
+- public final void read_longlong_array (org.omg.CORBA.LongLongSeqHolder seq, int offset, int length) {
+- impl.read_longlong_array(seq, offset, length);
+- }
+-
+- public final void read_float_array (org.omg.CORBA.FloatSeqHolder seq, int offset, int length) {
+- impl.read_float_array(seq, offset, length);
+- }
+-
+- public final void read_double_array (org.omg.CORBA.DoubleSeqHolder seq, int offset, int length) {
+- impl.read_double_array(seq, offset, length);
+- }
+-
+- // org.omg.CORBA.portable.ValueBase
+- public final String[] _truncatable_ids() {
+- return impl._truncatable_ids();
+- }
+-
+- // java.io.InputStream
+- public final int read(byte b[]) throws IOException {
+- return impl.read(b);
+- }
+-
+- public final int read(byte b[], int off, int len) throws IOException {
+- return impl.read(b, off, len);
+- }
+-
+- public final long skip(long n) throws IOException {
+- return impl.skip(n);
+- }
+-
+- public final int available() throws IOException {
+- return impl.available();
+- }
+-
+- public final void close() throws IOException {
+- impl.close();
+- }
+-
+- public final void mark(int readlimit) {
+- impl.mark(readlimit);
+- }
+-
+- public final void reset() {
+- impl.reset();
+- }
+-
+- public final boolean markSupported() {
+- return impl.markSupported();
+- }
+-
+- public abstract CDRInputStream dup();
+-
+- // Needed by TCUtility
+- public final java.math.BigDecimal read_fixed(short digits, short scale) {
+- return impl.read_fixed(digits, scale);
+- }
+-
+- public final boolean isLittleEndian() {
+- return impl.isLittleEndian();
+- }
+-
+- protected final ByteBuffer getByteBuffer() {
+- return impl.getByteBuffer();
+- }
+-
+- protected final void setByteBuffer(ByteBuffer byteBuffer) {
+- impl.setByteBuffer(byteBuffer);
+- }
+-
+- protected final void setByteBufferWithInfo(ByteBufferWithInfo bbwi) {
+- impl.setByteBufferWithInfo(bbwi);
+- }
+-
+- public final int getBufferLength() {
+- return impl.getBufferLength();
+- }
+-
+- protected final void setBufferLength(int value) {
+- impl.setBufferLength(value);
+- }
+-
+- protected final int getIndex() {
+- return impl.getIndex();
+- }
+-
+- protected final void setIndex(int value) {
+- impl.setIndex(value);
+- }
+-
+- public final void orb(org.omg.CORBA.ORB orb) {
+- impl.orb(orb);
+- }
+-
+- public final GIOPVersion getGIOPVersion() {
+- return impl.getGIOPVersion();
+- }
+-
+- public final BufferManagerRead getBufferManager() {
+- return impl.getBufferManager();
+- }
+-
+- // This should be overridden by any stream (ex: IIOPInputStream)
+- // which wants to read values. Thus, TypeCodeInputStream doesn't
+- // have to do this.
+- public CodeBase getCodeBase() {
+- return null;
+- }
+-
+- // Use Latin-1 for GIOP 1.0 or when code set negotiation was not
+- // performed.
+- protected CodeSetConversion.BTCConverter createCharBTCConverter() {
+- return CodeSetConversion.impl().getBTCConverter(OSFCodeSetRegistry.ISO_8859_1,
+- impl.isLittleEndian());
+- }
+-
+- // Subclasses must decide what to do here. It's inconvenient to
+- // make the class and this method abstract because of dup().
+- protected abstract CodeSetConversion.BTCConverter createWCharBTCConverter();
+-
+- // Prints the current buffer in a human readable form
+- void printBuffer() {
+- impl.printBuffer();
+- }
+-
+- /**
+- * Aligns the current position on the given octet boundary
+- * if there are enough bytes available to do so. Otherwise,
+- * it just returns. This is used for some (but not all)
+- * GIOP 1.2 message headers.
+- */
+- public void alignOnBoundary(int octetBoundary) {
+- impl.alignOnBoundary(octetBoundary);
+- }
+-
+- // Needed by request and reply messages for GIOP versions >= 1.2 only.
+- public void setHeaderPadding(boolean headerPadding) {
+- impl.setHeaderPadding(headerPadding);
+- }
+-
+- /**
+- * This must be called after determining the proper ORB version,
+- * and setting it on the stream's ORB instance. It can be called
+- * after reading the service contexts, since that is the only place
+- * we can get the ORB version info.
+- *
+- * Trying to unmarshal things requiring repository IDs before calling
+- * this will result in NullPtrExceptions.
+- */
+- public void performORBVersionSpecificInit() {
+- // In the case of SystemExceptions, a stream is created
+- // with its default constructor (and thus no impl is set).
+- if (impl != null)
+- impl.performORBVersionSpecificInit();
+- }
+-
+- /**
+- * Resets any internal references to code set converters.
+- * This is useful for forcing the CDR stream to reacquire
+- * converters (probably from its subclasses) when state
+- * has changed.
+- */
+- public void resetCodeSetConverters() {
+- impl.resetCodeSetConverters();
+- }
+-
+- public void setMessageMediator(MessageMediator messageMediator)
+- {
+- this.messageMediator = (CorbaMessageMediator) messageMediator;
+- }
+-
+- public MessageMediator getMessageMediator()
+- {
+- return messageMediator;
+- }
+-
+- // ValueInputStream -----------------------------
+-
+- public void start_value() {
+- impl.start_value();
+- }
+-
+- public void end_value() {
+- impl.end_value();
+- }
+-}
+--- ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaOutputStream.sjava 2013-09-06 11:20:47.000000000 -0700
++++ ./corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaOutputStream.sjava 1969-12-31 16:00:00.000000000 -0800
+@@ -1,435 +0,0 @@
+-/*
+- * Copyright (c) 2004, 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.encoding;
+-
+-import java.io.IOException;
+-import java.io.Serializable;
+-import java.math.BigDecimal;
+-import java.nio.ByteBuffer;
+-
+-import org.omg.CORBA.TypeCode;
+-import org.omg.CORBA.Principal;
+-import org.omg.CORBA.Any;
+-
+-import com.sun.corba.se.pept.protocol.MessageMediator;
+-
+-import com.sun.corba.se.spi.orb.ORB;
+-import com.sun.corba.se.spi.logging.CORBALogDomains;
+-import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
+-import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
+-
+-import com.sun.corba.se.impl.encoding.CodeSetConversion;
+-import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry;
+-import com.sun.corba.se.impl.orbutil.ORBConstants;
+-import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+-
+-/**
+- * This is delegates to the real implementation.
+- */
+-public abstract class CDROutputStream
+- extends org.omg.CORBA_2_3.portable.OutputStream
+- implements com.sun.corba.se.impl.encoding.MarshalOutputStream,
+- org.omg.CORBA.DataOutputStream, org.omg.CORBA.portable.ValueOutputStream
+-{
+-/*
+- private CDROutputStreamBase impl;
+- protected ORB orb ;
+- protected ORBUtilSystemException wrapper ;
+- protected CorbaMessageMediator corbaMessageMediator;
+-
+-
+- // We can move this out somewhere later. For now, it serves its purpose
+- // to create a concrete CDR delegate based on the GIOP version.
+- private static class OutputStreamFactory {
+-
+- public static CDROutputStreamBase newOutputStream(ORB orb, GIOPVersion version)
+- {
+- switch(version.intValue()) {
+- case GIOPVersion.VERSION_1_0:
+- return new CDROutputStream_1_0();
+- case GIOPVersion.VERSION_1_1:
+- return new CDROutputStream_1_1();
+- case GIOPVersion.VERSION_1_2:
+- return new CDROutputStream_1_2();
+- default:
+- ORBUtilSystemException wrapper = ORBUtilSystemException.get( orb,
+- CORBALogDomains.RPC_ENCODING ) ;
+- // REVISIT - what is appropriate? INTERNAL exceptions
+- // are really hard to track later.
+- throw wrapper.unsupportedGiopVersion( version ) ;
+- }
+- }
+- }
+-
+- // REVISIT - These two constructors should be re-factored to better hide
+- // the fact that someone extending this class 'can' construct a CDROutputStream
+- // that does not use pooled ByteBuffers. Right now, only EncapsOutputStream
+- // does _not_ use pooled ByteBuffers, see EncapsOutputStream.
+-
+- // NOTE: When a stream is constructed for non-channel-backed sockets
+- // it notifies the constructor not to use pooled (i.e, direct)
+- // ByteBuffers.
+-
+- public CDROutputStream(ORB orb,
+- GIOPVersion version,
+- boolean littleEndian,
+- BufferManagerWrite bufferManager,
+- byte streamFormatVersion,
+- boolean usePooledByteBuffers)
+- {
+- impl = OutputStreamFactory.newOutputStream(orb, version);
+- impl.init(orb, littleEndian, bufferManager, streamFormatVersion, usePooledByteBuffers);
+-
+- impl.setParent(this);
+- this.orb = orb ;
+- this.wrapper = ORBUtilSystemException.get( orb,
+- CORBALogDomains.RPC_ENCODING ) ;
+- }
+-
+- public CDROutputStream(ORB orb,
+- GIOPVersion version,
+- boolean littleEndian,
+- BufferManagerWrite bufferManager,
+- byte streamFormatVersion)
+- {
+- this(orb, version, littleEndian, bufferManager, streamFormatVersion, true);
+- }
+-*/
+-
+- private ByteArrayOutputStream bos ;
+- private ObjectOutputStream oos ;
+-
+- public JavaOutputStream()
+- {
+- bos = new ByteArrayOutputStream() ;
+- oos = new ObjectOutputStream( bos ) ;
+- }
+-
+- // Provided by IIOPOutputStream and EncapsOutputStream
+- public org.omg.CORBA.portable.InputStream create_input_stream()
+- {
+- ObjectInputStream ois = new ByteArrayInputStream( bos.toByteArray() ) ;
+-
+- return new JavaInputStream( ois ) ;
+- }
+-
+- public final void write_boolean(boolean value) {
+- impl.write_boolean(value);
+- }
+- public final void write_char(char value) {
+- impl.write_char(value);
+- }
+- public final void write_wchar(char value) {
+- impl.write_wchar(value);
+- }
+- public final void write_octet(byte value) {
+- impl.write_octet(value);
+- }
+- public final void write_short(short value) {
+- impl.write_short(value);
+- }
+- public final void write_ushort(short value) {
+- impl.write_ushort(value);
+- }
+- public final void write_long(int value) {
+- impl.write_long(value);
+- }
+- public final void write_ulong(int value) {
+- impl.write_ulong(value);
+- }
+- public final void write_longlong(long value) {
+- impl.write_longlong(value);
+- }
+- public final void write_ulonglong(long value) {
+- impl.write_ulonglong(value);
+- }
+- public final void write_float(float value) {
+- impl.write_float(value);
+- }
+- public final void write_double(double value) {
+- impl.write_double(value);
+- }
+- public final void write_string(String value) {
+- impl.write_string(value);
+- }
+- public final void write_wstring(String value) {
+- impl.write_wstring(value);
+- }
+-
+- public final void write_boolean_array(boolean[] value, int offset, int length) {
+- impl.write_boolean_array(value, offset, length);
+- }
+- public final void write_char_array(char[] value, int offset, int length) {
+- impl.write_char_array(value, offset, length);
+- }
+- public final void write_wchar_array(char[] value, int offset, int length) {
+- impl.write_wchar_array(value, offset, length);
+- }
+- public final void write_octet_array(byte[] value, int offset, int length) {
+- impl.write_octet_array(value, offset, length);
+- }
+- public final void write_short_array(short[] value, int offset, int length) {
+- impl.write_short_array(value, offset, length);
+- }
+- public final void write_ushort_array(short[] value, int offset, int length){
+- impl.write_ushort_array(value, offset, length);
+- }
+- public final void write_long_array(int[] value, int offset, int length) {
+- impl.write_long_array(value, offset, length);
+- }
+- public final void write_ulong_array(int[] value, int offset, int length) {
+- impl.write_ulong_array(value, offset, length);
+- }
+- public final void write_longlong_array(long[] value, int offset, int length) {
+- impl.write_longlong_array(value, offset, length);
+- }
+- public final void write_ulonglong_array(long[] value, int offset,int length) {
+- impl.write_ulonglong_array(value, offset, length);
+- }
+- public final void write_float_array(float[] value, int offset, int length) {
+- impl.write_float_array(value, offset, length);
+- }
+- public final void write_double_array(double[] value, int offset, int length) {
+- impl.write_double_array(value, offset, length);
+- }
+- public final void write_Object(org.omg.CORBA.Object value) {
+- impl.write_Object(value);
+- }
+- public final void write_TypeCode(TypeCode value) {
+- impl.write_TypeCode(value);
+- }
+- public final void write_any(Any value) {
+- impl.write_any(value);
+- }
+-
+- public final void write_Principal(Principal value) {
+- impl.write_Principal(value);
+- }
+-
+- public final void write(int b) throws java.io.IOException {
+- impl.write(b);
+- }
+-
+- public final void write_fixed(java.math.BigDecimal value) {
+- impl.write_fixed(value);
+- }
+-
+- public final void write_Context(org.omg.CORBA.Context ctx,
+- org.omg.CORBA.ContextList contexts) {
+- impl.write_Context(ctx, contexts);
+- }
+-
+- public final org.omg.CORBA.ORB orb() {
+- return impl.orb();
+- }
+-
+- // org.omg.CORBA_2_3.portable.OutputStream
+- public final void write_value(java.io.Serializable value) {
+- impl.write_value(value);
+- }
+-
+- public final void write_value(java.io.Serializable value, java.lang.Class clz) {
+- impl.write_value(value, clz);
+- }
+-
+- public final void write_value(java.io.Serializable value, String repository_id) {
+- impl.write_value(value, repository_id);
+- }
+-
+- public final void write_value(java.io.Serializable value,
+- org.omg.CORBA.portable.BoxedValueHelper factory) {
+- impl.write_value(value, factory);
+- }
+-
+- public final void write_abstract_interface(java.lang.Object obj) {
+- impl.write_abstract_interface(obj);
+- }
+-
+- // java.io.OutputStream
+- public final void write(byte b[]) throws IOException {
+- impl.write(b);
+- }
+-
+- public final void write(byte b[], int off, int len) throws IOException {
+- impl.write(b, off, len);
+- }
+-
+- public final void flush() throws IOException {
+- impl.flush();
+- }
+-
+- public final void close() throws IOException {
+- impl.close();
+- }
+-
+- // com.sun.corba.se.impl.encoding.MarshalOutputStream
+- public final void start_block() {
+- impl.start_block();
+- }
+-
+- public final void end_block() {
+- impl.end_block();
+- }
+-
+- public final void putEndian() {
+- impl.putEndian();
+- }
+-
+- public void writeTo(java.io.OutputStream s)
+- throws IOException
+- {
+- impl.writeTo(s);
+- }
+-
+- public final byte[] toByteArray() {
+- return impl.toByteArray();
+- }
+-
+- // org.omg.CORBA.DataOutputStream
+- public final void write_Abstract (java.lang.Object value) {
+- impl.write_Abstract(value);
+- }
+-
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list