/hg/release/icedtea6-1.9: Remove testcases not in upstream version.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Oct 21 07:06:53 PDT 2011
changeset 30ddc2f3dbe4 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=30ddc2f3dbe4
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Oct 21 15:04:36 2011 +0100
Remove testcases not in upstream version.
2011-10-21 Andrew John Hughes <ahughes at redhat.com>
* patches/security/20111018/7083012.patch: Remove
testcases not in upstream version.
diffstat:
ChangeLog | 5 +
patches/security/20111018/7083012.patch | 825 --------------------------------
2 files changed, 5 insertions(+), 825 deletions(-)
diffs (truncated from 850 to 500 lines):
diff -r a9e59fbb036e -r 30ddc2f3dbe4 ChangeLog
--- a/ChangeLog Wed Oct 19 02:23:05 2011 +0100
+++ b/ChangeLog Fri Oct 21 15:04:36 2011 +0100
@@ -1,3 +1,8 @@
+2011-10-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/security/20111018/7083012.patch:
+ Remove testcases not in upstream version.
+
2011-10-19 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Prepare for 1.9.11.
diff -r a9e59fbb036e -r 30ddc2f3dbe4 patches/security/20111018/7083012.patch
--- a/patches/security/20111018/7083012.patch Wed Oct 19 02:23:05 2011 +0100
+++ b/patches/security/20111018/7083012.patch Fri Oct 21 15:04:36 2011 +0100
@@ -141,834 +141,3 @@
PermissionCollection perms,
boolean forLoader)
{
---- /dev/null Fri Sep 16 10:04:16 2011
-+++ openjdk/jdk/test/sun/rmi/registry/7083012/altreg/Registry.java Fri Sep 16 10:04:03 2011
-@@ -0,0 +1,192 @@
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package java.rmi.registry;
-+
-+import java.rmi.AccessException;
-+import java.rmi.AlreadyBoundException;
-+import java.rmi.NotBoundException;
-+import java.rmi.Remote;
-+import java.rmi.RemoteException;
-+
-+/**
-+ * <code>Registry</code> is a remote interface to a simple remote
-+ * object registry that provides methods for storing and retrieving
-+ * remote object references bound with arbitrary string names. The
-+ * <code>bind</code>, <code>unbind</code>, and <code>rebind</code>
-+ * methods are used to alter the name bindings in the registry, and
-+ * the <code>lookup</code> and <code>list</code> methods are used to
-+ * query the current name bindings.
-+ *
-+ * <p>In its typical usage, a <code>Registry</code> enables RMI client
-+ * bootstrapping: it provides a simple means for a client to obtain an
-+ * initial reference to a remote object. Therefore, a registry's
-+ * remote object implementation is typically exported with a
-+ * well-known address, such as with a well-known {@link
-+ * java.rmi.server.ObjID#REGISTRY_ID ObjID} and TCP port number
-+ * (default is {@link #REGISTRY_PORT 1099}).
-+ *
-+ * <p>The {@link LocateRegistry} class provides a programmatic API for
-+ * constructing a bootstrap reference to a <code>Registry</code> at a
-+ * remote address (see the static <code>getRegistry</code> methods)
-+ * and for creating and exporting a <code>Registry</code> in the
-+ * current VM on a particular local address (see the static
-+ * <code>createRegistry</code> methods).
-+ *
-+ * <p>A <code>Registry</code> implementation may choose to restrict
-+ * access to some or all of its methods (for example, methods that
-+ * mutate the registry's bindings may be restricted to calls
-+ * originating from the local host). If a <code>Registry</code>
-+ * method chooses to deny access for a given invocation, its
-+ * implementation may throw {@link java.rmi.AccessException}, which
-+ * (because it extends {@link java.rmi.RemoteException}) will be
-+ * wrapped in a {@link java.rmi.ServerException} when caught by a
-+ * remote client.
-+ *
-+ * <p>The names used for bindings in a <code>Registry</code> are pure
-+ * strings, not parsed. A service which stores its remote reference
-+ * in a <code>Registry</code> may wish to use a package name as a
-+ * prefix in the name binding to reduce the likelihood of name
-+ * collisions in the registry.
-+ *
-+ * @author Ann Wollrath
-+ * @author Peter Jones
-+ * @version %I%, %E%
-+ * @since JDK1.1
-+ * @see LocateRegistry
-+ */
-+public interface Registry extends Remote {
-+
-+ /** Well known port for registry. */
-+ public static final int REGISTRY_PORT = 1099;
-+
-+ /**
-+ * Returns the remote reference bound to the specified
-+ * <code>name</code> in this registry.
-+ *
-+ * @param name the name for the remote reference to look up
-+ *
-+ * @return a reference to a remote object
-+ *
-+ * @throws NotBoundException if <code>name</code> is not currently bound
-+ *
-+ * @throws RemoteException if remote communication with the
-+ * registry failed; if exception is a <code>ServerException</code>
-+ * containing an <code>AccessException</code>, then the registry
-+ * denies the caller access to perform this operation
-+ *
-+ * @throws AccessException if this registry is local and it denies
-+ * the caller access to perform this operation
-+ *
-+ * @throws NullPointerException if <code>name</code> is <code>null</code>
-+ */
-+ public Remote lookup(Object name)
-+ throws RemoteException, NotBoundException, AccessException;
-+
-+ /**
-+ * Binds a remote reference to the specified <code>name</code> in
-+ * this registry.
-+ *
-+ * @param name the name to associate with the remote reference
-+ * @param obj a reference to a remote object (usually a stub)
-+ *
-+ * @throws AlreadyBoundException if <code>name</code> is already bound
-+ *
-+ * @throws RemoteException if remote communication with the
-+ * registry failed; if exception is a <code>ServerException</code>
-+ * containing an <code>AccessException</code>, then the registry
-+ * denies the caller access to perform this operation (if
-+ * originating from a non-local host, for example)
-+ *
-+ * @throws AccessException if this registry is local and it denies
-+ * the caller access to perform this operation
-+ *
-+ * @throws NullPointerException if <code>name</code> is
-+ * <code>null</code>, or if <code>obj</code> is <code>null</code>
-+ */
-+ public void bind(String name, Remote obj)
-+ throws RemoteException, AlreadyBoundException, AccessException;
-+
-+ /**
-+ * Removes the binding for the specified <code>name</code> in
-+ * this registry.
-+ *
-+ * @param name the name of the binding to remove
-+ *
-+ * @throws NotBoundException if <code>name</code> is not currently bound
-+ *
-+ * @throws RemoteException if remote communication with the
-+ * registry failed; if exception is a <code>ServerException</code>
-+ * containing an <code>AccessException</code>, then the registry
-+ * denies the caller access to perform this operation (if
-+ * originating from a non-local host, for example)
-+ *
-+ * @throws AccessException if this registry is local and it denies
-+ * the caller access to perform this operation
-+ *
-+ * @throws NullPointerException if <code>name</code> is <code>null</code>
-+ */
-+ public void unbind(String name)
-+ throws RemoteException, NotBoundException, AccessException;
-+
-+ /**
-+ * Replaces the binding for the specified <code>name</code> in
-+ * this registry with the supplied remote reference. If there is
-+ * an existing binding for the specified <code>name</code>, it is
-+ * discarded.
-+ *
-+ * @param name the name to associate with the remote reference
-+ * @param obj a reference to a remote object (usually a stub)
-+ *
-+ * @throws RemoteException if remote communication with the
-+ * registry failed; if exception is a <code>ServerException</code>
-+ * containing an <code>AccessException</code>, then the registry
-+ * denies the caller access to perform this operation (if
-+ * originating from a non-local host, for example)
-+ *
-+ * @throws AccessException if this registry is local and it denies
-+ * the caller access to perform this operation
-+ *
-+ * @throws NullPointerException if <code>name</code> is
-+ * <code>null</code>, or if <code>obj</code> is <code>null</code>
-+ */
-+ public void rebind(String name, Remote obj)
-+ throws RemoteException, AccessException;
-+
-+ /**
-+ * Returns an array of the names bound in this registry. The
-+ * array will contain a snapshot of the names bound in this
-+ * registry at the time of the given invocation of this method.
-+ *
-+ * @return an array of the names bound in this registry
-+ *
-+ * @throws RemoteException if remote communication with the
-+ * registry failed; if exception is a <code>ServerException</code>
-+ * containing an <code>AccessException</code>, then the registry
-+ * denies the caller access to perform this operation
-+ *
-+ * @throws AccessException if this registry is local and it denies
-+ * the caller access to perform this operation
-+ */
-+ public String[] list() throws RemoteException, AccessException;
-+}
---- /dev/null Fri Sep 16 10:04:45 2011
-+++ openjdk/jdk/test/sun/rmi/registry/7083012/altreg/RegistryImpl.java Fri Sep 16 10:04:34 2011
-@@ -0,0 +1,358 @@
-+/*
-+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package sun.rmi.registry;
-+
-+import java.util.Enumeration;
-+import java.util.Hashtable;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-+import java.io.IOException;
-+import java.net.*;
-+import java.rmi.*;
-+import java.rmi.server.ObjID;
-+import java.rmi.server.RemoteServer;
-+import java.rmi.server.ServerNotActiveException;
-+import java.rmi.registry.Registry;
-+import java.rmi.server.RMIClientSocketFactory;
-+import java.rmi.server.RMIServerSocketFactory;
-+import java.security.PrivilegedActionException;
-+import java.text.MessageFormat;
-+import sun.rmi.server.UnicastServerRef;
-+import sun.rmi.server.UnicastServerRef2;
-+import sun.rmi.transport.LiveRef;
-+import sun.rmi.transport.ObjectTable;
-+import sun.rmi.transport.Target;
-+
-+/**
-+ * A "registry" exists on every node that allows RMI connections to
-+ * servers on that node. The registry on a particular node contains a
-+ * transient database that maps names to remote objects. When the
-+ * node boots, the registry database is empty. The names stored in the
-+ * registry are pure and are not parsed. A service storing itself in
-+ * the registry may want to prefix its name of the service by a package
-+ * name (although not required), to reduce name collisions in the
-+ * registry.
-+ *
-+ * The LocateRegistry class is used to obtain registry for different hosts.
-+ *
-+ * @see java.rmi.registry.LocateRegistry
-+ */
-+public class RegistryImpl extends java.rmi.server.RemoteServer
-+ implements Registry
-+{
-+
-+ /* indicate compatibility with JDK 1.1.x version of class */
-+ private static final long serialVersionUID = 4666870661827494597L;
-+ private Hashtable bindings = new Hashtable(101);
-+ private static Hashtable allowedAccessCache = new Hashtable(3);
-+ private static RegistryImpl registry;
-+ private static ObjID id = new ObjID(ObjID.REGISTRY_ID);
-+
-+ private static ResourceBundle resources = null;
-+
-+ /**
-+ * Construct a new RegistryImpl on the specified port with the
-+ * given custom socket factory pair.
-+ */
-+ public RegistryImpl(int port,
-+ RMIClientSocketFactory csf,
-+ RMIServerSocketFactory ssf)
-+ throws RemoteException
-+ {
-+ LiveRef lref = new LiveRef(id, port, csf, ssf);
-+ setup(new UnicastServerRef2(lref));
-+ }
-+
-+ /**
-+ * Construct a new RegistryImpl on the specified port.
-+ */
-+ public RegistryImpl(int port)
-+ throws RemoteException
-+ {
-+ LiveRef lref = new LiveRef(id, port);
-+ setup(new UnicastServerRef(lref));
-+ }
-+
-+ /*
-+ * Create the export the object using the parameter
-+ * <code>uref</code>
-+ */
-+ private void setup(UnicastServerRef uref)
-+ throws RemoteException
-+ {
-+ /* Server ref must be created and assigned before remote
-+ * object 'this' can be exported.
-+ */
-+ ref = uref;
-+ uref.exportObject(this, null, true);
-+ }
-+
-+ /**
-+ * Returns the remote object for specified name in the registry.
-+ * @exception RemoteException If remote operation failed.
-+ * @exception NotBound If name is not currently bound.
-+ */
-+ public Remote lookup(Object name)
-+ throws RemoteException, NotBoundException
-+ {
-+ synchronized (bindings) {
-+ Remote obj = (Remote)bindings.get(name);
-+ if (obj == null)
-+ throw new NotBoundException();
-+ return obj;
-+ }
-+ }
-+
-+ /**
-+ * Binds the name to the specified remote object.
-+ * @exception RemoteException If remote operation failed.
-+ * @exception AlreadyBoundException If name is already bound.
-+ */
-+ public void bind(String name, Remote obj)
-+ throws RemoteException, AlreadyBoundException, AccessException
-+ {
-+ checkAccess("Registry.bind");
-+ synchronized (bindings) {
-+ Remote curr = (Remote)bindings.get(name);
-+ if (curr != null)
-+ throw new AlreadyBoundException(name);
-+ bindings.put(name, obj);
-+ }
-+ }
-+
-+ /**
-+ * Unbind the name.
-+ * @exception RemoteException If remote operation failed.
-+ * @exception NotBound If name is not currently bound.
-+ */
-+ public void unbind(String name)
-+ throws RemoteException, NotBoundException, AccessException
-+ {
-+ checkAccess("Registry.unbind");
-+ synchronized (bindings) {
-+ Remote obj = (Remote)bindings.get(name);
-+ if (obj == null)
-+ throw new NotBoundException(name);
-+ bindings.remove(name);
-+ }
-+ }
-+
-+ /**
-+ * Rebind the name to a new object, replaces any existing binding.
-+ * @exception RemoteException If remote operation failed.
-+ */
-+ public void rebind(String name, Remote obj)
-+ throws RemoteException, AccessException
-+ {
-+ checkAccess("Registry.rebind");
-+ bindings.put(name, obj);
-+ }
-+
-+ /**
-+ * Returns an enumeration of the names in the registry.
-+ * @exception RemoteException If remote operation failed.
-+ */
-+ public String[] list()
-+ throws RemoteException
-+ {
-+ String[] names;
-+ synchronized (bindings) {
-+ int i = bindings.size();
-+ names = new String[i];
-+ Enumeration enum_ = bindings.keys();
-+ while ((--i) >= 0)
-+ names[i] = (String)enum_.nextElement();
-+ }
-+ return names;
-+ }
-+
-+ /**
-+ * Check that the caller has access to perform indicated operation.
-+ * The client must be on same the same host as this server.
-+ */
-+ public static void checkAccess(String op) throws AccessException {
-+
-+ try {
-+ /*
-+ * Get client host that this registry operation was made from.
-+ */
-+ final String clientHostName = getClientHost();
-+ InetAddress clientHost;
-+
-+ try {
-+ clientHost = (InetAddress)
-+ java.security.AccessController.doPrivileged(
-+ new java.security.PrivilegedExceptionAction() {
-+ public Object run()
-+ throws java.net.UnknownHostException
-+ {
-+ return InetAddress.getByName(clientHostName);
-+ }
-+ });
-+ } catch (PrivilegedActionException pae) {
-+ throw (java.net.UnknownHostException) pae.getException();
-+ }
-+
-+ // if client not yet seen, make sure client allowed access
-+ if (allowedAccessCache.get(clientHost) == null) {
-+
-+ if (clientHost.isAnyLocalAddress()) {
-+ throw new AccessException(
-+ "Registry." + op + " disallowed; origin unknown");
-+ }
-+
-+ try {
-+ final InetAddress finalClientHost = clientHost;
-+
-+ java.security.AccessController.doPrivileged(
-+ new java.security.PrivilegedExceptionAction() {
-+ public Object run() throws java.io.IOException {
-+ /*
-+ * if a ServerSocket can be bound to the client's
-+ * address then that address must be local
-+ */
-+ (new ServerSocket(0, 10, finalClientHost)).close();
-+ allowedAccessCache.put(finalClientHost,
-+ finalClientHost);
-+ return null;
-+ }
-+ });
-+ } catch (PrivilegedActionException pae) {
-+ // must have been an IOException
-+
-+ throw new AccessException(
-+ "Registry." + op + " disallowed; origin " +
-+ clientHost + " is non-local host");
-+ }
-+ }
-+ } catch (ServerNotActiveException ex) {
-+ /*
-+ * Local call from this VM: allow access.
-+ */
-+ } catch (java.net.UnknownHostException ex) {
-+ throw new AccessException("Registry." + op +
-+ " disallowed; origin is unknown host");
-+ }
-+ }
-+
-+ public static ObjID getID() {
-+ return id;
-+ }
-+
-+ /**
-+ * Retrieves text resources from the locale-specific properties file.
-+ */
-+ private static String getTextResource(String key) {
-+ if (resources == null) {
-+ try {
-+ resources = ResourceBundle.getBundle(
-+ "sun.rmi.registry.resources.rmiregistry");
-+ } catch (MissingResourceException mre) {
-+ }
-+ if (resources == null) {
-+ // throwing an Error is a bit extreme, methinks
-+ return ("[missing resource file: " + key + "]");
-+ }
-+ }
-+
-+ String val = null;
-+ try {
-+ val = resources.getString(key);
-+ } catch (MissingResourceException mre) {
-+ }
More information about the distro-pkg-dev
mailing list