# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1245685222 -7200
# Node ID 393046bdec90e552fde133ce55ce7cfbee629695
# Parent  cf9b143bfaf9f6313a391fce31a9882048a89cf9# Parent  a4d32dc556eba39fe0cb9b69822f8f8745dda1f8
Merging eliminateswing branch, as the swing (and AWT) seem to compile separatelly

diff -r cf9b143bfaf9 -r 393046bdec90 build.xml
--- a/build.xml	Sat Jun 20 22:21:50 2009 +0200
+++ b/build.xml	Mon Jun 22 17:40:22 2009 +0200
@@ -4,6 +4,7 @@
 
     <target name="all">
         <antcall target="base"/>
+        <antcall target="client"/>
         <antcall target="applet"/>
         <antcall target="corba"/>
         <antcall target="deprecated7"/>
@@ -81,43 +82,45 @@
         </and>
     </selector>
     <selector id="corba">
-        <or>
-            <filename name="org/omg/**"/>
-            <filename name="com/sun/corba/**"/>
-            <filename name="com/sun/jmx/remote/internal/ProxyInputStream.java"/>
-            <filename name="com/sun/jndi/cosnaming/**"/>
-            <filename name="com/sun/jndi/toolkit/corba/**"/>
-            <filename name="com/sun/jndi/url/iiop/**"/>
-            <filename name="com/sun/jndi/url/iiopname/**"/>
-            <filename name="com/sun/jndi/url/corbaname/**"/>
-            <filename name="javax/management/remote/rmi/RMIConnector.java"/>
-            <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
-            <filename name="javax/management/remote/rmi/RMIServerImpl.java"/>
-            <filename name="javax/management/remote/rmi/RMIIIOPServerImpl.java"/>
-            <filename name="javax/management/remote/rmi/RMIConnectionImpl.java"/>
-            <filename name="javax/management/remote/rmi/RMIJRMPServerImpl.java"/>
-            <filename name="javax/rmi/PortableRemoteObject.java"/>
-            <filename name="com/sun/jmx/remote/security/FileLoginModule.java"/>
-            <filename name="com/sun/jmx/remote/security/JMXPluggableAuthenticator.java"/>
-            <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/iiop/ClientProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/iiop/ServerProvider.java"/>
-            <filename name="com/sun/jmx/remote/protocol/rmi/ServerProvider.java"/>
-            <filename name="com/sun/jndi/url/iiop/iiopURLContextFactory.java"/>
-            <filename name="sun/rmi/rmic/RMIGenerator.java"/>
-            <filename name="sun/management/jmxremote/ConnectorBootstrap.java"/>
-            <filename name="sun/management/Agent.java"/>
-            <filename name="sun/management/snmp/AdaptorBootstrap.java"/>
-            <filename name="javax/rmi/CORBA/**"/>
-            <filename name="com/sun/org/omg/**"/>
-            <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
-            <filename name="com/sun/jndi/url/iiop/iiopURLContext.java"/>
-            <filename name="sun/rmi/rmic/iiop/**"/>
-
-            <!-- now there are just two references in jconsole -->
-            <filename name="sun/tools/jconsole/**"/>
-        </or>
+        <and>
+            <or>
+                <filename name="org/omg/**"/>
+                <filename name="com/sun/corba/**"/>
+                <filename name="com/sun/jmx/remote/internal/ProxyInputStream.java"/>
+                <filename name="com/sun/jndi/cosnaming/**"/>
+                <filename name="com/sun/jndi/toolkit/corba/**"/>
+                <filename name="com/sun/jndi/url/iiop/**"/>
+                <filename name="com/sun/jndi/url/iiopname/**"/>
+                <filename name="com/sun/jndi/url/corbaname/**"/>
+                <filename name="javax/management/remote/rmi/RMIConnector.java"/>
+                <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
+                <filename name="javax/management/remote/rmi/RMIServerImpl.java"/>
+                <filename name="javax/management/remote/rmi/RMIIIOPServerImpl.java"/>
+                <filename name="javax/management/remote/rmi/RMIConnectionImpl.java"/>
+                <filename name="javax/management/remote/rmi/RMIJRMPServerImpl.java"/>
+                <filename name="javax/rmi/PortableRemoteObject.java"/>
+                <filename name="com/sun/jmx/remote/security/FileLoginModule.java"/>
+                <filename name="com/sun/jmx/remote/security/JMXPluggableAuthenticator.java"/>
+                <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/rmi/ClientProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/iiop/ClientProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/iiop/ServerProvider.java"/>
+                <filename name="com/sun/jmx/remote/protocol/rmi/ServerProvider.java"/>
+                <filename name="com/sun/jndi/url/iiop/iiopURLContextFactory.java"/>
+                <filename name="sun/rmi/rmic/RMIGenerator.java"/>
+                <filename name="sun/management/jmxremote/ConnectorBootstrap.java"/>
+                <filename name="sun/management/Agent.java"/>
+                <filename name="sun/management/snmp/AdaptorBootstrap.java"/>
+                <filename name="javax/rmi/CORBA/**"/>
+                <filename name="com/sun/org/omg/**"/>
+                <filename name="javax/management/remote/rmi/RMIConnectorServer.java"/>
+                <filename name="com/sun/jndi/url/iiop/iiopURLContext.java"/>
+                <filename name="sun/rmi/rmic/iiop/**"/>
+            </or>
+            <none>
+                <selector refid="deprecated7"/>
+            </none>
+        </and>
     </selector>
     <selector id="beans">
         <and>
@@ -133,6 +136,78 @@
         </and>
     </selector>
 
+    <selector id="client">
+        <and>
+            <or>
+                <filename name="java/awt/**"/>
+                <filename name="sun/awt/**"/>
+                <filename name="com/sun/awt/**"/>
+                <filename name="javax/imageio/**"/>
+                <filename name="javax/print/**"/>
+                <filename name="javax/accessibility/**"/>
+                <filename name="com/sun/imageio/**"/>
+                <filename name="javax/swing/**"/>
+                <filename name="sun/swing/**"/>
+                <filename name="sun/java2d/**"/>
+                <filename name="sun/print/**"/>
+                <filename name="sun/font/**"/>
+                <filename name="sun/beans/**"/>
+                <filename name="sun/awt/shell/**"/>
+                <filename name="com/sun/swing/**"/>
+                <filename name="com/sun/java/swing/**"/>
+                <filename name="com/sun/xml/internal/xsom/impl/util/**"/>
+                <filename name="com/sun/security/auth/callback/DialogCallbackHandler*"/>
+                <filename name="com/sun/inputmethods/internal/**"/>
+                <filename name="com/sun/xml/internal/bind/**"/>
+                
+                <filename name="com/sun/xml/internal/messaging/saaj/**"/>
+                <filename name="com/sun/xml/internal/org/jvnet/staxex/**"/>
+                <filename name="com/sun/xml/internal/stream/buffer/stax/**"/>
+                <filename name="com/sun/xml/internal/ws/**"/>
+                <filename name="com/sun/istack/internal/**"/>
+                <filename name="com/sun/xml/internal/stream/buffer/**"/>
+<!--                <filename name="com/sun/xml/internal/stream/**"/>-->
+                <filename name="com/sun/xml/internal/xsom/**"/>
+                
+                <filename name="javax/xml/soap/**"/>
+                <filename name="javax/xml/bind/**"/>
+                <filename name="javax/xml/ws/**"/>
+                <filename name="javax/activation/**"/>
+
+                <filename name="sun/net/www/content/image/**"/>
+
+                <!--<filename name="com/sun/naming/internal/**"/>-->
+
+                <!-- input method has JFrame in signature -->
+                <filename name="sun/awt/im/**"/>
+                <filename name="sun/awt/X11/**"/>
+
+                <filename name="java/beans/javax_swing*"/>
+                <filename name="java/beans/**"/>
+                <filename name="com/sun/beans/**"/>
+                <!-- bridge between jmx and beans -->
+                <filename name="META-INF/services/com.sun.jmx.mbeanserver.IntrospectorProxy"/>
+                <!-- bridge between java.text and java.awt.font for Bidi -->
+                <filename name="META-INF/services/sun.text.BidiProxy"/>
+            </or>
+            <none>
+                <filename name="java/awt/AWTPermission*"/>
+
+                <filename name="java/beans/ConstructorProperties*"/>
+                <filename name="java/beans/PropertyChangeListener*"/>
+                <filename name="java/beans/PropertyChangeEvent*"/>
+                <filename name="java/beans/IndexedPropertyChangeEvent*"/>
+                <filename name="java/beans/PropertyChangeSupport*"/>
+                <filename name="java/beans/ChangeListenerMap*"/>
+
+                <!-- remove classes from other modules -->
+                <selector refid="applet"/>
+                <selector refid="corba"/>
+                <selector refid="deprecated7"/>
+            </none>
+        </and>
+    </selector>
+
     <selector id="deprecated7">
         <or>
             <!-- deprecated as it contains one method
@@ -145,8 +220,12 @@
             <filename name="javax/swing/RepaintManager*"/>
 
             <!-- tools -->
-            <filename name="sun/tools/serialver/**"/>
-            <filename name="com/sun/tools/corba/**"/>
+            <filename name="sun/security/tools/**"/>
+            <filename name="com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl*"/>
+            <filename name="com/sun/tools/**"/>
+            <filename name="com/sun/jdi/**"/>
+            <filename name="sun/tools/**"/>
+            <filename name="sun/rmi/rmic/**"/>
         </or>
     </selector>
 
@@ -155,9 +234,9 @@
             <!-- exclude classes from other modules -->
             <selector refid="corba"/>
             <selector refid="applet"/>
+            <selector refid="client"/>
             <selector refid="deprecated7"/>
         <!--
-            <selector refid="beans"/>
             <selector refid="client"/>
             <selector refid="enterprise"/>
             <selector refid="deprecated7"/>
@@ -184,13 +263,13 @@
     <target name="deprecated7">
         <antcall target="-compile-one-module">
             <param name="module" value="deprecated7"/>
-            <param name="depends" value="base:applet"/>
+            <param name="depends" value="base:applet:client:corba"/>
         </antcall>
     </target>
     <target name="applet">
         <antcall target="-compile-one-module">
             <param name="module" value="applet"/>
-            <param name="depends" value="base"/>
+            <param name="depends" value="base:client"/>
         </antcall>
     </target>
     <target name="beans">
@@ -198,10 +277,16 @@
             <param name="module" value="beans"/>
         </antcall>
     </target>
+    <target name="client">
+        <antcall target="-compile-one-module">
+            <param name="module" value="client"/>
+            <param name="depends" value="base"/>
+        </antcall>
+    </target>
     <target name="corba">
         <antcall target="-compile-one-module">
             <param name="module" value="corba"/>
-            <param name="depends" value="base:applet"/>
+            <param name="depends" value="base:client:applet"/>
         </antcall>
     </target>
 
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/META-INF/services/com.sun.jmx.mbeanserver.IntrospectorProxy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/META-INF/services/com.sun.jmx.mbeanserver.IntrospectorProxy	Mon Jun 22 17:40:22 2009 +0200
@@ -0,0 +1,1 @@
+sun.beans.IntrospectorProxyImpl
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/META-INF/services/sun.text.BidiProxy
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/META-INF/services/sun.text.BidiProxy	Mon Jun 22 17:40:22 2009 +0200
@@ -0,0 +1,2 @@
+sun.font.BidiProxyImpl
+
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/com/sun/beans/IntrospectorProxyImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/com/sun/beans/IntrospectorProxyImpl.java	Mon Jun 22 17:40:22 2009 +0200
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2005-2008 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 sun.beans;
+
+import java.beans.BeanInfo;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.TreeMap;
+
+import com.sun.jmx.mbeanserver.IntrospectorProxy;
+
+public abstract class IntrospectorProxyImpl extends IntrospectorProxy {
+    public Map<String, Object> inspectClass(Class<?> type, Object values) {
+        Map<String, Object> map = new TreeMap<String, Object>();
+        try {
+            BeanInfo bi = java.beans.Introspector.getBeanInfo(type);
+            PropertyDescriptor[] pds = bi.getPropertyDescriptors();
+            for (PropertyDescriptor pd : pds) {
+                String name = pd.getName();
+                if (name.equals("class")) {
+                    continue;
+                }
+                Method get = pd.getReadMethod();
+                if (get != null) {
+                    if (values == null) {
+                        map.put(name, get);
+                    } else {
+                        map.put(name, get.invoke(values));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            Throwable t = e;
+            if (t instanceof InvocationTargetException) {
+                t = t.getCause();
+            }
+            map.put("Exception", t);
+        }
+        return map;
+    }
+}
\ No newline at end of file
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/com/sun/jmx/mbeanserver/Introspector.java
--- a/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java	Sat Jun 20 22:21:50 2009 +0200
+++ b/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java	Mon Jun 22 17:40:22 2009 +0200
@@ -25,14 +25,9 @@
 
 package com.sun.jmx.mbeanserver;
 
-import com.sun.jmx.remote.util.EnvHelp;
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
@@ -41,7 +36,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
-import javax.management.AttributeNotFoundException;
 import javax.management.Description;
 
 import javax.management.Descriptor;
@@ -53,14 +47,11 @@
 import javax.management.MBeanInfo;
 import javax.management.MXBean;
 import javax.management.NotCompliantMBeanException;
-import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.MXBeanMappingFactory;
 
 import static com.sun.jmx.defaults.JmxProperties.MBEANSERVER_LOGGER;
 import com.sun.jmx.mbeanserver.Util;
 import com.sun.jmx.remote.util.EnvHelp;
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.util.LinkedHashSet;
@@ -732,11 +723,11 @@
             } else {
                 // Java Beans introspection
                 //
-                BeanInfo bi = java.beans.Introspector.getBeanInfo(complex.getClass());
-                PropertyDescriptor[] pds = bi.getPropertyDescriptors();
-                for (PropertyDescriptor pd : pds)
-                    if (pd.getName().equals(element))
-                        return pd.getReadMethod().invoke(complex);
+                Map<String,Object> methods = IntrospectorProxy.getDefault().inspectClass(complex.getClass(), null);
+                Object method = methods.get(element);
+                if (method instanceof Method) {
+                    return ((Method)method).invoke(complex);
+                }
                 throw new AttributeNotFoundException(
                     "Could not find the getter method for the property " +
                     element + " using the Java Beans introspector");
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/com/sun/jmx/mbeanserver/IntrospectorProxy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/com/sun/jmx/mbeanserver/IntrospectorProxy.java	Mon Jun 22 17:40:22 2009 +0200
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2005-2008 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.jmx.mbeanserver;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.TreeMap;
+
+public abstract class IntrospectorProxy {
+    public static IntrospectorProxy getDefault() {
+        Iterator<IntrospectorProxy> it = ServiceLoader.load(IntrospectorProxy.class).iterator();
+        return it.hasNext() ? it.next() : new SimpleIntrospector();
+    }
+
+    /** Either fills the map with inspected Method objects (if values == null)
+     * or with real values of those methods called on the values target
+     */
+    public abstract Map<String, Object> inspectClass(Class<?> type, Object values);
+
+    private static final class SimpleIntrospector extends IntrospectorProxy {
+        @Override
+        public Map<String,Object> inspectClass(Class<?> type, Object values) {
+            Map<String, Object> map = new TreeMap<String, Object>();
+            try {
+                for (Method get : type.getMethods()) {
+                    if (get.getName().equals("getClass")) {
+                        continue;
+                    }
+                    if (get.getParameterTypes().length != 0) {
+                        continue;
+                    }
+                    String name;
+                    if (get.getName().startsWith("get")) {
+                        name = get.getName().substring(3);
+                    } else {
+                        if (get.getName().startsWith("is")) {
+                            name = get.getName().substring(2);
+                        } else {
+                            continue;
+                        }
+                    }
+                    if (values == null) {
+                        map.put(name, get);
+                    } else {
+                        map.put(name, get.invoke(values));
+                    }
+                }
+            } catch (Exception e) {
+                Throwable t = e;
+                if (t instanceof InvocationTargetException) {
+                    t = t.getCause();
+                }
+                map.put("Exception", t);
+            }
+            return map;
+        }
+
+    }
+}
\ No newline at end of file
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/com/sun/naming/internal/ResourceManager.java
--- a/src/share/classes/com/sun/naming/internal/ResourceManager.java	Sat Jun 20 22:21:50 2009 +0200
+++ b/src/share/classes/com/sun/naming/internal/ResourceManager.java	Mon Jun 22 17:40:22 2009 +0200
@@ -25,11 +25,10 @@
 
 package com.sun.naming.internal;
 
-import java.awt.Component;
 import java.io.InputStream;
 import java.io.IOException;
-import java.net.URL;
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -41,7 +40,6 @@
 import java.util.WeakHashMap;
 
 import javax.naming.*;
-import sun.swing.SwingUtilities2;
 
 /**
   * The ResourceManager class facilitates the reading of JNDI resource files.
@@ -144,7 +142,7 @@
         if (env == null) {
             env = new Hashtable(11);
         }
-        Component applet = (Component)env.get(Context.APPLET);
+        Object applet = env.get(Context.APPLET);
 
         // Merge property values from env param, applet params, and system
         // properties.  The first value wins:  there's no concatenation of
@@ -158,7 +156,7 @@
             Object val = env.get(props[i]);
             if (val == null) {
                 if (applet != null) {
-                    val = SwingUtilities2.getAppletParameter(applet, props[i]);
+                    val = getAppletParameter(applet, props[i]);
                 }
                 if (val == null) {
                     // Read system property.
@@ -559,4 +557,16 @@
         }
         return false;
     }
+
+    public static String getAppletParameter(Object applet, String name) {
+        try {
+            Class<?> appletC = Class.forName("java.applet.Applet");
+            Method get = appletC.getMethod("getParameter", String.class);
+            return (String)get.invoke(applet, name);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+
 }
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/java/text/Bidi.java
--- a/src/share/classes/java/text/Bidi.java	Sat Jun 20 22:21:50 2009 +0200
+++ b/src/share/classes/java/text/Bidi.java	Mon Jun 22 17:40:22 2009 +0200
@@ -35,10 +35,8 @@
 
 package java.text;
 
-import java.awt.Toolkit;
-import java.awt.font.TextAttribute;
-import java.awt.font.NumericShaper;
 import sun.text.CodePointIterator;
+import sun.text.BidiProxy;
 
 /**
  * This class implements the Unicode Bidirectional Algorithm.
@@ -69,7 +67,7 @@
     int[] cws;
 
     static {
-         sun.font.FontManagerNativeLibrary.load();
+        BidiProxy.getDefault().init();
     }
 
     /** Constant indicating base direction is left-to-right. */
@@ -156,51 +154,20 @@
 
         paragraph.first();
         try {
-            Boolean runDirection = (Boolean)paragraph.getAttribute(TextAttribute.RUN_DIRECTION);
-            if (runDirection != null) {
-                if (TextAttribute.RUN_DIRECTION_LTR.equals(runDirection)) {
-                    flags = DIRECTION_LEFT_TO_RIGHT; // clears default setting
-                } else {
-                    flags = DIRECTION_RIGHT_TO_LEFT;
-                }
+            Integer f = BidiProxy.getDefault().findDirection(paragraph);
+            if (f != null) {
+                flags = f;
             }
         }
         catch (ClassCastException e) {
         }
 
         try {
-            NumericShaper shaper = (NumericShaper)paragraph.getAttribute(TextAttribute.NUMERIC_SHAPING);
-            if (shaper != null) {
-                shaper.shape(text, 0, text.length);
-            }
+            BidiProxy.getDefault().shapeText(paragraph, text);
         }
         catch (ClassCastException e) {
         }
-
-        int pos = start;
-        do {
-            paragraph.setIndex(pos);
-            Object embeddingLevel = paragraph.getAttribute(TextAttribute.BIDI_EMBEDDING);
-            int newpos = paragraph.getRunLimit(TextAttribute.BIDI_EMBEDDING);
-
-            if (embeddingLevel != null) {
-                try {
-                    int intLevel = ((Integer)embeddingLevel).intValue();
-                    if (intLevel >= -61 && intLevel < 61) {
-                        byte level = (byte)(intLevel < 0 ? (-intLevel | 0x80) : intLevel);
-                        if (embeddings == null) {
-                            embeddings = new byte[length];
-                        }
-                        for (int i = pos - start; i < newpos - start; ++i) {
-                            embeddings[i] = level;
-                        }
-                    }
-                }
-                catch (ClassCastException e) {
-                }
-            }
-            pos = newpos;
-        } while (pos < limit);
+        embeddings = BidiProxy.getDefault().embedding(start, paragraph, embeddings, length, limit);
 
         nativeBidiChars(this, text, 0, embeddings, 0, text.length, flags);
     }
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/javax/management/JMX.java
--- a/src/share/classes/javax/management/JMX.java	Sat Jun 20 22:21:50 2009 +0200
+++ b/src/share/classes/javax/management/JMX.java	Mon Jun 22 17:40:22 2009 +0200
@@ -26,10 +26,8 @@
 package javax.management;
 
 import com.sun.jmx.mbeanserver.Introspector;
+import com.sun.jmx.mbeanserver.IntrospectorProxy;
 import com.sun.jmx.mbeanserver.MBeanInjector;
-import com.sun.jmx.remote.util.ClassLogger;
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
@@ -298,25 +296,7 @@
         }
 
         private Map<String, Object> toMap() {
-            Map<String, Object> map = new TreeMap<String, Object>();
-            try {
-                BeanInfo bi = java.beans.Introspector.getBeanInfo(getClass());
-                PropertyDescriptor[] pds = bi.getPropertyDescriptors();
-                for (PropertyDescriptor pd : pds) {
-                    String name = pd.getName();
-                    if (name.equals("class"))
-                        continue;
-                    Method get = pd.getReadMethod();
-                    if (get != null)
-                        map.put(name, get.invoke(this));
-                }
-            } catch (Exception e) {
-                Throwable t = e;
-                if (t instanceof InvocationTargetException)
-                    t = t.getCause();
-                map.put("Exception", t);
-            }
-            return map;
+            return IntrospectorProxy.getDefault().inspectClass(getClass(), this);
         }
 
         @Override
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/sun/applet/AppletViewerPanel.java
--- a/src/share/classes/sun/applet/AppletViewerPanel.java	Sat Jun 20 22:21:50 2009 +0200
+++ b/src/share/classes/sun/applet/AppletViewerPanel.java	Mon Jun 22 17:40:22 2009 +0200
@@ -26,12 +26,9 @@
 package sun.applet;
 
 import java.util.*;
-import java.io.*;
 import java.net.URL;
 import java.net.MalformedURLException;
-import java.awt.*;
 import java.applet.*;
-import sun.tools.jar.*;
 
 
 /**
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/sun/font/BidiProxyImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/sun/font/BidiProxyImpl.java	Mon Jun 22 17:40:22 2009 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2000-2003 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 sun.font;
+
+import java.awt.font.NumericShaper;
+import java.awt.font.TextAttribute;
+import java.text.AttributedCharacterIterator;
+import java.text.Bidi;
+import sun.text.BidiProxy;
+
+/*
+ * (C) Copyright IBM Corp. 1999-2003 - All Rights Reserved
+ *
+ * The original version of this source code and documentation is
+ * copyrighted and owned by IBM. These materials are provided
+ * under terms of a License Agreement between IBM and Sun.
+ * This technology is protected by multiple US and International
+ * patents. This notice and attribution to IBM may not be removed.
+ */
+public abstract class BidiProxyImpl extends BidiProxy {
+
+    public void init() {
+        sun.font.FontManagerNativeLibrary.load();
+    }
+
+    public Integer findDirection(AttributedCharacterIterator paragraph) {
+        Boolean runDirection = (Boolean)paragraph.getAttribute(TextAttribute.RUN_DIRECTION);
+        if (runDirection != null) {
+            if (TextAttribute.RUN_DIRECTION_LTR.equals(runDirection)) {
+                return Bidi.DIRECTION_LEFT_TO_RIGHT; // clears default setting
+                } else {
+                return Bidi.DIRECTION_RIGHT_TO_LEFT;
+            }
+        }
+        return null;
+    }
+
+    public void shapeText(AttributedCharacterIterator paragraph, char[] text) {
+        NumericShaper shaper = (NumericShaper) paragraph.getAttribute(TextAttribute.NUMERIC_SHAPING);
+        if (shaper != null) {
+            shaper.shape(text, 0, text.length);
+        }
+    }
+
+
+    public byte[] embedding(int start, AttributedCharacterIterator paragraph, byte[] embeddings, int length, int limit) {
+        int pos = start;
+        do {
+            paragraph.setIndex(pos);
+            Object embeddingLevel = paragraph.getAttribute(TextAttribute.BIDI_EMBEDDING);
+            int newpos = paragraph.getRunLimit(TextAttribute.BIDI_EMBEDDING);
+            if (embeddingLevel != null) {
+                try {
+                    int intLevel = ((Integer) embeddingLevel).intValue();
+                    if (intLevel >= -61 && intLevel < 61) {
+                        byte level = (byte) (intLevel < 0 ? (-intLevel | 0x80) : intLevel);
+                        if (embeddings == null) {
+                            embeddings = new byte[length];
+                        }
+                        for (int i = pos - start; i < newpos - start; ++i) {
+                            embeddings[i] = level;
+                        }
+                    }
+                } catch (ClassCastException e) {
+                }
+            }
+            pos = newpos;
+        } while (pos < limit);
+        return embeddings;
+    }
+
+}
+
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/sun/nio/fs/MimeType.java
--- a/src/share/classes/sun/nio/fs/MimeType.java	Sat Jun 20 22:21:50 2009 +0200
+++ b/src/share/classes/sun/nio/fs/MimeType.java	Mon Jun 22 17:40:22 2009 +0200
@@ -25,6 +25,8 @@
 
 package sun.nio.fs;
 
+import java.util.Locale;
+
 /**
  * Represents a MIME type for the purposes of validation and matching. For
  * now this class is implemented using the javax.activation.MimeType class but
@@ -32,9 +34,9 @@
  */
 
 public class MimeType {
-    private final javax.activation.MimeType type;
+    private final Impl type;
 
-    private MimeType(javax.activation.MimeType type) {
+    private MimeType(Impl type) {
         this.type = type;
     }
 
@@ -45,18 +47,14 @@
      *          If the string is not a valid MIME type
      */
     public static MimeType parse(String type) {
-        try {
-            return new MimeType(new javax.activation.MimeType(type));
-        } catch (javax.activation.MimeTypeParseException x) {
-            throw new IllegalArgumentException(x);
-        }
+        return new MimeType(new Impl(type));
     }
 
     /**
      * Returns {@code true} if this MIME type has parameters.
      */
     public boolean hasParameters() {
-        return !type.getParameters().isEmpty();
+        return type.hasParameters;
     }
 
     /**
@@ -66,8 +64,220 @@
     public boolean match(String other) {
         try {
             return type.match(other);
-        } catch (javax.activation.MimeTypeParseException x) {
+        } catch (IllegalArgumentException x) {
             return false;
         }
     }
+
+    /** copy of javax.activation.MimeType */
+    private static class Impl {
+
+        private String    primaryType;
+        private String    subType;
+        private boolean   hasParameters;
+
+        /**
+         * A string that holds all the special chars.
+         */
+        private static final String TSPECIALS = "()<>@,;:/[]?=\\\"";
+
+        /**
+         * Default constructor.
+         */
+        public Impl() {
+            primaryType = "application";
+            subType = "*";
+            hasParameters = false;
+        }
+
+        /**
+         * Constructor that builds a MimeType from a String.
+         *
+         * @param rawdata   the MIME type string
+         */
+        public Impl(String rawdata) throws IllegalArgumentException {
+            parse(rawdata);
+        }
+
+        /**
+         * A routine for parsing the MIME type out of a String.
+         */
+        private void parse(String rawdata) throws IllegalArgumentException {
+            int slashIndex = rawdata.indexOf('/');
+            int semIndex = rawdata.indexOf(';');
+            if ((slashIndex < 0) && (semIndex < 0)) {
+                //    neither character is present, so treat it
+                //    as an error
+                throw new IllegalArgumentException("Unable to find a sub type.");
+            } else if ((slashIndex < 0) && (semIndex >= 0)) {
+                //    we have a ';' (and therefore a parameter list),
+                //    but no '/' indicating a sub type is present
+                throw new IllegalArgumentException("Unable to find a sub type.");
+            } else if ((slashIndex >= 0) && (semIndex < 0)) {
+                //    we have a primary and sub type but no parameter list
+                primaryType = rawdata.substring(0, slashIndex).trim().
+                                                    toLowerCase(Locale.ENGLISH);
+                subType = rawdata.substring(slashIndex + 1).trim().
+                                                    toLowerCase(Locale.ENGLISH);
+                hasParameters = false;
+            } else if (slashIndex < semIndex) {
+                //    we have all three items in the proper sequence
+                primaryType = rawdata.substring(0, slashIndex).trim().
+                                                    toLowerCase(Locale.ENGLISH);
+                subType = rawdata.substring(slashIndex + 1, semIndex).trim().
+                                                    toLowerCase(Locale.ENGLISH);
+                hasParameters = true;
+            } else {
+                // we have a ';' lexically before a '/' which means we
+                // have a primary type and a parameter list but no sub type
+                throw new IllegalArgumentException("Unable to find a sub type.");
+            }
+
+            //    now validate the primary and sub types
+
+            //    check to see if primary is valid
+            if (!isValidToken(primaryType))
+                throw new IllegalArgumentException("Primary type is invalid.");
+
+            //    check to see if sub is valid
+            if (!isValidToken(subType))
+                throw new IllegalArgumentException("Sub type is invalid.");
+        }
+
+        /**
+         * Retrieve the primary type of this object.
+         *
+         * @return  the primary MIME type
+         */
+        public String getPrimaryType() {
+            return primaryType;
+        }
+
+        /**
+         * Set the primary type for this object to the given String.
+         *
+         * @param primary   the primary MIME type
+         * @exception       IllegalArgumentException  if the primary type
+         *                                          is not a valid token
+         */
+        public void setPrimaryType(String primary) throws IllegalArgumentException {
+            //    check to see if primary is valid
+            if (!isValidToken(primaryType))
+                throw new IllegalArgumentException("Primary type is invalid.");
+            primaryType = primary.toLowerCase(Locale.ENGLISH);
+        }
+
+        /**
+         * Retrieve the subtype of this object.
+         *
+         * @return  the MIME subtype
+         */
+        public String getSubType() {
+            return subType;
+        }
+
+        /**
+         * Set the subtype for this object to the given String.
+         *
+         * @param sub       the MIME subtype
+         * @exception       IllegalArgumentException  if the subtype
+         *                                          is not a valid token
+         */
+        public void setSubType(String sub) throws IllegalArgumentException {
+            //    check to see if sub is valid
+            if (!isValidToken(subType))
+                throw new IllegalArgumentException("Sub type is invalid.");
+            subType = sub.toLowerCase(Locale.ENGLISH);
+        }
+
+        /**
+         * Return the String representation of this object.
+         */
+        @Override
+        public String toString() {
+            return getBaseType();
+        }
+
+        /**
+         * Return a String representation of this object
+         * without the parameter list.
+         *
+         * @return  the MIME type and sub-type
+         */
+        public String getBaseType() {
+            return primaryType + "/" + subType;
+        }
+
+        /**
+         * Determine if the primary and sub type of this object is
+         * the same as what is in the given type.
+         *
+         * @param type      the MimeType object to compare with
+         * @return          true if they match
+         */
+        public boolean match(Impl type) {
+            return primaryType.equals(type.getPrimaryType())
+                        && (subType.equals("*")
+                                || type.getSubType().equals("*")
+                                || (subType.equals(type.getSubType())));
+        }
+
+        /**
+         * Determine if the primary and sub type of this object is
+         * the same as the content type described in rawdata.
+         *
+         * @param rawdata   the MIME type string to compare with
+         * @return          true if they match
+         */
+        public boolean match(String rawdata) throws IllegalArgumentException {
+            return match(new Impl(rawdata));
+        }
+
+        //    below here be scary parsing related things
+
+        /**
+         * Determine whether or not a given character belongs to a legal token.
+         */
+        private static boolean isTokenChar(char c) {
+            return ((c > 040) && (c < 0177)) && (TSPECIALS.indexOf(c) < 0);
+        }
+
+        /**
+         * Determine whether or not a given string is a legal token.
+         */
+        private boolean isValidToken(String s) {
+            int len = s.length();
+            if (len > 0) {
+                for (int i = 0; i < len; ++i) {
+                    char c = s.charAt(i);
+                    if (!isTokenChar(c)) {
+                        return false;
+                    }
+                }
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        /**
+         * A simple parser test,
+         * for debugging...
+         *
+        public static void main(String[] args)
+                                    throws IllegalArgumentException, IOException {
+            for (int i = 0; i < args.length; ++i) {
+                System.out.println("Original: " + args[i]);
+
+                MimeType type = new MimeType(args[i]);
+
+                System.out.println("Short:    " + type.getBaseType());
+                System.out.println("Parsed:   " + type.toString());
+                System.out.println();
+            }
+        }
+        */
+    }
+
+
 }
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/sun/swing/SwingUtilities2.java
--- a/src/share/classes/sun/swing/SwingUtilities2.java	Sat Jun 20 22:21:50 2009 +0200
+++ b/src/share/classes/sun/swing/SwingUtilities2.java	Mon Jun 22 17:40:22 2009 +0200
@@ -32,25 +32,18 @@
 import static java.awt.RenderingHints.*;
 import java.awt.event.*;
 import java.awt.font.*;
-import java.awt.geom.*;
 import java.awt.print.PrinterGraphics;
-import java.text.Bidi;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
 
 import javax.swing.*;
-import javax.swing.plaf.*;
 import javax.swing.text.Highlighter;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.DefaultHighlighter;
 import javax.swing.text.DefaultCaret;
 import javax.swing.table.TableCellRenderer;
-import sun.swing.PrintColorUIResource;
-import sun.swing.ImageIconUIResource;
 import sun.print.ProxyPrintGraphics;
 import sun.awt.*;
-import sun.security.action.GetPropertyAction;
-import sun.security.util.SecurityConstants;
 import java.io.*;
 import java.util.*;
 import sun.font.FontDesignMetrics;
@@ -1881,9 +1874,4 @@
         }
         return false;
     }
-
-    public static String getAppletParameter(Component applet, String name) {
-        // JST-TBD: some trick, maybe reflection, may code injection
-        return null;
-    }
 }
diff -r cf9b143bfaf9 -r 393046bdec90 src/share/classes/sun/text/BidiProxy.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/sun/text/BidiProxy.java	Mon Jun 22 17:40:22 2009 +0200
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2000-2003 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 sun.text;
+
+import java.text.AttributedCharacterIterator;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/*
+ * (C) Copyright IBM Corp. 1999-2003 - All Rights Reserved
+ *
+ * The original version of this source code and documentation is
+ * copyrighted and owned by IBM. These materials are provided
+ * under terms of a License Agreement between IBM and Sun.
+ * This technology is protected by multiple US and International
+ * patents. This notice and attribution to IBM may not be removed.
+ */
+public abstract class BidiProxy {
+    public static BidiProxy getDefault() {
+        Iterator<BidiProxy> it = ServiceLoader.load(BidiProxy.class).iterator();
+        return it.hasNext() ? it.next() : new DefaultBidiProxy();
+    }
+
+    public abstract void init();
+    public abstract Integer findDirection(AttributedCharacterIterator paragraph);
+    public abstract void shapeText(AttributedCharacterIterator paragraph, char[] text);
+    public abstract byte[] embedding(int start, AttributedCharacterIterator paragraph, byte[] embeddings, int length, int limit);
+
+
+    private static final class DefaultBidiProxy extends BidiProxy {
+
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public Integer findDirection(AttributedCharacterIterator paragraph) {
+            return null;
+        }
+
+        @Override
+        public void shapeText(AttributedCharacterIterator paragraph, char[] text) {
+        }
+
+        @Override
+        public byte[] embedding(int start, AttributedCharacterIterator paragraph, byte[] embeddings, int length, int limit) {
+            return embeddings;
+        }
+    }
+}
+