Initial import from IcedTea6.

2010-10-19  Andrew John Hughes  <[email protected]>

	* .hgignore,
	* Makefile.am,
	* acinclude.m4,
	* autogen.sh,
	* configure.ac,
	* extra/net/sourceforge/jnlp/about/HTMLPanel.java,
	* extra/net/sourceforge/jnlp/about/Main.java,
	* extra/net/sourceforge/jnlp/about/resources/about.html,
	* extra/net/sourceforge/jnlp/about/resources/applications.html,
	* extra/net/sourceforge/jnlp/about/resources/notes.html,
	* javac.in,
	* javaws.desktop: Imported from IcedTea6.
	* launcher/java.c,
	* launcher/java.h,
	* launcher/java_md.c,
	* launcher/java_md.h,
	* launcher/jli_util.h,
	* launcher/jni.h,
	* launcher/jvm.h,
	* launcher/jvm_md.h,
	* launcher/manifest_info.h,
	* launcher/splashscreen.h,
	* launcher/splashscreen_stubs.c,
	* launcher/version_comp.h,
	* launcher/wildcard.h: Imported from OpenJDK.
	* netx/javaws.1,
	* netx/javax/jnlp/BasicService.java,
	* netx/javax/jnlp/ClipboardService.java,
	* netx/javax/jnlp/DownloadService.java,
	* netx/javax/jnlp/DownloadServiceListener.java,
	* netx/javax/jnlp/ExtendedService.java,
	* netx/javax/jnlp/ExtensionInstallerService.java,
	* netx/javax/jnlp/FileContents.java,
	* netx/javax/jnlp/FileOpenService.java,
	* netx/javax/jnlp/FileSaveService.java,
	* netx/javax/jnlp/JNLPRandomAccessFile.java,
	* netx/javax/jnlp/PersistenceService.java,
	* netx/javax/jnlp/PrintService.java,
	* netx/javax/jnlp/ServiceManager.java,
	* netx/javax/jnlp/ServiceManagerStub.java,
	* netx/javax/jnlp/SingleInstanceListener.java,
	* netx/javax/jnlp/SingleInstanceService.java,
	* netx/javax/jnlp/UnavailableServiceException.java,
	* netx/net/sourceforge/jnlp/AppletDesc.java,
	* netx/net/sourceforge/jnlp/ApplicationDesc.java,
	* netx/net/sourceforge/jnlp/AssociationDesc.java,
	* netx/net/sourceforge/jnlp/ComponentDesc.java,
	* netx/net/sourceforge/jnlp/DefaultLaunchHandler.java,
	* netx/net/sourceforge/jnlp/ExtensionDesc.java,
	* netx/net/sourceforge/jnlp/IconDesc.java,
	* netx/net/sourceforge/jnlp/InformationDesc.java,
	* netx/net/sourceforge/jnlp/InstallerDesc.java,
	* netx/net/sourceforge/jnlp/JARDesc.java,
	* netx/net/sourceforge/jnlp/JNLPFile.java,
	* netx/net/sourceforge/jnlp/JNLPSplashScreen.java,
	* netx/net/sourceforge/jnlp/JREDesc.java,
	* netx/net/sourceforge/jnlp/LaunchException.java,
	* netx/net/sourceforge/jnlp/LaunchHandler.java,
	* netx/net/sourceforge/jnlp/Launcher.java,
	* netx/net/sourceforge/jnlp/MenuDesc.java,
	* netx/net/sourceforge/jnlp/NetxPanel.java,
	* netx/net/sourceforge/jnlp/Node.java,
	* netx/net/sourceforge/jnlp/PackageDesc.java,
	* netx/net/sourceforge/jnlp/ParseException.java,
	* netx/net/sourceforge/jnlp/Parser.java,
	* netx/net/sourceforge/jnlp/PluginBridge.java,
	* netx/net/sourceforge/jnlp/PropertyDesc.java,
	* netx/net/sourceforge/jnlp/RelatedContentDesc.java,
	* netx/net/sourceforge/jnlp/ResourcesDesc.java,
	* netx/net/sourceforge/jnlp/SecurityDesc.java,
	* netx/net/sourceforge/jnlp/ShortcutDesc.java,
	* netx/net/sourceforge/jnlp/StreamEater.java,
	* netx/net/sourceforge/jnlp/UpdateDesc.java,
	* netx/net/sourceforge/jnlp/Version.java,
	* netx/net/sourceforge/jnlp/cache/CacheEntry.java,
	* netx/net/sourceforge/jnlp/cache/CacheUtil.java,
	* netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
	* netx/net/sourceforge/jnlp/cache/DownloadIndicator.java,
	* netx/net/sourceforge/jnlp/cache/Resource.java,
	* netx/net/sourceforge/jnlp/cache/ResourceTracker.java,
	* netx/net/sourceforge/jnlp/cache/UpdatePolicy.java,
	* netx/net/sourceforge/jnlp/cache/package.html,
	* netx/net/sourceforge/jnlp/event/ApplicationEvent.java,
	* netx/net/sourceforge/jnlp/event/ApplicationListener.java,
	* netx/net/sourceforge/jnlp/event/DownloadEvent.java,
	* netx/net/sourceforge/jnlp/event/DownloadListener.java,
	* netx/net/sourceforge/jnlp/event/package.html,
	* netx/net/sourceforge/jnlp/package.html,
	* netx/net/sourceforge/jnlp/resources/Manifest.mf,
	* netx/net/sourceforge/jnlp/resources/Messages.properties,
	* netx/net/sourceforge/jnlp/resources/about.jnlp,
	* netx/net/sourceforge/jnlp/resources/default.jnlp,
	* netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
	* netx/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
	* netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
	* netx/net/sourceforge/jnlp/runtime/AppletInstance.java,
	* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
	* netx/net/sourceforge/jnlp/runtime/Boot.java,
	* netx/net/sourceforge/jnlp/runtime/Boot13.java,
	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
	* netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
	* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
	* netx/net/sourceforge/jnlp/runtime/package.html,
	* netx/net/sourceforge/jnlp/security/AccessWarningPane.java,
	* netx/net/sourceforge/jnlp/security/AppletWarningPane.java,
	* netx/net/sourceforge/jnlp/security/CertVerifier.java,
	* netx/net/sourceforge/jnlp/security/CertWarningPane.java,
	* netx/net/sourceforge/jnlp/security/CertsInfoPane.java,
	* netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
	* netx/net/sourceforge/jnlp/security/MoreInfoPane.java,
	* netx/net/sourceforge/jnlp/security/NotAllSignedWarningPane.java,
	* netx/net/sourceforge/jnlp/security/SecurityDialogPanel.java,
	* netx/net/sourceforge/jnlp/security/SecurityUtil.java,
	* netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
	* netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
	* netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
	* netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
	* netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
	* netx/net/sourceforge/jnlp/services/ExtendedSingleInstanceService.java,
	* netx/net/sourceforge/jnlp/services/InstanceExistsException.java,
	* netx/net/sourceforge/jnlp/services/ServiceUtil.java,
	* netx/net/sourceforge/jnlp/services/SingleInstanceLock.java,
	* netx/net/sourceforge/jnlp/services/XBasicService.java,
	* netx/net/sourceforge/jnlp/services/XClipboardService.java,
	* netx/net/sourceforge/jnlp/services/XDownloadService.java,
	* netx/net/sourceforge/jnlp/services/XExtendedService.java,
	* netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
	* netx/net/sourceforge/jnlp/services/XFileContents.java,
	* netx/net/sourceforge/jnlp/services/XFileOpenService.java,
	* netx/net/sourceforge/jnlp/services/XFileSaveService.java,
	* netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
	* netx/net/sourceforge/jnlp/services/XPersistenceService.java,
	* netx/net/sourceforge/jnlp/services/XPrintService.java,
	* netx/net/sourceforge/jnlp/services/XServiceManagerStub.java,
	* netx/net/sourceforge/jnlp/services/XSingleInstanceService.java,
	* netx/net/sourceforge/jnlp/services/package.html,
	* netx/net/sourceforge/jnlp/tools/CharacterEncoder.java,
	* netx/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
	* netx/net/sourceforge/jnlp/tools/JarRunner.java,
	* netx/net/sourceforge/jnlp/tools/JarSigner.java,
	* netx/net/sourceforge/jnlp/tools/JarSignerResources.java,
	* netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
	* netx/net/sourceforge/jnlp/tools/KeyTool.java,
	* netx/net/sourceforge/jnlp/util/FileUtils.java,
	* netx/net/sourceforge/jnlp/util/PropertiesFile.java,
	* netx/net/sourceforge/jnlp/util/Reflect.java,
	* netx/net/sourceforge/jnlp/util/WeakList.java,
	* netx/net/sourceforge/jnlp/util/XDesktopEntry.java,
	* netx/net/sourceforge/nanoxml/XMLElement.java,
	* netx/net/sourceforge/nanoxml/XMLParseException.java,
	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc,
	* plugin/icedteanp/IcedTeaJavaRequestProcessor.h,
	* plugin/icedteanp/IcedTeaNPPlugin.cc,
	* plugin/icedteanp/IcedTeaNPPlugin.h,
	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc,
	* plugin/icedteanp/IcedTeaPluginRequestProcessor.h,
	* plugin/icedteanp/IcedTeaPluginUtils.cc,
	* plugin/icedteanp/IcedTeaPluginUtils.h,
	* plugin/icedteanp/IcedTeaRunnable.cc,
	* plugin/icedteanp/IcedTeaRunnable.h,
	* plugin/icedteanp/IcedTeaScriptablePluginObject.cc,
	* plugin/icedteanp/IcedTeaScriptablePluginObject.h,
	* plugin/icedteanp/java/netscape/javascript/JSException.java,
	* plugin/icedteanp/java/netscape/javascript/JSObject.java,
	* plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java,
	* plugin/icedteanp/java/netscape/javascript/JSProxy.java,
	* plugin/icedteanp/java/netscape/javascript/JSRunnable.java,
	* plugin/icedteanp/java/netscape/javascript/JSUtil.java,
	* plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java,
	* plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java,
	* plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java,
	* plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java,
	* plugin/icedteanp/java/sun/applet/JavaConsole.java,
	* plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java,
	* plugin/icedteanp/java/sun/applet/PasswordAuthenticationDialog.java,
	* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java,
	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java,
	* plugin/icedteanp/java/sun/applet/PluginCallRequest.java,
	* plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java,
	* plugin/icedteanp/java/sun/applet/PluginClassLoader.java,
	* plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java,
	* plugin/icedteanp/java/sun/applet/PluginCookieManager.java,
	* plugin/icedteanp/java/sun/applet/PluginDebug.java,
	* plugin/icedteanp/java/sun/applet/PluginException.java,
	* plugin/icedteanp/java/sun/applet/PluginMain.java,
	* plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java,
	* plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java,
	* plugin/icedteanp/java/sun/applet/PluginObjectStore.java,
	* plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java,
	* plugin/icedteanp/java/sun/applet/PluginProxySelector.java,
	* plugin/icedteanp/java/sun/applet/PluginStreamHandler.java,
	* plugin/icedteanp/java/sun/applet/RequestQueue.java,
	* plugin/icedteanp/java/sun/applet/TestEnv.java,
	* plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java,
	* plugin/tests/LiveConnect/DummyObject.java,
	* plugin/tests/LiveConnect/OverloadTestHelper1.java,
	* plugin/tests/LiveConnect/OverloadTestHelper2.java,
	* plugin/tests/LiveConnect/OverloadTestHelper3.java,
	* plugin/tests/LiveConnect/PluginTest.java,
	* plugin/tests/LiveConnect/build,
	* plugin/tests/LiveConnect/common.js,
	* plugin/tests/LiveConnect/index.html,
	* plugin/tests/LiveConnect/jjs_eval_test.js,
	* plugin/tests/LiveConnect/jjs_func_parameters_tests.js,
	* plugin/tests/LiveConnect/jjs_func_rettype_tests.js,
	* plugin/tests/LiveConnect/jjs_get_tests.js,
	* plugin/tests/LiveConnect/jjs_set_tests.js,
	* plugin/tests/LiveConnect/jsj_func_overload_tests.js,
	* plugin/tests/LiveConnect/jsj_func_parameters_tests.js,
	* plugin/tests/LiveConnect/jsj_func_rettype_tests.js,
	* plugin/tests/LiveConnect/jsj_get_tests.js,
	* plugin/tests/LiveConnect/jsj_set_tests.js,
	* plugin/tests/LiveConnect/jsj_type_casting_tests.js,
	* plugin/tests/LiveConnect/jsj_type_conversion_tests.js:
	Initial import from IcedTea6.
	* AUTHORS,
	* COPYING
	* INSTALL,
	* NEWS,
	* README: New documentation.

2 files changed, 455 insertions, 0 deletions

diff --git a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
new file mode 100644
index 0000000..69b98b4
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
@@ -0,0 +1,335 @@
+/* CertificatePane.java
+   Copyright (C) 2008 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea 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, version 2.
+
+IcedTea 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 IcedTea; 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
+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 net.sourceforge.jnlp.security.viewer;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Enumeration;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+
+import net.sourceforge.jnlp.security.SecurityUtil;
+import net.sourceforge.jnlp.security.SecurityWarningDialog;
+import net.sourceforge.jnlp.tools.KeyTool;
+
+public class CertificatePane extends JPanel {
+
+        /**
+         * The certificates stored in the user's trusted.certs file.
+         */
+        private ArrayList<X509Certificate> certs = null;
+
+        /**
+         * "Issued To" and "Issued By" string pairs for certs.
+         */
+        private String[][] issuedToAndBy = null;
+        private final String[] columnNames = { "Issued To", "Issued By" };
+
+        private JTable table;
+
+        private JDialog parent;
+
+        private JComponent defaultFocusComponent = null;
+
+        /**
+         * The KeyStore associated with the user's trusted.certs file.
+         */
+        private KeyStore keyStore = null;
+
+        public CertificatePane(JDialog parent) {
+                super();
+                this.parent = parent;
+                initializeKeyStore();
+                addComponents();
+        }
+
+        /**
+         * Reads the user's trusted.cacerts keystore.
+         */
+        private void initializeKeyStore() {
+                try {
+                        keyStore = SecurityUtil.getUserKeyStore();
+                } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+        }
+
+        //create the GUI here.
+        protected void addComponents() {
+                readKeyStore();
+
+                JPanel main = new JPanel(new BorderLayout());
+
+                JPanel tablePanel = new JPanel(new BorderLayout());
+
+                //Table
+                DefaultTableModel tableModel
+                        = new DefaultTableModel(issuedToAndBy, columnNames);
+                table = new JTable(tableModel);
+                table.getTableHeader().setReorderingAllowed(false);
+                table.setFillsViewportHeight(true);
+                JScrollPane tablePane = new JScrollPane(table);
+                tablePane.setPreferredSize(new Dimension(500,200));
+                tablePane.setSize(new Dimension(500,200));
+                tablePane.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
+
+                JTabbedPane tabbedPane = new JTabbedPane();
+                tabbedPane.addTab("User", tablePane);
+                JPanel buttonPanel = new JPanel(new FlowLayout());
+
+                String[] buttonNames = {"Import", "Export", "Remove", "Details"};
+                char[] buttonMnemonics = {      KeyEvent.VK_I,
+                                                                        KeyEvent.VK_E,
+                                                                        KeyEvent.VK_M,
+                                                                        KeyEvent.VK_D};
+                ActionListener[] listeners = {  new ImportButtonListener(),
+                                                                                new ExportButtonListener(),
+                                                                                new RemoveButtonListener(),
+                                                                                new DetailsButtonListener() };
+                JButton button;
+
+                //get the max width
+                int maxWidth = 0;
+                for (int i = 0; i < buttonNames.length; i++) {
+                        button = new JButton(buttonNames[i]);
+                        maxWidth = Math.max(maxWidth, button.getMinimumSize().width);
+                }
+
+                for (int i = 0; i < buttonNames.length; i++) {
+                        button = new JButton(buttonNames[i]);
+                        button.setMnemonic(buttonMnemonics[i]);
+                        button.addActionListener(listeners[i]);
+                        button.setSize(maxWidth, button.getSize().height);
+                        buttonPanel.add(button);
+                }
+
+                tablePanel.add(tabbedPane, BorderLayout.CENTER);
+                tablePanel.add(buttonPanel, BorderLayout.SOUTH);
+
+                JPanel closePanel = new JPanel(new BorderLayout());
+                closePanel.setBorder(BorderFactory.createEmptyBorder(7,7,7,7));
+                JButton closeButton = new JButton("Close");
+                closeButton.addActionListener(new CloseButtonListener());
+                defaultFocusComponent = closeButton;
+                closePanel.add(closeButton, BorderLayout.EAST);
+
+                main.add(tablePanel, BorderLayout.CENTER);
+                main.add(closePanel, BorderLayout.SOUTH);
+
+                add(main);
+
+        }
+
+        /**
+         * Read in the optionPane's keystore to issuedToAndBy.
+         */
+        private void readKeyStore() {
+
+                Enumeration<String> aliases = null;
+                certs = new ArrayList<X509Certificate>();
+                try {
+
+                        //Get all of the X509Certificates and put them into an ArrayList
+                        aliases = keyStore.aliases();
+                        while (aliases.hasMoreElements()) {
+                                Certificate c = keyStore.getCertificate(aliases.nextElement());
+                                if (c instanceof X509Certificate)
+                                        certs.add((X509Certificate)c);
+                        }
+
+                        //get the publisher and root information
+                        issuedToAndBy = new String[certs.size()][2];
+                        for (int i = 0; i < certs.size(); i++) {
+                    X509Certificate c = certs.get(i);
+                                issuedToAndBy[i][0] =
+                                        SecurityUtil.getCN(c.getSubjectX500Principal().getName());
+                                issuedToAndBy[i][1] =
+                                        SecurityUtil.getCN(c.getIssuerX500Principal().getName());
+                }
+                } catch (Exception e) {
+                        //TODO
+                }
+        }
+
+        /**
+         * Re-reads the certs file and repopulates the JTable. This is typically
+         * called after a certificate was deleted from the keystore.
+         */
+        private void repopulateTable() {
+                initializeKeyStore();
+                readKeyStore();
+                DefaultTableModel tableModel
+                        = new DefaultTableModel(issuedToAndBy, columnNames);
+
+                table.setModel(tableModel);
+                repaint();
+        }
+
+        public void focusOnDefaultButton() {
+            if (defaultFocusComponent != null) {
+                defaultFocusComponent.requestFocusInWindow();
+            }
+        }
+
+        private class ImportButtonListener implements ActionListener {
+        public void actionPerformed(ActionEvent e) {
+
+                JFileChooser chooser = new JFileChooser();
+                int returnVal = chooser.showOpenDialog(parent);
+                if(returnVal == JFileChooser.APPROVE_OPTION) {
+                        try {
+                                KeyTool kt = new KeyTool();
+                                kt.importCert(chooser.getSelectedFile());
+                                repopulateTable();
+                        } catch (Exception ex) {
+                                // TODO: handle exception
+                                ex.printStackTrace();
+                        }
+                }
+        }
+    }
+
+        private class ExportButtonListener implements ActionListener {
+                public void actionPerformed(ActionEvent e) {
+                        //For now, let's just export in -rfc mode as keytool does.
+                        //we'll write to a file the exported certificate.
+
+
+                        try {
+                                int selectedRow = table.getSelectedRow();
+                                if (selectedRow != -1) {
+                                JFileChooser chooser = new JFileChooser();
+                                int returnVal = chooser.showOpenDialog(parent);
+                                if(returnVal == JFileChooser.APPROVE_OPTION) {
+                                        String alias = keyStore.getCertificateAlias(certs
+                                                        .get(selectedRow));
+                                        if (alias != null) {
+                                                Certificate c = keyStore.getCertificate(alias);
+                                                PrintStream ps = new PrintStream(chooser.getSelectedFile().getAbsolutePath());
+                                                KeyTool.dumpCert(c, ps);
+                                                repopulateTable();
+                                        }
+                                }
+                                }
+                        } catch (Exception ex) {
+                                // TODO
+                                ex.printStackTrace();
+                        }
+                }
+        }
+
+        private class RemoveButtonListener implements ActionListener {
+
+                /**
+                 * Removes a certificate from the keyStore and writes changes to disk.
+                 */
+        public void actionPerformed(ActionEvent e) {
+
+                try {
+                        int selectedRow = table.getSelectedRow();
+
+                        if (selectedRow != -1){
+                                String alias = keyStore.getCertificateAlias(certs.get(selectedRow));
+                                if (alias != null) {
+
+                                        int i = JOptionPane.showConfirmDialog(parent,
+                                                        "Are you sure you want to remove the selected certificate?",
+                                                        "Confirmation - Remove Certificate?",
+                                                        JOptionPane.YES_NO_OPTION);
+                                        if (i == 0) {
+                                                keyStore.deleteEntry(alias);
+                                                FileOutputStream fos = new FileOutputStream(
+                                                        SecurityUtil.getTrustedCertsFilename());
+                                                keyStore.store(fos, SecurityUtil.getTrustedCertsPassword());
+                                                fos.close();
+                                        }
+                                }
+                                repopulateTable();
+                        }
+                } catch (Exception ex) {
+                        // TODO
+                                ex.printStackTrace();
+                }
+
+        }
+    }
+
+        private class DetailsButtonListener implements ActionListener {
+
+                /**
+                 * Shows the details of a trusted certificate.
+                 */
+        public void actionPerformed(ActionEvent e) {
+
+                int selectedRow = table.getSelectedRow();
+                if (selectedRow != -1 && selectedRow >= 0) {
+                        X509Certificate c = certs.get(selectedRow);
+                        SecurityWarningDialog.showSingleCertInfoDialog(c, parent);
+                }
+        }
+    }
+
+        private class CloseButtonListener implements ActionListener {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                parent.dispose();
+            }
+        }
+
+}
diff --git a/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java b/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java
new file mode 100644
index 0000000..403472c
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java
@@ -0,0 +1,120 @@
+/* CertificateViewer.java
+   Copyright (C) 2008 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea 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, version 2.
+
+IcedTea 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 IcedTea; 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
+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 net.sourceforge.jnlp.security.viewer;
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Toolkit;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JDialog;
+import javax.swing.UIManager;
+
+public class CertificateViewer extends JDialog {
+
+    private boolean initialized = false;
+    private static final String dialogTitle = "Certificates";
+
+    CertificatePane panel;
+
+        public CertificateViewer() {
+            super((Frame)null, dialogTitle, true);
+
+        Container contentPane = getContentPane();
+        contentPane.setLayout(new BorderLayout());
+
+        panel = new CertificatePane(this);
+
+        add(panel);
+
+        pack();
+
+        WindowAdapter adapter = new WindowAdapter() {
+            private boolean gotFocus = false;
+
+            public void windowGainedFocus(WindowEvent we) {
+                // Once window gets focus, set initial focus
+                if (!gotFocus) {
+                    panel.focusOnDefaultButton();
+                    gotFocus = true;
+                }
+            }
+        };
+        addWindowFocusListener(adapter);
+
+                initialized = true;
+        }
+
+        public boolean isInitialized(){
+                return initialized;
+        }
+
+        private void centerDialog() {
+                Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+                Dimension dialogSize = getSize();
+
+                setLocation((screen.width - dialogSize.width)/2,
+                        (screen.height - dialogSize.height)/2);
+        }
+
+
+        public static void showCertificateViewer() throws Exception {
+            setSystemLookAndFeel();
+
+                CertificateViewer cv = new CertificateViewer();
+                cv.setResizable(true);
+                cv.centerDialog();
+                cv.setVisible(true);
+                cv.dispose();
+        }
+
+    private static void setSystemLookAndFeel() {
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (Exception e) {
+            // don't worry if we can't.
+        }
+    }
+
+        public static void main(String[] args) throws Exception {
+                CertificateViewer.showCertificateViewer();
+        }
+}