/hg/icedtea: Remove NetX and the IcedTea plugin, now developed i...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 9 09:41:59 PST 2010
changeset 464f7b987fb6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=464f7b987fb6
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 09 17:41:47 2010 +0000
Remove NetX and the IcedTea plugin, now developed in IcedTea-Web.
2010-12-09 Andrew John Hughes <ahughes at redhat.com>
Remove NetX and the IcedTea plugin; now developed in
IcedTea-Web.
* NEWS: Updated.
* 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,
* 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/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.jav
a,
* 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,
* patches/extensions/liveconnect-dist.patch,
* patches/extensions/liveconnect.patch,
* patches/extensions/netx-dist.patch,
* patches/extensions/netx-umask.patch,
* patches/extensions/netx.patch,
* 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.j
ava,
* 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.jav
a,
* 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:
Remove plugin and NetX.
* Makefile.am: Remove NetX and plugin variables, targets and
aliases. (JDK_CHANGESET): Update to pick up applet hole
patch. (JDK_SHA256SUM): Likewise. (NETX_CLASSES):
Removed. (NETX_JAR): Likewise. (NETX_SRC): Likewise.
(NETX_SRCDIR): Likewise. (NETX_RESOURCE_DIR): Likewise.
(NETX_EXTRA_DIR): Likewise. (PLUGIN_SRCDIR): Likewise.
(PLUGIN_BUILD_DIR): Likewise. (LIVECONNECT_DIR): Likewise.
(LIVECONNECT_SRCS): Likewise. (LIVECONNECT_CLASSES):
Likewise. (LIVECONNECT_JAR): Likewise.
(LIVECONNECT_SRC): Likewise. (NETX_BOOTSTRAP_CLASSES):
Likewise. (ICEDTEA_BOOTSTRAP_CLASSES): Remove
NETX_BOOTSTRAP_CLASSES. (ICEDTEAPLUGIN_TARGET): Removed.
(JNLP_ABOUT_TARGET): Likewise. (PLUGIN_TEST_SRCS): Likewise.
(ICEDTEA_PATCHES): Drop netx.patch, netx-dist.patch, netx-
umask.patch, liveconnect.patch, liveconnect-dist.patch.
(PLUGIN_VERSION): Removed. (ICEDTEA_ENV): Don't pass
ALT_NETX_DIST or ALT_LIVECONNECT_DIST. (EXTRA_DIST): Drop
extensions patch directory, extra, netx and plugin source
directories. (clean-local): Remove dropped targets.
(.PHONY): Likewise. (icedtea): Drop dependencies on plugin
and liveconnect. Remove copying of plugin and javaws data.
(icedtea-debug): Likewise. (icedtea-boot): Remove dead
dependencies. (PLUGIN_SRC): Removed.
(PLUGIN_OBJECTS): Likewise. ($(PLUGIN_BUILD_DIR)/%.o):
Dropped target. ($(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so):
Likewise. (liveconnect-source-files): Likewise.
(liveconnect): Likewise. (liveconnect-dist): Likewise.
(icedtea-npplugin): Likewise. (clean-IcedTeaPlugin):
Likewise. (clean-liveconnect): Likewise. (netx-
source-files): Likewise. (netx): Likewise. (netx-
dist): Likewise. (clean-netx): Likewise. (extra-
source-files): Likewise. (extra-class-files): Likewise.
(clean-extra): Likewise. (extra-lib/about.jar): Likewise.
(plugin-tests): Likewise.
diffstat:
200 files changed, 272 insertions(+), 45076 deletions(-)
ChangeLog | 258 +
Makefile.am | 276 -
extra/net/sourceforge/jnlp/about/HTMLPanel.java | 59
extra/net/sourceforge/jnlp/about/Main.java | 135
extra/net/sourceforge/jnlp/about/resources/about.html | 28
extra/net/sourceforge/jnlp/about/resources/applications.html | 36
extra/net/sourceforge/jnlp/about/resources/notes.html | 82
netx/javax/jnlp/BasicService.java | 12
netx/javax/jnlp/ClipboardService.java | 10
netx/javax/jnlp/DownloadService.java | 24
netx/javax/jnlp/DownloadServiceListener.java | 12
netx/javax/jnlp/ExtendedService.java | 51
netx/javax/jnlp/ExtensionInstallerService.java | 21
netx/javax/jnlp/FileContents.java | 17
netx/javax/jnlp/FileOpenService.java | 10
netx/javax/jnlp/FileSaveService.java | 10
netx/javax/jnlp/JNLPRandomAccessFile.java | 45
netx/javax/jnlp/PersistenceService.java | 17
netx/javax/jnlp/PrintService.java | 12
netx/javax/jnlp/ServiceManager.java | 53
netx/javax/jnlp/ServiceManagerStub.java | 10
netx/javax/jnlp/SingleInstanceListener.java | 35
netx/javax/jnlp/SingleInstanceService.java | 46
netx/javax/jnlp/UnavailableServiceException.java | 15
netx/net/sourceforge/jnlp/AppletDesc.java | 122
netx/net/sourceforge/jnlp/ApplicationDesc.java | 74
netx/net/sourceforge/jnlp/AssociationDesc.java | 56
netx/net/sourceforge/jnlp/ComponentDesc.java | 40
netx/net/sourceforge/jnlp/DefaultLaunchHandler.java | 112
netx/net/sourceforge/jnlp/ExtensionDesc.java | 143
netx/net/sourceforge/jnlp/IconDesc.java | 135
netx/net/sourceforge/jnlp/InformationDesc.java | 267 -
netx/net/sourceforge/jnlp/InstallerDesc.java | 52
netx/net/sourceforge/jnlp/JARDesc.java | 141
netx/net/sourceforge/jnlp/JNLPFile.java | 623 --
netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 93
netx/net/sourceforge/jnlp/JREDesc.java | 165
netx/net/sourceforge/jnlp/LaunchException.java | 188
netx/net/sourceforge/jnlp/LaunchHandler.java | 66
netx/net/sourceforge/jnlp/Launcher.java | 784 ---
netx/net/sourceforge/jnlp/MenuDesc.java | 38
netx/net/sourceforge/jnlp/NetxPanel.java | 146
netx/net/sourceforge/jnlp/Node.java | 146
netx/net/sourceforge/jnlp/PackageDesc.java | 102
netx/net/sourceforge/jnlp/ParseException.java | 92
netx/net/sourceforge/jnlp/Parser.java | 1270 -----
netx/net/sourceforge/jnlp/PluginBridge.java | 253 -
netx/net/sourceforge/jnlp/PropertyDesc.java | 64
netx/net/sourceforge/jnlp/RelatedContentDesc.java | 93
netx/net/sourceforge/jnlp/ResourcesDesc.java | 230
netx/net/sourceforge/jnlp/SecurityDesc.java | 201
netx/net/sourceforge/jnlp/ShortcutDesc.java | 70
netx/net/sourceforge/jnlp/StreamEater.java | 45
netx/net/sourceforge/jnlp/Version.java | 352 -
netx/net/sourceforge/jnlp/cache/CacheEntry.java | 172
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 379 -
netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 320 -
netx/net/sourceforge/jnlp/cache/DownloadIndicator.java | 91
netx/net/sourceforge/jnlp/cache/Resource.java | 269 -
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 1049 ----
netx/net/sourceforge/jnlp/cache/UpdatePolicy.java | 88
netx/net/sourceforge/jnlp/cache/package.html | 28
netx/net/sourceforge/jnlp/event/ApplicationEvent.java | 55
netx/net/sourceforge/jnlp/event/ApplicationListener.java | 37
netx/net/sourceforge/jnlp/event/DownloadEvent.java | 70
netx/net/sourceforge/jnlp/event/DownloadListener.java | 50
netx/net/sourceforge/jnlp/event/package.html | 28
netx/net/sourceforge/jnlp/package.html | 30
netx/net/sourceforge/jnlp/resources/Manifest.mf | 6
netx/net/sourceforge/jnlp/resources/Messages.properties | 178
netx/net/sourceforge/jnlp/resources/about.jnlp | 20
netx/net/sourceforge/jnlp/resources/default.jnlp | 20
netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 68
netx/net/sourceforge/jnlp/runtime/AppletAudioClip.java | 107
netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 354 -
netx/net/sourceforge/jnlp/runtime/AppletInstance.java | 138
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 300 -
netx/net/sourceforge/jnlp/runtime/Boot.java | 450 -
netx/net/sourceforge/jnlp/runtime/Boot13.java | 102
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 1191 ----
netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 103
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 562 --
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 540 --
netx/net/sourceforge/jnlp/runtime/package.html | 29
netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 200
netx/net/sourceforge/jnlp/security/AppletWarningPane.java | 115
netx/net/sourceforge/jnlp/security/CertVerifier.java | 92
netx/net/sourceforge/jnlp/security/CertWarningPane.java | 254 -
netx/net/sourceforge/jnlp/security/CertsInfoPane.java | 341 -
netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 238
netx/net/sourceforge/jnlp/security/MoreInfoPane.java | 110
netx/net/sourceforge/jnlp/security/NotAllSignedWarningPane.java | 120
netx/net/sourceforge/jnlp/security/SecurityDialogPanel.java | 134
netx/net/sourceforge/jnlp/security/SecurityUtil.java | 285 -
netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 474 -
netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 77
netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 286 -
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 335 -
netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 120
netx/net/sourceforge/jnlp/services/ExtendedSingleInstanceService.java | 49
netx/net/sourceforge/jnlp/services/InstanceExistsException.java | 35
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 293 -
netx/net/sourceforge/jnlp/services/SingleInstanceLock.java | 194
netx/net/sourceforge/jnlp/services/XBasicService.java | 232
netx/net/sourceforge/jnlp/services/XClipboardService.java | 81
netx/net/sourceforge/jnlp/services/XDownloadService.java | 179
netx/net/sourceforge/jnlp/services/XExtendedService.java | 54
netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 121
netx/net/sourceforge/jnlp/services/XFileContents.java | 121
netx/net/sourceforge/jnlp/services/XFileOpenService.java | 113
netx/net/sourceforge/jnlp/services/XFileSaveService.java | 140
netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java | 208
netx/net/sourceforge/jnlp/services/XPersistenceService.java | 177
netx/net/sourceforge/jnlp/services/XPrintService.java | 123
netx/net/sourceforge/jnlp/services/XServiceManagerStub.java | 106
netx/net/sourceforge/jnlp/services/XSingleInstanceService.java | 236
netx/net/sourceforge/jnlp/services/package.html | 29
netx/net/sourceforge/jnlp/tools/CharacterEncoder.java | 354 -
netx/net/sourceforge/jnlp/tools/HexDumpEncoder.java | 120
netx/net/sourceforge/jnlp/tools/JarRunner.java | 15
netx/net/sourceforge/jnlp/tools/JarSigner.java | 553 --
netx/net/sourceforge/jnlp/tools/JarSignerResources.java | 212
netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69
netx/net/sourceforge/jnlp/tools/KeyTool.java | 461 -
netx/net/sourceforge/jnlp/util/FileUtils.java | 71
netx/net/sourceforge/jnlp/util/PropertiesFile.java | 146
netx/net/sourceforge/jnlp/util/Reflect.java | 146
netx/net/sourceforge/jnlp/util/WeakList.java | 126
netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 213
netx/net/sourceforge/nanoxml/XMLElement.java | 1334 -----
netx/net/sourceforge/nanoxml/XMLParseException.java | 130
patches/extensions/liveconnect-dist.patch | 76
patches/extensions/liveconnect.patch | 89
patches/extensions/netx-dist.patch | 86
patches/extensions/netx-umask.patch | 169
patches/extensions/netx.patch | 130
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 1392 -----
plugin/icedteanp/IcedTeaJavaRequestProcessor.h | 233
plugin/icedteanp/IcedTeaNPPlugin.cc | 2439 ----------
plugin/icedteanp/IcedTeaNPPlugin.h | 134
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 996 ----
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 146
plugin/icedteanp/IcedTeaPluginUtils.cc | 1047 ----
plugin/icedteanp/IcedTeaPluginUtils.h | 296 -
plugin/icedteanp/IcedTeaRunnable.cc | 75
plugin/icedteanp/IcedTeaRunnable.h | 104
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 897 ---
plugin/icedteanp/IcedTeaScriptablePluginObject.h | 212
plugin/icedteanp/java/netscape/javascript/JSException.java | 140
plugin/icedteanp/java/netscape/javascript/JSObject.java | 297 -
plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java | 47
plugin/icedteanp/java/netscape/javascript/JSProxy.java | 58
plugin/icedteanp/java/netscape/javascript/JSRunnable.java | 72
plugin/icedteanp/java/netscape/javascript/JSUtil.java | 59
plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java | 52
plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java | 71
plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 63
plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java | 65
plugin/icedteanp/java/sun/applet/JavaConsole.java | 365 -
plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java | 696 --
plugin/icedteanp/java/sun/applet/PasswordAuthenticationDialog.java | 241
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 1505 ------
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 2190 --------
plugin/icedteanp/java/sun/applet/PluginCallRequest.java | 89
plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java | 61
plugin/icedteanp/java/sun/applet/PluginClassLoader.java | 51
plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 74
plugin/icedteanp/java/sun/applet/PluginCookieManager.java | 88
plugin/icedteanp/java/sun/applet/PluginDebug.java | 51
plugin/icedteanp/java/sun/applet/PluginException.java | 53
plugin/icedteanp/java/sun/applet/PluginMain.java | 327 -
plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java | 311 -
plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java | 147
plugin/icedteanp/java/sun/applet/PluginObjectStore.java | 132
plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 81
plugin/icedteanp/java/sun/applet/PluginProxySelector.java | 195
plugin/icedteanp/java/sun/applet/PluginStreamHandler.java | 454 -
plugin/icedteanp/java/sun/applet/RequestQueue.java | 77
plugin/icedteanp/java/sun/applet/TestEnv.java | 172
plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java | 54
plugin/tests/LiveConnect/DummyObject.java | 15
plugin/tests/LiveConnect/OverloadTestHelper1.java | 1
plugin/tests/LiveConnect/OverloadTestHelper2.java | 1
plugin/tests/LiveConnect/OverloadTestHelper3.java | 1
plugin/tests/LiveConnect/PluginTest.java | 710 --
plugin/tests/LiveConnect/build | 18
plugin/tests/LiveConnect/common.js | 219
plugin/tests/LiveConnect/index.html | 91
plugin/tests/LiveConnect/jjs_eval_test.js | 57
plugin/tests/LiveConnect/jjs_func_parameters_tests.js | 107
plugin/tests/LiveConnect/jjs_func_rettype_tests.js | 61
plugin/tests/LiveConnect/jjs_get_tests.js | 114
plugin/tests/LiveConnect/jjs_set_tests.js | 314 -
plugin/tests/LiveConnect/jsj_func_overload_tests.js | 181
plugin/tests/LiveConnect/jsj_func_parameters_tests.js | 216
plugin/tests/LiveConnect/jsj_func_rettype_tests.js | 262 -
plugin/tests/LiveConnect/jsj_get_tests.js | 260 -
plugin/tests/LiveConnect/jsj_set_tests.js | 318 -
plugin/tests/LiveConnect/jsj_type_casting_tests.js | 825 ---
plugin/tests/LiveConnect/jsj_type_conversion_tests.js | 825 ---
diffs (truncated from 46343 to 500 lines):
diff -r 313adf325208 -r 464f7b987fb6 ChangeLog
--- a/ChangeLog Wed Dec 08 20:59:00 2010 +0000
+++ b/ChangeLog Thu Dec 09 17:41:47 2010 +0000
@@ -1,3 +1,261 @@ 2010-12-08 Andrew John Hughes <ahughes
+2010-12-09 Andrew John Hughes <ahughes at redhat.com>
+
+ Remove NetX and the IcedTea plugin; now developed
+ in IcedTea-Web.
+ * NEWS: Updated.
+ * 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,
+ * 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/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,
+ * patches/extensions/liveconnect-dist.patch,
+ * patches/extensions/liveconnect.patch,
+ * patches/extensions/netx-dist.patch,
+ * patches/extensions/netx-umask.patch,
+ * patches/extensions/netx.patch,
+ * 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:
+ Remove plugin and NetX.
+ * Makefile.am:
+ Remove NetX and plugin variables, targets and aliases.
+ (JDK_CHANGESET): Update to pick up applet hole patch.
+ (JDK_SHA256SUM): Likewise.
+ (NETX_CLASSES): Removed.
+ (NETX_JAR): Likewise.
+ (NETX_SRC): Likewise.
+ (NETX_SRCDIR): Likewise.
+ (NETX_RESOURCE_DIR): Likewise.
+ (NETX_EXTRA_DIR): Likewise.
+ (PLUGIN_SRCDIR): Likewise.
+ (PLUGIN_BUILD_DIR): Likewise.
+ (LIVECONNECT_DIR): Likewise.
+ (LIVECONNECT_SRCS): Likewise.
+ (LIVECONNECT_CLASSES): Likewise.
+ (LIVECONNECT_JAR): Likewise.
+ (LIVECONNECT_SRC): Likewise.
+ (NETX_BOOTSTRAP_CLASSES): Likewise.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Remove NETX_BOOTSTRAP_CLASSES.
+ (ICEDTEAPLUGIN_TARGET): Removed.
+ (JNLP_ABOUT_TARGET): Likewise.
+ (PLUGIN_TEST_SRCS): Likewise.
+ (ICEDTEA_PATCHES): Drop netx.patch, netx-dist.patch,
+ netx-umask.patch, liveconnect.patch, liveconnect-dist.patch.
+ (PLUGIN_VERSION): Removed.
+ (ICEDTEA_ENV): Don't pass ALT_NETX_DIST or ALT_LIVECONNECT_DIST.
+ (EXTRA_DIST): Drop extensions patch directory, extra, netx and
+ plugin source directories.
+ (clean-local): Remove dropped targets.
+ (.PHONY): Likewise.
+ (icedtea): Drop dependencies on plugin and liveconnect. Remove
+ copying of plugin and javaws data.
+ (icedtea-debug): Likewise.
+ (icedtea-boot): Remove dead dependencies.
+ (PLUGIN_SRC): Removed.
+ (PLUGIN_OBJECTS): Likewise.
+ ($(PLUGIN_BUILD_DIR)/%.o): Dropped target.
+ ($(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so): Likewise.
+ (liveconnect-source-files): Likewise.
+ (liveconnect): Likewise.
+ (liveconnect-dist): Likewise.
+ (icedtea-npplugin): Likewise.
+ (clean-IcedTeaPlugin): Likewise.
+ (clean-liveconnect): Likewise.
+ (netx-source-files): Likewise.
+ (netx): Likewise.
+ (netx-dist): Likewise.
+ (clean-netx): Likewise.
+ (extra-source-files): Likewise.
+ (extra-class-files): Likewise.
+ (clean-extra): Likewise.
+ (extra-lib/about.jar): Likewise.
+ (plugin-tests): Likewise.
+
2010-12-08 Andrew John Hughes <ahughes at redhat.com>
* javac.in: Add missing semicolon.
diff -r 313adf325208 -r 464f7b987fb6 Makefile.am
--- a/Makefile.am Wed Dec 08 20:59:00 2010 +0000
+++ b/Makefile.am Thu Dec 09 17:41:47 2010 +0000
@@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = 81685aa89446
HOTSPOT_CHANGESET = 81685aa89446
JAXP_CHANGESET = 43658f98c582
JAXWS_CHANGESET = f3444af18aff
-JDK_CHANGESET = c981a387cd86
+JDK_CHANGESET = e7fc51780596
LANGTOOLS_CHANGESET = fdf1b74d3437
OPENJDK_CHANGESET = c94d1673451e
@@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = 7ca6831eb7505c21b860
HOTSPOT_SHA256SUM = 7ca6831eb7505c21b8607c7cf8d12cb182fca21c3a40c4696db737d56d80e54b
JAXP_SHA256SUM = e0aa77b166b30d4d4052110956da831c59c43e22f8d6feeac62a06775bb083b6
JAXWS_SHA256SUM = ff4124f3765ac5ebac5ecfd0391cb2a54857d80ac7f967f60630ce0879cfd1f4
-JDK_SHA256SUM = d211d0f1ec2baae5560e076eb60e313421c087e85ead4592256c2885a99d8b85
+JDK_SHA256SUM = 0a01f5c43c8ef895addbc6c75adf4046d200c7a0d95d8056fa4f127a1b87feec
LANGTOOLS_SHA256SUM = d200c9bcf1c1805e0800a8cd8017e99ff6d12db14a1fcca8e9b67c59dc5ed448
OPENJDK_SHA256SUM = d7a3a531f0e064898e511f08f1127447b9171adce21ae4cecb3bca84b3f7b531
@@ -58,9 +58,6 @@ BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_D
BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot
BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
-NETX_CLASSES = $(abs_top_builddir)/netx.build
-NETX_JAR = $(NETX_CLASSES)/lib/classes.jar
-NETX_SRC = $(NETX_CLASSES)/lib/src.zip
ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
@@ -77,18 +74,6 @@ LANGTOOLS = openjdk-boot/langtools/src/s
LANGTOOLS = openjdk-boot/langtools/src/share/classes
CORBA = openjdk-boot/corba/src/share/classes
JAXWS = $(BUILD_OUTPUT_DIR)/jaxws/drop/jaxws_src/src
-
-NETX_SRCDIR = netx
-NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
-NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
-
-PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
-PLUGIN_BUILD_DIR=$(abs_top_builddir)/plugin.build/icedteanp
-LIVECONNECT_DIR = netscape sun/applet
-LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
-LIVECONNECT_CLASSES = $(abs_top_builddir)/liveconnect
-LIVECONNECT_JAR = $(LIVECONNECT_CLASSES)/lib/classes.jar
-LIVECONNECT_SRC = $(LIVECONNECT_CLASSES)/lib/src.zip
PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
@@ -139,23 +124,13 @@ ICEDTEA_BOOTSTRAP_RESOURCES = \
ICEDTEA_BOOTSTRAP_RESOURCES = \
$(LANGTOOLS)/com/sun/tools/javac/resources
-# PR43578 - java.security.CodeSource.getCodeSigners() missing
-# PR43582 - Missing javax.swing.JTable.setFillsViewportHeight
-# PR43585 - java.security.KeyStore.TrustedCertificateEntry class missing
-NETX_BOOTSTRAP_CLASSES = \
- $(SHARE)/java/security/CodeSource.java \
- $(SHARE)/javax/swing/JTable.java \
- $(SHARE)/java/security/KeyStore.java
-
# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
# PR43389 - javax.management.StandardMBean
ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
$(SHARE)/javax/management/StandardMBean.java \
$(SHARE)/java/nio/file/SimpleFileVisitor.java \
- $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java \
- $(NETX_BOOTSTRAP_CLASSES)
-
+ $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java
endif
# Settings for javac
@@ -196,11 +171,6 @@ else
HS_SHA256SUM = $(HOTSPOT_SHA256SUM)
HS_CHANGESET = $(HOTSPOT_CHANGESET)
HS_URL = $(HOTSPOT_URL)
-endif
-
-if ENABLE_PLUGIN
-ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin.stamp
-JNLP_ABOUT_TARGET = extra-lib/about.jar
endif
if ENABLE_PULSE_JAVA
@@ -279,8 +249,6 @@ OPENJDK_BOOT_TREE = stamps/patch-jaxws.s
# Sources list
-PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
-
REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
# Patch list
@@ -335,9 +303,6 @@ ICEDTEA_PATCHES = \
patches/no-precompiled.patch \
patches/parisc.patch \
patches/sh4-support.patch \
- patches/extensions/netx.patch \
- patches/extensions/netx-dist.patch \
- patches/extensions/netx-umask.patch \
patches/jtreg-httpTest.patch
# Conditional patches
@@ -376,11 +341,6 @@ ICEDTEA_PATCHES += patches/icedtea-syste
ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \
patches/systemtap-gcc-4.5.patch \
patches/systemtap-alloc-size-workaround.patch
-endif
-
-if ENABLE_PLUGIN
-ICEDTEA_PATCHES += patches/extensions/liveconnect.patch \
- patches/extensions/liveconnect-dist.patch
endif
if ENABLE_NSS
@@ -478,8 +438,6 @@ ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
endif
-PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
-
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
@@ -520,7 +478,6 @@ ICEDTEA_ENV = \
DISTRIBUTION_ID="$(DIST_ID)" \
DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
- ALT_NETX_DIST="$(NETX_CLASSES)" \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
DISABLE_INTREE_EC="true" \
@@ -557,11 +514,6 @@ if WITH_RHINO
if WITH_RHINO
ICEDTEA_ENV += \
RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
-endif
-
-if ENABLE_PLUGIN
-ICEDTEA_ENV += \
- ALT_LIVECONNECT_DIST="$(LIVECONNECT_CLASSES)"
endif
# OpenJDK boot build environment.
@@ -739,14 +691,12 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
$(top_srcdir)/patches/debian/*.patch \
- $(top_srcdir)/patches/extensions/*.patch \
$(top_srcdir)/patches/security/*.patch \
- tools-copy contrib extra overlays \
+ tools-copy contrib overlays \
javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
$(JTREG_SRCS) \
HACKING $(PULSEAUDIO_SRCS) fsg.sh \
- $(top_srcdir)/plugin $(top_srcdir)/$(NETX_SRCDIR) \
hotspot.map autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
@@ -765,12 +715,11 @@ check-local: jtregcheck
clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
- clean-extra clean-netx clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
+ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
- clean-extract clean-generated clean-IcedTeaPlugin clean-liveconnect clean-native-ecj \
- clean-hgforest clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \
- clean-add-zero clean-add-zero-debug clean-add-cacao clean-add-cacao-debug clean-rt \
- clean-rewrite-rhino clean-rewriter
+ clean-extract clean-generated clean-native-ecj clean-hgforest clean-icedtea-stage2 \
+ clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
+ clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -796,8 +745,8 @@ install:
clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \
clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
clean-icedtea icedtea-stage2 clean-icedtea-boot \
- clean-rt clean-IcedTeaPlugin hotspot hotspot-helper clean-extra clean-jtreg \
- clean-jtreg-reports clean-netx clean-drops jtregcheck
+ clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
+ clean-drops jtregcheck
env:
@echo 'unset JAVA_HOME'
@@ -1729,8 +1678,7 @@ clean-bootstrap-directory-symlink-stage2
# you change it in the icedtea-debug target as well.
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- $(ICEDTEAPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
+ stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -1739,16 +1687,6 @@ stamps/icedtea.stamp: stamps/bootstrap-d
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-if ENABLE_PLUGIN
- cp -pPRf $(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- cp -pPRf $(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- cp $(top_srcdir)/$(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
- $(BUILD_OUTPUT_DIR)/j2re-image/lib
- cp $(top_srcdir)/$(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
-endif
if ENABLE_PULSE_JAVA
cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -1801,8 +1739,7 @@ endif
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- $(ICEDTEAPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
+ stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -1811,16 +1748,6 @@ stamps/icedtea-debug.stamp: stamps/boots
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-if ENABLE_PLUGIN
- cp -pPRf $(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
More information about the distro-pkg-dev
mailing list