You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(97) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(127) |
Feb
(34) |
Mar
(16) |
Apr
(26) |
May
(55) |
Jun
(107) |
Jul
(36) |
Aug
(72) |
Sep
(90) |
Oct
(41) |
Nov
(27) |
Dec
(13) |
2008 |
Jan
(37) |
Feb
(39) |
Mar
(98) |
Apr
(115) |
May
(134) |
Jun
(120) |
Jul
(86) |
Aug
(149) |
Sep
(68) |
Oct
(66) |
Nov
(104) |
Dec
(49) |
2009 |
Jan
(131) |
Feb
(132) |
Mar
(125) |
Apr
(172) |
May
(161) |
Jun
(43) |
Jul
(47) |
Aug
(38) |
Sep
(18) |
Oct
(6) |
Nov
(1) |
Dec
(15) |
2010 |
Jan
(21) |
Feb
(8) |
Mar
(10) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(4) |
2011 |
Jan
(23) |
Feb
(10) |
Mar
(13) |
Apr
(3) |
May
|
Jun
(19) |
Jul
(11) |
Aug
(22) |
Sep
|
Oct
(4) |
Nov
(2) |
Dec
(12) |
2012 |
Jan
(3) |
Feb
(4) |
Mar
(7) |
Apr
(3) |
May
|
Jun
(1) |
Jul
(1) |
Aug
(30) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(8) |
2013 |
Jan
(3) |
Feb
(40) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(12) |
Dec
|
2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: <ls...@us...> - 2011-06-25 21:08:07
|
Revision: 5826 http://jnode.svn.sourceforge.net/jnode/?rev=5826&view=rev Author: lsantha Date: 2011-06-25 21:07:57 +0000 (Sat, 25 Jun 2011) Log Message: ----------- Improved remote debugging. Now standard Java debuggers can connect to JNode. Modified Paths: -------------- trunk/core/src/classpath/ext/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java trunk/core/src/classpath/vm/gnu/classpath/jdwp/NativeVMVirtualMachine.java trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/NativeTransportFactory.java Added Paths: ----------- trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/JNodeSocketTransport.java trunk/core/src/emu/gnu/ trunk/core/src/emu/gnu/classpath/ trunk/core/src/emu/gnu/classpath/jdwp/ trunk/core/src/emu/gnu/classpath/jdwp/EmuVirtualMachine.java trunk/core/src/emu/gnu/classpath/jdwp/Main.java Removed Paths: ------------- trunk/core/src/classpath/vm/gnu/classpath/jdwp/JNodeSocketTransport.java Modified: trunk/core/src/classpath/ext/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java =================================================================== --- trunk/core/src/classpath/ext/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java 2011-06-24 08:53:44 UTC (rev 5825) +++ trunk/core/src/classpath/ext/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java 2011-06-25 21:07:57 UTC (rev 5826) @@ -273,7 +273,7 @@ ThreadGroup root = getRootThreadGroup(jdwpGroup); os.writeInt(1); // Just one top level group allowed? - idMan.getObjectId(root); + idMan.getObjectId(root).write(os); } private void executeDispose(ByteBuffer bb, DataOutputStream os) Deleted: trunk/core/src/classpath/vm/gnu/classpath/jdwp/JNodeSocketTransport.java =================================================================== --- trunk/core/src/classpath/vm/gnu/classpath/jdwp/JNodeSocketTransport.java 2011-06-24 08:53:44 UTC (rev 5825) +++ trunk/core/src/classpath/vm/gnu/classpath/jdwp/JNodeSocketTransport.java 2011-06-25 21:07:57 UTC (rev 5826) @@ -1,166 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2003-2010 JNode.org - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; If not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package gnu.classpath.jdwp; - -import java.net.Socket; -import java.net.ServerSocket; -import java.util.HashMap; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import javax.net.ServerSocketFactory; -import javax.net.SocketFactory; -import gnu.classpath.jdwp.transport.ITransport; -import gnu.classpath.jdwp.transport.TransportException; - -/** - * - */ -public class JNodeSocketTransport implements ITransport { - - /** - * Name of this transport - */ - public static final String NAME = "dt_socket"; - - // Configure properties - private static final String _PROPERTY_ADDRESS = "address"; - private static final String _PROPERTY_SERVER = "server"; - - // Port number - private int port; - - // Host name - private String host; - - // Are we acting as a server? - private boolean server = false; - - // Socket - private Socket socket; - - /** - * Setup the connection configuration from the given properties - * - * @param properties the properties of the JDWP session - * @throws gnu.classpath.jdwp.transport.TransportException for any configury errors - */ - public void configure (HashMap properties) throws TransportException { - // Get address [form: "hostname:port"] - String p = (String) properties.get(_PROPERTY_ADDRESS); - if (p != null) { - String[] s = p.split(":"); - if (s.length == 2) { - host = s[0]; - port = Integer.parseInt(s[1]); - // @classpath-bugfix Michael Klaus (Mic...@gm...) - } else if (s.length == 1) { - port = Integer.parseInt(s[0]); - // @classpath-bugfix-end - } - } - - // Get server [form: "y" or "n"] - p = (String) properties.get(_PROPERTY_SERVER); - if (p != null) { - if (p.toLowerCase().equals("y")) - server = true; - } - } - - public static class ServerSocketHolder { - private static ServerSocket ss; - public static void close(){ - if(ss != null){ - try { - ss.close(); - } catch (Exception e){ - - } finally { - ss = null; - } - } - } - - static Socket getSocket(int port, int backlog) throws IOException{ - if(ss == null){ - ServerSocketFactory ssf = ServerSocketFactory.getDefault(); - ss = ssf.createServerSocket(port, backlog); - } - return ss.accept(); - } - } - - /** - * Initialize this socket connection. This includes - * connecting to the host (or listening for it). - * - * @throws TransportException if a transport-related error occurs - */ - public void initialize () throws TransportException { - try { - if (server) { - // Get a server socket - socket = ServerSocketHolder.getSocket(port, 1); - } else { - // Get a client socket (the factory will connect it) - SocketFactory sf = SocketFactory.getDefault(); - socket = sf.createSocket(host, port); - } - } - catch (IOException ioe) { - // This will grab UnknownHostException, too. - throw new TransportException(ioe); - } - } - - /** - * Shutdown the socket. This could cause SocketExceptions - * for anyone blocked on socket i/o - */ - public void shutdown () { - try { - socket.close(); - } catch (Throwable t) { - // We don't really care about errors at this point - } - } - - /** - * Returns an <code>InputStream</code> for the transport - * - * @throws IOException if an I/O error occurs creating the stream - * or the socket is not connected - */ - public InputStream getInputStream () throws IOException { - return socket.getInputStream(); - } - - /** - * Returns an <code>OutputStream</code> for the transport - * - * @throws IOException if an I/O error occurs creating the stream - * or the socket is not connected - */ - public OutputStream getOutputStream () throws IOException { - return socket.getOutputStream(); - } -} Modified: trunk/core/src/classpath/vm/gnu/classpath/jdwp/NativeVMVirtualMachine.java =================================================================== --- trunk/core/src/classpath/vm/gnu/classpath/jdwp/NativeVMVirtualMachine.java 2011-06-24 08:53:44 UTC (rev 5825) +++ trunk/core/src/classpath/vm/gnu/classpath/jdwp/NativeVMVirtualMachine.java 2011-06-25 21:07:57 UTC (rev 5826) @@ -27,6 +27,7 @@ import gnu.classpath.jdwp.util.MethodResult; import gnu.classpath.jdwp.event.EventRequest; +import org.jnode.annotation.NoInline; import org.jnode.vm.facade.VmUtils; import org.jnode.vm.isolate.VmIsolate; import org.jnode.vm.classmgr.VmIsolatedStatics; @@ -41,23 +42,34 @@ * @author Levente S\u00e1ntha */ class NativeVMVirtualMachine { + @NoInline +// public static boolean debug() { +// return true; +// } + /** * @see gnu.classpath.jdwp.VMVirtualMachine#suspendThread(java.lang.Thread) */ private static void suspendThread(Thread arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.suspendThread()"); } /** * @see gnu.classpath.jdwp.VMVirtualMachine#resumeThread(java.lang.Thread) */ private static void resumeThread(Thread arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.resumeThread()"); } /** * @see gnu.classpath.jdwp.VMVirtualMachine#getSuspendCount(java.lang.Thread) */ private static int getSuspendCount(Thread arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getSuspendCount()"); return 0; } /** @@ -65,12 +77,16 @@ */ private static int getAllLoadedClassesCount() { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getAllLoadedClassesCount()"); return 0; } /** * @see gnu.classpath.jdwp.VMVirtualMachine#getAllLoadedClasses() */ private static Iterator getAllLoadedClasses() { +// if(debug()) + System.out.println("NativeVMVirtualMachine.getAllLoadedClasses()"); return new Iterator() { private VmStaticsIterator iter = new VmStaticsIterator(VmUtils.getVm().getSharedStatics()); private Iterator<VmIsolatedStatics> isolated = VmIsolate.staticsIterator(); @@ -102,6 +118,8 @@ */ private static int getClassStatus(Class arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getClassStatus()"); return 0; } /** @@ -109,6 +127,8 @@ */ private static VMMethod[] getAllClassMethods(Class arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getAllClassMethods()"); return null; } /** @@ -116,6 +136,8 @@ */ private static VMMethod getClassMethod(Class arg1, long arg2) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getClassMethod()"); return null; } /** @@ -123,6 +145,8 @@ */ private static ArrayList getFrames(Thread arg1, int arg2, int arg3) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getFrame()"); return null; } /** @@ -130,6 +154,8 @@ */ private static VMFrame getFrame(Thread arg1, ByteBuffer arg2) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getFrame()"); return null; } /** @@ -137,6 +163,8 @@ */ private static int getFrameCount(Thread arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getFrameCount()"); return 0; } /** @@ -144,6 +172,8 @@ */ private static int getThreadStatus(Thread arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getThreadStatus()"); return 0; } /** @@ -151,6 +181,8 @@ */ private static ArrayList getLoadRequests(ClassLoader arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getLoadRequest()"); return null; } /** @@ -158,6 +190,8 @@ */ private static MethodResult executeMethod(Object arg1, Thread arg2, Class arg3, Method arg4, Object[] arg5, boolean arg6) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.executeMethod()"); return null; } /** @@ -165,6 +199,8 @@ */ private static String getSourceFile(Class arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.getSourceFile()"); return null; } /** @@ -172,21 +208,30 @@ */ private static void registerEvent(EventRequest arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.registerEvent() " + arg1.getId() + " " + arg1.getEventKind() + + " " + arg1.getSuspendPolicy() + " " + arg1.getFilters()); } /** * @see gnu.classpath.jdwp.VMVirtualMachine#unregisterEvent(gnu.classpath.jdwp.event.EventRequest) */ private static void unregisterEvent(EventRequest arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.unregisterEvent()"); } /** * @see gnu.classpath.jdwp.VMVirtualMachine#clearEvents(byte) */ private static void clearEvents(byte arg1) { //todo implement it +// if(debug()) + System.out.println("NativeVMVirtualMachine.clearEvents()"); } public static void redefineClass(Class oldClass, byte[] classData){ +// if(debug()) + System.out.println("NativeVMVirtualMachine.redefineClass()"); VmType old_type = VmType.fromClass(oldClass); VmType new_type = ClassDecoder.defineClass(oldClass.getName(), ByteBuffer.wrap(classData), false, Copied: trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/JNodeSocketTransport.java (from rev 5819, trunk/core/src/classpath/vm/gnu/classpath/jdwp/JNodeSocketTransport.java) =================================================================== --- trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/JNodeSocketTransport.java (rev 0) +++ trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/JNodeSocketTransport.java 2011-06-25 21:07:57 UTC (rev 5826) @@ -0,0 +1,166 @@ +/* + * $Id$ + * + * Copyright (C) 2003-2010 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library 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 Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +package gnu.classpath.jdwp.transport; + +import java.net.Socket; +import java.net.ServerSocket; +import java.util.HashMap; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import javax.net.ServerSocketFactory; +import javax.net.SocketFactory; +import gnu.classpath.jdwp.transport.ITransport; +import gnu.classpath.jdwp.transport.TransportException; + +/** + * + */ +public class JNodeSocketTransport implements ITransport { + + /** + * Name of this transport + */ + public static final String NAME = "dt_socket"; + + // Configure properties + private static final String _PROPERTY_ADDRESS = "address"; + private static final String _PROPERTY_SERVER = "server"; + + // Port number + private int port; + + // Host name + private String host; + + // Are we acting as a server? + private boolean server = false; + + // Socket + private Socket socket; + + /** + * Setup the connection configuration from the given properties + * + * @param properties the properties of the JDWP session + * @throws gnu.classpath.jdwp.transport.TransportException for any configury errors + */ + public void configure (HashMap properties) throws TransportException { + // Get address [form: "hostname:port"] + String p = (String) properties.get(_PROPERTY_ADDRESS); + if (p != null) { + String[] s = p.split(":"); + if (s.length == 2) { + host = s[0]; + port = Integer.parseInt(s[1]); + // @classpath-bugfix Michael Klaus (Mic...@gm...) + } else if (s.length == 1) { + port = Integer.parseInt(s[0]); + // @classpath-bugfix-end + } + } + + // Get server [form: "y" or "n"] + p = (String) properties.get(_PROPERTY_SERVER); + if (p != null) { + if (p.toLowerCase().equals("y")) + server = true; + } + } + + public static class ServerSocketHolder { + private static ServerSocket ss; + public static void close(){ + if(ss != null){ + try { + ss.close(); + } catch (Exception e){ + + } finally { + ss = null; + } + } + } + + static Socket getSocket(int port, int backlog) throws IOException{ + if(ss == null){ + ServerSocketFactory ssf = ServerSocketFactory.getDefault(); + ss = ssf.createServerSocket(port, backlog); + } + return ss.accept(); + } + } + + /** + * Initialize this socket connection. This includes + * connecting to the host (or listening for it). + * + * @throws TransportException if a transport-related error occurs + */ + public void initialize () throws TransportException { + try { + if (server) { + // Get a server socket + socket = ServerSocketHolder.getSocket(port, 1); + } else { + // Get a client socket (the factory will connect it) + SocketFactory sf = SocketFactory.getDefault(); + socket = sf.createSocket(host, port); + } + } + catch (IOException ioe) { + // This will grab UnknownHostException, too. + throw new TransportException(ioe); + } + } + + /** + * Shutdown the socket. This could cause SocketExceptions + * for anyone blocked on socket i/o + */ + public void shutdown () { + try { + socket.close(); + } catch (Throwable t) { + // We don't really care about errors at this point + } + } + + /** + * Returns an <code>InputStream</code> for the transport + * + * @throws IOException if an I/O error occurs creating the stream + * or the socket is not connected + */ + public InputStream getInputStream () throws IOException { + return socket.getInputStream(); + } + + /** + * Returns an <code>OutputStream</code> for the transport + * + * @throws IOException if an I/O error occurs creating the stream + * or the socket is not connected + */ + public OutputStream getOutputStream () throws IOException { + return socket.getOutputStream(); + } +} Modified: trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/NativeTransportFactory.java =================================================================== --- trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/NativeTransportFactory.java 2011-06-24 08:53:44 UTC (rev 5825) +++ trunk/core/src/classpath/vm/gnu/classpath/jdwp/transport/NativeTransportFactory.java 2011-06-25 21:07:57 UTC (rev 5826) @@ -20,8 +20,6 @@ package gnu.classpath.jdwp.transport; -import gnu.classpath.jdwp.JNodeSocketTransport; - /** * */ Copied: trunk/core/src/emu/gnu/classpath/jdwp/EmuVirtualMachine.java (from rev 5819, trunk/core/src/classpath/ext/gnu/classpath/jdwp/VMVirtualMachine.java) =================================================================== --- trunk/core/src/emu/gnu/classpath/jdwp/EmuVirtualMachine.java (rev 0) +++ trunk/core/src/emu/gnu/classpath/jdwp/EmuVirtualMachine.java 2011-06-25 21:07:57 UTC (rev 5826) @@ -0,0 +1,404 @@ +/* VMVirtualMachine.java -- A reference implementation of a JDWP virtual + machine + + Copyright (C) 2005, 2006 Free Software Foundation + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package gnu.classpath.jdwp; + +import gnu.classpath.jdwp.event.ClassPrepareEvent; +import gnu.classpath.jdwp.event.EventRequest; +import gnu.classpath.jdwp.event.VmInitEvent; +import gnu.classpath.jdwp.exception.JdwpException; +import gnu.classpath.jdwp.util.MethodResult; +import java.lang.reflect.Method; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Iterator; + +/** + * A virtual machine according to JDWP. + * + * @author Keith Seitz <ke...@re...> + */ +public class EmuVirtualMachine +{ + /** + * Suspend a thread + * + * @param thread the thread to suspend + */ + public static void suspendThread (Thread thread) + throws JdwpException{ + System.out.println("suspendThread"); + } + + /** + * Suspend all threads + */ + public static void suspendAllThreads () + throws JdwpException + { + // Our JDWP thread group -- don't suspend any of those threads + Thread current = Thread.currentThread (); + ThreadGroup jdwpGroup = current.getThreadGroup (); + + // Find the root ThreadGroup + ThreadGroup group = jdwpGroup; + ThreadGroup parent = group.getParent (); + while (parent != null) + { + group = parent; + parent = group.getParent (); + } + + // Get all the threads in the system + int num = group.activeCount (); + Thread[] threads = new Thread[num]; + group.enumerate (threads); + + for (int i = 0; i < num; ++i) + { + Thread t = threads[i]; + if (t != null) + { + if (t.getThreadGroup () == jdwpGroup || t == current) + { + // Don't suspend the current thread or any JDWP thread + continue; + } + else + suspendThread (t); + } + } + + // Now suspend the current thread + suspendThread (current); + } + + /** + * Resume a thread. A thread must be resumed as many times + * as it has been suspended. + * + * @param thread the thread to resume + */ + public static void resumeThread (Thread thread) + throws JdwpException { + System.out.println("resumeThread"); + } + + /** + * Resume all threads. This simply decrements the thread's + * suspend count. It can not be used to force the application + * to run. + */ + public static void resumeAllThreads () + throws JdwpException + { + // Our JDWP thread group -- don't resume + Thread current = Thread.currentThread (); + ThreadGroup jdwpGroup = current.getThreadGroup (); + + // Find the root ThreadGroup + ThreadGroup group = jdwpGroup; + ThreadGroup parent = group.getParent (); + while (parent != null) + { + group = parent; + parent = group.getParent (); + } + + // Get all the threads in the system + int num = group.activeCount (); + Thread[] threads = new Thread[num]; + group.enumerate (threads); + + for (int i = 0; i < num; ++i) + { + Thread t = threads[i]; + if (t != null) + { + if (t.getThreadGroup () == jdwpGroup || t == current) + { + // Don't resume the current thread or any JDWP thread + continue; + } + else + resumeThread (t); + } + } + } + + /** + * Get the suspend count for a give thread + * + * @param thread the thread whose suspend count is desired + * @return the number of times the thread has been suspended + */ + public static int getSuspendCount (Thread thread) + throws JdwpException { + System.out.println("getSuspendCount"); + return 0; + } + + /** + * Returns a count of the number of loaded classes in the VM + */ + public static int getAllLoadedClassesCount () + throws JdwpException { + System.out.println("getAllLoadedClassesCount"); + return 0; + } + + /** + * Returns an iterator over all the loaded classes in the VM + */ + public static Iterator getAllLoadedClasses () + throws JdwpException { + System.out.println("getAllLoadedClasses"); + ArrayList a = new ArrayList(); + a.add(String.class); + a.add(Object.class); + a.add(Integer.class); + a.add(EmuVirtualMachine.class); + return a.iterator(); + } + + /** + * Returns the status of the given class + * + * @param clazz the class whose status is desired + * @return a flag containing the class's status + * @see gnu.classpath.jdwp.JdwpConstants.ClassStatus + */ + public static int getClassStatus (Class clazz) + throws JdwpException { + System.out.println("getClassStatus"); + return 0; + } + + /** + * Returns all of the methods defined in the given class. This + * includes all methods, constructors, and class initializers. + * + * @param klass the class whose methods are desired + * @return an array of virtual machine methods + */ + public static VMMethod[] getAllClassMethods (Class klass) + throws JdwpException { + System.out.println("getAllClassMethods"); + return new VMMethod[0]; + } + + /** + * A factory method for getting valid virtual machine methods + * which may be passed to/from the debugger. + * + * @param klass the class in which the method is defined + * @param id the ID of the desired method + * @return the desired internal representation of the method + * @throws gnu.classpath.jdwp.exception.InvalidMethodException if the method is not defined + * in the class + * @throws gnu.classpath.jdwp.exception.JdwpException for any other error + */ + public static VMMethod getClassMethod(Class klass, long id) + throws JdwpException { + System.out.println("getClassMethod"); + return null; + } + + /** + * Returns the thread's call stack + * + * @param thread thread for which to get call stack + * @param start index of first frame to return + * @param length number of frames to return (-1 for all frames) + * @return a list of frames + */ + public static ArrayList getFrames (Thread thread, int start, + int length) + throws JdwpException { + System.out.println("getFrames"); + return new ArrayList(); + } + + /** + * Returns the frame for a given thread with the frame ID in + * the buffer + * + * I don't like this. + * + * @param thread the frame's thread + * @param bb buffer containing the frame's ID + * @return the desired frame + */ + public static VMFrame getFrame (Thread thread, ByteBuffer bb) + throws JdwpException { + System.out.println("getFrame"); + return null; + } + + /** + * Returns the number of frames in the thread's stack + * + * @param thread the thread for which to get a frame count + * @return the number of frames in the thread's stack + */ + public static int getFrameCount (Thread thread) + throws JdwpException { + System.out.println("getFrameCount"); + return 0; + } + + + /** + * Returns the status of a thread + * + * @param thread the thread for which to get status + * @return integer status of the thread + * @see gnu.classpath.jdwp.JdwpConstants.ThreadStatus + */ + public static int getThreadStatus (Thread thread) + throws JdwpException { + System.out.println("getThreadStatus"); + return 0; + } + + /** + * Returns a list of all classes which this class loader has been + * requested to load + * + * @param cl the class loader + * @return a list of all visible classes + */ + public static ArrayList getLoadRequests (ClassLoader cl) + throws JdwpException { + System.out.println("getLoadRequests"); + return new ArrayList(); + } + + /** + * Executes a method in the virtual machine + * + * @param obj instance in which to invoke method (null for static) + * @param thread the thread in which to invoke the method + * @param clazz the class in which the method is defined + * @param method the method to invoke + * @param values arguments to pass to method + * @param nonVirtual "otherwise, normal virtual invoke + * (instance methods only) " + * @return a result object containing the results of the invocation + */ + public static MethodResult executeMethod (Object obj, Thread thread, + Class clazz, Method method, + Object[] values, + boolean nonVirtual) + throws JdwpException { + System.out.println("executeMethod"); + return null; + } + + /** + * "Returns the name of source file in which a reference type was declared" + * + * @param clazz the class for which to return a source file + * @return a string containing the source file name; "no path information + * for the file is included" + */ + public static String getSourceFile (Class clazz) + throws JdwpException { + System.out.println("getSourceFile"); + return null; + } + + /** + * Register a request from the debugger + * + * Virtual machines have two options. Either do nothing and allow + * the event manager to take care of the request (useful for broadcast-type + * events like class prepare/load/unload, thread start/end, etc.) + * or do some internal work to set up the event notification (useful for + * execution-related events like breakpoints, single-stepping, etc.). + */ + public static void registerEvent (EventRequest request) + throws JdwpException { + System.out.println("registerEvent " + request.getId() + " " + request.getEventKind() + " " + + request.getSuspendPolicy() + " " + request.getFilters()); + + if(request.getEventKind() == JdwpConstants.EventKind.VM_INIT) { + new Thread(){ + @Override + public void run() { + try { + Thread.sleep(1000); + Jdwp.notify(new VmInitEvent(Thread.currentThread())); + Jdwp.notify(new ClassPrepareEvent(Thread.currentThread(), Class.class, 0)); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } + } + }.start(); + } + } + + /** + * Unregisters the given request + * + * @param request the request to unregister + */ + public static void unregisterEvent (EventRequest request) + throws JdwpException { + System.out.println("unregisterEvent"); + + } + + + /** + * Clear all events of the given kind + * + * @param kind the type of events to clear + */ + public static void clearEvents (byte kind) + throws JdwpException { + System.out.println("clearEvents"); + } + + public static void redefineClass(Class old_class, byte[] classData) { + System.out.println("redefineClass"); + } +} Added: trunk/core/src/emu/gnu/classpath/jdwp/Main.java =================================================================== --- trunk/core/src/emu/gnu/classpath/jdwp/Main.java (rev 0) +++ trunk/core/src/emu/gnu/classpath/jdwp/Main.java 2011-06-25 21:07:57 UTC (rev 5826) @@ -0,0 +1,59 @@ +package gnu.classpath.jdwp; + +import gnu.classpath.jdwp.transport.JNodeSocketTransport; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.Reader; + +/** + * User: lsantha + * Date: 6/25/11 5:13 PM + */ +public class Main { + private static final String str_quit = "Type 'q' to exit"; + + private static final int DEFAULT_PORT = 6789; + + private boolean up = true; + + public static void main(String[] args) throws Exception { + new Main().execute(); + } + + public void execute() throws Exception { + // FIXME - in the even of internal exceptions, JDWP writes to System.out. + final String ps = "transport=dt_socket,suspend=n,address=" + DEFAULT_PORT + ",server=y"; + Thread t = new Thread(new Runnable() { + public void run() { + while (up()) { + Jdwp jdwp = new Jdwp(); + jdwp.configure(ps); + jdwp.run(); + jdwp.waitToFinish(); + jdwp.shutdown(); + } + // workaround for the restricted capabilities of JDWP support in GNU Classpath. + JNodeSocketTransport.ServerSocketHolder.close(); + } + }); + t.start(); + + Reader in = new InputStreamReader(System.in); + PrintWriter out = new PrintWriter(System.out); + while (in.read() != 'q') { + out.println(str_quit); + } + // FIXME - this just stops the 'debug' command. The listener will keep running + // until the remote debugger disconnects. We should have a way to disconnect at + // this end. + down(); + } + + public synchronized boolean up() { + return up; + } + + public synchronized void down() { + up = false; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ga...@us...> - 2011-06-24 08:53:50
|
Revision: 5825 http://jnode.svn.sourceforge.net/jnode/?rev=5825&view=rev Author: galatnm Date: 2011-06-24 08:53:44 +0000 (Fri, 24 Jun 2011) Log Message: ----------- Remove commented code. Modified Paths: -------------- trunk/fs/src/fs/org/jnode/fs/ext2/cache/BlockCache.java trunk/fs/src/fs/org/jnode/fs/ext2/cache/INodeCache.java Modified: trunk/fs/src/fs/org/jnode/fs/ext2/cache/BlockCache.java =================================================================== --- trunk/fs/src/fs/org/jnode/fs/ext2/cache/BlockCache.java 2011-06-21 18:12:05 UTC (rev 5824) +++ trunk/fs/src/fs/org/jnode/fs/ext2/cache/BlockCache.java 2011-06-24 08:53:44 UTC (rev 5825) @@ -17,7 +17,7 @@ * along with this library; If not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + package org.jnode.fs.ext2.cache; import java.io.IOException; @@ -49,20 +49,13 @@ cacheListeners.add(listener); } - /* - * private boolean containsKey(Integer key) { boolean result = - * super.containsKey(key); if(result) log.debug("CACHE HIT, size:"+size()); - * else log.debug("CACHE MISS"); return result; } - */ - protected synchronized boolean removeEldestEntry(Map.Entry<Object, Block> eldest) { log.debug("BlockCache size: " + size()); if (size() > MAX_SIZE) { try { eldest.getValue().flush(); // notify the listeners - final CacheEvent event = new CacheEvent(eldest.getValue(), - CacheEvent.REMOVED); + final CacheEvent event = new CacheEvent(eldest.getValue(), CacheEvent.REMOVED); for (CacheListener l : cacheListeners) { l.elementRemoved(event); } Modified: trunk/fs/src/fs/org/jnode/fs/ext2/cache/INodeCache.java =================================================================== --- trunk/fs/src/fs/org/jnode/fs/ext2/cache/INodeCache.java 2011-06-21 18:12:05 UTC (rev 5824) +++ trunk/fs/src/fs/org/jnode/fs/ext2/cache/INodeCache.java 2011-06-24 08:53:44 UTC (rev 5825) @@ -17,7 +17,7 @@ * along with this library; If not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + package org.jnode.fs.ext2.cache; import java.util.Hashtable; @@ -34,52 +34,3 @@ super(initialCapacity, loadFactor); } } - -/* -public class INodeCache extends LinkedHashMap { - // at most MAX_SIZE blocks fit in the cache - static final int MAX_SIZE = 10; - private final Logger log = Logger.getLogger(getClass()); - - public INodeCache(int initialCapacity, float loadFactor) { - super(Math.min(MAX_SIZE, initialCapacity), loadFactor, true); - // super(initialCapacity,loadFactor); - log.setLevel(Level.DEBUG); - } - -// public boolean containsKey(Integer key) { -// boolean result = super.containsKey(key); -// if (result) -// log.debug("INODE CACHE HIT, size:" + size()); -// else -// log.debug("INODE CACHE MISS"); -// return result; -// } - - protected synchronized boolean removeEldestEntry(final Map.Entry eldest) { - log.debug("INodeCache size: " + size()); - INode eldestINode = (INode) eldest.getValue(); - synchronized (eldestINode) { - while (eldestINode.isLocked()) { - // an other thread has indicated that this inode - // should not be removed from the cache - try { - log.info("** Waiting for an other thread to unlock inode " + eldestINode); - eldestINode.wait(1000); - } catch (InterruptedException iex) { - } - } - - if (size() > MAX_SIZE) { - try { - eldestINode.flush(); - } catch (Exception e) { - log.error("Can't flush inode!", e); - } - return true; - } else - return false; - } - } -} -*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-21 18:12:11
|
Revision: 5824 http://jnode.svn.sourceforge.net/jnode/?rev=5824&view=rev Author: lsantha Date: 2011-06-21 18:12:05 +0000 (Tue, 21 Jun 2011) Log Message: ----------- Fixes to the build system. Modified Paths: -------------- classlib6/all/build.xml classlib6/all/lib/jnode.xml classlib6/core/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2011-06-21 18:09:36 UTC (rev 5823) +++ classlib6/all/build.xml 2011-06-21 18:12:05 UTC (rev 5824) @@ -47,7 +47,6 @@ <property name="mauve.jar" value="${root.dir}/core/lib/mauve.jar"/> <property name="ejc.jar" value="${root.dir}/core/lib/ejc-3.1.1.jar"/> - <property name="iso9660.jar" value="${root.dir}/builder/lib/iso9660.jar" /> <property name="sabre.jar" value="${root.dir}/builder/lib/sabre.jar" /> <!-- libraries needed to run tests --> @@ -89,18 +88,8 @@ <pathelement location="${cglib.jar}"/> <pathelement location="${log4j.jar}"/> <pathelement location="${basedir}/conf"/> - <pathelement location="${beanshell.jar}"/> - <pathelement location="${js.jar}"/> - <pathelement location="${oncrpc.jar}"/> - <pathelement location="${edtftpj.jar}"/> - <pathelement location="${jcifs.jar}"/> <pathelement location="${commons-net.jar}"/> - <pathelement location="${dnsjava.jar}"/> <pathelement location="${mauve.jar}"/> - <pathelement location="${derby.jar}"/> - <pathelement location="${derbynet.jar}"/> - <pathelement location="${derbytools.jar}"/> - <pathelement location="${iso9660.jar}"/> <pathelement location="${sabre.jar}"/> </path> @@ -337,105 +326,13 @@ <!-- Call the assemble target of all subprojects --> <target name="assemble-projects" depends="prepare"> <!-- pre compile tasks needed for compilation --> + <ant target="pre-compile" dir="${root.dir}/core" inheritall="on" inheritrefs="on" /> <ant target="pre-compile" dir="${root.dir}/builder" inheritall="on" inheritrefs="on" /> <jnode.antall target="assemble"/> </target> - <!-- Assemble all plugins --> - <target name="assemble-plugins" depends="assemble-projects,openjdk-annotate"> - <!-- Now assemble all plugins --> - <!-- - <taskdef name="plugin" classname="org.jnode.build.PluginTask" classpathref="cp-jnode"/> - <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}"> - <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/> - - <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/> - <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/> - - <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/> - <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/> - <libalias name="jnode-mmtk-nogc.jar" alias="${jnode-mmtk-nogc.jar}"/> - - <libalias name="mmtk.jar" alias="${mmtk.jar}"/> - - <libalias name="commons-net-1.1.0.jar" alias="${commons-net.jar}"/> - <libalias name="dnsjava-1.6.6.jar" alias="${dnsjava.jar}"/> - <libalias name="jsch-0.1.24.jar" alias="${jsch.jar}"/> - <libalias name="log4j.jar" alias="${log4j.jar}"/> - <libalias name="beanshell.jar" alias="${beanshell.jar}"/> - <libalias name="nanoxml-java.jar" alias="${nanoxml-java.jar}"/> - <libalias name="js.jar" alias="${js.jar}"/> - <libalias name="thinlet.jar" alias="${thinlet.jar}"/> - - <libalias name="junit.jar" alias="${junit.jar}"/> - <libalias name="jmock-1.0.1.jar" alias="${jmock.jar}"/> - <libalias name="jmock-cglib-1.0.1.jar" alias="${jmock-cglib.jar}"/> - <libalias name="asm.jar" alias="${asm.jar}"/> - <libalias name="asm-attrs.jar" alias="${asm-attrs.jar}"/> - <libalias name="asm-util.jar" alias="${asm-util.jar}"/> - <libalias name="cglib.jar" alias="${cglib.jar}"/> - <libalias name="mauve.jar" alias="${mauve.jar}"/> - - <libalias name="ant.jar" alias="${ant.jar}"/> - <libalias name="ant-launcher.jar" alias="${ant-launcher.jar}"/> - <libalias name="edtftpj.jar" alias="${edtftpj.jar}"/> - <libalias name="jcifs.jar" alias="${jcifs.jar}"/> - <libalias name="ejc.jar" alias="${ejc.jar}"/> - <libalias name="oncrpc.jar" alias="${oncrpc.jar}"/> - <libalias name="telnetd.jar" alias="${telnetd.jar}"/> - <libalias name="commons-logging.jar" alias="${commons-logging.jar}"/> - <libalias name="jetty.jar" alias="${jetty.jar}"/> - <libalias name="jetty-util.jar" alias="${jetty-util.jar}"/> - <libalias name="jsp.jar" alias="${jsp.jar}"/> - <libalias name="jsp-api.jar" alias="${jsp-api.jar}"/> - <libalias name="servlet.jar" alias="${servlet.jar}"/> - <libalias name="derby.jar" alias="${derby.jar}"/> - <libalias name="derbynet.jar" alias="${derbynet.jar}"/> - <libalias name="derbytools.jar" alias="${derbytools.jar}"/> - - <descriptors dir="${descriptors.dir}/"> - <include name="*.xml"/> - <exclude name="*plugin-list.xml"/> - </descriptors> - </plugin> - --> - </target> - - <!-- Assemble all default initjars --> - <target name="assemble-default-initjars" depends="assemble-plugins" unless="no.default.initjars"> - <!-- Build all default initjar's --> - <!-- - <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/> - <initjars destdir="${initjars.dir}" - pluginDir="${plugins.dir}" - systemPluginList="${basedir}/conf/system-plugin-list.xml"> - <insert userApplicationsDir="${user.applications.dir}"/> - - <fileset dir="${basedir}/conf"> - <exclude name="system-plugin-list.xml"/> - <include name="*plugin-list.xml"/> - </fileset> - </initjars> - --> - </target> - - <!-- Assemble all custom initjars --> - <target name="assemble-custom-initjars" depends="assemble-plugins" if="custom.plugin-list.dir"> - <!-- Build all custom initjar's --> - <!-- - <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/> - <initjars destdir="${initjars.dir}" - pluginDir="${plugins.dir}" - systemPluginList="${basedir}/conf/system-plugin-list.xml"> - <fileset dir="${custom.plugin-list.dir}"> - <include name="*plugin-list.xml"/> - </fileset> - </initjars> - --> - </target> - <!-- Assemble all subprojects, plugins and initjars --> - <target name="assemble" depends="assemble-default-initjars, assemble-custom-initjars"> + <target name="assemble" depends="assemble-projects,openjdk-annotate"> </target> <!-- Give help on possible targets --> @@ -466,28 +363,6 @@ </echo> </target> - <!-- Upload a distribution --> - <!--target name="upload"> - <property name="upload.dir" value="${build.dir}/upload"/> - <mkdir dir="${upload.dir}"/> - <gzip src="${jnode-x86.iso}" destfile="${upload.dir}/jnode-x86-${jnode-ver}.iso.gz"/> - <copy todir="${upload.dir}" file="${sources.dist.tar.gz}"/> - <checksum algorithm="MD5" forceoverwrite="true"> - <fileset dir="${upload.dir}"> - <include name="jnode-x86-${jnode-ver}.iso.gz" /> - <include name="jnodesources-${jnode-ver}.tar.gz" /> - </fileset> - </checksum> - <echo message="FTP upload disabled. Uploadables are in: ${upload.dir}"/> - TODO find a way to automatically upload the files - jsch based scp with sftp fails with an error to sourceforge - FTP uploads are abandone by sourceforge - <ftp server="upload.sourceforge.net" remotedir="incoming" passive="yes" newer="yes" verbose="yes" userid="anonymous" password="${user.name}@users.sourceforge.net"> - <fileset dir="${upload.dir}"/> - </ftp> - </target> - --> - <!-- Clean everything files --> <target name="clean" description="clean the complete build output"> <jnode.antall target="clean"/> @@ -575,17 +450,6 @@ </jnode.javadoc> </target> - <!-- Backup CVS files --> - <!-- TODO create replacement SVN task - <target name="backup"> - <mkdir dir="${backup.dir}"/> - <tstamp> - <format property="date" pattern="dd-MM-yyyy"/> - </tstamp> - <get src="http://cvs.sourceforge.net/cvstarballs/jnode-cvsroot.tar.bz2" dest="${backup.dir}/jnode-cvsroot-${date}.tar.bz2" usetimestamp="true" verbose="true"/> - </target> - --> - <!-- Compare classpath version of jnode with real classpath version --> <target name="cp-compare" depends="assemble"> <taskdef name="cp-compare" classname="org.jnode.ant.taskdefs.classpath.CompareTask" classpathref="cp-jnode"/> @@ -715,7 +579,7 @@ </hotswap> </target> - <target name="oj-compare" depends="assemble"> + <target name="oj-compare" depends="assemble" description="compare the classlibrary with OpenJDK"> <taskdef name="cp-compare" classname="org.jnode.ant.taskdefs.classpath.CompareTask" classpathref="cp-jnode"/> <patternset id="cp-includes-pattern"> @@ -726,11 +590,18 @@ <patternset id="cp-sources-pattern"> <exclude name="com/sun/demo/**/*"/> + <exclude name="com/sun/imageio/plugins/jpeg/**/*"/> + <exclude name="com/sun/java/swing/plaf/gtk/**/*"/> + <exclude name="com/sun/java/swing/plaf/windows/**/*"/> + <exclude name="com/sun/jmx/snmp/**/*"/> + <exclude name="com/sun/script/javascript/**/*"/> <exclude name="com/sun/tools/hat/**/*"/> <exclude name="com/sun/tools/example/**/*"/> <exclude name="com/sun/tools/javah/**/*"/> <exclude name="com/sun/tools/internal/txw2/**/*"/> - <exclude name="sun/jvmstat/**/*"/> + <!--<exclude name="sun/jvmstat/**/*"/> --> + <exclude name="sun/java2d/opengl/**/*"/> + <exclude name="sun/management/snmp/**/*"/> <exclude name="sun/tools/attach/**/*"/> <exclude name="sun/tools/jinfo/**/*"/> <exclude name="sun/tools/jps/**/*"/> @@ -738,7 +609,7 @@ <exclude name="sun/tools/jstack/**/*"/> <exclude name="sun/tools/jstat/**/*"/> <exclude name="sun/tools/jstatd/**/*"/> - <exclude name="sun/tools/jconsole/**/*"/> + <!-- <exclude name="sun/tools/jconsole/**/*"/> --> </patternset> <delete dir="${build.dir}/openjdk-compare"/> @@ -851,27 +722,6 @@ </n2a> </target> - <!-- check plugin dependencies --> - <target name="check-plugins" depends="assemble-plugins"> - <!-- Check all plugins --> - <taskdef name="checkDeps" classname="org.jnode.build.dependencies.BCELDependencyChecker" - classpathref="cp-jnode" /> - <!-- - TODO: remove duplicate classes from mmtk related plugins and enable their checking. - --> - <checkDeps> - <plugins dir="${plugins.dir}/"> - <include name="*.jar" /> - <exclude name="*mmtk*.jar" /> - </plugins> - - <descriptors dir="${descriptors.dir}/"> - <include name="*.xml" /> - <exclude name="*plugin-list.xml" /> - <exclude name="*mmtk*.xml" /> - </descriptors> - </checkDeps> - </target> <!-- Create a patch --> <!-- TODO create replacement SVN task <target name="create-patch"> Modified: classlib6/all/lib/jnode.xml =================================================================== --- classlib6/all/lib/jnode.xml 2011-06-21 18:09:36 UTC (rev 5823) +++ classlib6/all/lib/jnode.xml 2011-06-21 18:12:05 UTC (rev 5824) @@ -14,7 +14,7 @@ target="${java.target}" source="${java.source}" encoding="${java.encoding}" - excludes="**/*-template.java,**/package-info.java"> + excludes="**/*-template.java"> <bootclasspath path="${jnode-core.jar}"/> <compilerarg value="${compilerarg}"/> </javac> Modified: classlib6/core/build.xml =================================================================== --- classlib6/core/build.xml 2011-06-21 18:09:36 UTC (rev 5823) +++ classlib6/core/build.xml 2011-06-21 18:12:05 UTC (rev 5824) @@ -76,12 +76,15 @@ </copy> </target> - <!-- Compile all subproject java files --> - <target name="compile" depends="prepare"> + <target name="pre-compile" depends="prepare"> <jnode.compile> <src refid="classpath-sources" /> <classpath refid="my-cp"/> </jnode.compile> + </target> + + <!-- Compile all subproject java files --> + <target name="compile" depends="pre-compile"> <parallel > <jnode.compile> <src refid="classpath-sources-corba" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-21 18:09:42
|
Revision: 5823 http://jnode.svn.sourceforge.net/jnode/?rev=5823&view=rev Author: lsantha Date: 2011-06-21 18:09:36 +0000 (Tue, 21 Jun 2011) Log Message: ----------- Fixed misnamed file. Added Paths: ----------- classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/package-info.java Removed Paths: ------------- classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/pacakge-info.java Deleted: classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/pacakge-info.java =================================================================== --- classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/pacakge-info.java 2011-06-21 15:57:03 UTC (rev 5822) +++ classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/pacakge-info.java 2011-06-21 18:09:36 UTC (rev 5823) @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2005, 2006, 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. - */ - -/** - * {@link SEIStub} and its supporting code. - */ -package com.sun.xml.internal.ws.client.sei; Added: classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/package-info.java =================================================================== --- classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/package-info.java (rev 0) +++ classlib6/core/src/openjdk/jaxws/com/sun/xml/internal/ws/client/sei/package-info.java 2011-06-21 18:09:36 UTC (rev 5823) @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2005, 2006, 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. + */ + +/** + * {@link SEIStub} and its supporting code. + */ +package com.sun.xml.internal.ws.client.sei; +//jnode misnamed file in OpenJDK \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-21 15:57:09
|
Revision: 5822 http://jnode.svn.sourceforge.net/jnode/?rev=5822&view=rev Author: lsantha Date: 2011-06-21 15:57:03 +0000 (Tue, 21 Jun 2011) Log Message: ----------- Removing unused libraries. Removed Paths: ------------- classlib6/builder/lib/iso9660.jar classlib6/builder/lib/javacc.jar Deleted: classlib6/builder/lib/iso9660.jar =================================================================== (Binary files differ) Deleted: classlib6/builder/lib/javacc.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-21 15:56:41
|
Revision: 5821 http://jnode.svn.sourceforge.net/jnode/?rev=5821&view=rev Author: lsantha Date: 2011-06-21 15:56:32 +0000 (Tue, 21 Jun 2011) Log Message: ----------- Removing unused Java code. Removed Paths: ------------- classlib6/builder/src/builder/org/jnode/ant/taskdefs/Asm.java classlib6/builder/src/builder/org/jnode/ant/taskdefs/TemplateTask.java classlib6/builder/src/builder/org/jnode/build/AsmSourceInfo.java classlib6/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java classlib6/builder/src/builder/org/jnode/build/VMwareBuilderTask.java Deleted: classlib6/builder/src/builder/org/jnode/ant/taskdefs/Asm.java =================================================================== --- classlib6/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2011-06-21 15:36:21 UTC (rev 5820) +++ classlib6/builder/src/builder/org/jnode/ant/taskdefs/Asm.java 2011-06-21 15:56:32 UTC (rev 5821) @@ -1,433 +0,0 @@ -/* - * $Id: Asm.java 5071 2009-02-28 16:38:38Z fduminy $ - * - * Copyright (C) 2003-2009 JNode.org - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; If not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package org.jnode.ant.taskdefs; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Execute; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.taskdefs.condition.Os; - -/** - * Description of the Class. - * - * @author epr - * @version $Revision: 5071 $ - */ -public class Asm extends MatchingTask { - - public static class IncludeDir { - private File dir; - - /** - * Constructor for IncludeDir. - */ - public IncludeDir() { - super(); - } - - /** - * Returns the dir. - * - * @return File - */ - public File getDir() { - return dir; - } - - /** - * Sets the dir. - * - * @param dir The dir to set - */ - public void setDir(File dir) { - this.dir = dir; - } - } - - private static String postFixSlash(String s) { - if (!s.endsWith(File.separator)) { - return s + File.separator; - } else { - return s; - } - } - - private int bits = 32; - - private File destdir; - - private String ext = "o"; - - private Set<IncludeDir> includeDirs = new HashSet<IncludeDir>(); - - private File listFile; - - private String outputFormat; - - private File srcdir; - - private boolean enableJNasm; - - private String version; - - /** - * Add an includedir. - * - * @param dir - */ - public void addConfiguredIncludeDir(IncludeDir dir) { - includeDirs.add(dir); - } - - /** - * Description of the Method. - * - * @param srcFile - * @param dstFile - * @throws BuildException Description of Exception - * @throws IOException Description of the Exception - */ - private void doNasm(File srcFile, File dstFile) throws BuildException, - IOException { - - Execute exec = new Execute(); - ArrayList<String> cmdLine = new ArrayList<String>(); - if (bits == 64) { - cmdLine.add("yasm"); - } else if (Os.isFamily("windows")) { - cmdLine.add("nasmw.exe"); - } else { - cmdLine.add("nasm"); - } - - cmdLine.add("-o"); - cmdLine.add(dstFile.toString()); - - if (bits == 64) { - cmdLine.add("-m"); - cmdLine.add("amd64"); - // Set preprocessor - cmdLine.add("-r"); - cmdLine.add("nasm"); - } - - cmdLine.add("-D"); - cmdLine.add("BITS" + bits); - - if (version != null) { - cmdLine.add("-D"); - cmdLine.add("JNODE_VERSION='" + version + "'"); - } - - if (outputFormat != null) { - cmdLine.add("-f"); - cmdLine.add(outputFormat); - } - - if (listFile != null) { - cmdLine.add("-l"); - cmdLine.add(listFile.toString()); - } - - for (IncludeDir dir : includeDirs) { - cmdLine.add("-I"); - cmdLine.add(postFixSlash(dir.getDir().toString())); - } - - cmdLine.add(srcFile.toString()); - - log("cmdLine=" + cmdLine, Project.MSG_VERBOSE); - - exec.setCommandline(cmdLine.toArray(new String[cmdLine - .size()])); - - dstFile.getParentFile().mkdirs(); - int rc = exec.execute(); - - if (rc != 0) { - destdir.delete(); - throw new BuildException("Asm failed on " - + srcFile.getAbsolutePath()); - } - } - - /** - * Description of the Method. - * - * @throws BuildException Description of Exception - */ - public void execute() throws BuildException { - - if (srcdir == null) { - throw new BuildException("Error: srcdir attribute must be set!", - getLocation()); - } else if (!srcdir.isDirectory()) { - throw new BuildException("Error: srcdir directory is not valid!", - getLocation()); - } - - if (destdir == null) { - throw new BuildException("Error: destdir attribute must be set!", - getLocation()); - } else if (!destdir.isDirectory()) { - throw new BuildException("Error: destdir directory is not valid!", - getLocation()); - } - - try { - if (!enableJNasm) { - executeAsm(); - } - } catch (IOException ex) { - throw new BuildException(ex); - } - } - - /** - * Description of the Method. - * - * @throws BuildException Description of Exception - * @throws IOException Description of the Exception - */ - protected void executeAsm() throws BuildException, IOException { - - DirectoryScanner scanner = getDirectoryScanner(getSrcdir()); - String allFiles[] = scanner.getIncludedFiles(); - Map<File, File> compileMap = new HashMap<File, File>(); - scanDir(srcdir, destdir, allFiles, compileMap); - - if (compileMap.size() > 0) { - log("Compiling " + compileMap.size() + " source files to " - + destdir); - - for (File srcFile : compileMap.keySet()) { - File dstFile = compileMap.get(srcFile); - doNasm(srcFile, dstFile); - } - } - } - - /** - * Gets the number of bits of the target platform. - * - * @return 32/64 - */ - public final int getBits() { - return this.bits; - } - - /** - * Returns the destdir. - * - * @return File - */ - public File getDestdir() { - return destdir; - } - - /** - * Returns the ext. - * - * @return String - */ - public String getExtension() { - return ext; - } - - /** - * Returns the listFile. - * - * @return File - */ - public File getListFile() { - return listFile; - } - - /** - * Returns the outputFormat. - * - * @return String - */ - public String getOutputFormat() { - return outputFormat; - } - - /** - * Returns the srcdir. - * - * @return File - */ - public File getSrcdir() { - return srcdir; - } - - /** - * Scans the directory looking for source files to be compiled. The results - * are returned in the class variable compileList - * - * @param srcDir Description of Parameter - * @param destDir Description of Parameter - * @param files Description of Parameter - * @param compileMap - * @throws IOException Description of the Exception - */ - protected void scanDir(File srcDir, File destDir, String[] files, - Map<File, File> compileMap) throws IOException { - long now = System.currentTimeMillis(); - - for (int c = 0; c < files.length; c++) { - File aFile = new File(srcdir, files[c]); - - // get the path within the uriroot - String fileDirString = aFile.getParentFile().toString(); - String rootDirString = srcdir.toString(); - - int diff = fileDirString.compareTo(rootDirString); - String destSubDir = fileDirString.substring( - fileDirString.length() - diff, fileDirString.length()) - .replace('\\', '/'); - - // log(destSubDir); - File fileDir = new File(destDir.toString() + destSubDir); - - String objName = aFile.getName().substring(0, - aFile.getName().indexOf(".asm")) - + "." + ext; - File objFile = new File(fileDir, objName); - - // check if the file has been modified in the future, error? - if (aFile.lastModified() > now) { - log("Warning: file modified in the future: " + aFile.getName(), - Project.MSG_WARN); - } - - if (!objFile.exists() - || aFile.lastModified() > objFile.lastModified()) { - if (!objFile.exists()) { - log("Compiling " + aFile.getPath() + " because class file " - + objFile.getPath() + " does not exist", - Project.MSG_VERBOSE); - } else { - log("Compiling " + aFile.getPath() - + " because it is out of date with respect to " - + objFile.getPath(), Project.MSG_VERBOSE); - } - - compileMap.put(aFile, objFile); - log(aFile.toString(), Project.MSG_VERBOSE); - } - } - } - - /** - * Sets the number of bits of the target platform. - * - * @param bits 32/64 - */ - public final void setBits(int bits) { - if ((bits != 32) && (bits != 64)) { - throw new IllegalArgumentException("Invalid bits value " + bits); - } - this.bits = bits; - } - - /** - * Sets the Destdir attribute of the JspC object. - * - * @param destDir The new Destdir value - */ - public void setDestdir(File destDir) { - this.destdir = destDir; - } - - /** - * Sets the ext. - * - * @param ext The ext to set - */ - public void setExtension(String ext) { - this.ext = ext; - } - - /** - * Sets the listFile. - * - * @param listFile The listFile to set - */ - public void setListFile(File listFile) { - this.listFile = listFile; - } - - /** - * Sets the outputFormat. - * - * @param outputFormat The outputFormat to set - */ - public void setOutputFormat(String outputFormat) { - this.outputFormat = outputFormat; - } - - /** - * Sets the srcdir. - * - * @param srcdir The srcdir to set - */ - public void setSrcdir(File srcdir) { - this.srcdir = srcdir; - } - - /** - * @return Returns the enableJNasm. - */ - public final boolean isEnableJNasm() { - return enableJNasm; - } - - /** - * @param enableJNasm The enableJNasm to set. - */ - public final void setEnableJNasm(boolean enableJNasm) { - this.enableJNasm = enableJNasm; - } - - /** - * @return Returns the version. - */ - public final String getVersion() { - return version; - } - - /** - * @param version The version to set. - */ - public final void setVersion(String version) { - this.version = version; - } -} Deleted: classlib6/builder/src/builder/org/jnode/ant/taskdefs/TemplateTask.java =================================================================== --- classlib6/builder/src/builder/org/jnode/ant/taskdefs/TemplateTask.java 2011-06-21 15:36:21 UTC (rev 5820) +++ classlib6/builder/src/builder/org/jnode/ant/taskdefs/TemplateTask.java 2011-06-21 15:56:32 UTC (rev 5821) @@ -1,170 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2003-2009 JNode.org - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; If not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package org.jnode.ant.taskdefs; - -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.StringWriter; -import java.util.ArrayList; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; - -/** - * @author Levente S\u00e1ntha - */ -public class TemplateTask extends Task { - private ArrayList<Token> tokens = new ArrayList<Token>(); - private String file; - private String toFile; - - @Override - public void execute() throws BuildException { - try { - //check file - if (file == null || file.trim().length() == 0) - return; - - File ff = new File(file); - if (!ff.exists()) - return; - - //check toFile - if (toFile == null || toFile.trim().length() == 0) - return; - - //check tokens - boolean found = true; - for (Token t : tokens) { - if (t.name == null || t.name.trim().length() == 0) { - t.name = null; - found = false; - } else if (t.value == null || - t.value.trim().length() == 0 || - t.value.startsWith("${") && t.value.endsWith("}")) { - t.value = null; - found = false; - } - } - - //read input file - FileReader fr = new FileReader(ff); - StringWriter sw = new StringWriter(); - char[] buff = new char[512]; - int cc; - while ((cc = fr.read(buff)) > 0) { - sw.write(buff, 0, cc); - } - fr.close(); - sw.close(); - - if (found) { - //default token - Token enabled = new Token(); - enabled.setName("ENABLED = false"); - enabled.setValue("ENABLED = true"); - tokens.add(enabled); - } - - //replace tokens - String s1 = sw.toString(); - if (found) { - for (Token t : tokens) { - s1 = s1.replace(t.name, t.value); - } - } - - String s2 = ""; - - //read output file - ff = new File(toFile); - if (ff.exists()) { - fr = new FileReader(ff); - sw = new StringWriter(); - buff = new char[512]; - while ((cc = fr.read(buff)) > 0) { - sw.write(buff, 0, cc); - } - fr.close(); - sw.close(); - s2 = sw.toString(); - } - - //if changed replace old file contents with new file contents - if (!s1.equals(s2)) { - ff.getAbsoluteFile().getParentFile().mkdirs(); - FileWriter fw = new FileWriter(ff); - fw.write(s1); - fw.close(); - } - } catch (Exception x) { - throw new BuildException(x); - } - } - - public String getFile() { - return file; - } - - public void setFile(String file) { - this.file = file; - } - - public String getToFile() { - return toFile; - } - - public void setToFile(String toFile) { - this.toFile = toFile; - } - - public Token createToken() { - Token token = new Token(); - tokens.add(token); - return token; - } - - public static class Token { - String name; - String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - return "Token(" + name + "," + value + ")"; - } - } -} Deleted: classlib6/builder/src/builder/org/jnode/build/AsmSourceInfo.java =================================================================== --- classlib6/builder/src/builder/org/jnode/build/AsmSourceInfo.java 2011-06-21 15:36:21 UTC (rev 5820) +++ classlib6/builder/src/builder/org/jnode/build/AsmSourceInfo.java 2011-06-21 15:56:32 UTC (rev 5821) @@ -1,87 +0,0 @@ -/* - * $Id: AsmSourceInfo.java 5071 2009-02-28 16:38:38Z fduminy $ - * - * Copyright (C) 2003-2009 JNode.org - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; If not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package org.jnode.build; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * This class contains information needed for the assembly compilation - * of the nano kernel sources. - * - * @author Ewout Prangsma (ep...@us...) - */ -public final class AsmSourceInfo { - - /** - * Include directories. - */ - private final List<File> includeDirs = new ArrayList<File>(); - - /** - * Main source file. - */ - private File sourceFile; - - /** - * Return a list of all configured include directories. - * - * @return - */ - public final List<File> includeDirs() { - return Collections.unmodifiableList(includeDirs); - } - - /** - * Gets the main source file. - * - * @return Returns the sourceFile. - */ - public final File getSrcFile() { - return sourceFile; - } - - /** - * Sets the main source file. - * - * @param sourceFile The sourceFile to set. - */ - public final void setSrcFile(File sourceFile) { - this.sourceFile = sourceFile; - } - - /** - * Create an includeDir sub element. - * - * @return - */ - public IncludeDir createIncludeDir() { - return new IncludeDir(); - } - - public final class IncludeDir { - public void setDir(File dir) { - includeDirs.add(dir); - } - } -} Deleted: classlib6/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java =================================================================== --- classlib6/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java 2011-06-21 15:36:21 UTC (rev 5820) +++ classlib6/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java 2011-06-21 15:56:32 UTC (rev 5821) @@ -1,32 +0,0 @@ -/* - * $Id: JNodeClassNotFoundException.java 4971 2009-02-02 06:44:38Z lsantha $ - * - * Copyright (C) 2003-2009 JNode.org - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; If not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package org.jnode.build; - - -final class JNodeClassNotFoundException extends Exception { - - /** - * @param s - */ - public JNodeClassNotFoundException(String s) { - super(s); - } -} Deleted: classlib6/builder/src/builder/org/jnode/build/VMwareBuilderTask.java =================================================================== --- classlib6/builder/src/builder/org/jnode/build/VMwareBuilderTask.java 2011-06-21 15:36:21 UTC (rev 5820) +++ classlib6/builder/src/builder/org/jnode/build/VMwareBuilderTask.java 2011-06-21 15:56:32 UTC (rev 5821) @@ -1,321 +0,0 @@ -/* - * $Id: VMwareBuilderTask.java 5080 2009-03-01 10:21:21Z fduminy $ - * - * Copyright (C) 2003-2009 JNode.org - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. - * - * This library 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 Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; If not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -package org.jnode.build; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.util.Properties; -import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; - -/** - * This task builds a VMWare '.vmx' file to allow JNode to be run using VMWare player. - * - * @author ... - * @author cr...@jn... - */ -public class VMwareBuilderTask extends Task { - - private String logFile; // log file use for kernel debugger messages - private String isoFile; - private int memSize; - private String overrideFile; - private String vmdkImageFile; - private String saveDir; - - /** - * @return Returns the memory size. - */ - public final int getMemSize() { - return memSize; - } - - /** - * @param memSize The memory size to set. - */ - public final void setMemSize(int memSize) { - this.memSize = memSize; - } - - /** - * @return Returns the log file. - */ - public final String getLogFile() { - return logFile; - } - - /** - * @param logFile The log file to set. - */ - public final void setLogFile(String logFile) { - this.logFile = logFile; - } - - /** - * The VmdkImage file is a VMX virtual disk image file. - * - * @return Returns the VmdkImage file or <code>null</code> - */ - public String getVmdkImageFile() { - return vmdkImageFile; - } - - /** - * @param vmdkImageFile The VmdkImage file to set. - */ - public void setVmdkImageFile(String vmdkImageFile) { - this.vmdkImageFile = vmdkImageFile; - } - - /** - * The override file is a Java Properties file containing VMX settings - * to override the default ones hard-wired into this class. - * - * @return Returns the override file or <code>null</code> - */ - public String getOverrideFile() { - return overrideFile; - } - - /** - * @param overrideFile The override file to set. - */ - public void setOverrideFile(String overrideFile) { - this.overrideFile = overrideFile; - } - - /** - * The save directory is used to preserve certain VMWare state - * files across 'clean' builds. - * - * @return the save directory - */ - public String getSaveDir() { - return saveDir; - } - - /** - * @param saveDir the save directory to set - */ - public void setSaveDir(String saveDir) { - this.saveDir = saveDir; - } - - /** - * @see org.apache.tools.ant.Task#execute() - */ - @Override - public void execute() throws BuildException { - // Build the default properties, based on the supplied memSize and logFile. - Properties props = new Properties(); - buildDefaultProperties(props); - - if (overrideFile != null && overrideFile.length() > 0) { - // If VMX overrides are provided, read them and add them to the properties; - BufferedReader br = null; - try { - // Unfortunately, we cannot use java.util.Property#load(...) because - // VMX properties can have ':' in the property name. - br = new BufferedReader(new FileReader(overrideFile)); - String line; - final Pattern propertyPattern = Pattern.compile("^([a-zA-Z0-9\\.:]+)\\s*=\\s*\"([^\"]*)\""); - final Pattern commentPattern = Pattern.compile("^#"); - while ((line = br.readLine()) != null) { - line = line.trim(); - if (line.isEmpty() || commentPattern.matcher(line).find()) { - continue; - } - Matcher matcher = propertyPattern.matcher(line); - if (!matcher.find()) { - throw new BuildException( - "Cannot parse this VMX override: '" + line + "'"); - } - props.put(matcher.group(1), matcher.group(2)); - } - } catch (FileNotFoundException ex) { - throw new BuildException( - "Cannot open the VMX override file: " + overrideFile, ex); - } catch (IOException ex) { - throw new BuildException( - "Problem reading the VMX override file: " + overrideFile, ex); - } finally { - if (br != null) { - try { - br.close(); - } catch (IOException ex) { - /* ignore it */ - } - } - } - } - - if (vmdkImageFile != null && vmdkImageFile.length() > 0) { - File file = new File(vmdkImageFile); - if (!file.exists()) { - System.err.println(vmdkImageFile + " does not exists"); - } else if (file.length() == 0) { - System.err.println(vmdkImageFile + " is empty"); - } else { - // Add VMX properties to configure a virtual disk - props.setProperty("ide1:0.present", "TRUE"); - props.setProperty("ide1:0.fileName", vmdkImageFile); - props.setProperty("ide1:0.mode", "persistent"); - props.setProperty("ide1:0.startConnected", "TRUE"); - props.setProperty("ide1:0.writeThrough", "TRUE"); - props.setProperty("ide1:0.redo", ""); - } - } - - // Now output the VMX file from the properties, sorted in key order for neatness. - File vmxFile = new File(isoFile + ".vmx"); - try { - FileWriter out = new FileWriter(vmxFile); - try { - PrintWriter w = new PrintWriter(out); - TreeSet<Object> keys = new TreeSet<Object>(); - keys.addAll(props.keySet()); - for (Object key : keys) { - Object value = props.get(key); - w.println(key + " = \"" + value + "\""); - } - } finally { - out.close(); - } - } catch (IOException ex) { - throw new BuildException("Cannot write the VMX file: " + vmxFile); - } - - // Finally reinstate the saved JNode.nvram file if we have one. - if (saveDir != null) { - File savedNVRam = new File(saveDir, "JNode.nvram"); - File nvram = new File(new File(isoFile).getParentFile(), "JNode.nvram"); - if (savedNVRam.exists() && !nvram.exists()) { - InputStream is = null; - OutputStream os = null; - try { - is = new FileInputStream(savedNVRam); - os = new FileOutputStream(nvram); - byte[] buffer = new byte[(int) savedNVRam.length()]; - is.read(buffer); - os.write(buffer); - os.flush(); - } catch (IOException ex) { - throw new BuildException("Cannot copy the saved 'JNode.nvram' file: " + - ex.getMessage()); - } finally { - if (is != null) { - try { - is.close(); - } catch (IOException ex) { - // ignore - } - } - if (os != null) { - try { - os.close(); - } catch (IOException ex) { - // ignore - } - } - } - } - } - } - - private void buildDefaultProperties(Properties props) { - props.put("config.version", "8"); - props.put("virtualHW.version", "4"); - props.put("memsize", String.valueOf(memSize)); - props.put("MemAllowAutoScaleDown", "FALSE"); - - props.put("ide0:0.present", "TRUE"); - props.put("ide0:0.startConnected", "TRUE"); - props.put("ide0:0.fileName", new File(isoFile).getName()); - props.put("ide0:0.deviceType", "cdrom-image"); - props.put("ide0:0.redo", ""); - - props.put("ide1:0.present", "FALSE"); - props.put("ide1:0.startConnected", "TRUE"); - - props.put("floppy0.present", "FALSE"); - props.put("usb.present", "TRUE"); - props.put("sound.present", "FALSE"); - props.put("sound.virtualDev", "es1371"); - props.put("displayName", "JNode"); - props.put("guestOS", "dos"); - - props.put("nvram", "JNode.nvram"); - props.put("MemTrimRate", "-1"); - - final String osName = System.getProperty("os.name").toLowerCase(); - if (osName.contains("linux") || osName.contains("unix") || - osName.contains("bsd")) { - props.put("ethernet0.connectionType", "bridged"); - props.put("ethernet0.vnet", "/dev/vmnet1"); - } - props.put("ethernet0.addressType", "generated"); - props.put("ethernet0.generatedAddress", "00:0c:29:2a:96:30"); - props.put("ethernet0.generatedAddressOffset", "0"); - props.put("ethernet0.present", "TRUE"); - props.put("ethernet0.startConnected", "TRUE"); - - props.put("uuid.location", "56 4d 94 59 c9 96 80 88-6c 3a 37 80 04 68 c9 b2"); - props.put("uuid.bios", "56 4d 94 59 c9 96 80 88-6c 3a 37 80 04 68 c9 b2"); - - if (logFile != null && logFile.trim().length() != 0) { - props.put("serial0.present", "TRUE"); - props.put("serial0.fileType", "file"); - props.put("serial0.fileName", logFile); - } - - props.put("tools.syncTime", "TRUE"); - props.put("uuid.action", "create"); - props.put("checkpoint.vmState", ""); - } - - /** - * @return Returns the isoFile. - */ - public final String getIsoFile() { - return isoFile; - } - - /** - * @param isoFile The isoFile to set. - */ - public final void setIsoFile(String isoFile) { - this.isoFile = isoFile; - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-21 15:36:33
|
Revision: 5820 http://jnode.svn.sourceforge.net/jnode/?rev=5820&view=rev Author: lsantha Date: 2011-06-21 15:36:21 +0000 (Tue, 21 Jun 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/corba/sun/rmi/rmic/resources/rmic.properties classlib6/core/src/openjdk/corba/sun/rmi/rmic/resources/rmic_ja.properties classlib6/core/src/openjdk/corba/sun/rmi/rmic/resources/rmic_zh_CN.properties classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/AbstractMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/ByteArrayMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/HostIdentifier.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/IntegerMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/LongMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/Monitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/MonitorException.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/MonitoredHost.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/MonitoredVm.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/MonitoredVmUtil.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/StringMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/VmIdentifier.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/event/HostEvent.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/event/HostListener.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/event/VmEvent.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/event/VmListener.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/event/VmStatusChangeEvent.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/event/package.html classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/package.html classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/remote/BufferedMonitoredVm.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/remote/RemoteHost.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/remote/RemoteVm.java classlib6/core/src/openjdk/sun/sun/jvmstat/monitor/remote/package.html classlib6/core/src/openjdk/sun/sun/tools/jconsole/AboutDialog.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/BorderedComponent.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/ClassTab.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/ConnectDialog.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/CreateMBeanDialog.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/Formatter.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/HTMLPane.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/JConsole.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/LabeledComponent.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/MBeansTab.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/MaximizableInternalFrame.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/MemoryPoolProxy.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/MemoryPoolStat.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/MemoryTab.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/OutputViewer.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/OverviewPanel.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/OverviewTab.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/Plotter.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/PlotterPanel.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/ProxyClient.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/Resources.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/SummaryTab.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/Tab.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/ThreadTab.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/TimeComboBox.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/VMInternalFrame.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/VMPanel.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/VariableGridLayout.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/Worker.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/IconManager.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/OperationEntry.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/TableSorter.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/ThreadDialog.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/Utils.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XArrayDataViewer.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XDataViewer.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XMBean.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XMBeanAttributes.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XMBeanInfo.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XMBeanNotifications.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XMBeanOperations.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XNodeInfo.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XObject.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XOpenTypeViewer.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XOperations.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XPlotter.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XPlottingViewer.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XSheet.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XTable.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XTextField.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XTextFieldEditor.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XTree.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/inspector/XTreeRenderer.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/resources/JConsoleResources.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/resources/JConsoleResources_ja.java classlib6/core/src/openjdk/sun/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java classlib6/core/src/openjdk/svm/sun/nio/ch/PollArrayWrapper.java Added Paths: ----------- classlib6/core/src/icedtea/sun/nio/ch/ classlib6/core/src/icedtea/sun/nio/ch/AlreadyBoundException.java classlib6/core/src/openjdk/com/com/sun/java/browser/ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessException.java classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessor.java classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAction.java classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMService.java classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMServiceProvider.java classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMUnsupportedException.java classlib6/core/src/openjdk/com/com/sun/java/browser/net/ classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyInfo.java classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyService.java classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyServiceProvider.java classlib6/core/src/openjdk/com/com/sun/net/ssl/SSLContext.java classlib6/core/src/openjdk/com/com/sun/net/ssl/internal/www/ classlib6/core/src/openjdk/com/com/sun/net/ssl/internal/www/protocol/ classlib6/core/src/openjdk/com/com/sun/net/ssl/internal/www/protocol/https/ classlib6/core/src/openjdk/com/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java classlib6/core/src/openjdk/com/com/sun/net/ssl/internal/www/protocol/https/Handler.java classlib6/core/src/openjdk/com/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java classlib6/core/src/openjdk/java/java/nio/charset/package.html classlib6/core/src/openjdk/java/java/nio/package.html classlib6/core/src/openjdk/java/java/security/package.html classlib6/core/src/openjdk/java/java/util/concurrent/atomic/package-info.java classlib6/core/src/openjdk/java/java/util/concurrent/locks/package-info.java classlib6/core/src/openjdk/java/java/util/concurrent/package-info.java classlib6/core/src/openjdk/javax/javax/smartcardio/ classlib6/core/src/openjdk/javax/javax/smartcardio/ATR.java classlib6/core/src/openjdk/javax/javax/smartcardio/Card.java classlib6/core/src/openjdk/javax/javax/smartcardio/CardChannel.java classlib6/core/src/openjdk/javax/javax/smartcardio/CardException.java classlib6/core/src/openjdk/javax/javax/smartcardio/CardNotPresentException.java classlib6/core/src/openjdk/javax/javax/smartcardio/CardPermission.java classlib6/core/src/openjdk/javax/javax/smartcardio/CardTerminal.java classlib6/core/src/openjdk/javax/javax/smartcardio/CardTerminals.java classlib6/core/src/openjdk/javax/javax/smartcardio/CommandAPDU.java classlib6/core/src/openjdk/javax/javax/smartcardio/ResponseAPDU.java classlib6/core/src/openjdk/javax/javax/smartcardio/TerminalFactory.java classlib6/core/src/openjdk/javax/javax/smartcardio/TerminalFactorySpi.java classlib6/core/src/openjdk/javax/javax/smartcardio/package.html classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/Builder.java classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/localization/ classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/localization/Localizable.java classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/localization/LocalizableMessage.java classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/localization/LocalizableMessageFactory.java classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/localization/Localizer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/AliasFileParser.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/CountedTimerTask.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/MonitorDataException.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/MonitorStatus.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/MonitorStructureException.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/MonitorTypeException.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/MonitorVersionException.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/PerfLongMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/SyntaxException.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/package.html classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/file/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/file/package.html classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataBuffer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/local/package.html classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/rmi/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v1_0/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v2_0/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/resources/ classlib6/core/src/openjdk/sun/sun/jvmstat/perfdata/resources/aliasmap classlib6/core/src/openjdk/sun/sun/launcher/ classlib6/core/src/openjdk/sun/sun/launcher/LauncherHelp.java classlib6/core/src/openjdk/sun/sun/launcher/resources/ classlib6/core/src/openjdk/sun/sun/launcher/resources/launcher.properties classlib6/core/src/openjdk/sun/sun/nio/ch/AbstractPollSelectorImpl.java classlib6/core/src/openjdk/sun/sun/nio/ch/DatagramChannelImpl.java classlib6/core/src/openjdk/sun/sun/nio/ch/DatagramSocketAdaptor.java classlib6/core/src/openjdk/sun/sun/nio/ch/DevPollSelectorProvider.java classlib6/core/src/openjdk/sun/sun/nio/ch/FileChannelImpl.java classlib6/core/src/openjdk/sun/sun/nio/ch/FileLockImpl.java classlib6/core/src/openjdk/sun/sun/nio/ch/Net.java classlib6/core/src/openjdk/sun/sun/nio/ch/OptionAdaptor.java classlib6/core/src/openjdk/sun/sun/nio/ch/PollSelectorProvider.java classlib6/core/src/openjdk/sun/sun/nio/ch/SelectorProviderImpl.java classlib6/core/src/openjdk/sun/sun/nio/ch/ServerSocketAdaptor.java classlib6/core/src/openjdk/sun/sun/nio/ch/ServerSocketChannelImpl.java classlib6/core/src/openjdk/sun/sun/nio/ch/SocketAdaptor.java classlib6/core/src/openjdk/sun/sun/nio/ch/SocketChannelImpl.java classlib6/core/src/openjdk/sun/sun/print/AttributeUpdater.java classlib6/core/src/openjdk/sun/sun/print/BackgroundLookupListener.java classlib6/core/src/openjdk/sun/sun/print/BackgroundServiceLookup.java classlib6/core/src/openjdk/sun/sun/print/CustomMediaSizeName.java classlib6/core/src/openjdk/sun/sun/print/CustomMediaTray.java classlib6/core/src/openjdk/sun/sun/print/DialogOwner.java classlib6/core/src/openjdk/sun/sun/print/DialogTypeSelection.java classlib6/core/src/openjdk/sun/sun/print/ImagePrinter.java classlib6/core/src/openjdk/sun/sun/print/OpenBook.java classlib6/core/src/openjdk/sun/sun/print/PSPathGraphics.java classlib6/core/src/openjdk/sun/sun/print/PSPrinterJob.java classlib6/core/src/openjdk/sun/sun/print/PSStreamPrintJob.java classlib6/core/src/openjdk/sun/sun/print/PSStreamPrintService.java classlib6/core/src/openjdk/sun/sun/print/PSStreamPrinterFactory.java classlib6/core/src/openjdk/sun/sun/print/PageableDoc.java classlib6/core/src/openjdk/sun/sun/print/PathGraphics.java classlib6/core/src/openjdk/sun/sun/print/PeekGraphics.java classlib6/core/src/openjdk/sun/sun/print/PeekMetrics.java classlib6/core/src/openjdk/sun/sun/print/PrintJob2D.java classlib6/core/src/openjdk/sun/sun/print/PrintJobAttributeException.java classlib6/core/src/openjdk/sun/sun/print/PrintJobFlavorException.java classlib6/core/src/openjdk/sun/sun/print/ProxyGraphics2D.java classlib6/core/src/openjdk/sun/sun/print/RasterPrinterJob.java classlib6/core/src/openjdk/sun/sun/print/ServiceDialog.java classlib6/core/src/openjdk/sun/sun/print/ServiceNotifier.java classlib6/core/src/openjdk/sun/sun/print/SunAlternateMedia.java classlib6/core/src/openjdk/sun/sun/print/SunMinMaxPage.java classlib6/core/src/openjdk/sun/sun/print/SunPageSelection.java classlib6/core/src/openjdk/sun/sun/print/SunPrinterJobService.java classlib6/core/src/openjdk/sun/sun/print/psfont.properties.ja classlib6/core/src/openjdk/sun/sun/print/psfontj2d.properties classlib6/core/src/openjdk/sun/sun/print/resources/ classlib6/core/src/openjdk/sun/sun/print/resources/duplex.png classlib6/core/src/openjdk/sun/sun/print/resources/oneside.png classlib6/core/src/openjdk/sun/sun/print/resources/orientLandscape.png classlib6/core/src/openjdk/sun/sun/print/resources/orientPortrait.png classlib6/core/src/openjdk/sun/sun/print/resources/orientRevLandscape.png classlib6/core/src/openjdk/sun/sun/print/resources/orientRevPortrait.png classlib6/core/src/openjdk/sun/sun/print/resources/serviceui.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_de.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_es.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_fr.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_it.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_ja.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_ko.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_sv.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_zh_CN.properties classlib6/core/src/openjdk/sun/sun/print/resources/serviceui_zh_TW.properties classlib6/core/src/openjdk/sun/sun/print/resources/tumble.png classlib6/core/src/openjdk/sun/sun/security/smartcardio/ classlib6/core/src/openjdk/sun/sun/security/smartcardio/CardImpl.java classlib6/core/src/openjdk/sun/sun/security/smartcardio/ChannelImpl.java classlib6/core/src/openjdk/sun/sun/security/smartcardio/PCSC.java classlib6/core/src/openjdk/sun/sun/security/smartcardio/PCSCException.java classlib6/core/src/openjdk/sun/sun/security/smartcardio/PCSCTerminals.java classlib6/core/src/openjdk/sun/sun/security/smartcardio/SunPCSC.java classlib6/core/src/openjdk/sun/sun/security/smartcardio/TerminalImpl.java classlib6/core/src/openjdk/sun/sunw/ classlib6/core/src/openjdk/sun/sunw/io/ classlib6/core/src/openjdk/sun/sunw/io/Serializable.java classlib6/core/src/openjdk/sun/sunw/util/ classlib6/core/src/openjdk/sun/sunw/util/EventListener.java classlib6/core/src/openjdk/sun/sunw/util/EventObject.java classlib6/core/src/openjdk/svm/com/ classlib6/core/src/openjdk/svm/com/sun/ classlib6/core/src/openjdk/svm/com/sun/java/ classlib6/core/src/openjdk/svm/com/sun/java/swing/ classlib6/core/src/openjdk/svm/com/sun/java/swing/plaf/ classlib6/core/src/openjdk/svm/com/sun/java/swing/plaf/windows/ classlib6/core/src/openjdk/svm/com/sun/java/swing/plaf/windows/DesktopProperty.java classlib6/core/src/openjdk/svm/com/sun/management/ classlib6/core/src/openjdk/svm/com/sun/management/OSMBeanFactory.java classlib6/core/src/openjdk/svm/com/sun/management/UnixOperatingSystem.java classlib6/core/src/openjdk/svm/com/sun/tools/ classlib6/core/src/openjdk/svm/com/sun/tools/jdi/ classlib6/core/src/openjdk/svm/com/sun/tools/jdi/JDWP.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AbstractCommandNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AbstractGroupNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AbstractNamedNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AbstractSimpleNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AbstractSimpleTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AbstractTypeListNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AbstractTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/AltNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ArrayObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ArrayRegionTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ArrayTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/BooleanTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ByteTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ClassLoaderObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ClassObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ClassTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/CommandNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/CommandSetNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/CommentNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ConstantNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ConstantSetNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/Context.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ErrorNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ErrorSetNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/EventNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/FieldTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/FrameTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/GroupNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/IntTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/InterfaceTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/LocationTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/LongTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/Main.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/MethodTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/NameNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/NameValueNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/Node.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/OutNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/Parse.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ReferenceIDTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ReferenceTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/RepeatNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ReplyNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/RootNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/SelectNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/StringObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/StringTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/TaggedObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ThreadGroupObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ThreadObjectTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/TypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/UntaggedValueTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/ValueTypeNode.java classlib6/core/src/openjdk/svm/com/sun/tools/jdwpgen/jdwp.spec classlib6/core/src/openjdk/svm/java/io/ classlib6/core/src/openjdk/svm/java/io/UnixFileSystem.java classlib6/core/src/openjdk/svm/java/rmi/ classlib6/core/src/openjdk/svm/java/rmi/activation/ classlib6/core/src/openjdk/svm/java/rmi/activation/ActivationGroup_Stub.java classlib6/core/src/openjdk/svm/java/util/ classlib6/core/src/openjdk/svm/java/util/prefs/ classlib6/core/src/openjdk/svm/java/util/prefs/FileSystemPreferences.java classlib6/core/src/openjdk/svm/java/util/prefs/FileSystemPreferencesFactory.java classlib6/core/src/openjdk/svm/sun/font/ classlib6/core/src/openjdk/svm/sun/font/NativeFont.java classlib6/core/src/openjdk/svm/sun/font/NativeGlyphMapper.java classlib6/core/src/openjdk/svm/sun/font/NativeStrike.java classlib6/core/src/openjdk/svm/sun/font/NativeStrikeDisposer.java classlib6/core/src/openjdk/svm/sun/font/XMap.java classlib6/core/src/openjdk/svm/sun/management/ classlib6/core/src/openjdk/svm/sun/management/FileSystemImpl.java classlib6/core/src/openjdk/svm/sun/misc/FileURLMapper.java classlib6/core/src/openjdk/svm/sun/misc/OSEnvironment.java classlib6/core/src/openjdk/svm/sun/net/dns/ classlib6/core/src/openjdk/svm/sun/net/dns/ResolverConfigurationImpl.java classlib6/core/src/openjdk/svm/sun/net/www/protocol/jar/ classlib6/core/src/openjdk/svm/sun/net/www/protocol/jar/JarFileFactory.java classlib6/core/src/openjdk/svm/sun/nio/ch/DatagramDispatcher.java classlib6/core/src/openjdk/svm/sun/nio/ch/DevPollArrayWrapper.java classlib6/core/src/openjdk/svm/sun/nio/ch/DevPollSelectorImpl.java classlib6/core/src/openjdk/svm/sun/nio/ch/FileDispatcher.java classlib6/core/src/openjdk/svm/sun/nio/ch/FileKey.java classlib6/core/src/openjdk/svm/sun/nio/ch/InheritedChannel.java classlib6/core/src/openjdk/svm/sun/nio/ch/PipeImpl.java classlib6/core/src/openjdk/svm/sun/nio/ch/PollSelectorImpl.java classlib6/core/src/openjdk/svm/sun/nio/ch/SinkChannelImpl.java classlib6/core/src/openjdk/svm/sun/nio/ch/SocketDispatcher.java classlib6/core/src/openjdk/svm/sun/nio/ch/SourceChannelImpl.java classlib6/core/src/openjdk/svm/sun/security/smartcardio/ classlib6/core/src/openjdk/svm/sun/security/smartcardio/PlatformPCSC.java Removed Paths: ------------- classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/windows/ classlib6/core/src/openjdk/com/com/sun/management/OSMBeanFactory.java classlib6/core/src/openjdk/com/com/sun/management/UnixOperatingSystem.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/JDWP.java classlib6/core/src/openjdk/com/com/sun/tools/jdwpgen/ classlib6/core/src/openjdk/java/java/io/UnixFileSystem.java classlib6/core/src/openjdk/java/java/rmi/activation/ActivationGroup_Stub.java classlib6/core/src/openjdk/java/java/util/concurrent/atomic/package.html classlib6/core/src/openjdk/java/java/util/concurrent/locks/package.html classlib6/core/src/openjdk/java/java/util/concurrent/package.html classlib6/core/src/openjdk/java/java/util/prefs/FileSystemPreferences.java classlib6/core/src/openjdk/java/java/util/prefs/FileSystemPreferencesFactory.java classlib6/core/src/openjdk/javax/javax/xml/package.html classlib6/core/src/openjdk/sun/sun/font/NativeFont.java classlib6/core/src/openjdk/sun/sun/font/NativeGlyphMapper.java classlib6/core/src/openjdk/sun/sun/font/NativeStrike.java classlib6/core/src/openjdk/sun/sun/font/NativeStrikeDisposer.java classlib6/core/src/openjdk/sun/sun/font/XMap.java classlib6/core/src/openjdk/sun/sun/java2d/pipe/DuctusRenderer.java classlib6/core/src/openjdk/sun/sun/java2d/pipe/DuctusShapeRenderer.java classlib6/core/src/openjdk/sun/sun/management/FileSystemImpl.java classlib6/core/src/openjdk/sun/sun/misc/FileURLMapper.java classlib6/core/src/openjdk/sun/sun/misc/OSEnvironment.java classlib6/core/src/openjdk/sun/sun/net/dns/ResolverConfigurationImpl.java classlib6/core/src/openjdk/sun/sun/net/www/protocol/jar/JarFileFactory.java classlib6/core/src/openjdk/sun/sun/nio/ch/exceptions Added: classlib6/core/src/icedtea/sun/nio/ch/AlreadyBoundException.java =================================================================== --- classlib6/core/src/icedtea/sun/nio/ch/AlreadyBoundException.java (rev 0) +++ classlib6/core/src/icedtea/sun/nio/ch/AlreadyBoundException.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,51 @@ +/* + * Copyright 2000-2007 Sun Microsystems, Inc. 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + */ + +// -- This file was mechanically generated: Do not edit! -- // + +package sun.nio.ch; + + +/** + * Unchecked exception thrown when an attempt is made to bind a {@link + * SocketChannel} that is already bound. + * + * @since 1.4 + */ + +public class AlreadyBoundException + extends IllegalStateException +{ + + private static final long serialVersionUID = 9002280723481772026L; + + /** + * Constructs an instance of this class. + */ + public AlreadyBoundException() { } + +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessException.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessException.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessException.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2000, 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.java.browser.dom; + +public class DOMAccessException extends Exception +{ + /** + * Constructs a new DOMAccessException with no detail message. + */ + public DOMAccessException() + { + this(null, null); + } + + + /** + * Constructs a new DOMAccessException with the given detail message. + * + * @param msg Detail message. + */ + public DOMAccessException(String msg) + { + this(null, msg); + } + + /** + * Constructs a new DOMAccessException with the given exception as a root clause. + * + * @param e Exception. + */ + public DOMAccessException(Exception e) + { + this(e, null); + } + + /** + * Constructs a new DOMAccessException with the given exception as a root clause and the given detail message. + * + * @param e Exception. + * @param msg Detail message. + */ + public DOMAccessException(Exception e, String msg) + { + this.ex = e; + this.msg = msg; + } + + /** + * Returns the detail message of the error or null if there is no detail message. + */ + public String getMessage() + { + return msg; + } + + /** + * Returns the root cause of the error or null if there is none. + */ + public Throwable getCause() + { + return ex; + } + + private Throwable ex; + private String msg; +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessor.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessor.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAccessor.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2000, 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.java.browser.dom; + + +public interface DOMAccessor +{ + /** + * Returns the Document object of the DOM. + */ + public org.w3c.dom.Document getDocument(Object obj) throws org.w3c.dom.DOMException; + + /** + * Returns a DOMImplementation object. + */ + public org.w3c.dom.DOMImplementation getDOMImplementation(); +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAction.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAction.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMAction.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2000, 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.java.browser.dom; + + +public interface DOMAction +{ + /** + * When an object implementing interface DOMAction is passed + * to DOMService.invokeAndWait() or DOMService.invokeLater(), + * run method is called in the DOM access dispatch thread. + * + * accessor is used for the DOMAction to access the entry point of + * the browser's DOM, if necessary. + * + * @param accessor DOMAccessor + */ + public Object run(DOMAccessor accessor); +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMService.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMService.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMService.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2000, 2001, 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.java.browser.dom; + +public abstract class DOMService +{ + /** + * Returns new instance of a DOMService. The implementation + * of the DOMService returns depends on the setting of the + * com.sun.java.browser.dom.DOMServiceProvider property or, + * if the property is not set, a platform specific default. + * + * Throws DOMUnsupportedException if the DOMService is not + * available to the obj. + * + * @param obj Object to leverage the DOMService + */ + public static DOMService getService(Object obj) + throws DOMUnsupportedException + { + try + { + String provider = (String) java.security.AccessController.doPrivileged( + new sun.security.action.GetPropertyAction("com.sun.java.browser.dom.DOMServiceProvider")); + + Class clazz = DOMService.class.forName("sun.plugin.dom.DOMService"); + + return (DOMService) clazz.newInstance(); + } + catch (Throwable e) + { + throw new DOMUnsupportedException(e.toString()); + } + } + + /** + * An empty constructor is provided. Implementations of this + * abstract class must provide a public no-argument constructor + * in order for the static getService() method to work correctly. + * Application programmers should not be able to directly + * construct implementation subclasses of this abstract subclass. + */ + public DOMService() + { + } + + /** + * Causes action.run() to be executed synchronously on the + * DOM action dispatching thread. This call will block until all + * pending DOM actions have been processed and (then) + * action.run() returns. This method should be used when an + * application thread needs to access the browser's DOM. + * It should not be called from the DOMActionDispatchThread. + * + * Note that if the DOMAction.run() method throws an uncaught + * exception (on the DOM action dispatching thread), it's caught + * and re-thrown, as an DOMAccessException, on the caller's thread. + * + * If the DOMAction.run() method throws any DOM security related + * exception (on the DOM action dispatching thread), it's caught + * and re-thrown, as an DOMSecurityException, on the caller's thread. + * + * @param action DOMAction. + */ + public abstract Object invokeAndWait(DOMAction action) throws DOMAccessException; + + /** + * Causes action.run() to be executed asynchronously on the + * DOM action dispatching thread. This method should be used + * when an application thread needs to access the browser's + * DOM. It should not be called from the DOMActionDispatchThread. + * + * Note that if the DOMAction.run() method throws an uncaught + * exception (on the DOM action dispatching thread), it will not be + * caught and re-thrown on the caller's thread. + * + * @param action DOMAction. + */ + public abstract void invokeLater(DOMAction action); +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMServiceProvider.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMServiceProvider.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMServiceProvider.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2000, 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.java.browser.dom; + +public abstract class DOMServiceProvider +{ + /** + * An empty constructor is provided. Implementations should + * provide a public constructor so that the DOMService + * can instantiate instances of the implementation class. + * Application programmers should not be able to directly + * construct implementation subclasses of this abstract subclass. + * The only way an application should be able to obtain a + * reference to a DOMServiceProvider implementation + * instance is by using the appropriate methods of the + * DOMService. + */ + public DOMServiceProvider() + { + } + + /** + * Returns true if the DOMService can determine the association + * between the obj and the underlying DOM in the browser. + */ + public abstract boolean canHandle(Object obj); + + /** + * Returns the Document object of the DOM. + */ + public abstract org.w3c.dom.Document getDocument(Object obj) throws DOMUnsupportedException; + + /** + * Returns the DOMImplemenation object of the DOM. + */ + public abstract org.w3c.dom.DOMImplementation getDOMImplementation(); +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMUnsupportedException.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMUnsupportedException.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/dom/DOMUnsupportedException.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2000, 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.java.browser.dom; + + +public class DOMUnsupportedException extends Exception +{ + /** + * Constructs a new DOMUnsupportedException with no detail message. + */ + public DOMUnsupportedException() + { + this(null, null); + } + + /** + * Constructs a new DOMUnsupportedException with the given detail message. + * + * @param msg Detail message. + */ + public DOMUnsupportedException(String msg) + { + this(null, msg); + } + + /** + * Constructs a new DOMUnsupportedException with the given exception as a root clause. + * + * @param e Exception. + */ + public DOMUnsupportedException(Exception e) + { + this(e, null); + } + + /** + * Constructs a new DOMUnsupportedException with the given exception as a root clause and the given detail message. + * + * @param e Exception. + * @param msg Detail message. + */ + public DOMUnsupportedException(Exception e, String msg) + { + this.ex = e; + this.msg = msg; + } + + /** + * Returns the detail message of the error or null if there is no detail message. + */ + public String getMessage() + { + return msg; + } + + /** + * Returns the root cause of the error or null if there is none. + */ + public Throwable getCause() + { + return ex; + } + + private Throwable ex; + private String msg; +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyInfo.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyInfo.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyInfo.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2001, 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.java.browser.net; + +/** + * + * @author Zhengyu Gu + */ +public interface ProxyInfo { + public String getHost(); + public int getPort(); + public boolean isSocks(); +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyService.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyService.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyService.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2001, 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.java.browser.net; + +import java.net.URL; +import java.io.IOException; + +/** + * + * @author Zhengyu Gu + */ +public class ProxyService extends Object { + private static ProxyServiceProvider provider = null; + + + public static void setProvider(ProxyServiceProvider p) + throws IOException { + if(null == provider) + provider = p; + else + throw new IOException("Proxy service provider has already been set."); + } + + + /** + * <p>The function returns proxy information of the specified URL.</p> + * @param url URL + * @return returns proxy information. If there is not proxy, returns null + * @since 1.4 + */ + public static ProxyInfo[] getProxyInfo(URL url) + throws IOException { + if(null == provider) + throw new IOException("Proxy service provider is not yet set"); + + return provider.getProxyInfo(url); + } +} Added: classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyServiceProvider.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyServiceProvider.java (rev 0) +++ classlib6/core/src/openjdk/com/com/sun/java/browser/net/ProxyServiceProvider.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2001, 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.java.browser.net; + +import java.net.URL; + +/** + * + * @author Zhengyu Gu + */ +public interface ProxyServiceProvider { + public ProxyInfo[] getProxyInfo(URL url); +} Deleted: classlib6/core/src/openjdk/com/com/sun/management/OSMBeanFactory.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/management/OSMBeanFactory.java 2011-06-06 06:18:06 UTC (rev 5819) +++ classlib6/core/src/openjdk/com/com/sun/management/OSMBeanFactory.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -1,52 +0,0 @@ -/* - * Copyright 2003-2004 Sun Microsystems, Inc. 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.management; - -import java.lang.management.OperatingSystemMXBean; -import sun.management.VMManagement; - -/** - * Operating system dependent MBean factory. - * <p> - * <b>WARNING:</b> While this class is public, it should not be treated as - * public API and its API may change in incompatable ways between dot dot - * releases and even patch releases. You should not rely on this class. - */ -public class OSMBeanFactory { - /* static factory class */ - private OSMBeanFactory() {}; - - private static UnixOperatingSystem osMBean = null; - - public static synchronized OperatingSystemMXBean - getOperatingSystemMXBean(VMManagement jvm) { - - if (osMBean == null) { - osMBean = new UnixOperatingSystem(jvm); - } - return (OperatingSystemMXBean) osMBean; - } -} Deleted: classlib6/core/src/openjdk/com/com/sun/management/UnixOperatingSystem.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/management/UnixOperatingSystem.java 2011-06-06 06:18:06 UTC (rev 5819) +++ classlib6/core/src/openjdk/com/com/sun/management/UnixOperatingSystem.java 2011-06-21 15:36:21 UTC (rev 5820) @@ -1,58 +0,0 @@ -/* - * Copyright 2003-2005 Sun Microsystems, Inc. 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. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - -package com.sun.management; - -import sun.management.VMManagement; - -/** - * Implementation class for the operating system. - * Standard and committed hotspot-specific metrics if any. - * - * ManagementFactory.getOperatingSystemMXBean() returns an instance - * of this class. - */ -class UnixOperatingSystem - extends sun.management.OperatingSystemImpl - implements UnixOperatingSystemMXBean { - - UnixOperatingSystem(VMManagement vm) { - super(vm); - } - - public native long getCommittedVirtualMemorySize(); - public native long getTotalSwapSpaceSize(); - public native long getFreeSwapSpaceSize(); - public native long getProcessCpuTime(); - public native long getFreePhysicalMemorySize(); - public native long getTotalPhysicalMemorySize(); - public native long getOpenFileDescriptorCount(); - public native long getMaxFileDescriptorCount(); - - ... [truncated message content] |
From: <ls...@us...> - 2011-06-06 06:18:12
|
Revision: 5819 http://jnode.svn.sourceforge.net/jnode/?rev=5819&view=rev Author: lsantha Date: 2011-06-06 06:18:06 +0000 (Mon, 06 Jun 2011) Log Message: ----------- Updated IntelliJ Idea project file to version 10.5 Modified Paths: -------------- classlib6/Classlib6.ipr Modified: classlib6/Classlib6.ipr =================================================================== --- classlib6/Classlib6.ipr 2011-06-06 06:16:37 UTC (rev 5818) +++ classlib6/Classlib6.ipr 2011-06-06 06:18:06 UTC (rev 5819) @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="ASMPluginConfiguration"> + <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" /> + <groovy codeStyle="LEGACY" /> + </component> <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> <buildFile url="file://$PROJECT_DIR$/all/build.xml"> @@ -87,6 +91,16 @@ <option name="LABEL_INDENT_ABSOLUTE" value="false" /> <option name="USE_RELATIVE_INDENTS" value="false" /> </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="haml"> + <option name="INDENT_SIZE" value="2" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + <option name="USE_RELATIVE_INDENTS" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> <ADDITIONAL_INDENT_OPTIONS fileType="java"> <option name="INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="4" /> @@ -190,11 +204,8 @@ <option name="SKIP_IMPORT_STATEMENTS" value="false" /> </component> <component name="EclipseCompilerSettings"> - <option name="DEBUGGING_INFO" value="true" /> <option name="GENERATE_NO_WARNINGS" value="true" /> <option name="DEPRECATION" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> </component> <component name="EclipseEmbeddedCompilerSettings"> <option name="DEBUGGING_INFO" value="true" /> @@ -214,10 +225,6 @@ </component> <component name="IdProvider" IDEtalkID="435AAC2234C36B0F2257FA7F02C447FB" /> <component name="JavacSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="DEPRECATION" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> <option name="MAXIMUM_HEAP_SIZE" value="1024" /> </component> <component name="JavadocGenerationManager"> @@ -237,14 +244,6 @@ <option name="LOCALE" /> <option name="OPEN_IN_BROWSER" value="true" /> </component> - <component name="JikesSettings"> - <option name="JIKES_PATH" value="" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="DEPRECATION" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="IS_EMACS_ERRORS_MODE" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> <component name="Palette2"> <group name="Swing"> <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> @@ -391,13 +390,6 @@ </value> </option> </component> - <component name="RmicSettings"> - <option name="IS_EANABLED" value="false" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="GENERATE_IIOP_STUBS" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> <component name="SvnBranchConfigurationManager"> <option name="myConfigurationMap"> <map> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-06 06:16:43
|
Revision: 5818 http://jnode.svn.sourceforge.net/jnode/?rev=5818&view=rev Author: lsantha Date: 2011-06-06 06:16:37 +0000 (Mon, 06 Jun 2011) Log Message: ----------- Added classlib6 Netbeans project private directory to SVN ignore. Property Changed: ---------------- classlib6/netbeans/nbproject/ Property changes on: classlib6/netbeans/nbproject ___________________________________________________________________ Added: svn:ignore + private This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-06 06:15:18
|
Revision: 5817 http://jnode.svn.sourceforge.net/jnode/?rev=5817&view=rev Author: lsantha Date: 2011-06-06 06:15:11 +0000 (Mon, 06 Jun 2011) Log Message: ----------- Updated classlib6 project files for Netbeans 7.0 Modified Paths: -------------- classlib6/netbeans/nbbuild.xml classlib6/netbeans/nbproject/build-impl.xml classlib6/netbeans/nbproject/genfiles.properties classlib6/netbeans/nbproject/project.properties classlib6/netbeans/nbproject/project.xml Removed Paths: ------------- classlib6/netbeans/nbproject/privatee/ Modified: classlib6/netbeans/nbbuild.xml =================================================================== --- classlib6/netbeans/nbbuild.xml 2011-06-06 06:11:42 UTC (rev 5816) +++ classlib6/netbeans/nbbuild.xml 2011-06-06 06:15:11 UTC (rev 5817) @@ -2,8 +2,13 @@ <!-- You may freely edit this file. See commented blocks below for --> <!-- some examples of how to customize the build. --> <!-- (If you delete it and reopen the project it will be recreated.) --> -<project name="JNode" default="default" basedir="."> - <description>Builds, tests, and runs the project JNode.</description> +<!-- By default, only the Clean and Build commands use this build script. --> +<!-- Commands such as Run, Debug, and Test only use this build script if --> +<!-- the Compile on Save feature is turned off for the project. --> +<!-- You can turn off the Compile on Save (or Deploy on Save) setting --> +<!-- in the project's Project Properties dialog box.--> +<project name="JNode Classlib6" default="default" basedir="."> + <description>Builds, tests, and runs the project JNode Classlib6</description> <import file="nbproject/build-impl.xml"/> <!-- Modified: classlib6/netbeans/nbproject/build-impl.xml =================================================================== --- classlib6/netbeans/nbproject/build-impl.xml 2011-06-06 06:11:42 UTC (rev 5816) +++ classlib6/netbeans/nbproject/build-impl.xml 2011-06-06 06:15:11 UTC (rev 5817) @@ -19,7 +19,14 @@ - cleanup --> -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="JNode-impl"> +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="JNode_Classlib6-impl"> + <fail message="Please build using Ant 1.7.1 or higher."> + <condition> + <not> + <antversion atleast="1.7.1"/> + </not> + </condition> + </fail> <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> <!-- ====================== @@ -48,21 +55,84 @@ </target> <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> <available file="${manifest.file}" property="manifest.available"/> - <condition property="manifest.available+main.class"> + <condition property="splashscreen.available"> <and> - <isset property="manifest.available"/> + <not> + <equals arg1="${application.splash}" arg2="" trim="true"/> + </not> + <available file="${application.splash}"/> + </and> + </condition> + <condition property="main.class.available"> + <and> <isset property="main.class"/> <not> <equals arg1="${main.class}" arg2="" trim="true"/> </not> </and> </condition> + <condition property="manifest.available+main.class"> + <and> + <isset property="manifest.available"/> + <isset property="main.class.available"/> + </and> + </condition> + <condition property="do.archive"> + <not> + <istrue value="${jar.archive.disabled}"/> + </not> + </condition> + <condition property="do.mkdist"> + <and> + <isset property="do.archive"/> + <isset property="libs.CopyLibs.classpath"/> + <not> + <istrue value="${mkdist.disabled}"/> + </not> + </and> + </condition> <condition property="manifest.available+main.class+mkdist.available"> <and> <istrue value="${manifest.available+main.class}"/> - <isset property="libs.CopyLibs.classpath"/> + <isset property="do.mkdist"/> </and> </condition> + <condition property="do.archive+manifest.available"> + <and> + <isset property="manifest.available"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="do.archive+main.class.available"> + <and> + <isset property="main.class.available"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="do.archive+splashscreen.available"> + <and> + <isset property="splashscreen.available"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="do.archive+manifest.available+main.class"> + <and> + <istrue value="${manifest.available+main.class}"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="manifest.available-mkdist.available"> + <or> + <istrue value="${manifest.available}"/> + <isset property="do.mkdist"/> + </or> + </condition> + <condition property="manifest.available+main.class-mkdist.available"> + <or> + <istrue value="${manifest.available+main.class}"/> + <isset property="do.mkdist"/> + </or> + </condition> <condition property="have.tests"> <or/> </condition> @@ -137,6 +207,7 @@ <property name="javadoc.preview" value="true"/> <property name="application.args" value=""/> <property name="source.encoding" value="${file.encoding}"/> + <property name="runtime.encoding" value="${source.encoding}"/> <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> <and> <isset property="javadoc.encoding"/> @@ -152,12 +223,22 @@ <condition property="do.depend.true"> <istrue value="${do.depend}"/> </condition> - <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> + <path id="endorsed.classpath.path" path="${endorsed.classpath}"/> + <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'"> + <length length="0" string="${endorsed.classpath}" when="greater"/> + </condition> + <condition else="false" property="jdkBug6558476"> <and> - <isset property="jaxws.endorsed.dir"/> - <available file="nbproject/jaxws-build.xml"/> + <matches pattern="1\.[56]" string="${java.specification.version}"/> + <not> + <os family="unix"/> + </not> </and> </condition> + <property name="javac.fork" value="${jdkBug6558476}"/> + <property name="jar.index" value="false"/> + <property name="jar.index.metainf" value="${jar.index}"/> + <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> </target> <target name="-post-init"> <!-- Empty placeholder for easier customization. --> @@ -225,26 +306,79 @@ </sequential> </macrodef> </target> - <target name="-init-macrodef-javac"> + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${src.core.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.icedtea.dir}:${src.mmtk-vm.dir}:${src.com.dir}:${src.java.dir}:${src.javax.dir}:${src.org.dir}:${src.sun.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${gnu.dir}:${java.dir}:${javax.dir}:${tools.dir}:${vm.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${javac.processorpath}" name="processorpath"/> + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> <attribute default="${javac.debug}" name="debug"/> - <attribute default="" name="sourcepath"/> + <attribute default="${empty.dir}" name="sourcepath"/> + <attribute default="${empty.dir}" name="gensrcdir"/> <element name="customize" optional="true"/> <sequential> - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}"> + <property location="${build.dir}/empty" name="empty.dir"/> + <mkdir dir="${empty.dir}"/> + <mkdir dir="@{apgeneratedsrcdir}"/> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> + <src> + <dirset dir="@{gensrcdir}" erroronmissingdir="false"> + <include name="*"/> + </dirset> + </src> <classpath> <path path="@{classpath}"/> </classpath> - <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> + <compilerarg line="${javac.compilerargs}"/> + <compilerarg value="-processorpath"/> + <compilerarg path="@{processorpath}:${empty.dir}"/> + <compilerarg line="${ap.processors.internal}"/> + <compilerarg line="${annotation.processing.processor.options}"/> + <compilerarg value="-s"/> + <compilerarg path="@{apgeneratedsrcdir}"/> + <compilerarg line="${ap.proc.none.internal}"/> <customize/> </javac> </sequential> </macrodef> + </target> + <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${src.core.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.icedtea.dir}:${src.mmtk-vm.dir}:${src.com.dir}:${src.java.dir}:${src.javax.dir}:${src.org.dir}:${src.sun.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${gnu.dir}:${java.dir}:${javax.dir}:${tools.dir}:${vm.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${javac.processorpath}" name="processorpath"/> + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> + <attribute default="${empty.dir}" name="sourcepath"/> + <attribute default="${empty.dir}" name="gensrcdir"/> + <element name="customize" optional="true"/> + <sequential> + <property location="${build.dir}/empty" name="empty.dir"/> + <mkdir dir="${empty.dir}"/> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> + <src> + <dirset dir="@{gensrcdir}" erroronmissingdir="false"> + <include name="*"/> + </dirset> + </src> + <classpath> + <path path="@{classpath}"/> + </classpath> + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> + <compilerarg line="${javac.compilerargs}"/> + <customize/> + </javac> + </sequential> + </macrodef> + </target> + <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${src.core.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.icedtea.dir}:${src.mmtk-vm.dir}:${src.com.dir}:${src.java.dir}:${src.javax.dir}:${src.org.dir}:${src.sun.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${gnu.dir}:${java.dir}:${javax.dir}:${tools.dir}:${vm.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> @@ -261,15 +395,20 @@ <attribute default="${build.classes.dir}" name="destdir"/> <sequential> <fail unless="javac.includes">Must set javac.includes</fail> - <pathconvert pathsep="," property="javac.includes.binary"> + <pathconvert pathsep="${line.separator}" property="javac.includes.binary"> <path> <filelist dir="@{destdir}" files="${javac.includes}"/> </path> <globmapper from="*.java" to="*.class"/> </pathconvert> + <tempfile deleteonexit="true" property="javac.includesfile.binary"/> + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/> <delete> - <files includes="${javac.includes.binary}"/> + <files includesfile="${javac.includesfile.binary}"/> </delete> + <delete> + <fileset file="${javac.includesfile.binary}"/> + </delete> </sequential> </macrodef> </target> @@ -279,7 +418,8 @@ <attribute default="${excludes}" name="excludes"/> <attribute default="**" name="testincludes"/> <sequential> - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> + <property name="junit.forkmode" value="perTest"/> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <batchtest todir="${build.test.results.dir}"/> <classpath> <path path="${run.test.classpath}"/> @@ -290,18 +430,64 @@ </syspropertyset> <formatter type="brief" usefile="false"/> <formatter type="xml"/> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> + <jvmarg value="-ea"/> <jvmarg line="${run.jvmargs}"/> </junit> </sequential> </macrodef> </target> - <target name="-init-macrodef-nbjpda"> + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/> + <target name="-profile-pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-profile-post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-profile-init-macrodef-profile"> + <macrodef name="resolve"> + <attribute name="name"/> + <attribute name="value"/> + <sequential> + <property name="@{name}" value="${env.@{value}}"/> + </sequential> + </macrodef> + <macrodef name="profile"> + <attribute default="${main.class}" name="classname"/> + <element name="customize" optional="true"/> + <sequential> + <property environment="env"/> + <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> + <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> + <jvmarg value="${profiler.info.jvmargs.agent}"/> + <jvmarg line="${profiler.info.jvmargs}"/> + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> + <arg line="${application.args}"/> + <classpath> + <path path="${run.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check"> + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> + </target> + <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1"> <attribute default="${main.class}" name="name"/> <attribute default="${debug.classpath}" name="classpath"/> <attribute default="" name="stopclassname"/> <sequential> - <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket"> + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}"> <classpath> <path path="@{classpath}"/> </classpath> @@ -332,6 +518,12 @@ <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> <istrue value="${have-jdk-older-than-1.4}"/> </condition> + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> + <os family="windows"/> + </condition> + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}"> + <isset property="debug.transport"/> + </condition> </target> <target depends="-init-debug-args" name="-init-macrodef-debug"> <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3"> @@ -340,8 +532,11 @@ <element name="customize" optional="true"/> <sequential> <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg line="${debug-args-line}"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> <jvmarg line="${run.jvmargs}"/> <classpath> <path path="@{classpath}"/> @@ -358,12 +553,16 @@ <target name="-init-macrodef-java"> <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> <attribute default="${main.class}" name="classname"/> + <attribute default="${run.classpath}" name="classpath"/> <element name="customize" optional="true"/> <sequential> <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> <jvmarg line="${run.jvmargs}"/> <classpath> - <path path="${run.classpath}"/> + <path path="@{classpath}"/> </classpath> <syspropertyset> <propertyref prefix="run-sys-prop."/> @@ -374,20 +573,94 @@ </sequential> </macrodef> </target> + <target name="-init-macrodef-copylibs"> + <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${manifest.file}" name="manifest"/> + <element name="customize" optional="true"/> + <sequential> + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> + <pathconvert property="run.classpath.without.build.classes.dir"> + <path path="${run.classpath}"/> + <map from="${build.classes.dir.resolved}" to=""/> + </pathconvert> + <pathconvert pathsep=" " property="jar.classpath"> + <path path="${run.classpath.without.build.classes.dir}"/> + <chainedmapper> + <flattenmapper/> + <globmapper from="*" to="lib/*"/> + </chainedmapper> + </pathconvert> + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> + <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> + <fileset dir="${build.classes.dir}"/> + <manifest> + <attribute name="Class-Path" value="${jar.classpath}"/> + <customize/> + </manifest> + </copylibs> + </sequential> + </macrodef> + </target> <target name="-init-presetdef-jar"> <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> - <jar compress="${jar.compress}" jarfile="${dist.jar}"> + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> <j2seproject1:fileset dir="${build.classes.dir}"/> </jar> </presetdef> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/> + <target name="-init-ap-cmdline-properties"> + <property name="annotation.processing.enabled" value="true"/> + <property name="annotation.processing.processors.list" value=""/> + <property name="annotation.processing.processor.options" value=""/> + <property name="annotation.processing.run.all.processors" value="true"/> + <property name="javac.processorpath" value="${javac.classpath}"/> + <property name="javac.test.processorpath" value="${javac.test.classpath}"/> + <condition property="ap.supported.internal" value="true"> + <not> + <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/> + </not> + </condition> + </target> + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported"> + <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}"> + <isfalse value="${annotation.processing.run.all.processors}"/> + </condition> + <condition else="" property="ap.proc.none.internal" value="-proc:none"> + <isfalse value="${annotation.processing.enabled}"/> + </condition> + </target> + <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> + <property name="ap.cmd.line.internal" value=""/> + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/> <!-- =================== COMPILATION SECTION =================== --> - <target depends="init" name="deps-jar" unless="no.deps"/> + <target name="-deps-jar-init" unless="built-jar.properties"> + <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/> + <delete file="${built-jar.properties}" quiet="true"/> + </target> + <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> + <echo level="warn" message="Cycle detected: JNode Classlib6 was already built"/> + </target> + <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> + <mkdir dir="${build.dir}"/> + <touch file="${built-jar.properties}" verbose="false"/> + <property file="${built-jar.properties}" prefix="already.built.jar."/> + <antcall target="-warn-already-built-jar"/> + <propertyfile file="${built-jar.properties}"> + <entry key="${basedir}" value=""/> + </propertyfile> + </target> + <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> + <target depends="init" name="-check-automatic-build"> + <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/> + </target> + <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build"> + <antcall target="clean"/> + </target> <target depends="init,deps-jar" name="-pre-pre-compile"> <mkdir dir="${build.classes.dir}"/> </target> @@ -396,10 +669,15 @@ <!-- You can override this target in the ../build.xml file. --> </target> <target if="do.depend.true" name="-compile-depend"> - <j2seproject3:depend/> + <pathconvert property="build.generated.subdirs"> + <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false"> + <include name="*"/> + </dirset> + </pathconvert> + <j2seproject3:depend srcdir="${src.core.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.icedtea.dir}:${src.mmtk-vm.dir}:${src.com.dir}:${src.java.dir}:${src.javax.dir}:${src.org.dir}:${src.sun.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${gnu.dir}:${java.dir}:${javax.dir}:${tools.dir}:${vm.dir}:${build.generated.subdirs}"/> </target> - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> - <j2seproject3:javac/> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> + <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> <copy todir="${build.classes.dir}"> <fileset dir="${src.core.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.apps.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> @@ -446,11 +724,17 @@ <fileset dir="${vm.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> </copy> </target> + <target if="has.persistence.xml" name="-copy-persistence-xml"> + <mkdir dir="${build.classes.dir}/META-INF"/> + <copy todir="${build.classes.dir}/META-INF"> + <fileset dir="${meta.inf.dir}" includes="persistence.xml"/> + </copy> + </target> <target name="-post-compile"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> <target name="-pre-compile-single"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> @@ -458,13 +742,13 @@ <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile/> - <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.core.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.icedtea.dir}:${src.mmtk-vm.dir}:${src.com.dir}:${src.java.dir}:${src.javax.dir}:${src.org.dir}:${src.sun.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${gnu.dir}:${java.dir}:${javax.dir}:${tools.dir}:${vm.dir}"/> + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.core.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.icedtea.dir}:${src.mmtk-vm.dir}:${src.com.dir}:${src.java.dir}:${src.javax.dir}:${src.org.dir}:${src.sun.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${gnu.dir}:${java.dir}:${javax.dir}:${tools.dir}:${vm.dir}"/> </target> <target name="-post-compile-single"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> <!-- ==================== JAR BUILDING SECTION @@ -478,52 +762,60 @@ <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available"> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available"> <j2seproject1:jar/> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available"> <j2seproject1:jar manifest="${manifest.file}"/> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> <j2seproject1:jar manifest="${manifest.file}"> <j2seproject1:manifest> <j2seproject1:attribute name="Main-Class" value="${main.class}"/> </j2seproject1:manifest> </j2seproject1:jar> - <echo>To run this application from the command line without Ant, try:</echo> + <echo level="info">To run this application from the command line without Ant, try:</echo> <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> <property location="${dist.jar}" name="dist.jar.resolved"/> <pathconvert property="run.classpath.with.dist.jar"> <path path="${run.classpath}"/> <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> </pathconvert> - <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> + <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries"> - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> - <pathconvert property="run.classpath.without.build.classes.dir"> - <path path="${run.classpath}"/> - <map from="${build.classes.dir.resolved}" to=""/> - </pathconvert> - <pathconvert pathsep=" " property="jar.classpath"> - <path path="${run.classpath.without.build.classes.dir}"/> - <chainedmapper> - <flattenmapper/> - <globmapper from="*" to="lib/*"/> - </chainedmapper> - </pathconvert> - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> - <fileset dir="${build.classes.dir}"/> - <manifest> - <attribute name="Main-Class" value="${main.class}"/> - <attribute name="Class-Path" value="${jar.classpath}"/> - </manifest> - </copylibs> - <echo>To run this application from the command line without Ant, try:</echo> + <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available"> + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> + <touch file="${tmp.manifest.file}" verbose="false"/> + </target> + <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest"> + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> + <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> + </target> + <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main"> + <manifest file="${tmp.manifest.file}" mode="update"> + <attribute name="Main-Class" value="${main.class}"/> + </manifest> + </target> + <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen"> + <basename file="${application.splash}" property="splashscreen.basename"/> + <mkdir dir="${build.classes.dir}/META-INF"/> + <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> + <manifest file="${tmp.manifest.file}" mode="update"> + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> + </manifest> + </target> + <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack"> + <j2seproject3:copylibs manifest="${tmp.manifest.file}"/> + <echo level="info">To run this application from the command line without Ant, try:</echo> <property location="${dist.jar}" name="dist.jar.resolved"/> - <echo>java -jar "${dist.jar.resolved}"</echo> + <echo level="info">java -jar "${dist.jar.resolved}"</echo> </target> + <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest"> + <delete> + <fileset file="${tmp.manifest.file}"/> + </delete> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/> <target name="-post-jar"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> @@ -544,10 +836,14 @@ <target name="-do-not-recompile"> <property name="javac.includes.binary" value=""/> </target> - <target depends="init,-do-not-recompile,compile-single" name="run-single"> + <target depends="init,compile-single" name="run-single"> <fail unless="run.class">Must select one file in the IDE or set run.class</fail> <j2seproject1:java classname="${run.class}"/> </target> + <target depends="init,compile-test-single" name="run-test-with-main"> + <fail unless="run.class">Must select one file in the IDE or set run.class</fail> + <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/> + </target> <!-- ================= DEBUGGING SECTION @@ -556,6 +852,9 @@ <target depends="init" if="netbeans.home" name="-debug-start-debugger"> <j2seproject1:nbjpdastart name="${debug.class}"/> </target> + <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test"> + <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/> + </target> <target depends="init,compile" name="-debug-start-debuggee"> <j2seproject3:debug> <customize> @@ -572,7 +871,12 @@ <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> <j2seproject3:debug classname="${debug.class}"/> </target> - <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> + <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test"> + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> + <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/> + </target> + <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/> <target depends="init" name="-pre-debug-fix"> <fail unless="fix.includes">Must set fix.includes</fail> <property name="javac.includes" value="${fix.includes}.java"/> @@ -582,11 +886,77 @@ </target> <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> <!-- + ================= + PROFILING SECTION + ================= + --> + <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile"> + <nbprofiledirect> + <classpath> + <path path="${run.classpath}"/> + </classpath> + </nbprofiledirect> + <profile/> + </target> + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single"> + <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail> + <nbprofiledirect> + <classpath> + <path path="${run.classpath}"/> + </classpath> + </nbprofiledirect> + <profile classname="${profile.class}"/> + </target> + <!-- + ========================= + APPLET PROFILING SECTION + ========================= + --> + <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet"> + <nbprofiledirect> + <classpath> + <path path="${run.classpath}"/> + </classpath> + </nbprofiledirect> + <profile classname="sun.applet.AppletViewer"> + <customize> + <arg value="${applet.url}"/> + </customize> + </profile> + </target> + <!-- + ========================= + TESTS PROFILING SECTION + ========================= + --> + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single"> + <nbprofiledirect> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + </nbprofiledirect> + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> + <jvmarg value="${profiler.info.jvmargs.agent}"/> + <jvmarg line="${profiler.info.jvmargs}"/> + <test name="${profile.class}"/> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + </junit> + </target> + <!-- =============== JAVADOC SECTION =============== --> - <target depends="init" name="-javadoc-build"> + <target depends="init" if="have.sources" name="-javadoc-build"> <mkdir dir="${dist.javadoc.dir}"/> <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> <classpath> @@ -721,7 +1091,144 @@ <fileset dir="${vm.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> + <include name="**/*.java"/> + </fileset> </javadoc> + <copy todir="${dist.javadoc.dir}"> + <fileset dir="${src.core.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.apps.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.emu.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.install.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.fs.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test2.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.awt.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.desktop.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver2.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.font.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test3.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.thinlet.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver3.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.net.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test4.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.shell.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test5.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver4.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.sound.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test6.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.textui.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver5.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.nanoxml.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.icedtea.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.mmtk-vm.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.com.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.java.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.javax.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.org.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.sun.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.vm.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test7.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.vmmagic.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${configure.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${ext.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${gnu.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${java.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${javax.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${tools.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${vm.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> + <include name="**/doc-files/**"/> + </fileset> + </copy> </target> <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview"> <nbbrowse file="${dist.javadoc.dir}/index.html"/> @@ -742,8 +1249,8 @@ <target if="do.depend.true" name="-compile-test-depend"> <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/> </target> - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/> + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir=""/> <copy todir="${build.test.classes.dir}"/> </target> <target name="-post-compile-test"> @@ -755,10 +1262,10 @@ <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/> + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="" srcdir=""/> <copy todir="${build.test.classes.dir}"/> </target> <target name="-post-compile-test-single"> @@ -778,7 +1285,7 @@ <j2seproject3:junit testincludes="**/*Test.java"/> </target> <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> - <fail if="tests.failed">Some tests failed; see details above.</fail> + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> </target> <target depends="init" if="have.tests" name="test-report"/> <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/> @@ -791,9 +1298,9 @@ <j2seproject3:junit excludes="" includes="${test.includes}"/> </target> <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> - <fail if="tests.failed">Some tests failed; see details above.</fail> + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> </target> - <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> <!-- ======================= JUNIT DEBUGGING SECTION @@ -820,7 +1327,7 @@ <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> </target> - <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> + <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> </target> @@ -857,14 +1364,45 @@ CLEANUP SECTION =============== --> - <target depends="init" name="deps-clean" unless="no.deps"/> + <target name="-deps-clean-init" unless="built-clean.properties"> + <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/> + <delete file="${built-clean.properties}" quiet="true"/> + </target> + <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> + <echo level="warn" message="Cycle detected: JNode Classlib6 was already built"/> + </target> + <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> ... [truncated message content] |
From: <ls...@us...> - 2011-06-06 06:11:48
|
Revision: 5816 http://jnode.svn.sourceforge.net/jnode/?rev=5816&view=rev Author: lsantha Date: 2011-06-06 06:11:42 +0000 (Mon, 06 Jun 2011) Log Message: ----------- Deleting Netbeans project private directory from classlib6. Modified Paths: -------------- classlib6/netbeans/nbproject/privatee/private.properties classlib6/netbeans/nbproject/privatee/private.xml Added Paths: ----------- classlib6/netbeans/nbproject/privatee/ Removed Paths: ------------- classlib6/netbeans/nbproject/private/ Modified: classlib6/netbeans/nbproject/privatee/private.properties =================================================================== --- classlib6/netbeans/nbproject/private/private.properties 2011-06-05 09:22:58 UTC (rev 5815) +++ classlib6/netbeans/nbproject/privatee/private.properties 2011-06-06 06:11:42 UTC (rev 5816) @@ -2,5 +2,4 @@ do.jar=true javac.debug=true javadoc.preview=true -jaxws.endorsed.dir=/ext/prg/netbeans-6.1/java2/modules/ext/jaxws21/api -user.properties.file=/root/.netbeans/6.1/build.properties +user.properties.file=/home/lsantha/.netbeans/7.0/build.properties Modified: classlib6/netbeans/nbproject/privatee/private.xml =================================================================== --- classlib6/netbeans/nbproject/private/private.xml 2011-06-05 09:22:58 UTC (rev 5815) +++ classlib6/netbeans/nbproject/privatee/private.xml 2011-06-06 06:11:42 UTC (rev 5816) @@ -1,2 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project-private xmlns="http://www.netbeans.org/ns/project-private/1"/> +<project-private xmlns="http://www.netbeans.org/ns/project-private/1"> + <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/> + <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1"> + <file>file:/media/sdb5/ext/devel/classlib6/netbeans/nbbuild.xml</file> + <file>file:/media/sdb5/ext/devel/classlib6/netbeans/nbproject/project.xml</file> + <file>file:/media/sdb5/ext/devel/classlib6/netbeans/nbproject/project.properties</file> + </open-files> +</project-private> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-05 09:23:04
|
Revision: 5815 http://jnode.svn.sourceforge.net/jnode/?rev=5815&view=rev Author: lsantha Date: 2011-06-05 09:22:58 +0000 (Sun, 05 Jun 2011) Log Message: ----------- Added directory nbproject/private to svn ignores. Property Changed: ---------------- trunk/netbeans/nbproject/ Property changes on: trunk/netbeans/nbproject ___________________________________________________________________ Added: svn:ignore + private This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-05 09:20:37
|
Revision: 5814 http://jnode.svn.sourceforge.net/jnode/?rev=5814&view=rev Author: lsantha Date: 2011-06-05 09:20:29 +0000 (Sun, 05 Jun 2011) Log Message: ----------- Updated project files for Netbeans 7.0. Modified Paths: -------------- trunk/netbeans/nbproject/build-impl.xml trunk/netbeans/nbproject/genfiles.properties trunk/netbeans/nbproject/project.properties Modified: trunk/netbeans/nbproject/build-impl.xml =================================================================== --- trunk/netbeans/nbproject/build-impl.xml 2011-06-05 09:14:28 UTC (rev 5813) +++ trunk/netbeans/nbproject/build-impl.xml 2011-06-05 09:20:29 UTC (rev 5814) @@ -20,6 +20,13 @@ --> <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="JNode-impl"> + <fail message="Please build using Ant 1.7.1 or higher."> + <condition> + <not> + <antversion atleast="1.7.1"/> + </not> + </condition> + </fail> <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> <!-- ====================== @@ -48,21 +55,84 @@ </target> <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> <available file="${manifest.file}" property="manifest.available"/> - <condition property="manifest.available+main.class"> + <condition property="splashscreen.available"> <and> - <isset property="manifest.available"/> + <not> + <equals arg1="${application.splash}" arg2="" trim="true"/> + </not> + <available file="${application.splash}"/> + </and> + </condition> + <condition property="main.class.available"> + <and> <isset property="main.class"/> <not> <equals arg1="${main.class}" arg2="" trim="true"/> </not> </and> </condition> + <condition property="manifest.available+main.class"> + <and> + <isset property="manifest.available"/> + <isset property="main.class.available"/> + </and> + </condition> + <condition property="do.archive"> + <not> + <istrue value="${jar.archive.disabled}"/> + </not> + </condition> + <condition property="do.mkdist"> + <and> + <isset property="do.archive"/> + <isset property="libs.CopyLibs.classpath"/> + <not> + <istrue value="${mkdist.disabled}"/> + </not> + </and> + </condition> <condition property="manifest.available+main.class+mkdist.available"> <and> <istrue value="${manifest.available+main.class}"/> - <isset property="libs.CopyLibs.classpath"/> + <isset property="do.mkdist"/> </and> </condition> + <condition property="do.archive+manifest.available"> + <and> + <isset property="manifest.available"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="do.archive+main.class.available"> + <and> + <isset property="main.class.available"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="do.archive+splashscreen.available"> + <and> + <isset property="splashscreen.available"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="do.archive+manifest.available+main.class"> + <and> + <istrue value="${manifest.available+main.class}"/> + <istrue value="${do.archive}"/> + </and> + </condition> + <condition property="manifest.available-mkdist.available"> + <or> + <istrue value="${manifest.available}"/> + <isset property="do.mkdist"/> + </or> + </condition> + <condition property="manifest.available+main.class-mkdist.available"> + <or> + <istrue value="${manifest.available+main.class}"/> + <isset property="do.mkdist"/> + </or> + </condition> <condition property="have.tests"> <or/> </condition> @@ -130,6 +200,7 @@ <property name="javadoc.preview" value="true"/> <property name="application.args" value=""/> <property name="source.encoding" value="${file.encoding}"/> + <property name="runtime.encoding" value="${source.encoding}"/> <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> <and> <isset property="javadoc.encoding"/> @@ -145,12 +216,22 @@ <condition property="do.depend.true"> <istrue value="${do.depend}"/> </condition> - <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> + <path id="endorsed.classpath.path" path="${endorsed.classpath}"/> + <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'"> + <length length="0" string="${endorsed.classpath}" when="greater"/> + </condition> + <condition else="false" property="jdkBug6558476"> <and> - <isset property="jaxws.endorsed.dir"/> - <available file="nbproject/jaxws-build.xml"/> + <matches pattern="1\.[56]" string="${java.specification.version}"/> + <not> + <os family="unix"/> + </not> </and> </condition> + <property name="javac.fork" value="${jdkBug6558476}"/> + <property name="jar.index" value="false"/> + <property name="jar.index.metainf" value="${jar.index}"/> + <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> </target> <target name="-post-init"> <!-- Empty placeholder for easier customization. --> @@ -211,26 +292,79 @@ </sequential> </macrodef> </target> - <target name="-init-macrodef-javac"> + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${src.template.dir}:${src.emu3.dir}:${src.core.dir}:${src.emu2.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.mmtk-vm.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${vm.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${javac.processorpath}" name="processorpath"/> + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> <attribute default="${javac.debug}" name="debug"/> - <attribute default="/does/not/exist" name="sourcepath"/> + <attribute default="${empty.dir}" name="sourcepath"/> + <attribute default="${empty.dir}" name="gensrcdir"/> <element name="customize" optional="true"/> <sequential> - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}"> + <property location="${build.dir}/empty" name="empty.dir"/> + <mkdir dir="${empty.dir}"/> + <mkdir dir="@{apgeneratedsrcdir}"/> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> + <src> + <dirset dir="@{gensrcdir}" erroronmissingdir="false"> + <include name="*"/> + </dirset> + </src> <classpath> <path path="@{classpath}"/> </classpath> - <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> + <compilerarg line="${javac.compilerargs}"/> + <compilerarg value="-processorpath"/> + <compilerarg path="@{processorpath}:${empty.dir}"/> + <compilerarg line="${ap.processors.internal}"/> + <compilerarg line="${annotation.processing.processor.options}"/> + <compilerarg value="-s"/> + <compilerarg path="@{apgeneratedsrcdir}"/> + <compilerarg line="${ap.proc.none.internal}"/> <customize/> </javac> </sequential> </macrodef> + </target> + <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${src.template.dir}:${src.emu3.dir}:${src.core.dir}:${src.emu2.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.mmtk-vm.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${vm.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${javac.processorpath}" name="processorpath"/> + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> + <attribute default="${empty.dir}" name="sourcepath"/> + <attribute default="${empty.dir}" name="gensrcdir"/> + <element name="customize" optional="true"/> + <sequential> + <property location="${build.dir}/empty" name="empty.dir"/> + <mkdir dir="${empty.dir}"/> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> + <src> + <dirset dir="@{gensrcdir}" erroronmissingdir="false"> + <include name="*"/> + </dirset> + </src> + <classpath> + <path path="@{classpath}"/> + </classpath> + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> + <compilerarg line="${javac.compilerargs}"/> + <customize/> + </javac> + </sequential> + </macrodef> + </target> + <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> <attribute default="${src.template.dir}:${src.emu3.dir}:${src.core.dir}:${src.emu2.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.mmtk-vm.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${vm.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> @@ -247,15 +381,20 @@ <attribute default="${build.classes.dir}" name="destdir"/> <sequential> <fail unless="javac.includes">Must set javac.includes</fail> - <pathconvert pathsep="," property="javac.includes.binary"> + <pathconvert pathsep="${line.separator}" property="javac.includes.binary"> <path> <filelist dir="@{destdir}" files="${javac.includes}"/> </path> <globmapper from="*.java" to="*.class"/> </pathconvert> + <tempfile deleteonexit="true" property="javac.includesfile.binary"/> + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/> <delete> - <files includes="${javac.includes.binary}"/> + <files includesfile="${javac.includesfile.binary}"/> </delete> + <delete> + <fileset file="${javac.includesfile.binary}"/> + </delete> </sequential> </macrodef> </target> @@ -265,7 +404,8 @@ <attribute default="${excludes}" name="excludes"/> <attribute default="**" name="testincludes"/> <sequential> - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> + <property name="junit.forkmode" value="perTest"/> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <batchtest todir="${build.test.results.dir}"/> <classpath> <path path="${run.test.classpath}"/> @@ -276,11 +416,57 @@ </syspropertyset> <formatter type="brief" usefile="false"/> <formatter type="xml"/> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> + <jvmarg value="-ea"/> <jvmarg line="${run.jvmargs}"/> </junit> </sequential> </macrodef> </target> + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/> + <target name="-profile-pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-profile-post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-profile-init-macrodef-profile"> + <macrodef name="resolve"> + <attribute name="name"/> + <attribute name="value"/> + <sequential> + <property name="@{name}" value="${env.@{value}}"/> + </sequential> + </macrodef> + <macrodef name="profile"> + <attribute default="${main.class}" name="classname"/> + <element name="customize" optional="true"/> + <sequential> + <property environment="env"/> + <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> + <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> + <jvmarg value="${profiler.info.jvmargs.agent}"/> + <jvmarg line="${profiler.info.jvmargs}"/> + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> + <arg line="${application.args}"/> + <classpath> + <path path="${run.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check"> + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> + </target> <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1"> <attribute default="${main.class}" name="name"/> @@ -332,8 +518,11 @@ <element name="customize" optional="true"/> <sequential> <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg line="${debug-args-line}"/> <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> <jvmarg line="${run.jvmargs}"/> <classpath> <path path="@{classpath}"/> @@ -350,12 +539,16 @@ <target name="-init-macrodef-java"> <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> <attribute default="${main.class}" name="classname"/> + <attribute default="${run.classpath}" name="classpath"/> <element name="customize" optional="true"/> <sequential> <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> <jvmarg line="${run.jvmargs}"/> <classpath> - <path path="${run.classpath}"/> + <path path="@{classpath}"/> </classpath> <syspropertyset> <propertyref prefix="run-sys-prop."/> @@ -366,20 +559,87 @@ </sequential> </macrodef> </target> + <target name="-init-macrodef-copylibs"> + <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${manifest.file}" name="manifest"/> + <element name="customize" optional="true"/> + <sequential> + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> + <pathconvert property="run.classpath.without.build.classes.dir"> + <path path="${run.classpath}"/> + <map from="${build.classes.dir.resolved}" to=""/> + </pathconvert> + <pathconvert pathsep=" " property="jar.classpath"> + <path path="${run.classpath.without.build.classes.dir}"/> + <chainedmapper> + <flattenmapper/> + <globmapper from="*" to="lib/*"/> + </chainedmapper> + </pathconvert> + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> + <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> + <fileset dir="${build.classes.dir}"/> + <manifest> + <attribute name="Class-Path" value="${jar.classpath}"/> + <customize/> + </manifest> + </copylibs> + </sequential> + </macrodef> + </target> <target name="-init-presetdef-jar"> <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> - <jar compress="${jar.compress}" jarfile="${dist.jar}"> + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> <j2seproject1:fileset dir="${build.classes.dir}"/> </jar> </presetdef> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/> + <target name="-init-ap-cmdline-properties"> + <property name="annotation.processing.enabled" value="true"/> + <property name="annotation.processing.processors.list" value=""/> + <property name="annotation.processing.processor.options" value=""/> + <property name="annotation.processing.run.all.processors" value="true"/> + <property name="javac.processorpath" value="${javac.classpath}"/> + <property name="javac.test.processorpath" value="${javac.test.classpath}"/> + <condition property="ap.supported.internal" value="true"> + <not> + <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/> + </not> + </condition> + </target> + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported"> + <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}"> + <isfalse value="${annotation.processing.run.all.processors}"/> + </condition> + <condition else="" property="ap.proc.none.internal" value="-proc:none"> + <isfalse value="${annotation.processing.enabled}"/> + </condition> + </target> + <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> + <property name="ap.cmd.line.internal" value=""/> + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/> <!-- =================== COMPILATION SECTION =================== --> - <target depends="init" name="deps-jar" unless="no.deps"/> + <target name="-deps-jar-init" unless="built-jar.properties"> + <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/> + <delete file="${built-jar.properties}" quiet="true"/> + </target> + <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> + <echo level="warn" message="Cycle detected: JNode was already built"/> + </target> + <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> + <mkdir dir="${build.dir}"/> + <touch file="${built-jar.properties}" verbose="false"/> + <property file="${built-jar.properties}" prefix="already.built.jar."/> + <antcall target="-warn-already-built-jar"/> + <propertyfile file="${built-jar.properties}"> + <entry key="${basedir}" value=""/> + </propertyfile> + </target> <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> <target depends="init" name="-check-automatic-build"> <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/> @@ -395,10 +655,15 @@ <!-- You can override this target in the ../build.xml file. --> </target> <target if="do.depend.true" name="-compile-depend"> - <j2seproject3:depend/> + <pathconvert property="build.generated.subdirs"> + <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false"> + <include name="*"/> + </dirset> + </pathconvert> + <j2seproject3:depend srcdir="${src.template.dir}:${src.emu3.dir}:${src.core.dir}:${src.emu2.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.mmtk-vm.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${vm.dir}:${build.generated.subdirs}"/> </target> - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> - <j2seproject3:javac/> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> + <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> <copy todir="${build.classes.dir}"> <fileset dir="${src.template.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.emu3.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> @@ -438,6 +703,12 @@ <fileset dir="${vm.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> </copy> </target> + <target if="has.persistence.xml" name="-copy-persistence-xml"> + <mkdir dir="${build.classes.dir}/META-INF"/> + <copy todir="${build.classes.dir}/META-INF"> + <fileset dir="${meta.inf.dir}" includes="persistence.xml"/> + </copy> + </target> <target name="-post-compile"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> @@ -450,7 +721,7 @@ <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile/> - <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.template.dir}:${src.emu3.dir}:${src.core.dir}:${src.emu2.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.mmtk-vm.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${vm.dir}"/> + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.template.dir}:${src.emu3.dir}:${src.core.dir}:${src.emu2.dir}:${src.apps.dir}:${src.emu.dir}:${src.install.dir}:${src.test.dir}:${src.driver.dir}:${src.fs.dir}:${src.test2.dir}:${src.awt.dir}:${src.desktop.dir}:${src.driver2.dir}:${src.font.dir}:${src.test3.dir}:${src.thinlet.dir}:${src.driver3.dir}:${src.net.dir}:${src.test4.dir}:${src.shell.dir}:${src.test5.dir}:${src.driver4.dir}:${src.sound.dir}:${src.test6.dir}:${src.textui.dir}:${src.driver5.dir}:${src.nanoxml.dir}:${src.mmtk-vm.dir}:${src.vm.dir}:${src.test7.dir}:${src.vmmagic.dir}:${src.dir}:${configure.dir}:${ext.dir}:${vm.dir}"/> </target> <target name="-post-compile-single"> <!-- Empty placeholder for easier customization. --> @@ -470,52 +741,60 @@ <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available"> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available"> <j2seproject1:jar/> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available"> <j2seproject1:jar manifest="${manifest.file}"/> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> <j2seproject1:jar manifest="${manifest.file}"> <j2seproject1:manifest> <j2seproject1:attribute name="Main-Class" value="${main.class}"/> </j2seproject1:manifest> </j2seproject1:jar> - <echo>To run this application from the command line without Ant, try:</echo> + <echo level="info">To run this application from the command line without Ant, try:</echo> <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> <property location="${dist.jar}" name="dist.jar.resolved"/> <pathconvert property="run.classpath.with.dist.jar"> <path path="${run.classpath}"/> <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> </pathconvert> - <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> + <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> </target> - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries"> - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> - <pathconvert property="run.classpath.without.build.classes.dir"> - <path path="${run.classpath}"/> - <map from="${build.classes.dir.resolved}" to=""/> - </pathconvert> - <pathconvert pathsep=" " property="jar.classpath"> - <path path="${run.classpath.without.build.classes.dir}"/> - <chainedmapper> - <flattenmapper/> - <globmapper from="*" to="lib/*"/> - </chainedmapper> - </pathconvert> - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> - <fileset dir="${build.classes.dir}"/> - <manifest> - <attribute name="Main-Class" value="${main.class}"/> - <attribute name="Class-Path" value="${jar.classpath}"/> - </manifest> - </copylibs> - <echo>To run this application from the command line without Ant, try:</echo> + <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available"> + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> + <touch file="${tmp.manifest.file}" verbose="false"/> + </target> + <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest"> + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> + <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> + </target> + <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main"> + <manifest file="${tmp.manifest.file}" mode="update"> + <attribute name="Main-Class" value="${main.class}"/> + </manifest> + </target> + <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen"> + <basename file="${application.splash}" property="splashscreen.basename"/> + <mkdir dir="${build.classes.dir}/META-INF"/> + <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> + <manifest file="${tmp.manifest.file}" mode="update"> + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> + </manifest> + </target> + <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack"> + <j2seproject3:copylibs manifest="${tmp.manifest.file}"/> + <echo level="info">To run this application from the command line without Ant, try:</echo> <property location="${dist.jar}" name="dist.jar.resolved"/> - <echo>java -jar "${dist.jar.resolved}"</echo> + <echo level="info">java -jar "${dist.jar.resolved}"</echo> </target> + <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest"> + <delete> + <fileset file="${tmp.manifest.file}"/> + </delete> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/> <target name="-post-jar"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> @@ -536,10 +815,14 @@ <target name="-do-not-recompile"> <property name="javac.includes.binary" value=""/> </target> - <target depends="init,-do-not-recompile,compile-single" name="run-single"> + <target depends="init,compile-single" name="run-single"> <fail unless="run.class">Must select one file in the IDE or set run.class</fail> <j2seproject1:java classname="${run.class}"/> </target> + <target depends="init,compile-test-single" name="run-test-with-main"> + <fail unless="run.class">Must select one file in the IDE or set run.class</fail> + <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/> + </target> <!-- ================= DEBUGGING SECTION @@ -548,6 +831,9 @@ <target depends="init" if="netbeans.home" name="-debug-start-debugger"> <j2seproject1:nbjpdastart name="${debug.class}"/> </target> + <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test"> + <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/> + </target> <target depends="init,compile" name="-debug-start-debuggee"> <j2seproject3:debug> <customize> @@ -564,7 +850,12 @@ <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> <j2seproject3:debug classname="${debug.class}"/> </target> - <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> + <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test"> + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> + <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/> + </target> + <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/> <target depends="init" name="-pre-debug-fix"> <fail unless="fix.includes">Must set fix.includes</fail> <property name="javac.includes" value="${fix.includes}.java"/> @@ -574,11 +865,77 @@ </target> <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> <!-- + ================= + PROFILING SECTION + ================= + --> + <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile"> + <nbprofiledirect> + <classpath> + <path path="${run.classpath}"/> + </classpath> + </nbprofiledirect> + <profile/> + </target> + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single"> + <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail> + <nbprofiledirect> + <classpath> + <path path="${run.classpath}"/> + </classpath> + </nbprofiledirect> + <profile classname="${profile.class}"/> + </target> + <!-- + ========================= + APPLET PROFILING SECTION + ========================= + --> + <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet"> + <nbprofiledirect> + <classpath> + <path path="${run.classpath}"/> + </classpath> + </nbprofiledirect> + <profile classname="sun.applet.AppletViewer"> + <customize> + <arg value="${applet.url}"/> + </customize> + </profile> + </target> + <!-- + ========================= + TESTS PROFILING SECTION + ========================= + --> + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single"> + <nbprofiledirect> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + </nbprofiledirect> + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> + <jvmarg value="${profiler.info.jvmargs.agent}"/> + <jvmarg line="${profiler.info.jvmargs}"/> + <test name="${profile.class}"/> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + </junit> + </target> + <!-- =============== JAVADOC SECTION =============== --> - <target depends="init" name="-javadoc-build"> + <target depends="init" if="have.sources" name="-javadoc-build"> <mkdir dir="${dist.javadoc.dir}"/> <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> <classpath> @@ -692,7 +1049,123 @@ <fileset dir="${vm.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> + <include name="**/*.java"/> + </fileset> </javadoc> + <copy todir="${dist.javadoc.dir}"> + <fileset dir="${src.template.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.emu3.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.core.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.emu2.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.apps.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.emu.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.install.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.fs.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test2.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.awt.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.desktop.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver2.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.font.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test3.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.thinlet.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver3.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.net.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test4.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.shell.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test5.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver4.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.sound.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test6.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.textui.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.driver5.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.nanoxml.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.mmtk-vm.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.vm.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.test7.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.vmmagic.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${configure.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${ext.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${vm.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> + <include name="**/doc-files/**"/> + </fileset> + </copy> </target> <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview"> <nbbrowse file="${dist.javadoc.dir}/index.html"/> @@ -713,8 +1186,8 @@ <target if="do.depend.true" name="-compile-test-depend"> <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/> </target> - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/> + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir=""/> <copy todir="${build.test.classes.dir}"/> </target> <target name="-post-compile-test"> @@ -726,10 +1199,10 @@ <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/> + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="" srcdir=""/> <copy todir="${build.test.classes.dir}"/> </target> <target name="-post-compile-test-single"> @@ -749,7 +1222,7 @@ <j2seproject3:junit testincludes="**/*Test.java"/> </target> <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> - <fail if="tests.failed">Some tests failed; see details above.</fail> + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> </target> <target depends="init" if="have.tests" name="test-report"/> <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/> @@ -762,9 +1235,9 @@ <j2seproject3:junit excludes="" includes="${test.includes}"/> </target> <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> - <fail if="tests.failed">Some tests failed; see details above.</fail> + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> </target> - <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> <!-- ======================= JUNIT DEBUGGING SECTION @@ -791,7 +1264,7 @@ <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> </target> - <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> + <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> </target> @@ -828,14 +1301,45 @@ CLEANUP SECTION =============== --> - <target depends="init" name="deps-clean" unless="no.deps"/> + <target name="-deps-clean-init" unless="built-clean.properties"> + <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/> + <delete file="${built-clean.properties}" quiet="true"/> + </target> + <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> + <echo level="warn" message="Cycle detected: JNode was already built"/> + </target> + <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> + <mkdir dir="${build.dir}"/> + <touch file="${built-clean.properties}" verbose="false"/> + <property file="${built-clean.properties}" prefix="already.built.clean."/> + <antcall target="-warn-already-built-clean"/> + <propertyfile file="${built-clean.properties}"> + <entry key="${basedir}" value=""/> + </propertyfile> + </target> <target depends="init" name="-do-clean"> <delete dir="${build.dir}"/> - <delete dir="${dist.dir}"/> + <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/> </target> <target name="-post-clean"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/> + <target name="-check-call-dep"> + <property file="${call.built.properties}" prefix="already.built."/> + <condition property="should.call.dep"> + <not> + <isset property="already.built.${call.subproject}"/> + </not> + </condition> + </target> + <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep"> + <ant antfile="${call.script}" inheritall="false" target="${call.target}"> + <propertyset> + <propertyref prefix="transfer."/> + <mapper from="transfer.*" to="*" type="glob"/> + </propertyset> + </ant> + </target> </project> Modified: trunk/netbeans/nbproject/genfiles.properties =================================================================== --- trunk/netbeans/nbproject/genfiles.properties 2011-06-05 09:14:28 UTC (rev 5813) +++ trunk/netbeans/nbproject/genfiles.properties 2011-06-05 09:20:29 UTC (rev 5814) @@ -1,8 +1,8 @@ nbbuild.xml.data.CRC32=30b364ec nbbuild.xml.script.CRC32=ce58936d -nbbuild.xml.stylesheet.CRC32=958a1d3e +nbbuild.xml.stylesheet.CRC32=28e38971@1.43.1.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=30b364ec -nbproject/build-impl.xml.script.CRC32=dccf72ee -nbproject/build-impl.xml.stylesheet.CRC32=65b8de21 +nbproject/build-impl.xml.script.CRC32=1159414b +nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 Modified: trunk/netbeans/nbproject/project.properties =================================================================== --- trunk/netbeans/nbproject/project.properties 2011-06-05 09:14:28 UTC (rev 5813) +++ trunk/netbeans/nbproject/project.properties 2011-06-05 09:20:29 UTC (rev 5814) @@ -5,6 +5,7 @@ # This directory is removed when the project is cleaned: build.dir=build build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources # Only compile against the classpath explicitly listed here: build.sysclasspath=ignore build.test.classes.dir=${build.dir}/test/classes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-05 09:14:34
|
Revision: 5813 http://jnode.svn.sourceforge.net/jnode/?rev=5813&view=rev Author: lsantha Date: 2011-06-05 09:14:28 +0000 (Sun, 05 Jun 2011) Log Message: ----------- Removing private netbeans project files. Removed Paths: ------------- trunk/netbeans/nbproject/private/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-06-05 08:59:29
|
Revision: 5812 http://jnode.svn.sourceforge.net/jnode/?rev=5812&view=rev Author: lsantha Date: 2011-06-05 08:59:23 +0000 (Sun, 05 Jun 2011) Log Message: ----------- Applied patch by Daniel Noll: "Infinite loop reading NTFS indexes if disk exhibits a certain kind of corruption. I found a situation where an IndexEntryIterator's offset will not be incremented each time next() is called, if the size of an entry is zero (presumably due to corruption.) Attached patch makes this condition fail faster with an ISE." Modified Paths: -------------- trunk/fs/src/fs/org/jnode/fs/ntfs/IndexEntryIterator.java Modified: trunk/fs/src/fs/org/jnode/fs/ntfs/IndexEntryIterator.java =================================================================== --- trunk/fs/src/fs/org/jnode/fs/ntfs/IndexEntryIterator.java 2011-04-28 18:43:05 UTC (rev 5811) +++ trunk/fs/src/fs/org/jnode/fs/ntfs/IndexEntryIterator.java 2011-06-05 08:59:23 UTC (rev 5812) @@ -64,7 +64,16 @@ throw new NoSuchElementException(); } else { final IndexEntry result = nextEntry; - final int size = nextEntry.getSize(); + final int size = nextEntry.getSize(); + + // Prevents an infinite loop. Seen on images where the size of the index entry has been zeroed out. + if (size <= 0) { + throw new IllegalStateException(String.format( + "Index entry size is 0, filesystem is corrupt. Parent directory: '%s', reference number '%d'", + nextEntry.getParentFileRecord().getFileName(), + nextEntry.getParentFileRecord().getReferenceNumber())); + } + offset += size; // Now read the next next entry readNext(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-04-28 18:43:11
|
Revision: 5811 http://jnode.svn.sourceforge.net/jnode/?rev=5811&view=rev Author: lsantha Date: 2011-04-28 18:43:05 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Added javadoc command. Modified Paths: -------------- trunk/core/descriptors/com.sun.tools.javac.xml Modified: trunk/core/descriptors/com.sun.tools.javac.xml =================================================================== --- trunk/core/descriptors/com.sun.tools.javac.xml 2011-04-27 06:50:39 UTC (rev 5810) +++ trunk/core/descriptors/com.sun.tools.javac.xml 2011-04-28 18:43:05 UTC (rev 5811) @@ -46,12 +46,27 @@ <export name="com.sun.tools.javac.tree.*"/> <export name="com.sun.tools.javac.util.*"/> <export name="com.sun.tools.javac.zip.*"/> + <export name="com.sun.javadoc.*"/> + <export name="com.sun.tools.doclets.*"/> + <export name="com.sun.tools.doclets.formats.html.*"/> + <export name="com.sun.tools.doclets.formats.html.markup.*"/> + <export name="com.sun.tools.doclets.formats.html.resources.*"/> + <export name="com.sun.tools.doclets.internal.toolkit.*"/> + <export name="com.sun.tools.doclets.internal.toolkit.builders.*"/> + <export name="com.sun.tools.doclets.internal.toolkit.resources.*"/> + <export name="com.sun.tools.doclets.internal.toolkit.taglets.*"/> + <export name="com.sun.tools.doclets.internal.toolkit.util.*"/> + <export name="com.sun.tools.doclets.internal.toolkit.util.links.*"/> + <export name="com.sun.tools.doclets.standard.*"/> + <export name="com.sun.tools.javadoc.*"/> + <export name="com.sun.tools.javadoc.resources.*"/> </library> </runtime> <extension point="org.jnode.shell.aliases"> + <alias name="apt" class="com.sun.tools.apt.Main"/> <alias name="javac" class="com.sun.tools.javac.Main"/> - <alias name="apt" class="com.sun.tools.apt.Main"/> + <alias name="javadoc" class="com.sun.tools.javadoc.Main"/> </extension> <extension point="org.jnode.security.permissions"> @@ -59,8 +74,9 @@ <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> <permission class="java.util.PropertyPermission" name="<<ALL FILES>>" actions="read,write"/> <permission class="java.util.PropertyPermission" name="*" actions="read"/> + <permission class="java.util.PropertyPermission" name="user.language" actions="write"/> + <permission class="java.lang.RuntimePermission" name="accessDeclaredMembers"/> - <permission class="java.lang.RuntimePermission" name="getProtectionDomain"/> <permission class="java.lang.RuntimePermission" name="createClassLoader"/> <permission class="java.lang.RuntimePermission" name="setContextClassLoader"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-04-27 06:50:45
|
Revision: 5810 http://jnode.svn.sourceforge.net/jnode/?rev=5810&view=rev Author: lsantha Date: 2011-04-27 06:50:39 +0000 (Wed, 27 Apr 2011) Log Message: ----------- Fixed 'edit' command invocation. Modified Paths: -------------- trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java Modified: trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java =================================================================== --- trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java 2011-04-27 06:49:49 UTC (rev 5809) +++ trunk/distr/src/apps/org/jnode/apps/edit/EditCommand.java 2011-04-27 06:50:39 UTC (rev 5810) @@ -32,7 +32,7 @@ public class EditCommand extends AbstractCommand { private final FileArgument ARG_EDIT = new FileArgument("file", Argument.OPTIONAL, "the file to edit"); - EditCommand() { + public EditCommand() { super("edit a file"); registerArguments(ARG_EDIT); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-04-27 06:49:55
|
Revision: 5809 http://jnode.svn.sourceforge.net/jnode/?rev=5809&view=rev Author: lsantha Date: 2011-04-27 06:49:49 +0000 (Wed, 27 Apr 2011) Log Message: ----------- Improved support for java.lang.Package. Modified Paths: -------------- trunk/core/src/openjdk/vm/java/lang/NativePackage.java Modified: trunk/core/src/openjdk/vm/java/lang/NativePackage.java =================================================================== --- trunk/core/src/openjdk/vm/java/lang/NativePackage.java 2011-03-06 21:00:15 UTC (rev 5808) +++ trunk/core/src/openjdk/vm/java/lang/NativePackage.java 2011-04-27 06:49:49 UTC (rev 5809) @@ -26,10 +26,10 @@ class NativePackage { private static String getSystemPackage0(String name) { //todo implement it - throw new UnsupportedOperationException(); + return ""; } private static String[] getSystemPackages0() { //todo implement it - throw new UnsupportedOperationException(); + return new String[0]; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-03-06 21:00:22
|
Revision: 5808 http://jnode.svn.sourceforge.net/jnode/?rev=5808&view=rev Author: lsantha Date: 2011-03-06 21:00:15 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Following up class library changes. Modified Paths: -------------- trunk/all/conf/core-classes.txt trunk/core/descriptors/org.classpath.core.xml Modified: trunk/all/conf/core-classes.txt =================================================================== --- trunk/all/conf/core-classes.txt 2011-03-06 20:51:14 UTC (rev 5807) +++ trunk/all/conf/core-classes.txt 2011-03-06 21:00:15 UTC (rev 5808) @@ -116,6 +116,7 @@ //sun.reflect.generics.visitor //sun.reflect.misc sun.misc.VM +sun.net.ApplicationProxy sun.nio sun.nio.cs.US_ASCII sun.nio.cs.ISO_8859_1* Modified: trunk/core/descriptors/org.classpath.core.xml =================================================================== --- trunk/core/descriptors/org.classpath.core.xml 2011-03-06 20:51:14 UTC (rev 5807) +++ trunk/core/descriptors/org.classpath.core.xml 2011-03-06 21:00:15 UTC (rev 5808) @@ -53,6 +53,7 @@ <export name="sun.misc.ServiceConfigurationError"/> <export name="sun.misc.VM"/> + <export name="sun.net.ApplicationProxy*"/> <export name="sun.nio.cs.*"/> <export name="sun.text.*"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-03-06 20:51:24
|
Revision: 5807 http://jnode.svn.sourceforge.net/jnode/?rev=5807&view=rev Author: lsantha Date: 2011-03-06 20:51:14 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/java/java/lang/AbstractMethodError.java classlib6/core/src/openjdk/java/java/lang/AbstractStringBuilder.java classlib6/core/src/openjdk/java/java/lang/Appendable.java classlib6/core/src/openjdk/java/java/lang/ArithmeticException.java classlib6/core/src/openjdk/java/java/lang/ArrayIndexOutOfBoundsException.java classlib6/core/src/openjdk/java/java/lang/ArrayStoreException.java classlib6/core/src/openjdk/java/java/lang/AssertionError.java classlib6/core/src/openjdk/java/java/lang/AssertionStatusDirectives.java classlib6/core/src/openjdk/java/java/lang/Boolean.java classlib6/core/src/openjdk/java/java/lang/Byte.java classlib6/core/src/openjdk/java/java/lang/CharSequence.java classlib6/core/src/openjdk/java/java/lang/Character.java classlib6/core/src/openjdk/java/java/lang/CharacterData.java classlib6/core/src/openjdk/java/java/lang/Class.java classlib6/core/src/openjdk/java/java/lang/ClassCastException.java classlib6/core/src/openjdk/java/java/lang/ClassFormatError.java classlib6/core/src/openjdk/java/java/lang/ClassNotFoundException.java classlib6/core/src/openjdk/java/java/lang/CloneNotSupportedException.java classlib6/core/src/openjdk/java/java/lang/Cloneable.java classlib6/core/src/openjdk/java/java/lang/Comparable.java classlib6/core/src/openjdk/java/java/lang/ConditionalSpecialCasing.java classlib6/core/src/openjdk/java/java/lang/Deprecated.java classlib6/core/src/openjdk/java/java/lang/Double.java classlib6/core/src/openjdk/java/java/lang/Enum.java classlib6/core/src/openjdk/java/java/lang/EnumConstantNotPresentException.java classlib6/core/src/openjdk/java/java/lang/Error.java classlib6/core/src/openjdk/java/java/lang/Exception.java classlib6/core/src/openjdk/java/java/lang/ExceptionInInitializerError.java classlib6/core/src/openjdk/java/java/lang/Float.java classlib6/core/src/openjdk/java/java/lang/IllegalAccessError.java classlib6/core/src/openjdk/java/java/lang/IllegalAccessException.java classlib6/core/src/openjdk/java/java/lang/IllegalArgumentException.java classlib6/core/src/openjdk/java/java/lang/IllegalMonitorStateException.java classlib6/core/src/openjdk/java/java/lang/IllegalStateException.java classlib6/core/src/openjdk/java/java/lang/IllegalThreadStateException.java classlib6/core/src/openjdk/java/java/lang/IncompatibleClassChangeError.java classlib6/core/src/openjdk/java/java/lang/IndexOutOfBoundsException.java classlib6/core/src/openjdk/java/java/lang/InheritableThreadLocal.java classlib6/core/src/openjdk/java/java/lang/InstantiationError.java classlib6/core/src/openjdk/java/java/lang/InstantiationException.java classlib6/core/src/openjdk/java/java/lang/Integer.java classlib6/core/src/openjdk/java/java/lang/InternalError.java classlib6/core/src/openjdk/java/java/lang/InterruptedException.java classlib6/core/src/openjdk/java/java/lang/Iterable.java classlib6/core/src/openjdk/java/java/lang/LinkageError.java classlib6/core/src/openjdk/java/java/lang/Long.java classlib6/core/src/openjdk/java/java/lang/Math.java classlib6/core/src/openjdk/java/java/lang/NegativeArraySizeException.java classlib6/core/src/openjdk/java/java/lang/NoClassDefFoundError.java classlib6/core/src/openjdk/java/java/lang/NoSuchFieldError.java classlib6/core/src/openjdk/java/java/lang/NoSuchFieldException.java classlib6/core/src/openjdk/java/java/lang/NoSuchMethodError.java classlib6/core/src/openjdk/java/java/lang/NoSuchMethodException.java classlib6/core/src/openjdk/java/java/lang/NullPointerException.java classlib6/core/src/openjdk/java/java/lang/Number.java classlib6/core/src/openjdk/java/java/lang/NumberFormatException.java classlib6/core/src/openjdk/java/java/lang/Object.java classlib6/core/src/openjdk/java/java/lang/OutOfMemoryError.java classlib6/core/src/openjdk/java/java/lang/Override.java classlib6/core/src/openjdk/java/java/lang/Package.java classlib6/core/src/openjdk/java/java/lang/ProcessBuilder.java classlib6/core/src/openjdk/java/java/lang/Readable.java classlib6/core/src/openjdk/java/java/lang/Runnable.java classlib6/core/src/openjdk/java/java/lang/RuntimeException.java classlib6/core/src/openjdk/java/java/lang/RuntimePermission.java classlib6/core/src/openjdk/java/java/lang/SecurityException.java classlib6/core/src/openjdk/java/java/lang/Short.java classlib6/core/src/openjdk/java/java/lang/Shutdown.java classlib6/core/src/openjdk/java/java/lang/StackOverflowError.java classlib6/core/src/openjdk/java/java/lang/StackTraceElement.java classlib6/core/src/openjdk/java/java/lang/StrictMath.java classlib6/core/src/openjdk/java/java/lang/String.java classlib6/core/src/openjdk/java/java/lang/StringBuffer.java classlib6/core/src/openjdk/java/java/lang/StringBuilder.java classlib6/core/src/openjdk/java/java/lang/StringCoding.java classlib6/core/src/openjdk/java/java/lang/StringIndexOutOfBoundsException.java classlib6/core/src/openjdk/java/java/lang/SuppressWarnings.java classlib6/core/src/openjdk/java/java/lang/System.java classlib6/core/src/openjdk/java/java/lang/ThreadGroup.java classlib6/core/src/openjdk/java/java/lang/ThreadLocal.java classlib6/core/src/openjdk/java/java/lang/Throwable.java classlib6/core/src/openjdk/java/java/lang/TypeNotPresentException.java classlib6/core/src/openjdk/java/java/lang/UnknownError.java classlib6/core/src/openjdk/java/java/lang/UnsatisfiedLinkError.java classlib6/core/src/openjdk/java/java/lang/UnsupportedClassVersionError.java classlib6/core/src/openjdk/java/java/lang/UnsupportedOperationException.java classlib6/core/src/openjdk/java/java/lang/VerifyError.java classlib6/core/src/openjdk/java/java/lang/VirtualMachineError.java classlib6/core/src/openjdk/java/java/lang/Void.java classlib6/core/src/openjdk/java/java/lang/package-info.java classlib6/core/src/openjdk/java/java/lang/reflect/AccessibleObject.java classlib6/core/src/openjdk/java/java/lang/reflect/AnnotatedElement.java classlib6/core/src/openjdk/java/java/lang/reflect/Array.java classlib6/core/src/openjdk/java/java/lang/reflect/Constructor.java classlib6/core/src/openjdk/java/java/lang/reflect/Field.java classlib6/core/src/openjdk/java/java/lang/reflect/GenericArrayType.java classlib6/core/src/openjdk/java/java/lang/reflect/GenericDeclaration.java classlib6/core/src/openjdk/java/java/lang/reflect/GenericSignatureFormatError.java classlib6/core/src/openjdk/java/java/lang/reflect/InvocationHandler.java classlib6/core/src/openjdk/java/java/lang/reflect/InvocationTargetException.java classlib6/core/src/openjdk/java/java/lang/reflect/MalformedParameterizedTypeException.java classlib6/core/src/openjdk/java/java/lang/reflect/Member.java classlib6/core/src/openjdk/java/java/lang/reflect/Method.java classlib6/core/src/openjdk/java/java/lang/reflect/Modifier.java classlib6/core/src/openjdk/java/java/lang/reflect/ParameterizedType.java classlib6/core/src/openjdk/java/java/lang/reflect/Proxy.java classlib6/core/src/openjdk/java/java/lang/reflect/ReflectAccess.java classlib6/core/src/openjdk/java/java/lang/reflect/ReflectPermission.java classlib6/core/src/openjdk/java/java/lang/reflect/Type.java classlib6/core/src/openjdk/java/java/lang/reflect/TypeVariable.java classlib6/core/src/openjdk/java/java/lang/reflect/UndeclaredThrowableException.java classlib6/core/src/openjdk/java/java/lang/reflect/WildcardType.java classlib6/core/src/openjdk/java/java/lang/reflect/package-info.java classlib6/core/src/openjdk/java/java/net/AbstractPlainDatagramSocketImpl.java classlib6/core/src/openjdk/java/java/net/AbstractPlainSocketImpl.java classlib6/core/src/openjdk/java/java/net/Authenticator.java classlib6/core/src/openjdk/java/java/net/BindException.java classlib6/core/src/openjdk/java/java/net/CacheRequest.java classlib6/core/src/openjdk/java/java/net/CacheResponse.java classlib6/core/src/openjdk/java/java/net/ConnectException.java classlib6/core/src/openjdk/java/java/net/ContentHandlerFactory.java classlib6/core/src/openjdk/java/java/net/CookieHandler.java classlib6/core/src/openjdk/java/java/net/DatagramSocket.java classlib6/core/src/openjdk/java/java/net/DatagramSocketImpl.java classlib6/core/src/openjdk/java/java/net/DatagramSocketImplFactory.java classlib6/core/src/openjdk/java/java/net/FileNameMap.java classlib6/core/src/openjdk/java/java/net/HttpRetryException.java classlib6/core/src/openjdk/java/java/net/HttpURLConnection.java classlib6/core/src/openjdk/java/java/net/Inet4Address.java classlib6/core/src/openjdk/java/java/net/Inet4AddressImpl.java classlib6/core/src/openjdk/java/java/net/Inet6Address.java classlib6/core/src/openjdk/java/java/net/Inet6AddressImpl.java classlib6/core/src/openjdk/java/java/net/InetAddress.java classlib6/core/src/openjdk/java/java/net/InetAddressImpl.java classlib6/core/src/openjdk/java/java/net/InetSocketAddress.java classlib6/core/src/openjdk/java/java/net/JarURLConnection.java classlib6/core/src/openjdk/java/java/net/MalformedURLException.java classlib6/core/src/openjdk/java/java/net/MulticastSocket.java classlib6/core/src/openjdk/java/java/net/NetPermission.java classlib6/core/src/openjdk/java/java/net/NetworkInterface.java classlib6/core/src/openjdk/java/java/net/NoRouteToHostException.java classlib6/core/src/openjdk/java/java/net/PasswordAuthentication.java classlib6/core/src/openjdk/java/java/net/PortUnreachableException.java classlib6/core/src/openjdk/java/java/net/ProtocolException.java classlib6/core/src/openjdk/java/java/net/Proxy.java classlib6/core/src/openjdk/java/java/net/ProxySelector.java classlib6/core/src/openjdk/java/java/net/ResponseCache.java classlib6/core/src/openjdk/java/java/net/SecureCacheResponse.java classlib6/core/src/openjdk/java/java/net/Socket.java classlib6/core/src/openjdk/java/java/net/SocketAddress.java classlib6/core/src/openjdk/java/java/net/SocketImplFactory.java classlib6/core/src/openjdk/java/java/net/SocketOptions.java classlib6/core/src/openjdk/java/java/net/SocketPermission.java classlib6/core/src/openjdk/java/java/net/SocketTimeoutException.java classlib6/core/src/openjdk/java/java/net/SocksConsts.java classlib6/core/src/openjdk/java/java/net/SocksSocketImpl.java classlib6/core/src/openjdk/java/java/net/URI.java classlib6/core/src/openjdk/java/java/net/URISyntaxException.java classlib6/core/src/openjdk/java/java/net/URL.java classlib6/core/src/openjdk/java/java/net/URLClassLoader.java classlib6/core/src/openjdk/java/java/net/URLDecoder.java classlib6/core/src/openjdk/java/java/net/URLStreamHandlerFactory.java classlib6/core/src/openjdk/java/java/net/UnknownHostException.java classlib6/core/src/openjdk/java/java/net/UnknownServiceException.java classlib6/core/src/openjdk/java/java/net/package.html Added Paths: ----------- classlib6/core/src/openjdk/sun/sun/net/ApplicationProxy.java classlib6/core/src/openjdk/sun/sun/net/ResourceManager.java Modified: classlib6/core/src/openjdk/java/java/lang/AbstractMethodError.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/AbstractMethodError.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/AbstractMethodError.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/AbstractStringBuilder.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/AbstractStringBuilder.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/AbstractStringBuilder.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Appendable.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Appendable.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Appendable.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ArithmeticException.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ArithmeticException.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ArithmeticException.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ArrayIndexOutOfBoundsException.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ArrayIndexOutOfBoundsException.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ArrayIndexOutOfBoundsException.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ArrayStoreException.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ArrayStoreException.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ArrayStoreException.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/AssertionError.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/AssertionError.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/AssertionError.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/AssertionStatusDirectives.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/AssertionStatusDirectives.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/AssertionStatusDirectives.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Boolean.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Boolean.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Boolean.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Byte.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Byte.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Byte.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/CharSequence.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/CharSequence.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/CharSequence.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -22,6 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Character.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Character.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Character.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2002, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/CharacterData.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/CharacterData.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/CharacterData.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Class.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Class.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Class.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ClassCastException.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ClassCastException.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ClassCastException.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ClassFormatError.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ClassFormatError.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ClassFormatError.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ClassNotFoundException.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ClassNotFoundException.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ClassNotFoundException.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/CloneNotSupportedException.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/CloneNotSupportedException.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/CloneNotSupportedException.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Cloneable.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Cloneable.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Cloneable.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Comparable.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Comparable.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Comparable.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ConditionalSpecialCasing.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ConditionalSpecialCasing.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ConditionalSpecialCasing.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Deprecated.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Deprecated.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Deprecated.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Double.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Double.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Double.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Enum.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Enum.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Enum.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/EnumConstantNotPresentException.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/EnumConstantNotPresentException.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/EnumConstantNotPresentException.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Error.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Error.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Error.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2000 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 2000, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Exception.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Exception.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Exception.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2000 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2000, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/ExceptionInInitializerError.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/ExceptionInInitializerError.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/ExceptionInInitializerError.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2000 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2000, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.lang; Modified: classlib6/core/src/openjdk/java/java/lang/Float.java =================================================================== --- classlib6/core/src/openjdk/java/java/lang/Float.java 2011-03-06 19:17:58 UTC (rev 5806) +++ classlib6/core/src/openjdk/java/java/lang/Float.java 2011-03-06 20:51:14 UTC (rev 5807) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free... [truncated message content] |
From: <ls...@us...> - 2011-03-06 19:18:08
|
Revision: 5806 http://jnode.svn.sourceforge.net/jnode/?rev=5806&view=rev Author: lsantha Date: 2011-03-06 19:17:58 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/java/java/io/Bits.java classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java classlib6/core/src/openjdk/java/java/io/BufferedReader.java classlib6/core/src/openjdk/java/java/io/BufferedWriter.java classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java classlib6/core/src/openjdk/java/java/io/CharArrayReader.java classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java classlib6/core/src/openjdk/java/java/io/CharConversionException.java classlib6/core/src/openjdk/java/java/io/Closeable.java classlib6/core/src/openjdk/java/java/io/DataInputStream.java classlib6/core/src/openjdk/java/java/io/DataOutputStream.java classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java classlib6/core/src/openjdk/java/java/io/EOFException.java classlib6/core/src/openjdk/java/java/io/ExpiringCache.java classlib6/core/src/openjdk/java/java/io/Externalizable.java classlib6/core/src/openjdk/java/java/io/File.java classlib6/core/src/openjdk/java/java/io/FileFilter.java classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java classlib6/core/src/openjdk/java/java/io/FileReader.java classlib6/core/src/openjdk/java/java/io/FileSystem.java classlib6/core/src/openjdk/java/java/io/FileWriter.java classlib6/core/src/openjdk/java/java/io/FilenameFilter.java classlib6/core/src/openjdk/java/java/io/FilterInputStream.java classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java classlib6/core/src/openjdk/java/java/io/FilterReader.java classlib6/core/src/openjdk/java/java/io/FilterWriter.java classlib6/core/src/openjdk/java/java/io/Flushable.java classlib6/core/src/openjdk/java/java/io/IOException.java classlib6/core/src/openjdk/java/java/io/InputStream.java classlib6/core/src/openjdk/java/java/io/InputStreamReader.java classlib6/core/src/openjdk/java/java/io/InterruptedIOException.java classlib6/core/src/openjdk/java/java/io/InvalidClassException.java classlib6/core/src/openjdk/java/java/io/InvalidObjectException.java classlib6/core/src/openjdk/java/java/io/LineNumberInputStream.java classlib6/core/src/openjdk/java/java/io/LineNumberReader.java classlib6/core/src/openjdk/java/java/io/NotActiveException.java classlib6/core/src/openjdk/java/java/io/NotSerializableException.java classlib6/core/src/openjdk/java/java/io/ObjectInput.java classlib6/core/src/openjdk/java/java/io/ObjectInputStream.java classlib6/core/src/openjdk/java/java/io/ObjectInputValidation.java classlib6/core/src/openjdk/java/java/io/ObjectOutput.java classlib6/core/src/openjdk/java/java/io/ObjectOutputStream.java classlib6/core/src/openjdk/java/java/io/ObjectStreamClass.java classlib6/core/src/openjdk/java/java/io/ObjectStreamConstants.java classlib6/core/src/openjdk/java/java/io/ObjectStreamException.java classlib6/core/src/openjdk/java/java/io/ObjectStreamField.java classlib6/core/src/openjdk/java/java/io/OptionalDataException.java classlib6/core/src/openjdk/java/java/io/OutputStream.java classlib6/core/src/openjdk/java/java/io/OutputStreamWriter.java classlib6/core/src/openjdk/java/java/io/PipedReader.java classlib6/core/src/openjdk/java/java/io/PipedWriter.java classlib6/core/src/openjdk/java/java/io/PrintStream.java classlib6/core/src/openjdk/java/java/io/PrintWriter.java classlib6/core/src/openjdk/java/java/io/PushbackInputStream.java classlib6/core/src/openjdk/java/java/io/PushbackReader.java classlib6/core/src/openjdk/java/java/io/Reader.java classlib6/core/src/openjdk/java/java/io/SequenceInputStream.java classlib6/core/src/openjdk/java/java/io/Serializable.java classlib6/core/src/openjdk/java/java/io/SerializablePermission.java classlib6/core/src/openjdk/java/java/io/StreamCorruptedException.java classlib6/core/src/openjdk/java/java/io/StreamTokenizer.java classlib6/core/src/openjdk/java/java/io/StringBufferInputStream.java classlib6/core/src/openjdk/java/java/io/StringReader.java classlib6/core/src/openjdk/java/java/io/StringWriter.java classlib6/core/src/openjdk/java/java/io/SyncFailedException.java classlib6/core/src/openjdk/java/java/io/UTFDataFormatException.java classlib6/core/src/openjdk/java/java/io/UnsupportedEncodingException.java classlib6/core/src/openjdk/java/java/io/WriteAbortedException.java classlib6/core/src/openjdk/java/java/io/Writer.java classlib6/core/src/openjdk/java/java/io/package.html Added Paths: ----------- classlib6/core/src/openjdk/java/java/io/SerialCallbackContext.java Modified: classlib6/core/src/openjdk/java/java/io/Bits.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/Bits.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/Bits.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/BufferedInputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,13 +18,12 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; -import java.security.PrivilegedAction; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; /** @@ -66,24 +65,11 @@ * of buf[] as primary indicator that this stream is closed. (The * "in" field is also nulled out on close.) */ - private static final AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> bufUpdater; + private static final + AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> bufUpdater = + AtomicReferenceFieldUpdater.newUpdater + (BufferedInputStream.class, byte[].class, "buf"); - //jnode - //todo: should be cleaned up (possible reason: bug in jnode security subsystem) - static { - bufUpdater = java.security.AccessController.doPrivileged( - new PrivilegedAction<AtomicReferenceFieldUpdater<BufferedInputStream, byte[]>>() { - @Override - public AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> run() { - return createUpdater(); - } - }); - } - - private static final AtomicReferenceFieldUpdater<BufferedInputStream, byte[]> createUpdater() { - return AtomicReferenceFieldUpdater.newUpdater(BufferedInputStream.class, byte[].class, "buf"); - } - /** * The index one greater than the index of the last valid byte in * the buffer. Modified: classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/BufferedOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/BufferedReader.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/BufferedReader.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/BufferedReader.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/BufferedWriter.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/BufferedWriter.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/BufferedWriter.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/ByteArrayInputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/ByteArrayOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/CharArrayReader.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/CharArrayReader.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/CharArrayReader.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/CharArrayWriter.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/CharConversionException.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/CharConversionException.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/CharConversionException.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 1999, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/Closeable.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/Closeable.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/Closeable.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/DataInputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/DataInputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/DataInputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/DataOutputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/DataOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/DataOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/DeleteOnExitHook.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2005, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/EOFException.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/EOFException.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/EOFException.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2000 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 2000, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/ExpiringCache.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/ExpiringCache.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/ExpiringCache.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2002, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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. */ Modified: classlib6/core/src/openjdk/java/java/io/Externalizable.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/Externalizable.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/Externalizable.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/File.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/File.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/File.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; @@ -32,9 +32,9 @@ import java.util.ArrayList; import java.util.Map; import java.util.Hashtable; -import java.util.Random; import java.security.AccessController; import java.security.AccessControlException; +import java.security.SecureRandom; import sun.security.action.GetPropertyAction; @@ -1676,28 +1676,28 @@ /* -- Temporary files -- */ - private static final Object tmpFileLock = new Object(); + // lazy initialization of SecureRandom and temporary file directory + private static class LazyInitialization { + static final SecureRandom random = new SecureRandom(); - private static int counter = -1; /* Protected by tmpFileLock */ + static final String temporaryDirectory = temporaryDirectory(); + static String temporaryDirectory() { + return fs.normalize( + AccessController.doPrivileged( + new GetPropertyAction("java.io.tmpdir"))); + } + } private static File generateFile(String prefix, String suffix, File dir) throws IOException { - if (counter == -1) { - counter = new Random().nextInt() & 0xffff; - } - counter++; - return new File(dir, prefix + Integer.toString(counter) + suffix); + long n = LazyInitialization.random.nextLong(); + if (n == Long.MIN_VALUE) { + n = 0; // corner case + } else { + n = Math.abs(n); } - - private static String tmpdir; /* Protected by tmpFileLock */ - - private static String getTempDir() { - if (tmpdir == null) - tmpdir = fs.normalize( - AccessController.doPrivileged( - new GetPropertyAction("java.io.tmpdir"))); - return tmpdir; + return new File(dir, prefix + Long.toString(n) + suffix); } private static boolean checkAndCreate(String filename, SecurityManager sm) @@ -1793,9 +1793,8 @@ if (prefix.length() < 3) throw new IllegalArgumentException("Prefix string too short"); String s = (suffix == null) ? ".tmp" : suffix; - synchronized (tmpFileLock) { if (directory == null) { - String tmpDir = getTempDir(); + String tmpDir = LazyInitialization.temporaryDirectory(); directory = new File(tmpDir, fs.prefixLength(tmpDir)); } SecurityManager sm = System.getSecurityManager(); @@ -1805,7 +1804,6 @@ } while (!checkAndCreate(f.getPath(), sm)); return f; } - } /** * Creates an empty file in the default temporary-file directory, using @@ -1938,11 +1936,12 @@ private synchronized void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException { - s.defaultReadObject(); + ObjectInputStream.GetField fields = s.readFields(); + String pathField = (String)fields.get("path", null); char sep = s.readChar(); // read the previous separator char if (sep != separatorChar) - this.path = this.path.replace(sep, separatorChar); - this.path = fs.normalize(this.path); + pathField = pathField.replace(sep, separatorChar); + this.path = fs.normalize(pathField); this.prefixLength = fs.prefixLength(this.path); } Modified: classlib6/core/src/openjdk/java/java/io/FileFilter.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FileFilter.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FileFilter.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FileNotFoundException.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 1999, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FileReader.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FileReader.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FileReader.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2001 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2001, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FileSystem.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FileSystem.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FileSystem.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FileWriter.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FileWriter.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FileWriter.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2001 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2001, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FilenameFilter.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FilenameFilter.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FilenameFilter.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-1998 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FilterInputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FilterInputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FilterInputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FilterOutputStream.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 1999, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FilterReader.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FilterReader.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FilterReader.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/FilterWriter.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/FilterWriter.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/FilterWriter.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/Flushable.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/Flushable.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/Flushable.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.io; Modified: classlib6/core/src/openjdk/java/java/io/IOException.java =================================================================== --- classlib6/core/src/openjdk/java/java/io/IOException.java 2011-03-06 18:55:51 UTC (rev 5805) +++ classlib6/core/src/openjdk/java/java/io/IOException.java 2011-03-06 19:17:58 UTC (rev 5806) @@ -1,12 +1,12 @@ /* - * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. *... [truncated message content] |
From: <ls...@us...> - 2011-03-06 18:56:01
|
Revision: 5805 http://jnode.svn.sourceforge.net/jnode/?rev=5805&view=rev Author: lsantha Date: 2011-03-06 18:55:51 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/java/java/awt/AWTError.java classlib6/core/src/openjdk/java/java/awt/AWTEvent.java classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java classlib6/core/src/openjdk/java/java/awt/AWTException.java classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java classlib6/core/src/openjdk/java/java/awt/AWTPermission.java classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java classlib6/core/src/openjdk/java/java/awt/Adjustable.java classlib6/core/src/openjdk/java/java/awt/AttributeValue.java classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java classlib6/core/src/openjdk/java/java/awt/Color.java classlib6/core/src/openjdk/java/java/awt/Component.java classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java classlib6/core/src/openjdk/java/java/awt/Composite.java classlib6/core/src/openjdk/java/java/awt/CompositeContext.java classlib6/core/src/openjdk/java/java/awt/Conditional.java classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java classlib6/core/src/openjdk/java/java/awt/DisplayMode.java classlib6/core/src/openjdk/java/java/awt/Event.java classlib6/core/src/openjdk/java/java/awt/EventDispatchThread.java classlib6/core/src/openjdk/java/java/awt/EventQueue.java classlib6/core/src/openjdk/java/java/awt/FocusTraversalPolicy.java classlib6/core/src/openjdk/java/java/awt/FontFormatException.java classlib6/core/src/openjdk/java/java/awt/FontMetrics.java classlib6/core/src/openjdk/java/java/awt/GradientPaint.java classlib6/core/src/openjdk/java/java/awt/GradientPaintContext.java classlib6/core/src/openjdk/java/java/awt/Graphics2D.java classlib6/core/src/openjdk/java/java/awt/GraphicsCallback.java classlib6/core/src/openjdk/java/java/awt/GraphicsConfigTemplate.java classlib6/core/src/openjdk/java/java/awt/GraphicsConfiguration.java classlib6/core/src/openjdk/java/java/awt/GraphicsDevice.java classlib6/core/src/openjdk/java/java/awt/GraphicsEnvironment.java classlib6/core/src/openjdk/java/java/awt/GridBagLayoutInfo.java classlib6/core/src/openjdk/java/java/awt/HeadlessException.java classlib6/core/src/openjdk/java/java/awt/IllegalComponentStateException.java classlib6/core/src/openjdk/java/java/awt/ImageCapabilities.java classlib6/core/src/openjdk/java/java/awt/Insets.java classlib6/core/src/openjdk/java/java/awt/ItemSelectable.java classlib6/core/src/openjdk/java/java/awt/JobAttributes.java classlib6/core/src/openjdk/java/java/awt/KeyEventDispatcher.java classlib6/core/src/openjdk/java/java/awt/KeyEventPostProcessor.java classlib6/core/src/openjdk/java/java/awt/KeyboardFocusManager.java classlib6/core/src/openjdk/java/java/awt/LayoutManager.java classlib6/core/src/openjdk/java/java/awt/LayoutManager2.java classlib6/core/src/openjdk/java/java/awt/LinearGradientPaint.java classlib6/core/src/openjdk/java/java/awt/LinearGradientPaintContext.java classlib6/core/src/openjdk/java/java/awt/MenuComponent.java classlib6/core/src/openjdk/java/java/awt/MenuContainer.java classlib6/core/src/openjdk/java/java/awt/MenuShortcut.java classlib6/core/src/openjdk/java/java/awt/MouseInfo.java classlib6/core/src/openjdk/java/java/awt/MultipleGradientPaint.java classlib6/core/src/openjdk/java/java/awt/MultipleGradientPaintContext.java classlib6/core/src/openjdk/java/java/awt/PageAttributes.java classlib6/core/src/openjdk/java/java/awt/Paint.java classlib6/core/src/openjdk/java/java/awt/PaintContext.java classlib6/core/src/openjdk/java/java/awt/PointerInfo.java classlib6/core/src/openjdk/java/java/awt/PopupMenu.java classlib6/core/src/openjdk/java/java/awt/PrintGraphics.java classlib6/core/src/openjdk/java/java/awt/PrintJob.java classlib6/core/src/openjdk/java/java/awt/RadialGradientPaint.java classlib6/core/src/openjdk/java/java/awt/RadialGradientPaintContext.java classlib6/core/src/openjdk/java/java/awt/RenderingHints.java classlib6/core/src/openjdk/java/java/awt/ScrollPane.java classlib6/core/src/openjdk/java/java/awt/ScrollPaneAdjustable.java classlib6/core/src/openjdk/java/java/awt/SentEvent.java classlib6/core/src/openjdk/java/java/awt/SequencedEvent.java classlib6/core/src/openjdk/java/java/awt/Shape.java classlib6/core/src/openjdk/java/java/awt/SplashScreen.java classlib6/core/src/openjdk/java/java/awt/Stroke.java classlib6/core/src/openjdk/java/java/awt/SystemColor.java classlib6/core/src/openjdk/java/java/awt/SystemTray.java classlib6/core/src/openjdk/java/java/awt/Transparency.java classlib6/core/src/openjdk/java/java/awt/TrayIcon.java classlib6/core/src/openjdk/java/java/awt/package.html classlib6/core/src/openjdk/sun/sun/applet/AppletAudioClip.java classlib6/core/src/openjdk/sun/sun/applet/AppletClassLoader.java classlib6/core/src/openjdk/sun/sun/applet/AppletEvent.java classlib6/core/src/openjdk/sun/sun/applet/AppletEventMulticaster.java classlib6/core/src/openjdk/sun/sun/applet/AppletIOException.java classlib6/core/src/openjdk/sun/sun/applet/AppletIllegalArgumentException.java classlib6/core/src/openjdk/sun/sun/applet/AppletImageRef.java classlib6/core/src/openjdk/sun/sun/applet/AppletListener.java classlib6/core/src/openjdk/sun/sun/applet/AppletMessageHandler.java classlib6/core/src/openjdk/sun/sun/applet/AppletObjectInputStream.java classlib6/core/src/openjdk/sun/sun/applet/AppletProps.java classlib6/core/src/openjdk/sun/sun/applet/AppletResourceLoader.java classlib6/core/src/openjdk/sun/sun/applet/AppletSecurityException.java classlib6/core/src/openjdk/sun/sun/applet/AppletThreadGroup.java classlib6/core/src/openjdk/sun/sun/applet/AppletViewer.java classlib6/core/src/openjdk/sun/sun/applet/AppletViewerFactory.java classlib6/core/src/openjdk/sun/sun/applet/AppletViewerPanel.java classlib6/core/src/openjdk/sun/sun/applet/Main.java classlib6/core/src/openjdk/sun/sun/awt/AWTAutoShutdown.java classlib6/core/src/openjdk/sun/sun/awt/AWTSecurityManager.java classlib6/core/src/openjdk/sun/sun/awt/AppContext.java classlib6/core/src/openjdk/sun/sun/awt/CausedFocusEvent.java classlib6/core/src/openjdk/sun/sun/awt/CharsetString.java classlib6/core/src/openjdk/sun/sun/awt/ComponentAccessor.java classlib6/core/src/openjdk/sun/sun/awt/ComponentFactory.java classlib6/core/src/openjdk/sun/sun/awt/ConstrainableGraphics.java classlib6/core/src/openjdk/sun/sun/awt/CustomCursor.java classlib6/core/src/openjdk/sun/sun/awt/DebugSettings.java classlib6/core/src/openjdk/sun/sun/awt/DefaultMouseInfoPeer.java classlib6/core/src/openjdk/sun/sun/awt/DesktopBrowse.java classlib6/core/src/openjdk/sun/sun/awt/DisplayChangedListener.java classlib6/core/src/openjdk/sun/sun/awt/EmbeddedFrame.java classlib6/core/src/openjdk/sun/sun/awt/EventListenerAggregate.java classlib6/core/src/openjdk/sun/sun/awt/FocusingTextField.java classlib6/core/src/openjdk/sun/sun/awt/FontConfiguration.java classlib6/core/src/openjdk/sun/sun/awt/FontDescriptor.java classlib6/core/src/openjdk/sun/sun/awt/GlobalCursorManager.java classlib6/core/src/openjdk/sun/sun/awt/Graphics2Delegate.java classlib6/core/src/openjdk/sun/sun/awt/HeadlessToolkit.java classlib6/core/src/openjdk/sun/sun/awt/InputMethodSupport.java classlib6/core/src/openjdk/sun/sun/awt/KeyboardFocusManagerPeerImpl.java classlib6/core/src/openjdk/sun/sun/awt/ModalExclude.java classlib6/core/src/openjdk/sun/sun/awt/ModalityEvent.java classlib6/core/src/openjdk/sun/sun/awt/ModalityListener.java classlib6/core/src/openjdk/sun/sun/awt/Mutex.java classlib6/core/src/openjdk/sun/sun/awt/NativeLibLoader.java classlib6/core/src/openjdk/sun/sun/awt/NullComponentPeer.java classlib6/core/src/openjdk/sun/sun/awt/OSInfo.java classlib6/core/src/openjdk/sun/sun/awt/OrientableFlowLayout.java classlib6/core/src/openjdk/sun/sun/awt/PeerEvent.java classlib6/core/src/openjdk/sun/sun/awt/PlatformFont.java classlib6/core/src/openjdk/sun/sun/awt/RepaintArea.java classlib6/core/src/openjdk/sun/sun/awt/RequestFocusController.java classlib6/core/src/openjdk/sun/sun/awt/ScrollPaneWheelScroller.java classlib6/core/src/openjdk/sun/sun/awt/SunDisplayChanger.java classlib6/core/src/openjdk/sun/sun/awt/SunGraphicsCallback.java classlib6/core/src/openjdk/sun/sun/awt/SunHints.java classlib6/core/src/openjdk/sun/sun/awt/Symbol.java classlib6/core/src/openjdk/sun/sun/awt/TracedEventQueue.java classlib6/core/src/openjdk/sun/sun/awt/VariableGridLayout.java classlib6/core/src/openjdk/sun/sun/awt/VerticalBagLayout.java classlib6/core/src/openjdk/sun/sun/awt/WindowAccessor.java classlib6/core/src/openjdk/sun/sun/awt/WindowClosingListener.java classlib6/core/src/openjdk/sun/sun/awt/WindowClosingSupport.java classlib6/core/src/openjdk/sun/sun/awt/WindowIDProvider.java classlib6/core/src/openjdk/sun/sun/font/AttributeMap.java classlib6/core/src/openjdk/sun/sun/font/AttributeValues.java classlib6/core/src/openjdk/sun/sun/font/BidiUtils.java classlib6/core/src/openjdk/sun/sun/font/CMap.java classlib6/core/src/openjdk/sun/sun/font/CharToGlyphMapper.java classlib6/core/src/openjdk/sun/sun/font/CompositeFont.java classlib6/core/src/openjdk/sun/sun/font/CompositeFontDescriptor.java classlib6/core/src/openjdk/sun/sun/font/CompositeGlyphMapper.java classlib6/core/src/openjdk/sun/sun/font/CompositeStrike.java classlib6/core/src/openjdk/sun/sun/font/CoreMetrics.java classlib6/core/src/openjdk/sun/sun/font/Decoration.java classlib6/core/src/openjdk/sun/sun/font/DelegatingShape.java classlib6/core/src/openjdk/sun/sun/font/EAttribute.java classlib6/core/src/openjdk/sun/sun/font/ExtendedTextLabel.java classlib6/core/src/openjdk/sun/sun/font/ExtendedTextSourceLabel.java classlib6/core/src/openjdk/sun/sun/font/FileFont.java classlib6/core/src/openjdk/sun/sun/font/FileFontStrike.java classlib6/core/src/openjdk/sun/sun/font/Font2D.java classlib6/core/src/openjdk/sun/sun/font/Font2DHandle.java classlib6/core/src/openjdk/sun/sun/font/FontDesignMetrics.java classlib6/core/src/openjdk/sun/sun/font/FontFamily.java classlib6/core/src/openjdk/sun/sun/font/FontLineMetrics.java classlib6/core/src/openjdk/sun/sun/font/FontManager.java classlib6/core/src/openjdk/sun/sun/font/FontManagerNativeLibrary.java classlib6/core/src/openjdk/sun/sun/font/FontResolver.java classlib6/core/src/openjdk/sun/sun/font/FontRunIterator.java classlib6/core/src/openjdk/sun/sun/font/FontScaler.java classlib6/core/src/openjdk/sun/sun/font/FontScalerException.java classlib6/core/src/openjdk/sun/sun/font/FontStrike.java classlib6/core/src/openjdk/sun/sun/font/FontStrikeDesc.java classlib6/core/src/openjdk/sun/sun/font/FontStrikeDisposer.java classlib6/core/src/openjdk/sun/sun/font/FreetypeFontScaler.java classlib6/core/src/openjdk/sun/sun/font/GlyphLayout.java classlib6/core/src/openjdk/sun/sun/font/GlyphList.java classlib6/core/src/openjdk/sun/sun/font/GraphicComponent.java classlib6/core/src/openjdk/sun/sun/font/NullFontScaler.java classlib6/core/src/openjdk/sun/sun/font/PhysicalFont.java classlib6/core/src/openjdk/sun/sun/font/PhysicalStrike.java classlib6/core/src/openjdk/sun/sun/font/Script.java classlib6/core/src/openjdk/sun/sun/font/ScriptRun.java classlib6/core/src/openjdk/sun/sun/font/ScriptRunData.java classlib6/core/src/openjdk/sun/sun/font/StandardGlyphVector.java classlib6/core/src/openjdk/sun/sun/font/StandardTextSource.java classlib6/core/src/openjdk/sun/sun/font/StrikeCache.java classlib6/core/src/openjdk/sun/sun/font/StrikeMetrics.java classlib6/core/src/openjdk/sun/sun/font/SunLayoutEngine.java classlib6/core/src/openjdk/sun/sun/font/TextLabel.java classlib6/core/src/openjdk/sun/sun/font/TextLabelFactory.java classlib6/core/src/openjdk/sun/sun/font/TextLineComponent.java classlib6/core/src/openjdk/sun/sun/font/TextRecord.java classlib6/core/src/openjdk/sun/sun/font/TextSource.java classlib6/core/src/openjdk/sun/sun/font/TextSourceLabel.java classlib6/core/src/openjdk/sun/sun/font/TrueTypeFont.java classlib6/core/src/openjdk/sun/sun/font/TrueTypeGlyphMapper.java classlib6/core/src/openjdk/sun/sun/font/Type1Font.java classlib6/core/src/openjdk/sun/sun/font/Type1GlyphMapper.java classlib6/core/src/openjdk/sun/sun/font/Underline.java classlib6/core/src/openjdk/sun/sun/java2d/DefaultDisposerRecord.java classlib6/core/src/openjdk/sun/sun/java2d/Disposer.java classlib6/core/src/openjdk/sun/sun/java2d/DisposerRecord.java classlib6/core/src/openjdk/sun/sun/java2d/DisposerTarget.java classlib6/core/src/openjdk/sun/sun/java2d/FontSupport.java classlib6/core/src/openjdk/sun/sun/java2d/HeadlessGraphicsEnvironment.java classlib6/core/src/openjdk/sun/sun/java2d/InvalidPipeException.java classlib6/core/src/openjdk/sun/sun/java2d/NullSurfaceData.java classlib6/core/src/openjdk/sun/sun/java2d/StateTrackable.java classlib6/core/src/openjdk/sun/sun/java2d/StateTrackableDelegate.java classlib6/core/src/openjdk/sun/sun/java2d/StateTracker.java classlib6/core/src/openjdk/sun/sun/java2d/SunCompositeContext.java classlib6/core/src/openjdk/sun/sun/java2d/SunGraphics2D.java classlib6/core/src/openjdk/sun/sun/java2d/SunGraphicsEnvironment.java classlib6/core/src/openjdk/sun/sun/java2d/SurfaceData.java classlib6/core/src/openjdk/sun/sun/java2d/SurfaceDataProxy.java Added Paths: ----------- classlib6/core/src/openjdk/sun/sun/font/CreatedFontTracker.java classlib6/core/src/openjdk/sun/sun/java2d/Spans.java Modified: classlib6/core/src/openjdk/java/java/awt/AWTError.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/AWTError.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/AWTError.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/AWTEvent.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/AWTEvent.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/AWTEvent.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; @@ -33,6 +33,12 @@ import java.util.logging.Logger; import java.util.logging.Level; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.io.ObjectInputStream; +import java.io.IOException; +import sun.awt.AWTAccessor; + /** * The root event class for all AWT events. * This class and its subclasses supercede the original @@ -97,10 +103,33 @@ */ protected boolean consumed = false; + /* + * The event's AccessControlContext. + */ + private transient volatile AccessControlContext acc = + AccessController.getContext(); + + /* + * Returns the acc this event was constructed with. + */ + final AccessControlContext getAccessControlContext() { + if (acc == null) { + throw new SecurityException("AWTEvent is missing AccessControlContext"); + } + return acc; + } + transient boolean focusManagerIsDispatching = false; transient boolean isPosted; /** + * Indicates whether this AWTEvent was generated by the system as + * opposed to by user code. + */ + private transient boolean isSystemGenerated; + + + /** * The event mask for selecting component events. */ public final static long COMPONENT_EVENT_MASK = 0x01; @@ -230,6 +259,19 @@ if (!GraphicsEnvironment.isHeadless()) { initIDs(); } + AWTAccessor.setAWTEventAccessor(new AWTAccessor.AWTEventAccessor() { + public void setSystemGenerated(AWTEvent ev) { + ev.isSystemGenerated = true; + } + + public boolean isSystemGenerated(AWTEvent ev) { + return ev.isSystemGenerated; + } + + public AccessControlContext getAccessControlContext(AWTEvent ev) { + return ev.getAccessControlContext(); + } + }); } private static synchronized Field get_InputEvent_CanAccessSystemClipboard() { @@ -564,4 +606,11 @@ } } } + + private void readObject(ObjectInputStream in) + throws ClassNotFoundException, IOException + { + this.acc = AccessController.getContext(); + in.defaultReadObject(); + } } // class AWTEvent Modified: classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/AWTEventMulticaster.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/AWTException.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/AWTException.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/AWTException.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/AWTKeyStroke.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/AWTPermission.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/AWTPermission.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/AWTPermission.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/ActiveEvent.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/Adjustable.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/Adjustable.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/Adjustable.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1996-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/AttributeValue.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/AttributeValue.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/AttributeValue.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1999, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/BufferCapabilities.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/CheckboxGroup.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/Color.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/Color.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/Color.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -690,7 +690,7 @@ * @since JDK1.0 */ public boolean equals(Object obj) { - return obj instanceof Color && ((Color)obj).value == this.value; + return obj instanceof Color && ((Color)obj).getRGB() == this.getRGB(); } /** Modified: classlib6/core/src/openjdk/java/java/awt/Component.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/Component.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/Component.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -58,9 +58,11 @@ import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedAction; +import java.security.AccessControlContext; import javax.accessibility.*; import java.util.logging.*; import java.applet.Applet; +import sun.awt.AWTAccessor; import sun.security.action.GetPropertyAction; import sun.awt.AppContext; @@ -451,6 +453,12 @@ static final Object LOCK = new AWTTreeLock(); static class AWTTreeLock {} + /* + * The component's AccessControlContext. + */ + private transient volatile AccessControlContext acc = + AccessController.getContext(); + /** * Minimum size. * (This field perhaps should have been transient). @@ -641,6 +649,16 @@ return changeSupportLock; } + /* + * Returns the acc this component was constructed with. + */ + final AccessControlContext getAccessControlContext() { + if (acc == null) { + throw new SecurityException("Component is missing AccessControlContext"); + } + return acc; + } + boolean isPacked = false; /** @@ -778,6 +796,16 @@ } } + static { + AWTAccessor.setComponentAccessor(new AWTAccessor.ComponentAccessor() { + public AccessControlContext getAccessControlContext(Component comp) { + return comp.getAccessControlContext(); + } + + }); + } + + /** * Constructs a new component. Class <code>Component</code> can be * extended directly to create a lightweight component that does not @@ -4307,7 +4335,7 @@ } if (eventLog.isLoggable(Level.FINEST)) { - eventLog.log(Level.FINEST, "{0}", e); + eventLog.log(Level.FINEST, "{0}", String.valueOf(e)); } /* @@ -8317,6 +8345,8 @@ { changeSupportLock = new Object(); + acc = AccessController.getContext(); + s.defaultReadObject(); appContext = AppContext.getAppContext(); Modified: classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/ComponentOrientation.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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. */ /* Modified: classlib6/core/src/openjdk/java/java/awt/Composite.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/Composite.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/Composite.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1997-1998 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/CompositeContext.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/CompositeContext.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/CompositeContext.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1997-1998 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/Conditional.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/Conditional.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/Conditional.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1998 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/ContainerOrderFocusTraversalPolicy.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -21,7 +21,8 @@ * 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.awt; + */ +package java.awt; import java.util.logging.*; Modified: classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/DefaultFocusTraversalPolicy.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/DefaultKeyboardFocusManager.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; @@ -379,7 +379,7 @@ // should receive focus first if (focusLog.isLoggable(Level.FINER)) { focusLog.log(Level.FINER, "tempLost {0}, toFocus {1}", - new Object[]{tempLost, toFocus}); + new Object[]{String.valueOf(tempLost), String.valueOf(toFocus)}); } if (tempLost != null) { tempLost.requestFocusInWindow(CausedFocusEvent.Cause.ACTIVATION); @@ -447,7 +447,8 @@ Component newFocusOwner = fe.getComponent(); if (oldFocusOwner == newFocusOwner) { if (focusLog.isLoggable(Level.FINE)) { - focusLog.log(Level.FINE, "Skipping {0} because focus owner is the same", new Object[] {e}); + focusLog.log(Level.FINE, "Skipping {0} because focus owner is the same", + new Object[] {String.valueOf(e)}); } // We can't just drop the event - there could be // type-ahead markers associated with it. @@ -554,16 +555,20 @@ FocusEvent fe = (FocusEvent)e; Component currentFocusOwner = getGlobalFocusOwner(); if (currentFocusOwner == null) { - if (focusLog.isLoggable(Level.FINE)) focusLog.log(Level.FINE, "Skipping {0} because focus owner is null", - new Object[] {e}); + if (focusLog.isLoggable(Level.FINE)) { + focusLog.log(Level.FINE, "Skipping {0} because focus owner is null", + new Object[] {String.valueOf(e)}); + } break; } // Ignore cases where a Component loses focus to itself. // If we make a mistake because of retargeting, then the // FOCUS_GAINED handler will correct it. if (currentFocusOwner == fe.getOppositeComponent()) { - if (focusLog.isLoggable(Level.FINE)) focusLog.log(Level.FINE, "Skipping {0} because current focus owner is equal to opposite", - new Object[] {e}); + if (focusLog.isLoggable(Level.FINE)) { + focusLog.log(Level.FINE, "Skipping {0} because current focus owner is equal to opposite", + new Object[] {String.valueOf(e)}); + } break; } @@ -631,9 +636,11 @@ Window losingFocusWindow = we.getWindow(); Window activeWindow = getGlobalActiveWindow(); Window oppositeWindow = we.getOppositeWindow(); - if (focusLog.isLoggable(Level.FINE)) focusLog.log(Level.FINE, "Active {0}, Current focused {1}, losing focus {2} opposite {3}", - new Object[] {activeWindow, currentFocusedWindow, - losingFocusWindow, oppositeWindow}); + if (focusLog.isLoggable(Level.FINE)) { + focusLog.log(Level.FINE, "Active {0}, Current focused {1}, losing focus {2} opposite {3}", + new Object[] {String.valueOf(activeWindow), String.valueOf(currentFocusedWindow), + String.valueOf(losingFocusWindow), String.valueOf(oppositeWindow)}); + } if (currentFocusedWindow == null) { break; } @@ -819,7 +826,10 @@ } } if (ke != null) { - focusLog.log(Level.FINER, "Pumping approved event {0}", new Object[] {ke}); + if (focusLog.isLoggable(Level.FINER)) { + focusLog.log(Level.FINER, "Pumping approved event {0}", + new Object[] {String.valueOf(ke)}); + } enqueuedKeyEvents.removeFirst(); } } @@ -841,7 +851,7 @@ Iterator iter = typeAheadMarkers.iterator(); while (iter.hasNext()) { TypeAheadMarker marker = (TypeAheadMarker)iter.next(); - focusLog.log(Level.FINEST, " {0}", marker); + focusLog.log(Level.FINEST, " {0}", String.valueOf(marker)); } } } @@ -869,7 +879,10 @@ // The fix is rolled out. if (ke.getWhen() > marker.after) { - focusLog.log(Level.FINER, "Storing event {0} because of marker {1}", new Object[] {ke, marker}); + if (focusLog.isLoggable(Level.FINER)) { + focusLog.log(Level.FINER, "Storing event {0} because of marker {1}", + new Object[] {String.valueOf(ke), String.valueOf(marker)}); + } enqueuedKeyEvents.addLast(ke); return true; } @@ -881,7 +894,10 @@ } case FocusEvent.FOCUS_GAINED: - focusLog.log(Level.FINEST, "Markers before FOCUS_GAINED on {0}", new Object[] {target}); + if (focusLog.isLoggable(Level.FINEST)) { + focusLog.log(Level.FINEST, "Markers before FOCUS_GAINED on {0}", + new Object[] {String.valueOf(target)}); + } dumpMarkers(); // Search the marker list for the first marker tied to // the Component which just gained focus. Then remove @@ -910,7 +926,9 @@ } } else { // Exception condition - event without marker - focusLog.log(Level.FINER, "Event without marker {0}", e); + if (focusLog.isLoggable(Level.FINER)) { + focusLog.log(Level.FINER, "Event without marker {0}", String.valueOf(e)); + } } } focusLog.log(Level.FINEST, "Markers after FOCUS_GAINED"); @@ -1147,8 +1165,10 @@ return; } + if (focusLog.isLoggable(Level.FINER)) { focusLog.log(Level.FINER, "Enqueue at {0} for {1}", - new Object[] {after, untilFocused}); + new Object[] {after, String.valueOf(untilFocused)}); + } int insertionIndex = 0, i = typeAheadMarkers.size(); @@ -1187,8 +1207,10 @@ return; } + if (focusLog.isLoggable(Level.FINER)) { focusLog.log(Level.FINER, "Dequeue at {0} for {1}", - new Object[] {after, untilFocused}); + new Object[] {after, String.valueOf(untilFocused)}); + } TypeAheadMarker marker; ListIterator iter = typeAheadMarkers.listIterator Modified: classlib6/core/src/openjdk/java/java/awt/DisplayMode.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/DisplayMode.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/DisplayMode.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; Modified: classlib6/core/src/openjdk/java/java/awt/Event.java =================================================================== --- classlib6/core/src/openjdk/java/java/awt/Event.java 2011-03-05 13:27:27 UTC (rev 5804) +++ classlib6/core/src/openjdk/java/java/awt/Event.java 2011-03-06 18:55:51 UTC (rev 5805) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth ... [truncated message content] |
From: <ls...@us...> - 2011-03-05 13:27:38
|
Revision: 5804 http://jnode.svn.sourceforge.net/jnode/?rev=5804&view=rev Author: lsantha Date: 2011-03-05 13:27:27 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/sun/sun/swing/BakedArrayList.java classlib6/core/src/openjdk/sun/sun/swing/CachedPainter.java classlib6/core/src/openjdk/sun/sun/swing/DefaultLookup.java classlib6/core/src/openjdk/sun/sun/swing/FilePane.java classlib6/core/src/openjdk/sun/sun/swing/ImageCache.java classlib6/core/src/openjdk/sun/sun/swing/ImageIconUIResource.java classlib6/core/src/openjdk/sun/sun/swing/MenuItemCheckIconFactory.java classlib6/core/src/openjdk/sun/sun/swing/PrintColorUIResource.java classlib6/core/src/openjdk/sun/sun/swing/StringUIClientPropertyKey.java classlib6/core/src/openjdk/sun/sun/swing/SwingLazyValue.java classlib6/core/src/openjdk/sun/sun/swing/SwingUtilities2.java classlib6/core/src/openjdk/sun/sun/swing/UIAction.java classlib6/core/src/openjdk/sun/sun/swing/UIClientPropertyKey.java classlib6/core/src/openjdk/sun/sun/swing/WindowsPlacesBar.java classlib6/core/src/openjdk/sun/sun/swing/plaf/synth/DefaultSynthStyle.java classlib6/core/src/openjdk/sun/sun/swing/plaf/synth/Paint9Painter.java classlib6/core/src/openjdk/sun/sun/swing/plaf/synth/StyleAssociation.java classlib6/core/src/openjdk/sun/sun/swing/plaf/synth/SynthFileChooserUI.java classlib6/core/src/openjdk/sun/sun/swing/plaf/synth/SynthFileChooserUIImpl.java classlib6/core/src/openjdk/sun/sun/swing/plaf/synth/SynthIcon.java classlib6/core/src/openjdk/sun/sun/swing/plaf/synth/SynthUI.java classlib6/core/src/openjdk/sun/sun/swing/table/DefaultTableCellHeaderRenderer.java classlib6/core/src/openjdk/sun/sun/tools/jar/CommandLine.java classlib6/core/src/openjdk/sun/sun/tools/jar/JarException.java classlib6/core/src/openjdk/sun/sun/tools/jar/JarImageSource.java classlib6/core/src/openjdk/sun/sun/tools/jar/JarVerifierStream.java classlib6/core/src/openjdk/sun/sun/tools/jar/Main.java classlib6/core/src/openjdk/sun/sun/tools/jar/Manifest.java classlib6/core/src/openjdk/sun/sun/tools/jar/SignatureFile.java classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_de.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_es.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_fr.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_it.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_ja.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_ko.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_sv.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_zh_CN.properties classlib6/core/src/openjdk/sun/sun/tools/jar/resources/jar_zh_TW.properties classlib6/core/src/openjdk/sun/sun/tools/javac/resources/javac.properties classlib6/core/src/openjdk/sun/sun/tools/javac/resources/javac_ja.properties classlib6/core/src/openjdk/sun/sun/tools/javac/resources/javac_zh_CN.properties classlib6/core/src/openjdk/sun/sun/util/calendar/AbstractCalendar.java classlib6/core/src/openjdk/sun/sun/util/calendar/BaseCalendar.java classlib6/core/src/openjdk/sun/sun/util/calendar/CalendarDate.java classlib6/core/src/openjdk/sun/sun/util/calendar/CalendarSystem.java classlib6/core/src/openjdk/sun/sun/util/calendar/CalendarUtils.java classlib6/core/src/openjdk/sun/sun/util/calendar/Era.java classlib6/core/src/openjdk/sun/sun/util/calendar/Gregorian.java classlib6/core/src/openjdk/sun/sun/util/calendar/JulianCalendar.java classlib6/core/src/openjdk/sun/sun/util/calendar/ZoneInfo.java classlib6/core/src/openjdk/sun/sun/util/calendar/ZoneInfoFile.java classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_de.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_es.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_fr.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_it.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_ja.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_ko.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_sv.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_zh_CN.properties classlib6/core/src/openjdk/sun/sun/util/logging/resources/logging_zh_TW.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_ar.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_be.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_bg.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_ca.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_cs.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_da.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_de.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_el.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_el_CY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_en.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_en_GB.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_en_IE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_en_MT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_es.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_es_ES.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_es_US.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_et.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_fi.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_fr.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_fr_CA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_hi.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_hr.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_hu.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_in_ID.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_is.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_it.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_iw.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_ja.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_ko.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_lt.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_lv.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_mk.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_ms_MY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_mt.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_mt_MT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_nl.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_no.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_pl.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_pt.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_pt_PT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_ro.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_ru.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_sk.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_sl.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_sq.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_sr.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_sv.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_th.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_tr.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_uk.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_vi.properties classlib6/core/src/openjdk/sun/sun/util/resources/CalendarData_zh.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_AE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_BH.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_DZ.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_EG.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_IQ.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_JO.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_KW.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_LB.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_LY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_MA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_OM.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_QA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_SA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_SD.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_SY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_TN.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ar_YE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_be_BY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_bg_BG.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ca_ES.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_cs_CZ.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_da_DK.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_de.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_de_AT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_de_CH.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_de_DE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_de_GR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_de_LU.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_el_CY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_el_GR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_AU.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_CA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_GB.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_IE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_IN.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_MT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_NZ.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_PH.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_SG.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_US.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_en_ZA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_AR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_BO.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_CL.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_CO.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_CR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_DO.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_EC.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_ES.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_GT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_HN.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_MX.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_NI.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_PA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_PE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_PR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_PY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_SV.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_US.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_UY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_es_VE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_et_EE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_fi_FI.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_fr.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_fr_BE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_fr_CA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_fr_CH.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_fr_FR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_fr_LU.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ga_IE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_hi_IN.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_hr_HR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_hu_HU.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_in_ID.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_is_IS.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_it.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_it_CH.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_it_IT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_iw_IL.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ja.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ja_JP.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ko.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ko_KR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_lt_LT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_lv_LV.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_mk_MK.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ms_MY.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_mt_MT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_nl_BE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_nl_NL.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_no_NO.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_pl_PL.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_pt_BR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_pt_PT.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ro_RO.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_ru_RU.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sk_SK.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sl_SI.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sq_AL.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sr_BA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sr_CS.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sr_ME.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sv.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_sv_SE.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_th_TH.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_tr_TR.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_uk_UA.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_vi_VN.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_zh_CN.properties classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_zh_HK.java classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_zh_SG.java classlib6/core/src/openjdk/sun/sun/util/resources/CurrencyNames_zh_TW.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleData.java classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ar.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_be.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_bg.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ca.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_cs.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_da.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_de.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_el.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_el_CY.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_en.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_en_MT.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_en_PH.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_en_SG.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_es.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_es_US.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_et.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_fi.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_fr.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ga.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_hi.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_hr.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_hu.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_in.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_is.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_it.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_iw.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ja.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ko.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_lt.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_lv.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_mk.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ms.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_mt.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_nl.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_no.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_no_NO_NY.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_pl.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_pt.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_pt_BR.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_pt_PT.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ro.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_ru.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_sk.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_sl.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_sq.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_sr.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_sv.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_th.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_tr.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_uk.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_vi.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_zh.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_zh_SG.properties classlib6/core/src/openjdk/sun/sun/util/resources/LocaleNames_zh_TW.properties classlib6/core/src/openjdk/sun/sun/util/resources/OpenListResourceBundle.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNamesBundle.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_de.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_en.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_en_CA.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_en_GB.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_en_IE.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_es.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_fr.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_hi.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_it.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_ja.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_ko.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_sv.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_zh_CN.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_zh_HK.java classlib6/core/src/openjdk/sun/sun/util/resources/TimeZoneNames_zh_TW.java Added Paths: ----------- classlib6/core/src/openjdk/sun/sun/swing/MenuItemLayoutHelper.java classlib6/core/src/openjdk/sun/sun/util/calendar/TzIDOldMapping.java Modified: classlib6/core/src/openjdk/sun/sun/swing/BakedArrayList.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/BakedArrayList.java 2011-03-05 13:13:50 UTC (rev 5803) +++ classlib6/core/src/openjdk/sun/sun/swing/BakedArrayList.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.swing; Modified: classlib6/core/src/openjdk/sun/sun/swing/CachedPainter.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/CachedPainter.java 2011-03-05 13:13:50 UTC (rev 5803) +++ classlib6/core/src/openjdk/sun/sun/swing/CachedPainter.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -1,12 +1,12 @@ /* - * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2004, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.swing; Modified: classlib6/core/src/openjdk/sun/sun/swing/DefaultLookup.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/DefaultLookup.java 2011-03-05 13:13:50 UTC (rev 5803) +++ classlib6/core/src/openjdk/sun/sun/swing/DefaultLookup.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,15 +18,16 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.swing; import java.awt.Color; import java.awt.Insets; import javax.swing.*; +import javax.swing.border.Border; import javax.swing.plaf.ComponentUI; import sun.awt.AppContext; @@ -46,8 +47,7 @@ /** * Key used to store DefaultLookup for AppContext. */ - private static final Object DEFAULT_LOOKUP_KEY = new - StringBuffer("DefaultLookup"); + private static final Object DEFAULT_LOOKUP_KEY = new Object(); // DefaultLookup /** * Thread that last asked for a default. */ @@ -137,6 +137,10 @@ return ((Number)iValue).intValue(); } + public static int getInt(JComponent c, ComponentUI ui, String key) { + return getInt(c, ui, key, -1); + } + public static Insets getInsets(JComponent c, ComponentUI ui, String key, Insets defaultValue) { Object iValue = get(c, ui, key); @@ -147,6 +151,10 @@ return (Insets)iValue; } + public static Insets getInsets(JComponent c, ComponentUI ui, String key) { + return getInsets(c, ui, key, null); + } + public static boolean getBoolean(JComponent c, ComponentUI ui, String key, boolean defaultValue) { Object iValue = get(c, ui, key); @@ -157,6 +165,10 @@ return ((Boolean)iValue).booleanValue(); } + public static boolean getBoolean(JComponent c, ComponentUI ui, String key) { + return getBoolean(c, ui, key, false); + } + public static Color getColor(JComponent c, ComponentUI ui, String key, Color defaultValue) { Object iValue = get(c, ui, key); @@ -167,8 +179,36 @@ return (Color)iValue; } + public static Color getColor(JComponent c, ComponentUI ui, String key) { + return getColor(c, ui, key, null); + } + public static Icon getIcon(JComponent c, ComponentUI ui, String key, + Icon defaultValue) { + Object iValue = get(c, ui, key); + if (iValue == null || !(iValue instanceof Icon)) { + return defaultValue; + } + return (Icon)iValue; + } + public static Icon getIcon(JComponent c, ComponentUI ui, String key) { + return getIcon(c, ui, key, null); + } + + public static Border getBorder(JComponent c, ComponentUI ui, String key, + Border defaultValue) { + Object iValue = get(c, ui, key); + if (iValue == null || !(iValue instanceof Border)) { + return defaultValue; + } + return (Border)iValue; + } + + public static Border getBorder(JComponent c, ComponentUI ui, String key) { + return getBorder(c, ui, key, null); + } + public Object getDefault(JComponent c, ComponentUI ui, String key) { // basic return UIManager.get(key, c.getLocale()); Modified: classlib6/core/src/openjdk/sun/sun/swing/FilePane.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/FilePane.java 2011-03-05 13:13:50 UTC (rev 5803) +++ classlib6/core/src/openjdk/sun/sun/swing/FilePane.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -1,13 +1,13 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -19,9 +19,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.swing; @@ -263,6 +263,7 @@ private Color listViewBackground; private boolean listViewWindowsStyle; private boolean readOnly; + private boolean fullRowSelection = false; private ListSelectionModel listSelectionModel; private JList list; @@ -446,6 +447,7 @@ kiloByteString = UIManager.getString("FileChooser.fileSizeKiloBytes", l); megaByteString = UIManager.getString("FileChooser.fileSizeMegaBytes", l); gigaByteString = UIManager.getString("FileChooser.fileSizeGigaBytes", l); + fullRowSelection = UIManager.getBoolean("FileView.fullRowSelection"); renameErrorTitleText = UIManager.getString("FileChooser.renameErrorTitleText", l); renameErrorText = UIManager.getString("FileChooser.renameErrorText", l); @@ -976,6 +978,7 @@ public DetailsTableCellEditor(JTextField tf) { super(tf); this.tf = tf; + tf.setName("Table.editor"); tf.addFocusListener(editorFocusListener); } @@ -1003,7 +1006,8 @@ } public void setBounds(int x, int y, int width, int height) { - if (getHorizontalAlignment() == SwingConstants.LEADING) { + if (getHorizontalAlignment() == SwingConstants.LEADING && + !fullRowSelection) { // Restrict width to actual text width = Math.min(width, this.getPreferredSize().width+4); } else { @@ -1024,9 +1028,9 @@ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - if (table.convertColumnIndexToModel(column) != COLUMN_FILENAME || - (listViewWindowsStyle && !table.isFocusOwner())) { - + if ((table.convertColumnIndexToModel(column) != COLUMN_FILENAME || + (listViewWindowsStyle && !table.isFocusOwner())) && + !fullRowSelection) { isSelected = false; } @@ -1322,6 +1326,7 @@ Rectangle r = list.getCellBounds(index, index); if (editCell == null) { editCell = new JTextField(); + editCell.setName("Tree.cellEditor"); editCell.addActionListener(new EditActionListener()); editCell.addFocusListener(editorFocusListener); editCell.setNextFocusableComponent(list); @@ -1774,10 +1779,11 @@ Point p = evt.getPoint(); index = table.rowAtPoint(p); - if (SwingUtilities2.pointOutsidePrefSize(table, - index, - table.columnAtPoint(p), p)) { + boolean pointOutsidePrefSize = + SwingUtilities2.pointOutsidePrefSize( + table, index, table.columnAtPoint(p), p); + if (pointOutsidePrefSize && !fullRowSelection) { return; } Modified: classlib6/core/src/openjdk/sun/sun/swing/ImageCache.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/ImageCache.java 2011-03-05 13:13:50 UTC (rev 5803) +++ classlib6/core/src/openjdk/sun/sun/swing/ImageCache.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -1,12 +1,12 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.swing; Modified: classlib6/core/src/openjdk/sun/sun/swing/ImageIconUIResource.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/ImageIconUIResource.java 2011-03-05 13:13:50 UTC (rev 5803) +++ classlib6/core/src/openjdk/sun/sun/swing/ImageIconUIResource.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -1,12 +1,12 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.swing; Modified: classlib6/core/src/openjdk/sun/sun/swing/MenuItemCheckIconFactory.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/MenuItemCheckIconFactory.java 2011-03-05 13:13:50 UTC (rev 5803) +++ classlib6/core/src/openjdk/sun/sun/swing/MenuItemCheckIconFactory.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -1,12 +1,12 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.swing; Added: classlib6/core/src/openjdk/sun/sun/swing/MenuItemLayoutHelper.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/swing/MenuItemLayoutHelper.java (rev 0) +++ classlib6/core/src/openjdk/sun/sun/swing/MenuItemLayoutHelper.java 2011-03-05 13:27:27 UTC (rev 5804) @@ -0,0 +1,1339 @@ +/* + * Copyright (c) 2002, 2008, 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 sun.swing; + +import static sun.swing.SwingUtilities2.BASICMENUITEMUI_MAX_TEXT_OFFSET; + +import javax.swing.*; +import javax.swing.plaf.basic.BasicHTML; +import javax.swing.text.View; +import java.awt.*; +import java.awt.event.KeyEvent; +import java.util.Map; +import java.util.HashMap; + +/** + * Calculates preferred size and layouts menu items. + */ +public class MenuItemLayoutHelper { + + /* Client Property keys for calculation of maximal widths */ + public static final StringUIClientPropertyKey MAX_ARROW_WIDTH = + new StringUIClientPropertyKey("maxArrowWidth"); + public static final StringUIClientPropertyKey MAX_CHECK_WIDTH = + new StringUIClientPropertyKey("maxCheckWidth"); + public static final StringUIClientPropertyKey MAX_ICON_WIDTH = + new StringUIClientPropertyKey("maxIconWidth"); + public static final StringUIClientPropertyKey MAX_TEXT_WIDTH = + new StringUIClientPropertyKey("maxTextWidth"); + public static final StringUIClientPropertyKey MAX_ACC_WIDTH = + new StringUIClientPropertyKey("maxAccWidth"); + public static final StringUIClientPropertyKey MAX_LABEL_WIDTH = + new StringUIClientPropertyKey("maxLabelWidth"); + + private JMenuItem mi; + private JComponent miParent; + + private Font font; + private Font accFont; + private FontMetrics fm; + private FontMetrics accFm; + + private Icon icon; + private Icon checkIcon; + private Icon arrowIcon; + private String text; + private String accText; + + private boolean isColumnLayout; + private boolean useCheckAndArrow; + private boolean isLeftToRight; + private boolean isTopLevelMenu; + private View htmlView; + + private int verticalAlignment; + private int horizontalAlignment; + private int verticalTextPosition; + private int horizontalTextPosition; + private int gap; + private int leadingGap; + private int afterCheckIconGap; + private int minTextOffset; + + private Rectangle viewRect; + + private RectSize iconSize; + private RectSize textSize; + private RectSize accSize; + private RectSize checkSize; + private RectSize arrowSize; + private RectSize labelSize; + + /** + * The empty protected constructor is necessary for derived classes. + */ + protected MenuItemLayoutHelper() { + } + + public MenuItemLayoutHelper(JMenuItem mi, Icon checkIcon, Icon arrowIcon, + Rectangle viewRect, int gap, String accDelimiter, + boolean isLeftToRight, Font font, Font accFont, + boolean useCheckAndArrow, String propertyPrefix) { + reset(mi, checkIcon, arrowIcon, viewRect, gap, accDelimiter, + isLeftToRight, font, accFont, useCheckAndArrow, propertyPrefix); + } + + protected void reset(JMenuItem mi, Icon checkIcon, Icon arrowIcon, + Rectangle viewRect, int gap, String accDelimiter, + boolean isLeftToRight, Font font, Font accFont, + boolean useCheckAndArrow, String propertyPrefix) { + this.mi = mi; + this.miParent = getMenuItemParent(mi); + this.accText = getAccText(accDelimiter); + this.verticalAlignment = mi.getVerticalAlignment(); + this.horizontalAlignment = mi.getHorizontalAlignment(); + this.verticalTextPosition = mi.getVerticalTextPosition(); + this.horizontalTextPosition = mi.getHorizontalTextPosition(); + this.useCheckAndArrow = useCheckAndArrow; + this.font = font; + this.accFont = accFont; + this.fm = mi.getFontMetrics(font); + this.accFm = mi.getFontMetrics(accFont); + this.isLeftToRight = isLeftToRight; + this.isColumnLayout = isColumnLayout(isLeftToRight, + horizontalAlignment, horizontalTextPosition, + verticalTextPosition); + this.isTopLevelMenu = (this.miParent == null) ? true : false; + this.checkIcon = checkIcon; + this.icon = getIcon(propertyPrefix); + this.arrowIcon = arrowIcon; + this.text = mi.getText(); + this.gap = gap; + this.afterCheckIconGap = getAfterCheckIconGap(propertyPrefix); + this.minTextOffset = getMinTextOffset(propertyPrefix); + this.htmlView = (View) mi.getClientProperty(BasicHTML.propertyKey); + this.viewRect = viewRect; + + this.iconSize = new RectSize(); + this.textSize = new RectSize(); + this.accSize = new RectSize(); + this.checkSize = new RectSize(); + this.arrowSize = new RectSize(); + this.labelSize = new RectSize(); + calcWidthsAndHeights(); + setOriginalWidths(); + calcMaxWidths(); + + this.leadingGap = getLeadingGap(propertyPrefix); + calcMaxTextOffset(viewRect); + } + + private void setOriginalWidths() { + iconSize.origWidth = iconSize.width; + textSize.origWidth = textSize.width; + accSize.origWidth = accSize.width; + checkSize.origWidth = checkSize.width; + arrowSize.origWidth = arrowSize.width; + } + + private String getAccText(String acceleratorDelimiter) { + String accText = ""; + KeyStroke accelerator = mi.getAccelerator(); + if (accelerator != null) { + int modifiers = accelerator.getModifiers(); + if (modifiers > 0) { + accText = KeyEvent.getKeyModifiersText(modifiers); + accText += acceleratorDelimiter; + } + int keyCode = accelerator.getKeyCode(); + if (keyCode != 0) { + accText += KeyEvent.getKeyText(keyCode); + } else { + accText += accelerator.getKeyChar(); + } + } + return accText; + } + + private Icon getIcon(String propertyPrefix) { + // In case of column layout, .checkIconFactory is defined for this UI, + // the icon is compatible with it and useCheckAndArrow() is true, + // then the icon is handled by the checkIcon. + Icon icon = null; + MenuItemCheckIconFactory iconFactory = + (MenuItemCheckIconFactory) UIManager.get(propertyPrefix + + ".checkIconFactory"); + if (!isColumnLayout || !useCheckAndArrow || iconFactory == null + || !iconFactory.isCompatible(checkIcon, propertyPrefix)) { + icon = mi.getIcon(); + } + return icon; + } + + private int getMinTextOffset(String propertyPrefix) { + int minimumTextOffset = 0; + Object minimumTextOffsetObject = + UIManager.get(propertyPrefix + ".minimumTextOffset"); + if (minimumTextOffsetObject instanceof Integer) { + minimumTextOffset = (Integer) minimumTextOffsetObject; + } + return minimumTextOffset; + } + + private int getAfterCheckIconGap(String propertyPrefix) { + int afterCheckIconGap = gap; + Object afterCheckIconGapObject = + UIManager.get(propertyPrefix + ".afterCheckIconGap"); + if (afterCheckIconGapObject instanceof Integer) { + afterCheckIconGap = (Integer) afterCheckIconGapObject; + } + return afterCheckIconGap; + } + + private int getLeadingGap(String propertyPrefix) { + if (checkSize.getMaxWidth() > 0) { + return getCheckOffset(propertyPrefix); + } else { + return gap; // There is no any check icon + } + } + + private int getCheckOffset(String propertyPrefix) { + int checkIconOffset = gap; + Object checkIconOffsetObject = + UIManager.get(propertyPrefix + ".checkIconOffset"); + if (checkIconOffsetObject instanceof Integer) { + checkIconOffset = (Integer) checkIconOffsetObject; + } + return checkIconOffset; + } + + protected void calcWidthsAndHeights() { + // iconRect + if (icon != null) { + iconSize.width = icon.getIconWidth(); + iconSize.height = icon.getIconHeight(); + } + + // accRect + if (!accText.equals("")) { + accSize.width = SwingUtilities2.stringWidth(mi, accFm, accText); + accSize.height = accFm.getHeight(); + } + + // textRect + if (text == null) { + text = ""; + } else if (!text.equals("")) { + if (htmlView != null) { + // Text is HTML + textSize.width = + (int) htmlView.getPreferredSpan(View.X_AXIS); + textSize.height = + (int) htmlView.getPreferredSpan(View.Y_AXIS); + } else { + // Text isn't HTML + textSize.width = SwingUtilities2.stringWidth(mi, fm, text); + textSize.height = fm.getHeight(); + } + } + + if (useCheckAndArrow) { + // checkIcon + if (checkIcon != null) { + checkSize.width = checkIcon.getIconWidth(); + checkSize.height = checkIcon.getIconHeight(); + } + // arrowRect + if (arrowIcon != null) { + arrowSize.width = arrowIcon.getIconWidth(); + arrowSize.height = arrowIcon.getIconHeight(); + } + } + + // labelRect + if (isColumnLayout) { + labelSize.width = iconSize.width + textSize.width + gap; + labelSize.height = max(checkSize.height, iconSize.height, + textSize.height, accSize.height, arrowSize.height); + } else { + Rectangle textRect = new Rectangle(); + Rectangle iconRect = new Rectangle(); + SwingUtilities.layoutCompoundLabel(mi, fm, text, icon, + verticalAlignment, horizontalAlignment, + verticalTextPosition, horizontalTextPosition, + viewRect, iconRect, textRect, gap); + Rectangle labelRect = iconRect.union(textRect); + labelSize.height = labelRect.height; + labelSize.width = labelRect.width; + } + } + + protected void calcMaxWidths() { + calcMaxWidth(checkSize, MAX_CHECK_WIDTH); + calcMaxWidth(arrowSize, MAX_ARROW_WIDTH); + calcMaxWidth(accSize, MAX_ACC_WIDTH); + + if (isColumnLayout) { + calcMaxWidth(iconSize, MAX_ICON_WIDTH); + calcMaxWidth(textSize, MAX_TEXT_WIDTH); + int curGap = gap; + if ((iconSize.getMaxWidth() == 0) + || (textSize.getMaxWidth() == 0)) { + curGap = 0; + } + labelSize.maxWidth = + calcMaxValue(MAX_LABEL_WIDTH, iconSize.maxWidth + + textSize.maxWidth + curGap); + } else { + // We shouldn't use current icon and text widths + // in maximal widths calculation for complex layout. + iconSize.maxWidth = getParentIntProperty(MAX_ICON_WIDTH); + calcMaxWidth(labelSize, MAX_LABEL_WIDTH); + // If maxLabelWidth is wider + // than the widest icon + the widest text + gap, + // we should update the maximal text witdh + int candidateTextWidth = labelSize.maxWidth - iconSize.maxWidth; + if (iconSize.maxWidth > 0) { + candidateTextWidth -= gap; + } + textSize.maxWidth = calcMaxValue(MAX_TEXT_WIDTH, candidateTextWidth); + } + } + + protected void calcMaxWidth(RectSize rs, Object key) { + rs.maxWidth = calcMaxValue(key, rs.width); + } + + /** + * Calculates and returns maximal value through specified parent component + * client property. + * + * @param propertyName name of the property, which stores the maximal value. + * @param value a value which pretends to be maximal + * @return maximal value among the parent property and the value. + */ + protected int calcMaxValue(Object propertyName, int value) { + // Get maximal value from parent client property + int maxValue = getParentIntProperty(propertyName); + // Store new maximal width in parent client property + if (value > maxValue) { + if (miParent != null) { + miParent.putClientProperty(propertyName, value); + } + return value; + } else { + return maxValue; + } + } + + /** + * Returns parent client property as int. + * @param propertyName name of the parent property. + * @return value of the property as int. + */ + protected int getParentIntProperty(Object propertyName) { + Object value = null; + if (miParent != null) { + value = miParent.getClientProperty(propertyName); + } + if ((value == null) || !(value instanceof Integer)) { + value = 0; + } + return (Integer) value; + } + + public static boolean isColumnLayout(boolean isLeftToRight, + JMenuItem mi) { + assert(mi != null); + return isColumnLayout(isLeftToRight, mi.getHorizontalAlignment(), + mi.getHorizontalTextPosition(), mi.getVerticalTextPosition()); + } + + /** + * Answers should we do column layout for a menu item or not. + * We do it when a user doesn't set any alignments + * and text positions manually, except the vertical alignment. + */ + public static boolean isColumnLayout(boolean isLeftToRight, + int horizontalAlignment, + int horizontalTextPosition, + int verticalTextPosition) { + if (verticalTextPosition != SwingConstants.CENTER) { + return false; + } + if (isLeftToRight) { + if (horizontalAlignment != SwingConstants.LEADING + && horizontalAlignment != SwingConstants.LEFT) { + return false; + } + if (horizontalTextPosition != SwingConstants.TRAILING + && horizontalTextPosition != SwingConstants.RIGHT) { + return false; + } + } else { + if (horizontalAlignment != SwingConstants.LEADING + && horizontalAlignment != SwingConstants.RIGHT) { + return false; + } + if (horizontalTextPosition != SwingConstants.TRAILING + && horizontalTextPosition != SwingConstants.LEFT) { + return false; + } + } + return true; + } + + /** + * Calculates maximal text offset. + * It is required for some L&Fs (ex: Vista L&F). + * The offset is meaningful only for L2R column layout. + * + * @param viewRect the rectangle, the maximal text offset + * will be calculated for. + */ + private void calcMaxTextOffset(Rectangle viewRect) { + if (!isColumnLayout || !isLeftToRight) { + return; + } + + // Calculate the current text offset + int offset = viewRect.x + leadingGap + checkSize.maxWidth + + afterCheckIconGap + iconSize.maxWidth + gap; + if (checkSize.maxWidth == 0) { + offset -= afterCheckIconGap; + } + if (iconSize.maxWidth == 0) { + offset -= gap; + } + + // maximal text offset shouldn't be less than minimal text offset; + if (offset < minTextOffset) { + offset = minTextOffset; + } + + // Calculate and store the maximal text offset + calcMaxValue(SwingUtilities2.BASICMENUITEMUI_MAX_TEXT_OFFSET, offset); + } + + /** + * Layout icon, text, check icon, accelerator text and arrow icon + * in the viewRect and return their positions. + * + * If horizontalAlignment, verticalTextPosition and horizontalTextPosition + * are default (user doesn't set any manually) the layouting algorithm is: + *... [truncated message content] |
From: <ls...@us...> - 2011-03-05 13:14:01
|
Revision: 5803 http://jnode.svn.sourceforge.net/jnode/?rev=5803&view=rev Author: lsantha Date: 2011-03-05 13:13:50 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/sun/sun/security/jgss/krb5/InitialToken.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/Config.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/JarVerifier.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/KeyCache.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Cipher.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DHKeyFactory.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DSAKeyFactory.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Digest.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECDHKeyAgreement.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECKeyFactory.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Key.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyAgreement.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyFactory.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyGenerator.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyPairGenerator.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyStore.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Mac.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11RSACipher.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11RSAKeyFactory.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11SecretKeyFactory.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11SecureRandom.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Signature.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11TlsMasterSecretGenerator.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11TlsPrfGenerator.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Util.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/Session.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/SessionManager.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/SunPKCS11.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/TemplateManager.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/Token.java classlib6/core/src/openjdk/sun/sun/security/pkcs11/wrapper/PKCS11Exception.java classlib6/core/src/openjdk/sun/sun/security/provider/ByteArrayAccess.java classlib6/core/src/openjdk/sun/sun/security/provider/DSA.java classlib6/core/src/openjdk/sun/sun/security/provider/DSAKeyFactory.java classlib6/core/src/openjdk/sun/sun/security/provider/DSAKeyPairGenerator.java classlib6/core/src/openjdk/sun/sun/security/provider/DSAParameterGenerator.java classlib6/core/src/openjdk/sun/sun/security/provider/DSAParameters.java classlib6/core/src/openjdk/sun/sun/security/provider/DSAPrivateKey.java classlib6/core/src/openjdk/sun/sun/security/provider/DSAPublicKey.java classlib6/core/src/openjdk/sun/sun/security/provider/DigestBase.java classlib6/core/src/openjdk/sun/sun/security/provider/IdentityDatabase.java classlib6/core/src/openjdk/sun/sun/security/provider/JavaKeyStore.java classlib6/core/src/openjdk/sun/sun/security/provider/KeyProtector.java classlib6/core/src/openjdk/sun/sun/security/provider/MD2.java classlib6/core/src/openjdk/sun/sun/security/provider/MD5.java classlib6/core/src/openjdk/sun/sun/security/provider/ParameterCache.java classlib6/core/src/openjdk/sun/sun/security/provider/PolicyFile.java classlib6/core/src/openjdk/sun/sun/security/provider/PolicyParser.java classlib6/core/src/openjdk/sun/sun/security/provider/SHA.java classlib6/core/src/openjdk/sun/sun/security/provider/SHA2.java classlib6/core/src/openjdk/sun/sun/security/provider/SHA5.java classlib6/core/src/openjdk/sun/sun/security/provider/SecureRandom.java classlib6/core/src/openjdk/sun/sun/security/provider/SeedGenerator.java classlib6/core/src/openjdk/sun/sun/security/provider/Sun.java classlib6/core/src/openjdk/sun/sun/security/provider/SunEntries.java classlib6/core/src/openjdk/sun/sun/security/provider/SystemIdentity.java classlib6/core/src/openjdk/sun/sun/security/provider/SystemSigner.java classlib6/core/src/openjdk/sun/sun/security/provider/VerificationProvider.java classlib6/core/src/openjdk/sun/sun/security/provider/X509Factory.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/AdjacencyList.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/BasicChecker.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/BuildStep.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/Builder.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/CertId.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/CertPathHelper.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/CollectionCertStore.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/ConstraintsChecker.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/CrlRevocationChecker.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/DistributionPointFetcher.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/ForwardBuilder.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/ForwardState.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/IndexedCollectionCertStore.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/KeyChecker.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/LDAPCertStore.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/OCSPChecker.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/OCSPRequest.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/OCSPResponse.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/PKIXCertPathValidator.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/PKIXMasterCertPathValidator.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/PolicyChecker.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/PolicyNodeImpl.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/ReverseBuilder.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/ReverseState.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/State.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/SunCertPathBuilder.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/SunCertPathBuilderException.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/SunCertPathBuilderParameters.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/SunCertPathBuilderResult.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/URICertStore.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/Vertex.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/X509CertPath.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/X509CertificatePair.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSACore.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSAKeyFactory.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSAKeyPairGenerator.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSAPadding.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSAPrivateCrtKeyImpl.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSAPrivateKeyImpl.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSAPublicKeyImpl.java classlib6/core/src/openjdk/sun/sun/security/rsa/RSASignature.java classlib6/core/src/openjdk/sun/sun/security/rsa/SunRsaSign.java classlib6/core/src/openjdk/sun/sun/security/rsa/SunRsaSignEntries.java classlib6/core/src/openjdk/sun/sun/security/ssl/Alerts.java classlib6/core/src/openjdk/sun/sun/security/ssl/AppInputStream.java classlib6/core/src/openjdk/sun/sun/security/ssl/AppOutputStream.java classlib6/core/src/openjdk/sun/sun/security/ssl/BaseSSLSocketImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/ByteBufferInputStream.java classlib6/core/src/openjdk/sun/sun/security/ssl/CipherBox.java classlib6/core/src/openjdk/sun/sun/security/ssl/CipherSuite.java classlib6/core/src/openjdk/sun/sun/security/ssl/CipherSuiteList.java classlib6/core/src/openjdk/sun/sun/security/ssl/ClientHandshaker.java classlib6/core/src/openjdk/sun/sun/security/ssl/DHClientKeyExchange.java classlib6/core/src/openjdk/sun/sun/security/ssl/DHCrypt.java classlib6/core/src/openjdk/sun/sun/security/ssl/Debug.java classlib6/core/src/openjdk/sun/sun/security/ssl/DefaultSSLContextImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/ECDHClientKeyExchange.java classlib6/core/src/openjdk/sun/sun/security/ssl/ECDHCrypt.java classlib6/core/src/openjdk/sun/sun/security/ssl/EngineArgs.java classlib6/core/src/openjdk/sun/sun/security/ssl/EngineInputRecord.java classlib6/core/src/openjdk/sun/sun/security/ssl/EngineOutputRecord.java classlib6/core/src/openjdk/sun/sun/security/ssl/EngineWriter.java classlib6/core/src/openjdk/sun/sun/security/ssl/EphemeralKeyManager.java classlib6/core/src/openjdk/sun/sun/security/ssl/HandshakeHash.java classlib6/core/src/openjdk/sun/sun/security/ssl/HandshakeInStream.java classlib6/core/src/openjdk/sun/sun/security/ssl/HandshakeMessage.java classlib6/core/src/openjdk/sun/sun/security/ssl/HandshakeOutStream.java classlib6/core/src/openjdk/sun/sun/security/ssl/Handshaker.java classlib6/core/src/openjdk/sun/sun/security/ssl/HelloExtensions.java classlib6/core/src/openjdk/sun/sun/security/ssl/InputRecord.java classlib6/core/src/openjdk/sun/sun/security/ssl/JsseJce.java classlib6/core/src/openjdk/sun/sun/security/ssl/KerberosClientKeyExchange.java classlib6/core/src/openjdk/sun/sun/security/ssl/KerberosPreMasterSecret.java classlib6/core/src/openjdk/sun/sun/security/ssl/KeyManagerFactoryImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/MAC.java classlib6/core/src/openjdk/sun/sun/security/ssl/OutputRecord.java classlib6/core/src/openjdk/sun/sun/security/ssl/ProtocolList.java classlib6/core/src/openjdk/sun/sun/security/ssl/ProtocolVersion.java classlib6/core/src/openjdk/sun/sun/security/ssl/RSAClientKeyExchange.java classlib6/core/src/openjdk/sun/sun/security/ssl/RSASignature.java classlib6/core/src/openjdk/sun/sun/security/ssl/RandomCookie.java classlib6/core/src/openjdk/sun/sun/security/ssl/Record.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLContextImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLEngineImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLServerSocketFactoryImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLServerSocketImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLSessionContextImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLSessionImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLSocketFactoryImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/SSLSocketImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/ServerHandshaker.java classlib6/core/src/openjdk/sun/sun/security/ssl/SessionId.java classlib6/core/src/openjdk/sun/sun/security/ssl/SunJSSE.java classlib6/core/src/openjdk/sun/sun/security/ssl/SunX509KeyManagerImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/TrustManagerFactoryImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/X509KeyManagerImpl.java classlib6/core/src/openjdk/sun/sun/security/ssl/X509TrustManagerImpl.java classlib6/core/src/openjdk/sun/sun/security/timestamp/HttpTimestamper.java classlib6/core/src/openjdk/sun/sun/security/timestamp/TSRequest.java classlib6/core/src/openjdk/sun/sun/security/timestamp/TSResponse.java classlib6/core/src/openjdk/sun/sun/security/timestamp/TimestampToken.java classlib6/core/src/openjdk/sun/sun/security/timestamp/Timestamper.java classlib6/core/src/openjdk/sun/sun/security/tools/JarSigner.java classlib6/core/src/openjdk/sun/sun/security/tools/JarSignerResources.java classlib6/core/src/openjdk/sun/sun/security/tools/JarSignerResources_ja.java classlib6/core/src/openjdk/sun/sun/security/tools/KeyTool.java classlib6/core/src/openjdk/sun/sun/security/tools/PolicyTool.java classlib6/core/src/openjdk/sun/sun/security/tools/TimestampedSigner.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_de.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_es.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_fr.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_it.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_ja.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_ko.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_sv.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_zh_CN.java classlib6/core/src/openjdk/sun/sun/security/util/AuthResources_zh_TW.java classlib6/core/src/openjdk/sun/sun/security/util/BigInt.java classlib6/core/src/openjdk/sun/sun/security/util/BitArray.java classlib6/core/src/openjdk/sun/sun/security/util/ByteArrayLexOrder.java classlib6/core/src/openjdk/sun/sun/security/util/ByteArrayTagOrder.java classlib6/core/src/openjdk/sun/sun/security/util/Cache.java classlib6/core/src/openjdk/sun/sun/security/util/Debug.java classlib6/core/src/openjdk/sun/sun/security/util/DerEncoder.java classlib6/core/src/openjdk/sun/sun/security/util/DerIndefLenConverter.java classlib6/core/src/openjdk/sun/sun/security/util/DerInputBuffer.java classlib6/core/src/openjdk/sun/sun/security/util/DerInputStream.java classlib6/core/src/openjdk/sun/sun/security/util/DerOutputStream.java classlib6/core/src/openjdk/sun/sun/security/util/DerValue.java classlib6/core/src/openjdk/sun/sun/security/util/HostnameChecker.java classlib6/core/src/openjdk/sun/sun/security/util/ManifestDigester.java classlib6/core/src/openjdk/sun/sun/security/util/ManifestEntryVerifier.java classlib6/core/src/openjdk/sun/sun/security/util/ObjectIdentifier.java classlib6/core/src/openjdk/sun/sun/security/util/Password.java classlib6/core/src/openjdk/sun/sun/security/util/PathList.java classlib6/core/src/openjdk/sun/sun/security/util/PendingException.java classlib6/core/src/openjdk/sun/sun/security/util/PolicyUtil.java classlib6/core/src/openjdk/sun/sun/security/util/PropertyExpander.java classlib6/core/src/openjdk/sun/sun/security/util/Resources.java classlib6/core/src/openjdk/sun/sun/security/util/ResourcesMgr.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_de.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_es.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_fr.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_it.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_ja.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_ko.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_sv.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_zh_CN.java classlib6/core/src/openjdk/sun/sun/security/util/Resources_zh_TW.java classlib6/core/src/openjdk/sun/sun/security/util/SecurityConstants.java classlib6/core/src/openjdk/sun/sun/security/util/SignatureFileVerifier.java classlib6/core/src/openjdk/sun/sun/security/validator/EndEntityChecker.java classlib6/core/src/openjdk/sun/sun/security/validator/KeyStores.java classlib6/core/src/openjdk/sun/sun/security/validator/PKIXValidator.java classlib6/core/src/openjdk/sun/sun/security/validator/SimpleValidator.java classlib6/core/src/openjdk/sun/sun/security/validator/Validator.java classlib6/core/src/openjdk/sun/sun/security/validator/ValidatorException.java classlib6/core/src/openjdk/sun/sun/security/x509/AVA.java classlib6/core/src/openjdk/sun/sun/security/x509/AccessDescription.java classlib6/core/src/openjdk/sun/sun/security/x509/AlgIdDSA.java classlib6/core/src/openjdk/sun/sun/security/x509/AlgorithmId.java classlib6/core/src/openjdk/sun/sun/security/x509/AttributeNameEnumeration.java classlib6/core/src/openjdk/sun/sun/security/x509/AuthorityInfoAccessExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/AuthorityKeyIdentifierExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/BasicConstraintsExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/CRLDistributionPointsExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/CRLExtensions.java classlib6/core/src/openjdk/sun/sun/security/x509/CRLNumberExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/CRLReasonCodeExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/CertAndKeyGen.java classlib6/core/src/openjdk/sun/sun/security/x509/CertAttrSet.java classlib6/core/src/openjdk/sun/sun/security/x509/CertException.java classlib6/core/src/openjdk/sun/sun/security/x509/CertParseError.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateAlgorithmId.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateExtensions.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateIssuerExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateIssuerName.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateIssuerUniqueIdentity.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificatePoliciesExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificatePolicyId.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificatePolicyMap.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificatePolicySet.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateSerialNumber.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateSubjectName.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateSubjectUniqueIdentity.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateValidity.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateVersion.java classlib6/core/src/openjdk/sun/sun/security/x509/CertificateX509Key.java classlib6/core/src/openjdk/sun/sun/security/x509/DNSName.java classlib6/core/src/openjdk/sun/sun/security/x509/DistributionPoint.java classlib6/core/src/openjdk/sun/sun/security/x509/EDIPartyName.java classlib6/core/src/openjdk/sun/sun/security/x509/ExtendedKeyUsageExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/Extension.java classlib6/core/src/openjdk/sun/sun/security/x509/GeneralName.java classlib6/core/src/openjdk/sun/sun/security/x509/GeneralNameInterface.java classlib6/core/src/openjdk/sun/sun/security/x509/GeneralNames.java classlib6/core/src/openjdk/sun/sun/security/x509/GeneralSubtree.java classlib6/core/src/openjdk/sun/sun/security/x509/GeneralSubtrees.java classlib6/core/src/openjdk/sun/sun/security/x509/IPAddressName.java classlib6/core/src/openjdk/sun/sun/security/x509/InhibitAnyPolicyExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/IssuerAlternativeNameExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/KeyIdentifier.java classlib6/core/src/openjdk/sun/sun/security/x509/KeyUsageExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/NameConstraintsExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/NetscapeCertTypeExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/OIDMap.java classlib6/core/src/openjdk/sun/sun/security/x509/OIDName.java classlib6/core/src/openjdk/sun/sun/security/x509/OtherName.java classlib6/core/src/openjdk/sun/sun/security/x509/PKIXExtensions.java classlib6/core/src/openjdk/sun/sun/security/x509/PolicyConstraintsExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/PolicyInformation.java classlib6/core/src/openjdk/sun/sun/security/x509/PolicyMappingsExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/PrivateKeyUsageExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/RDN.java classlib6/core/src/openjdk/sun/sun/security/x509/RFC822Name.java classlib6/core/src/openjdk/sun/sun/security/x509/ReasonFlags.java classlib6/core/src/openjdk/sun/sun/security/x509/SerialNumber.java classlib6/core/src/openjdk/sun/sun/security/x509/SubjectAlternativeNameExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/SubjectKeyIdentifierExtension.java classlib6/core/src/openjdk/sun/sun/security/x509/URIName.java classlib6/core/src/openjdk/sun/sun/security/x509/UniqueIdentity.java classlib6/core/src/openjdk/sun/sun/security/x509/X400Address.java classlib6/core/src/openjdk/sun/sun/security/x509/X500Name.java classlib6/core/src/openjdk/sun/sun/security/x509/X500Signer.java classlib6/core/src/openjdk/sun/sun/security/x509/X509AttributeName.java classlib6/core/src/openjdk/sun/sun/security/x509/X509CRLEntryImpl.java classlib6/core/src/openjdk/sun/sun/security/x509/X509CRLImpl.java classlib6/core/src/openjdk/sun/sun/security/x509/X509Cert.java classlib6/core/src/openjdk/sun/sun/security/x509/X509CertImpl.java classlib6/core/src/openjdk/sun/sun/security/x509/X509CertInfo.java classlib6/core/src/openjdk/sun/sun/security/x509/X509Key.java Added Paths: ----------- classlib6/core/src/openjdk/sun/sun/security/action/GetBooleanSecurityPropertyAction.java classlib6/core/src/openjdk/sun/sun/security/action/OpenFileInputStreamAction.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/AlgorithmChecker.java classlib6/core/src/openjdk/sun/sun/security/provider/certpath/OCSP.java Added: classlib6/core/src/openjdk/sun/sun/security/action/GetBooleanSecurityPropertyAction.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/action/GetBooleanSecurityPropertyAction.java (rev 0) +++ classlib6/core/src/openjdk/sun/sun/security/action/GetBooleanSecurityPropertyAction.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2010, 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 sun.security.action; + +import java.security.Security; + +/** + * A convenience class for retrieving the boolean value of a security property + * as a privileged action. + * + * <p>An instance of this class can be used as the argument of + * <code>AccessController.doPrivileged</code>. + * + * <p>The following code retrieves the boolean value of the security + * property named <code>"prop"</code> as a privileged action: <p> + * + * <pre> + * boolean b = java.security.AccessController.doPrivileged + * (new GetBooleanSecurityPropertyAction("prop")).booleanValue(); + * </pre> + * + */ +public class GetBooleanSecurityPropertyAction + implements java.security.PrivilegedAction<Boolean> { + private String theProp; + + /** + * Constructor that takes the name of the security property whose boolean + * value needs to be determined. + * + * @param theProp the name of the security property + */ + public GetBooleanSecurityPropertyAction(String theProp) { + this.theProp = theProp; + } + + /** + * Determines the boolean value of the security property whose name was + * specified in the constructor. + * + * @return the <code>Boolean</code> value of the security property. + */ + public Boolean run() { + boolean b = false; + try { + String value = Security.getProperty(theProp); + b = (value != null) && value.equalsIgnoreCase("true"); + } catch (NullPointerException e) {} + return b; + } +} Added: classlib6/core/src/openjdk/sun/sun/security/action/OpenFileInputStreamAction.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/action/OpenFileInputStreamAction.java (rev 0) +++ classlib6/core/src/openjdk/sun/sun/security/action/OpenFileInputStreamAction.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2002, 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 sun.security.action; + +import java.io.*; + +import java.security.PrivilegedExceptionAction; + +/** + * A convenience class for opening a FileInputStream as a privileged action. + * + * @author Andreas Sterbenz + */ +public class OpenFileInputStreamAction + implements PrivilegedExceptionAction<FileInputStream> { + + private final File file; + + public OpenFileInputStreamAction(File file) { + this.file = file; + } + + public OpenFileInputStreamAction(String filename) { + this.file = new File(filename); + } + + public FileInputStream run() throws Exception { + return new FileInputStream(file); + } +} Modified: classlib6/core/src/openjdk/sun/sun/security/jgss/krb5/InitialToken.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/jgss/krb5/InitialToken.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/jgss/krb5/InitialToken.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, 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 @@ -209,6 +209,12 @@ int pos = 0; + if (checksum == null) { + GSSException ge = new GSSException(GSSException.FAILURE, -1, + "No cksum in AP_REQ's authenticator"); + ge.initCause(new KrbException(Krb5.KRB_AP_ERR_INAPP_CKSUM)); + throw ge; + } checksumBytes = checksum.getBytes(); if ((checksumBytes[0] != CHECKSUM_FIRST_BYTES[0]) || Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/Config.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/Config.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/Config.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2006, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/JarVerifier.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/JarVerifier.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/JarVerifier.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/KeyCache.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/KeyCache.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/KeyCache.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Cipher.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Cipher.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Cipher.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2010, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; @@ -127,7 +127,6 @@ // XXX change default to PKCS5Padding paddingType = PAD_NONE; } - session = token.getOpSession(); } protected void engineSetMode(String mode) throws NoSuchAlgorithmException { @@ -654,16 +653,4 @@ (token, key, keyAlgorithm).keyLength(); return n; } - - protected void finalize() throws Throwable { - try { - if ((session != null) && token.isValid()) { - cancelOperation(); - session = token.releaseSession(session); - } - } finally { - super.finalize(); - } - } - } Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DHKeyFactory.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DHKeyFactory.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DHKeyFactory.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DSAKeyFactory.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DSAKeyFactory.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11DSAKeyFactory.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Digest.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Digest.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Digest.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2010, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; @@ -308,16 +308,4 @@ throw new ProviderException("update() failed", e); } } - - protected void finalize() throws Throwable { - try { - if ((session != null) && token.isValid()) { - cancelOperation(); - session = token.releaseSession(session); - } - } finally { - super.finalize(); - } - } - } Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECDHKeyAgreement.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECDHKeyAgreement.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECDHKeyAgreement.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2006, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECKeyFactory.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECKeyFactory.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11ECKeyFactory.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2006, 2010, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; @@ -40,6 +40,8 @@ import sun.security.pkcs11.wrapper.*; import static sun.security.pkcs11.wrapper.PKCS11Constants.*; +import sun.security.util.DerValue; + /** * EC KeyFactory implemenation. * @@ -201,7 +203,16 @@ private PublicKey generatePublic(ECPoint point, ECParameterSpec params) throws PKCS11Exception { byte[] encodedParams = ECParameters.encodeParameters(params); - byte[] encodedPoint = ECParameters.encodePoint(point, params.getCurve()); + byte[] encodedPoint = null; + DerValue pkECPoint = new DerValue(DerValue.tag_OctetString, + ECParameters.encodePoint(point, params.getCurve())); + + try { + encodedPoint = pkECPoint.toByteArray(); + } catch (IOException e) { + throw new IllegalArgumentException("Could not DER encode point", e); + } + CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] { new CK_ATTRIBUTE(CKA_CLASS, CKO_PUBLIC_KEY), new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_EC), Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Key.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Key.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11Key.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2010, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,14 +18,15 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; import java.io.*; +import java.lang.ref.*; import java.math.BigInteger; import java.util.*; @@ -44,6 +45,8 @@ import sun.security.pkcs11.wrapper.*; import static sun.security.pkcs11.wrapper.PKCS11Constants.*; +import sun.security.util.DerValue; + /** * Key implementation classes. * @@ -67,9 +70,6 @@ // type of key, one of (PUBLIC, PRIVATE, SECRET) final String type; - // session in which the key was created, relevant for session objects - final Session session; - // token instance final Token token; @@ -85,10 +85,12 @@ // flags indicating whether the key is a token object, sensitive, extractable final boolean tokenObject, sensitive, extractable; + // phantom reference notification clean up for session keys + private final SessionKeyRef sessionKeyRef; + P11Key(String type, Session session, long keyID, String algorithm, int keyLength, CK_ATTRIBUTE[] attributes) { this.type = type; - this.session = session; this.token = session.token; this.keyID = keyID; this.algorithm = algorithm; @@ -111,7 +113,9 @@ this.sensitive = sensitive; this.extractable = extractable; if (tokenObject == false) { - session.addObject(); + sessionKeyRef = new SessionKeyRef(this, keyID, session); + } else { + sessionKeyRef = null; } } @@ -236,24 +240,6 @@ } } - protected void finalize() throws Throwable { - if (tokenObject || (token.isValid() == false)) { - super.finalize(); - return; - } - Session newSession = null; - try { - newSession = token.getOpSession(); - token.p11.C_DestroyObject(newSession.id(), keyID); - } catch (PKCS11Exception e) { - // ignore - } finally { - token.releaseSession(newSession); - session.removeObject(); - super.finalize(); - } - } - private final static CK_ATTRIBUTE[] A0 = new CK_ATTRIBUTE[0]; private static CK_ATTRIBUTE[] getAttributes(Session session, long keyID, @@ -1016,8 +1002,16 @@ try { params = P11ECKeyFactory.decodeParameters (attributes[1].getByteArray()); + DerValue wECPoint = new DerValue(attributes[0].getByteArray()); + if (wECPoint.getTag() != DerValue.tag_OctetString) + throw new IOException("Unexpected tag: " + + wECPoint.getTag()); + params = P11ECKeyFactory.decodeParameters + (attributes[1].getByteArray()); w = P11ECKeyFactory.decodePoint - (attributes[0].getByteArray(), params.getCurve()); + (wECPoint.getDataBytes(), params.getCurve()); + + } catch (Exception e) { throw new RuntimeException("Could not parse key values", e); } @@ -1055,5 +1049,68 @@ + "\n parameters: " + params; } } +} +/* + * NOTE: Must use PhantomReference here and not WeakReference + * otherwise the key maybe cleared before other objects which + * still use these keys during finalization such as SSLSocket. + */ +final class SessionKeyRef extends PhantomReference<P11Key> + implements Comparable<SessionKeyRef> { + private static ReferenceQueue<P11Key> refQueue = + new ReferenceQueue<P11Key>(); + private static Set<SessionKeyRef> refList = + Collections.synchronizedSortedSet(new TreeSet<SessionKeyRef>()); + + static ReferenceQueue<P11Key> referenceQueue() { + return refQueue; + } + + private static void drainRefQueueBounded() { + while (true) { + SessionKeyRef next = (SessionKeyRef) refQueue.poll(); + if (next == null) break; + next.dispose(); + } + } + + // handle to the native key + private long keyID; + private Session session; + + SessionKeyRef(P11Key key , long keyID, Session session) { + super(key, refQueue); + this.keyID = keyID; + this.session = session; + this.session.addObject(); + refList.add(this); + // TBD: run at some interval and not every time? + drainRefQueueBounded(); + } + + private void dispose() { + refList.remove(this); + if (session.token.isValid()) { + Session newSession = null; + try { + newSession = session.token.getOpSession(); + session.token.p11.C_DestroyObject(newSession.id(), keyID); + } catch (PKCS11Exception e) { + // ignore + } finally { + this.clear(); + session.token.releaseSession(newSession); + session.removeObject(); + } + } + } + + public int compareTo(SessionKeyRef other) { + if (this.keyID == other.keyID) { + return 0; + } else { + return (this.keyID < other.keyID) ? -1 : 1; + } + } } Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyAgreement.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyAgreement.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyAgreement.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyFactory.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyFactory.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyFactory.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyGenerator.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyGenerator.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyGenerator.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.security.pkcs11; Modified: classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyPairGenerator.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyPairGenerator.java 2011-03-05 13:01:15 UTC (rev 5802) +++ classlib6/core/src/openjdk/sun/sun/security/pkcs11/P11KeyPairGenerator.java 2011-03-05 13:13:50 UTC (rev 5803) @@ -1,12 +1,12 @@ /* - * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 2008, 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. Sun designates this + * publ... [truncated message content] |
From: <ls...@us...> - 2011-03-05 13:01:25
|
Revision: 5802 http://jnode.svn.sourceforge.net/jnode/?rev=5802&view=rev Author: lsantha Date: 2011-03-05 13:01:15 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java classlib6/core/src/openjdk/sun/sun/awt/image/FileImageSource.java classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageRepresentation.java classlib6/core/src/openjdk/sun/sun/awt/image/ImageWatched.java classlib6/core/src/openjdk/sun/sun/awt/image/ImagingLib.java classlib6/core/src/openjdk/sun/sun/awt/image/InputStreamImageSource.java classlib6/core/src/openjdk/sun/sun/awt/image/IntegerComponentRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/IntegerInterleavedRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/JPEGImageDecoder.java classlib6/core/src/openjdk/sun/sun/awt/image/NativeLibLoader.java classlib6/core/src/openjdk/sun/sun/awt/image/OffScreenImage.java classlib6/core/src/openjdk/sun/sun/awt/image/OffScreenImageSource.java classlib6/core/src/openjdk/sun/sun/awt/image/PNGImageDecoder.java classlib6/core/src/openjdk/sun/sun/awt/image/PixelConverter.java classlib6/core/src/openjdk/sun/sun/awt/image/ShortBandedRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/ShortComponentRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/ShortInterleavedRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/SunVolatileImage.java classlib6/core/src/openjdk/sun/sun/awt/image/SunWritableRaster.java classlib6/core/src/openjdk/sun/sun/awt/image/SurfaceManager.java classlib6/core/src/openjdk/sun/sun/awt/image/ToolkitImage.java classlib6/core/src/openjdk/sun/sun/awt/image/VolatileSurfaceManager.java classlib6/core/src/openjdk/sun/sun/awt/image/WritableRasterNative.java classlib6/core/src/openjdk/sun/sun/awt/image/XbmImageDecoder.java classlib6/core/src/openjdk/sun/sun/corba/Bridge.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/Dasher.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/LineSink.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesCache.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesMath.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesRenderingEngine.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/PiscesTileGenerator.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/Renderer.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/Stroker.java classlib6/core/src/openjdk/sun/sun/java2d/pisces/Transform4.java classlib6/core/src/openjdk/sun/sun/management/jmxremote/ConnectorBootstrap.java classlib6/core/src/openjdk/sun/sun/management/jmxremote/LocalRMIServerSocketFactory.java classlib6/core/src/openjdk/sun/sun/management/jmxremote/SSLContextRMIServerSocketFactory.java classlib6/core/src/openjdk/sun/sun/management/jmxremote/SingleEntryRegistry.java classlib6/core/src/openjdk/sun/sun/management/jmxremote/package.html classlib6/core/src/openjdk/sun/sun/management/resources/agent.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_de.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_es.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_fr.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_it.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_ja.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_ko.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_sv.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_zh_CN.properties classlib6/core/src/openjdk/sun/sun/management/resources/agent_zh_TW.properties classlib6/core/src/openjdk/sun/sun/misc/ASCIICaseInsensitiveComparator.java classlib6/core/src/openjdk/sun/sun/misc/BASE64Decoder.java classlib6/core/src/openjdk/sun/sun/misc/BASE64Encoder.java classlib6/core/src/openjdk/sun/sun/misc/CEFormatException.java classlib6/core/src/openjdk/sun/sun/misc/CEStreamExhausted.java classlib6/core/src/openjdk/sun/sun/misc/CRC16.java classlib6/core/src/openjdk/sun/sun/misc/Cache.java classlib6/core/src/openjdk/sun/sun/misc/CharacterDecoder.java classlib6/core/src/openjdk/sun/sun/misc/CharacterEncoder.java classlib6/core/src/openjdk/sun/sun/misc/ClassFileTransformer.java classlib6/core/src/openjdk/sun/sun/misc/ClassLoaderUtil.java classlib6/core/src/openjdk/sun/sun/misc/Cleaner.java classlib6/core/src/openjdk/sun/sun/misc/Compare.java classlib6/core/src/openjdk/sun/sun/misc/CompoundEnumeration.java classlib6/core/src/openjdk/sun/sun/misc/ConditionLock.java classlib6/core/src/openjdk/sun/sun/misc/DoubleConsts.java classlib6/core/src/openjdk/sun/sun/misc/ExtensionDependency.java classlib6/core/src/openjdk/sun/sun/misc/ExtensionInfo.java classlib6/core/src/openjdk/sun/sun/misc/ExtensionInstallationException.java classlib6/core/src/openjdk/sun/sun/misc/ExtensionInstallationProvider.java classlib6/core/src/openjdk/sun/sun/misc/FloatConsts.java classlib6/core/src/openjdk/sun/sun/misc/FloatingDecimal.java classlib6/core/src/openjdk/sun/sun/misc/FormattedFloatingDecimal.java classlib6/core/src/openjdk/sun/sun/misc/FpUtils.java classlib6/core/src/openjdk/sun/sun/misc/GC.java classlib6/core/src/openjdk/sun/sun/misc/HexDumpEncoder.java classlib6/core/src/openjdk/sun/sun/misc/InvalidJarIndexException.java classlib6/core/src/openjdk/sun/sun/misc/JarFilter.java classlib6/core/src/openjdk/sun/sun/misc/JarIndex.java classlib6/core/src/openjdk/sun/sun/misc/JavaIOFileDescriptorAccess.java classlib6/core/src/openjdk/sun/sun/misc/JavaLangAccess.java classlib6/core/src/openjdk/sun/sun/misc/JavaNetAccess.java classlib6/core/src/openjdk/sun/sun/misc/JavaUtilJarAccess.java classlib6/core/src/openjdk/sun/sun/misc/LRUCache.java classlib6/core/src/openjdk/sun/sun/misc/Launcher.java classlib6/core/src/openjdk/sun/sun/misc/Lock.java classlib6/core/src/openjdk/sun/sun/misc/MessageUtils.java classlib6/core/src/openjdk/sun/sun/misc/NativeSignalHandler.java classlib6/core/src/openjdk/sun/sun/misc/Perf.java classlib6/core/src/openjdk/sun/sun/misc/PerformanceLogger.java classlib6/core/src/openjdk/sun/sun/misc/ProxyGenerator.java classlib6/core/src/openjdk/sun/sun/misc/Queue.java classlib6/core/src/openjdk/sun/sun/misc/REException.java classlib6/core/src/openjdk/sun/sun/misc/Ref.java classlib6/core/src/openjdk/sun/sun/misc/Regexp.java classlib6/core/src/openjdk/sun/sun/misc/RegexpPool.java classlib6/core/src/openjdk/sun/sun/misc/RegexpTarget.java classlib6/core/src/openjdk/sun/sun/misc/Request.java classlib6/core/src/openjdk/sun/sun/misc/RequestProcessor.java classlib6/core/src/openjdk/sun/sun/misc/Resource.java classlib6/core/src/openjdk/sun/sun/misc/Service.java classlib6/core/src/openjdk/sun/sun/misc/ServiceConfigurationError.java classlib6/core/src/openjdk/sun/sun/misc/SharedSecrets.java classlib6/core/src/openjdk/sun/sun/misc/Signal.java classlib6/core/src/openjdk/sun/sun/misc/SignalHandler.java classlib6/core/src/openjdk/sun/sun/misc/SoftCache.java classlib6/core/src/openjdk/sun/sun/misc/Sort.java classlib6/core/src/openjdk/sun/sun/misc/Timeable.java classlib6/core/src/openjdk/sun/sun/misc/Timer.java classlib6/core/src/openjdk/sun/sun/misc/UCDecoder.java classlib6/core/src/openjdk/sun/sun/misc/UCEncoder.java classlib6/core/src/openjdk/sun/sun/misc/URLClassPath.java classlib6/core/src/openjdk/sun/sun/misc/UUDecoder.java classlib6/core/src/openjdk/sun/sun/misc/UUEncoder.java classlib6/core/src/openjdk/sun/sun/misc/Unsafe.java classlib6/core/src/openjdk/sun/sun/misc/VM.java classlib6/core/src/openjdk/sun/sun/misc/VMNotification.java classlib6/core/src/openjdk/sun/sun/net/NetworkClient.java classlib6/core/src/openjdk/sun/sun/net/www/MessageHeader.java classlib6/core/src/openjdk/sun/sun/reflect/misc/MethodUtil.java classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_de.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_es.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_fr.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_it.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_ja.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_ko.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_sv.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_zh_CN.properties classlib6/core/src/openjdk/sun/sun/rmi/registry/resources/rmiregistry_zh_TW.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_de.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_es.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_fr.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_it.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_ja.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_ko.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_sv.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_zh_CN.properties classlib6/core/src/openjdk/sun/sun/rmi/server/resources/rmid_zh_TW.properties Added Paths: ----------- classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java classlib6/core/src/openjdk/sun/sun/misc/JavaSecurityAccess.java classlib6/core/src/openjdk/sun/sun/rmi/server/Activation.java Added: classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java (rev 0) +++ classlib6/core/src/openjdk/sun/sun/awt/AWTAccessor.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -0,0 +1,132 @@ +/* + * 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. 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 sun.awt; + +import java.awt.*; +import java.awt.event.InputEvent; +import java.awt.geom.Point2D; +import java.awt.image.BufferedImage; + +import sun.misc.Unsafe; +import java.awt.peer.ComponentPeer; + +import java.security.AccessController; +import java.security.AccessControlContext; + +/** + * The AWTAccessor utility class. + * The main purpose of this class is to enable accessing + * private and package-private fields of classes from + * different classes/packages. See sun.misc.SharedSecretes + * for another example. + */ +public final class AWTAccessor { + + private static final Unsafe unsafe = Unsafe.getUnsafe(); + + /* + * We don't need any objects of this class. + * It's rather a collection of static methods + * and interfaces. + */ + private AWTAccessor() { + } + + /* + * An interface of accessor for the java.awt.Component class. + */ + public interface ComponentAccessor { + /* + * Returns the acc this component was constructed with. + */ + AccessControlContext getAccessControlContext(Component comp); + } + + /* + * An accessor for the AWTEvent class. + */ + public interface AWTEventAccessor { + /** + * Sets the flag on this AWTEvent indicating that it was + * generated by the system. + */ + void setSystemGenerated(AWTEvent ev); + + /** + * Indicates whether this AWTEvent was generated by the system. + */ + boolean isSystemGenerated(AWTEvent ev); + + + /* + * Returns the acc this event was constructed with. + */ + AccessControlContext getAccessControlContext(AWTEvent ev); + + } + + /* + * Accessor instances are initialized in the static initializers of + * corresponding AWT classes by using setters defined below. + */ + private static ComponentAccessor componentAccessor; + private static AWTEventAccessor awtEventAccessor; + + /* + * Set an accessor object for the java.awt.Component class. + */ + public static void setComponentAccessor(ComponentAccessor ca) { + componentAccessor = ca; + } + + /* + * Retrieve the accessor object for the java.awt.Component class. + */ + public static ComponentAccessor getComponentAccessor() { + if (componentAccessor == null) { + unsafe.ensureClassInitialized(Component.class); + } + + return componentAccessor; + } + + /* + * Set an accessor object for the java.awt.AWTEvent class. + */ + public static void setAWTEventAccessor(AWTEventAccessor aea) { + awtEventAccessor = aea; + } + + /* + * Retrieve the accessor object for the java.awt.AWTEvent class. + */ + public static AWTEventAccessor getAWTEventAccessor() { + if (awtEventAccessor == null) { + unsafe.ensureClassInitialized(AWTEvent.class); + } + return awtEventAccessor; + } +} Modified: classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/SunToolkit.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2008, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt; @@ -859,6 +859,15 @@ return AccessController.doPrivileged(new GetBooleanAction("sun.awt.erasebackgroundonresize")); } + + /** + * Makes the window OverrideRedirect, on X11 platforms. See + * ICCCM specification for more details about OverrideRedirect + * windows. Implemented in XToolkit, no-op in WToolkit. + */ + public void setOverrideRedirect(Window target) { + } + static SoftCache imgCache = new SoftCache(); static synchronized Image getImageFromHash(Toolkit tk, URL url) { Modified: classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDragSourceContextPeer.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.dnd; Modified: classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetContextPeer.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2010, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.dnd; @@ -57,6 +57,7 @@ import sun.awt.SunToolkit; import sun.awt.datatransfer.DataTransferer; import sun.awt.datatransfer.ToolkitThreadBlockedHandler; +import sun.security.util.SecurityConstants; /** * <p> @@ -216,6 +217,17 @@ throws UnsupportedFlavorException, IOException, InvalidDnDOperationException { + SecurityManager sm = System.getSecurityManager(); + try { + if (!dropComplete && sm != null) { + sm.checkSystemClipboardAccess(); + } + } catch (Exception e) { + Thread currentThread = Thread.currentThread(); + currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, e); + return null; + } + Long lFormat = null; Transferable localTransferable = local; Modified: classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/dnd/SunDropTargetEvent.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.dnd; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/BadDepthException.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1995 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceData.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1999, 2010, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; @@ -49,7 +49,7 @@ private BufferedImageGraphicsConfig graphicsConfig; RenderLoops solidloops; - private static native void initIDs(Class ICM); + private static native void initIDs(Class ICM, Class ICMColorData); private static final int DCM_RGBX_RED_MASK = 0xff000000; private static final int DCM_RGBX_GREEN_MASK = 0x00ff0000; @@ -67,7 +67,7 @@ private static final int DCM_ARGBBM_BLUE_MASK = 0x000000ff; static { - initIDs(IndexColorModel.class); + initIDs(IndexColorModel.class, ICMColorData.class); } public static SurfaceData createData(BufferedImage bufImg) { @@ -403,7 +403,7 @@ // their pixels are immediately retrievable anyway. } - public static native void freeNativeICMData(IndexColorModel icm); + private static native void freeNativeICMData(long pData); /** * Returns destination Image associated with this SurfaceData. @@ -411,4 +411,19 @@ public Object getDestination() { return bufImg; } + + public static final class ICMColorData { + private long pData = 0L; + + private ICMColorData(long pData) { + this.pData = pData; + } + + public void finalize() { + if (pData != 0L) { + BufImgSurfaceData.freeNativeICMData(pData); + pData = 0L; + } + } + } } Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/BufImgSurfaceManager.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/BufImgVolatileSurfaceManager.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageDevice.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1999, 2000, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/BufferedImageGraphicsConfig.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2005, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteArrayImageSource.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1996 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1996, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteBandedRaster.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteComponentRaster.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ByteInterleavedRaster.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/BytePackedRaster.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 2007, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/DataBufferNative.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2000, 2001, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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. */ Modified: classlib6/core/src/openjdk/sun/sun/awt/image/FileImageSource.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/FileImageSource.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/FileImageSource.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1995-1996 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 1996, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/GifImageDecoder.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -585,9 +585,16 @@ System.out.print("Reading a " + width + " by " + height + " " + (interlace ? "" : "non-") + "interlaced image..."); } - + int initCodeSize = ExtractByte(block, 9); + if (initCodeSize >= 12) { + if (verbose) { + System.out.println("Invalid initial code size: " + + initCodeSize); + } + return false; + } boolean ret = parseImage(x, y, width, height, - interlace, ExtractByte(block, 9), + interlace, initCodeSize, block, rasline, model); if (!ret) { Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageAccessException.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1995 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageConsumerQueue.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1997, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageDecoder.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetchable.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2001 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 2001, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageFetcher.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1995-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 2003, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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.awt.image; Modified: classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java =================================================================== --- classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java 2011-03-05 11:39:52 UTC (rev 5801) +++ classlib6/core/src/openjdk/sun/sun/awt/image/ImageFormatException.java 2011-03-05 13:01:15 UTC (rev 5802) @@ -1,12 +1,12 @@ /* - * Copyright 1995 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1995, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional info... [truncated message content] |