/hg/release/icedtea7-forest-2.1/corba: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 13 03:51:49 PST 2013
changeset 9c01bab5ffbd in /hg/release/icedtea7-forest-2.1/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=9c01bab5ffbd
author: andrew
date: Wed Feb 13 11:50:42 2013 +0000
Removed tag icedtea-2.1.5
changeset 443887178ee9 in /hg/release/icedtea7-forest-2.1/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=443887178ee9
author: andrew
date: Wed Feb 13 11:51:15 2013 +0000
Include additions and removals which are part of 8000631
changeset fb02b0451c09 in /hg/release/icedtea7-forest-2.1/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba?cmd=changeset;node=fb02b0451c09
author: andrew
date: Wed Feb 13 11:51:20 2013 +0000
Added tag icedtea-2.1.5 for changeset 443887178ee9
diffstat:
.hgtags | 4 +
src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java | 57 -
src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java | 54 -
src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java | 68 -
src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java | 66 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java | 177 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java | 177 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java | 108 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java | 102 -
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java | 990 ---------
src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java | 1065 ----------
src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java | 251 --
src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java | 77 -
src/share/classes/sun/corba/JavaCorbaAccess.java | 32 +
src/share/classes/sun/corba/SharedSecrets.java | 60 +
15 files changed, 96 insertions(+), 3192 deletions(-)
diffs (truncated from 3351 to 500 lines):
diff -r 30fd65efd06e -r fb02b0451c09 .hgtags
--- a/.hgtags Mon Feb 11 23:02:29 2013 +0000
+++ b/.hgtags Wed Feb 13 11:51:20 2013 +0000
@@ -156,3 +156,7 @@
0000000000000000000000000000000000000000 icedtea-2.1.5
0000000000000000000000000000000000000000 icedtea-2.1.5
1c355d31ca6a06929c6fe67792ce4f506f7b5db9 icedtea-2.1.5
+1c355d31ca6a06929c6fe67792ce4f506f7b5db9 icedtea-2.1.5
+0000000000000000000000000000000000000000 icedtea-2.1.5
+0000000000000000000000000000000000000000 icedtea-2.1.5
+443887178ee9b8109bfb3786120ccb6d17f1d4ba icedtea-2.1.5
diff -r 30fd65efd06e -r fb02b0451c09 src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java Mon Feb 11 23:02:29 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2000, 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;
-
-import java.io.*;
-import java.util.Hashtable;
-
-/**
- * Implements legacy behavior from before Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPInputStream_1_3 extends com.sun.corba.se.impl.io.IIOPInputStream
-{
- // The newer version in the io package correctly reads a wstring instead.
- // This concerns bug 4379597.
- protected String internalReadUTF(org.omg.CORBA.portable.InputStream stream)
- {
- return stream.read_string();
- }
-
- /**
- * Before JDK 1.3.1_01, the PutField/GetField implementation
- * actually sent a Hashtable.
- */
- public ObjectInputStream.GetField readFields()
- throws IOException, ClassNotFoundException, NotActiveException {
- Hashtable fields = (Hashtable)readObject();
- return new LegacyHookGetFields(fields);
- }
-
- public IIOPInputStream_1_3()
- throws java.io.IOException {
- super();
- }
-}
diff -r 30fd65efd06e -r fb02b0451c09 src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java Mon Feb 11 23:02:29 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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;
-
-import java.io.*;
-import java.util.Hashtable;
-
-/**
- * Implements legacy behavior from Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPInputStream_1_3_1 extends com.sun.corba.se.impl.io.IIOPInputStream
-{
- public IIOPInputStream_1_3_1()
- throws java.io.IOException {
- super();
- }
-
- /**
- * Before JDK 1.3.1_01, the PutField/GetField implementation
- * actually sent a Hashtable.
- */
- public ObjectInputStream.GetField readFields()
- throws IOException, ClassNotFoundException, NotActiveException {
-
- Hashtable fields = (Hashtable)readObject();
- return new LegacyHookGetFields(fields);
- }
-}
diff -r 30fd65efd06e -r fb02b0451c09 src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java Mon Feb 11 23:02:29 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2000, 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;
-
-import java.io.*;
-
-/**
- * Implements legacy behavior from before Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPOutputStream_1_3 extends com.sun.corba.se.impl.io.IIOPOutputStream
-{
- // We can't assume that the superclass's putFields
- // member will be non-private. We must allow
- // the RI to run on JDK 1.3.1 FCS as well as
- // the JDK 1.3.1_01 patch.
- private ObjectOutputStream.PutField putFields_1_3;
-
- // The newer version in the io package correctly writes a wstring instead.
- // This concerns bug 4379597.
- protected void internalWriteUTF(org.omg.CORBA.portable.OutputStream stream,
- String data)
- {
- stream.write_string(data);
- }
-
- public IIOPOutputStream_1_3()
- throws java.io.IOException {
- super();
- }
-
- /**
- * Before JDK 1.3.1_01, the PutField/GetField implementation
- * actually sent a Hashtable.
- */
- public ObjectOutputStream.PutField putFields()
- throws IOException {
- putFields_1_3 = new LegacyHookPutFields();
- return putFields_1_3;
- }
-
- public void writeFields()
- throws IOException {
- putFields_1_3.write(this);
- }
-}
diff -r 30fd65efd06e -r fb02b0451c09 src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java Mon Feb 11 23:02:29 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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;
-
-import java.io.*;
-import java.util.Hashtable;
-
-/**
- * Implements legacy behavior from Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPOutputStream_1_3_1 extends com.sun.corba.se.impl.io.IIOPOutputStream
-{
- // We can't assume that the superclass's putFields
- // member will be non-private. We must allow
- // the RI to run on JDK 1.3.1 FCS as well as
- // the JDK 1.3.1_01 patch.
- private ObjectOutputStream.PutField putFields_1_3_1;
-
- public IIOPOutputStream_1_3_1()
- throws java.io.IOException {
- super();
- }
-
- /**
- * Before JDK 1.3.1_01, the PutField/GetField implementation
- * actually sent a Hashtable.
- */
- public ObjectOutputStream.PutField putFields()
- throws IOException {
-
- putFields_1_3_1 = new LegacyHookPutFields();
- return putFields_1_3_1;
- }
-
- public void writeFields()
- throws IOException {
-
- putFields_1_3_1.write(this);
- }
-}
diff -r 30fd65efd06e -r fb02b0451c09 src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java Mon Feb 11 23:02:29 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2000, 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.orbutil;
-
-import org.omg.CORBA.ORB;
-import java.io.Serializable;
-import java.util.Hashtable;
-import java.net.MalformedURLException;
-import com.sun.corba.se.impl.io.TypeMismatchException;
-import com.sun.corba.se.impl.util.RepositoryId;
-
-/**
- * Delegates to the RepositoryId_1_3 implementation in
- * com.sun.corba.se.impl.orbutil. This is necessary to
- * overcome the fact that many of RepositoryId's methods
- * are static.
- */
-public final class RepIdDelegator_1_3
- implements RepositoryIdStrings,
- RepositoryIdUtility,
- RepositoryIdInterface
-{
- // RepositoryIdFactory methods
-
- public String createForAnyType(Class type) {
- return RepositoryId_1_3.createForAnyType(type);
- }
-
- public String createForJavaType(Serializable ser)
- throws TypeMismatchException
- {
- return RepositoryId_1_3.createForJavaType(ser);
- }
-
- public String createForJavaType(Class clz)
- throws TypeMismatchException
- {
- return RepositoryId_1_3.createForJavaType(clz);
- }
-
- public String createSequenceRepID(java.lang.Object ser) {
- return RepositoryId_1_3.createSequenceRepID(ser);
- }
-
- public String createSequenceRepID(Class clazz) {
- return RepositoryId_1_3.createSequenceRepID(clazz);
- }
-
- public RepositoryIdInterface getFromString(String repIdString) {
- return new RepIdDelegator_1_3(RepositoryId_1_3.cache.getId(repIdString));
- }
-
- // RepositoryIdUtility methods
-
- public boolean isChunkedEncoding(int valueTag) {
- return RepositoryId.isChunkedEncoding(valueTag);
- }
-
- public boolean isCodeBasePresent(int valueTag) {
- return RepositoryId.isCodeBasePresent(valueTag);
- }
-
- public String getClassDescValueRepId() {
- return RepositoryId_1_3.kClassDescValueRepID;
- }
-
- public String getWStringValueRepId() {
- return RepositoryId_1_3.kWStringValueRepID;
- }
-
- public int getTypeInfo(int valueTag) {
- return RepositoryId.getTypeInfo(valueTag);
- }
-
- public int getStandardRMIChunkedNoRepStrId() {
- return RepositoryId.kPreComputed_StandardRMIChunked_NoRep;
- }
-
- public int getCodeBaseRMIChunkedNoRepStrId() {
- return RepositoryId.kPreComputed_CodeBaseRMIChunked_NoRep;
- }
-
- public int getStandardRMIChunkedId() {
- return RepositoryId.kPreComputed_StandardRMIChunked;
- }
-
- public int getCodeBaseRMIChunkedId() {
- return RepositoryId.kPreComputed_CodeBaseRMIChunked;
- }
-
- public int getStandardRMIUnchunkedId() {
- return RepositoryId.kPreComputed_StandardRMIUnchunked;
- }
-
- public int getCodeBaseRMIUnchunkedId() {
- return RepositoryId.kPreComputed_CodeBaseRMIUnchunked;
- }
-
- public int getStandardRMIUnchunkedNoRepStrId() {
- return RepositoryId.kPreComputed_StandardRMIUnchunked_NoRep;
- }
-
- public int getCodeBaseRMIUnchunkedNoRepStrId() {
- return RepositoryId.kPreComputed_CodeBaseRMIUnchunked_NoRep;
- }
-
- // RepositoryIdInterface methods
-
- public Class getClassFromType() throws ClassNotFoundException {
- return delegate.getClassFromType();
- }
-
- public Class getClassFromType(String codebaseURL)
- throws ClassNotFoundException, MalformedURLException
- {
- return delegate.getClassFromType(codebaseURL);
- }
-
- public Class getClassFromType(Class expectedType,
- String codebaseURL)
- throws ClassNotFoundException, MalformedURLException
- {
- return delegate.getClassFromType(expectedType, codebaseURL);
- }
-
- public String getClassName() {
- return delegate.getClassName();
- }
-
- // Constructor used for factory/utility cases
- public RepIdDelegator_1_3() {}
-
- // Constructor used by getIdFromString. All non-static
- // RepositoryId methods will use the provided delegate.
- private RepIdDelegator_1_3(RepositoryId_1_3 _delegate) {
- this.delegate = _delegate;
- }
-
- private RepositoryId_1_3 delegate = null;
-
- public String toString() {
- if (delegate != null)
- return delegate.toString();
- else
- return this.getClass().getName();
- }
-
- public boolean equals(Object obj) {
- if (delegate != null)
- return delegate.equals(obj);
- else
- return super.equals(obj);
- }
-}
diff -r 30fd65efd06e -r fb02b0451c09 src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java Mon Feb 11 23:02:29 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2001, 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.orbutil;
-
-import org.omg.CORBA.ORB;
-import java.io.Serializable;
-import java.util.Hashtable;
-import java.net.MalformedURLException;
-import com.sun.corba.se.impl.io.TypeMismatchException;
-import com.sun.corba.se.impl.util.RepositoryId;
-
-/**
- * Delegates to the RepositoryId_1_3_1 implementation in
- * com.sun.corba.se.impl.orbutil. This is necessary to
- * overcome the fact that many of RepositoryId's methods
- * are static.
- */
-public final class RepIdDelegator_1_3_1
- implements RepositoryIdStrings,
- RepositoryIdUtility,
More information about the distro-pkg-dev
mailing list