/hg/icedtea6: NetX/plugin build sync (1/3): Build NetX and plugi...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Mar 12 08:46:41 PST 2010
changeset 7fd598f9cf42 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7fd598f9cf42
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Mar 12 16:46:26 2010 +0000
NetX/plugin build sync (1/3): Build NetX and plugin sources
separately.
2010-03-12 Andrew John Hughes <ahughes at redhat.com>
NetX/plugin build sync (1/3): Build NetX and plugin
sources separately.
* rt/javax/jnlp/BasicService.java,
* rt/javax/jnlp/ClipboardService.java,
* rt/javax/jnlp/DownloadService.java,
* rt/javax/jnlp/DownloadServiceListener.java,
* rt/javax/jnlp/ExtendedService.java,
* rt/javax/jnlp/ExtensionInstallerService.java,
* rt/javax/jnlp/FileContents.java,
* rt/javax/jnlp/FileOpenService.java,
* rt/javax/jnlp/FileSaveService.java,
* rt/javax/jnlp/JNLPRandomAccessFile.java,
* rt/javax/jnlp/PersistenceService.java,
* rt/javax/jnlp/PrintService.java,
* rt/javax/jnlp/ServiceManager.java,
* rt/javax/jnlp/ServiceManagerStub.java,
* rt/javax/jnlp/SingleInstanceListener.java,
* rt/javax/jnlp/SingleInstanceService.java,
* rt/javax/jnlp/UnavailableServiceException.java,
* rt/net/sourceforge/jnlp/AppletDesc.java,
* rt/net/sourceforge/jnlp/ApplicationDesc.java,
* rt/net/sourceforge/jnlp/AssociationDesc.java,
* rt/net/sourceforge/jnlp/ComponentDesc.java,
* rt/net/sourceforge/jnlp/DefaultLaunchHandler.java,
* rt/net/sourceforge/jnlp/ExtensionDesc.java,
* rt/net/sourceforge/jnlp/IconDesc.java,
* rt/net/sourceforge/jnlp/InformationDesc.java,
* rt/net/sourceforge/jnlp/InstallerDesc.java,
* rt/net/sourceforge/jnlp/JARDesc.java,
* rt/net/sourceforge/jnlp/JNLPFile.java,
* rt/net/sourceforge/jnlp/JNLPSplashScreen.java,
* rt/net/sourceforge/jnlp/JREDesc.java,
* rt/net/sourceforge/jnlp/LaunchException.java,
* rt/net/sourceforge/jnlp/LaunchHandler.java,
* rt/net/sourceforge/jnlp/Launcher.java,
* rt/net/sourceforge/jnlp/MenuDesc.java,
* rt/net/sourceforge/jnlp/NetxPanel.java,
* rt/net/sourceforge/jnlp/Node.java,
* rt/net/sourceforge/jnlp/PackageDesc.java,
* rt/net/sourceforge/jnlp/ParseException.java,
* rt/net/sourceforge/jnlp/Parser.java,
* rt/net/sourceforge/jnlp/PluginBridge.java,
* rt/net/sourceforge/jnlp/PropertyDesc.java,
* rt/net/sourceforge/jnlp/RelatedContentDesc.java,
* rt/net/sourceforge/jnlp/ResourcesDesc.java,
* rt/net/sourceforge/jnlp/SecurityDesc.java,
* rt/net/sourceforge/jnlp/ShortcutDesc.java,
* rt/net/sourceforge/jnlp/StreamEater.java,
* rt/net/sourceforge/jnlp/Version.java,
* rt/net/sourceforge/jnlp/cache/CacheEntry.java,
* rt/net/sourceforge/jnlp/cache/CacheUtil.java,
* rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
* rt/net/sourceforge/jnlp/cache/DownloadIndicator.java,
* rt/net/sourceforge/jnlp/cache/Resource.java,
* rt/net/sourceforge/jnlp/cache/ResourceTracker.java,
* rt/net/sourceforge/jnlp/cache/UpdatePolicy.java,
* rt/net/sourceforge/jnlp/cache/package.html,
* rt/net/sourceforge/jnlp/event/ApplicationEvent.java,
* rt/net/sourceforge/jnlp/event/ApplicationListener.java,
* rt/net/sourceforge/jnlp/event/DownloadEvent.java,
* rt/net/sourceforge/jnlp/event/DownloadListener.java,
* rt/net/sourceforge/jnlp/event/package.html,
* rt/net/sourceforge/jnlp/package.html,
* rt/net/sourceforge/jnlp/resources/Manifest.mf,
* rt/net/sourceforge/jnlp/resources/Messages.properties,
* rt/net/sourceforge/jnlp/resources/about.jnlp,
* rt/net/sourceforge/jnlp/resources/default.jnlp,
* rt/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
* rt/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
* rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
* rt/net/sourceforge/jnlp/runtime/AppletInstance.java,
* rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
* rt/net/sourceforge/jnlp/runtime/Boot.java,
* rt/net/sourceforge/jnlp/runtime/Boot13.java,
* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
* rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
* rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
* rt/net/sourceforge/jnlp/runtime/package.html,
* rt/net/sourceforge/jnlp/security/AccessWarningPane.java,
* rt/net/sourceforge/jnlp/security/AppletWarningPane.java,
* rt/net/sourceforge/jnlp/security/CertVerifier.java,
* rt/net/sourceforge/jnlp/security/CertWarningPane.java,
* rt/net/sourceforge/jnlp/security/CertsInfoPane.java,
* rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
* rt/net/sourceforge/jnlp/security/MoreInfoPane.java,
* rt/net/sourceforge/jnlp/security/SecurityDialogUI.java,
* rt/net/sourceforge/jnlp/security/SecurityUtil.java,
* rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
* rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
* rt/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
* rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
* rt/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
* rt/net/sourceforge/jnlp/services/ExtendedSingleInstanceService.java,
* rt/net/sourceforge/jnlp/services/InstanceExistsException.java,
* rt/net/sourceforge/jnlp/services/ServiceUtil.java,
* rt/net/sourceforge/jnlp/services/SingleInstanceLock.java,
* rt/net/sourceforge/jnlp/services/XBasicService.java,
* rt/net/sourceforge/jnlp/services/XClipboardService.java,
* rt/net/sourceforge/jnlp/services/XDownloadService.java,
* rt/net/sourceforge/jnlp/services/XExtendedService.java,
* rt/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
* rt/net/sourceforge/jnlp/services/XFileContents.java,
* rt/net/sourceforge/jnlp/services/XFileOpenService.java,
* rt/net/sourceforge/jnlp/services/XFileSaveService.java,
* rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
* rt/net/sourceforge/jnlp/services/XPersistenceService.java,
* rt/net/sourceforge/jnlp/services/XPrintService.java,
* rt/net/sourceforge/jnlp/services/XServiceManagerStub.java,
* rt/net/sourceforge/jnlp/services/XSingleInstanceService.java,
* rt/net/sourceforge/jnlp/services/package.html,
* rt/net/sourceforge/jnlp/tools/CharacterEncoder.java,
* rt/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
* rt/net/sourceforge/jnlp/tools/JarRunner.java,
* rt/net/sourceforge/jnlp/tools/JarSigner.java,
* rt/net/sourceforge/jnlp/tools/JarSignerResources.java,
* rt/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
* rt/net/sourceforge/jnlp/tools/KeyTool.java,
* rt/net/sourceforge/jnlp/util/FileUtils.java,
* rt/net/sourceforge/jnlp/util/PropertiesFile.java,
* rt/net/sourceforge/jnlp/util/Reflect.java,
* rt/net/sourceforge/jnlp/util/WeakList.java,
* rt/net/sourceforge/jnlp/util/XDesktopEntry.java,
* rt/net/sourceforge/nanoxml/XMLElement.java,
* rt/net/sourceforge/nanoxml/XMLParseException.java: Move NetX
sources to netx subdirectory.
* Makefile.am: (NETX_SRCDIR): Source directory containing NetX
sources. (NETX_RESOURCE_DIR): Path to NetX resource files.
(NETX_EXTRA_DIR): Path to extra NetX resource files.
(SOURCEPATH_DIRS): Renamed from ABS_SOURCE_DIRS. Drop rt
source directory (now plugs only) and plugin sources so it
only includes OpenJDK sources. (ICEDTEA_BOOTSTRAP_CLASSES):
Explicitly compile BasicDirectoryModel due to
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003
(LIVECONNECT_DIR): Use liveconnect build directory not rt.
(distclean-local): Call clean-netx, clean-plugin and clean-
liveconnect targets. Remove duplicate plugin cleanup.
(stamps/icedtea.stamp): Use NETX_RESOURCE_DIR for about.jnlp.
(stamps/icedtea-debug.stamp): Likewise. (liveconnect-source-
files.txt): Compile list of plugin sources.
(stamps/liveconnect.stamp): Build the plugin Java source code.
(stamps/liveconnect-dist.stamp): Create classes.jar and src.zip
for plugin (unused at present). (clean-liveconnect): Remove
build of Java plugin code. (netx-source-files.txt): Compile
list of NetX sources. (stamps/netx.stamp): Build the NetX
source code and copy the resources to the build directory..
(stamps/netx-dist.stamp): Create classes.jar and src.zip for
NetX (unused at present). (clean-netx): Remove build of NetX
code. (stamps/extra-class-files.stamp): Use NETX_EXTRA_DIR.
(rt-source-files.txt): Don't search rt directory in build tree
or plugin sources. (stamps/rt.stamp): Use SOURCEPATH_DIRS.
Don't copy NetX resources; now part of the NetX build.
(stamps/rt.stamp): Depend on liveconnect.stamp as plugin classes
are currently included in rt.jar. (stamps/plugs.stamp):
Depend on liveconnect.stamp and netx.stamp as plugin and
NetX classes are currently included in rt-closed.jar.
(liveconnect): New alias. (liveconncet-dist): Likewise.
(netx): Likewise. (netx-dist): Likewise.
* 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/SecurityDialogUI.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: New
location of NetX sources.
diffstat:
248 files changed, 23264 insertions(+), 22904 deletions(-)
ChangeLog | 291 ++
Makefile.am | 151 -
netx/javax/jnlp/BasicService.java | 13
netx/javax/jnlp/ClipboardService.java | 11
netx/javax/jnlp/DownloadService.java | 25
netx/javax/jnlp/DownloadServiceListener.java | 13
netx/javax/jnlp/ExtendedService.java | 51
netx/javax/jnlp/ExtensionInstallerService.java | 22
netx/javax/jnlp/FileContents.java | 18
netx/javax/jnlp/FileOpenService.java | 11
netx/javax/jnlp/FileSaveService.java | 11
netx/javax/jnlp/JNLPRandomAccessFile.java | 46
netx/javax/jnlp/PersistenceService.java | 18
netx/javax/jnlp/PrintService.java | 13
netx/javax/jnlp/ServiceManager.java | 54
netx/javax/jnlp/ServiceManagerStub.java | 11
netx/javax/jnlp/SingleInstanceListener.java | 35
netx/javax/jnlp/SingleInstanceService.java | 46
netx/javax/jnlp/UnavailableServiceException.java | 16
netx/net/sourceforge/jnlp/AppletDesc.java | 125
netx/net/sourceforge/jnlp/ApplicationDesc.java | 76
netx/net/sourceforge/jnlp/AssociationDesc.java | 56
netx/net/sourceforge/jnlp/ComponentDesc.java | 43
netx/net/sourceforge/jnlp/DefaultLaunchHandler.java | 114
netx/net/sourceforge/jnlp/ExtensionDesc.java | 145 +
netx/net/sourceforge/jnlp/IconDesc.java | 138 +
netx/net/sourceforge/jnlp/InformationDesc.java | 268 ++
netx/net/sourceforge/jnlp/InstallerDesc.java | 54
netx/net/sourceforge/jnlp/JARDesc.java | 144 +
netx/net/sourceforge/jnlp/JNLPFile.java | 623 ++++
netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 93
netx/net/sourceforge/jnlp/JREDesc.java | 167 +
netx/net/sourceforge/jnlp/LaunchException.java | 190 +
netx/net/sourceforge/jnlp/LaunchHandler.java | 68
netx/net/sourceforge/jnlp/Launcher.java | 792 +++++
netx/net/sourceforge/jnlp/MenuDesc.java | 38
netx/net/sourceforge/jnlp/NetxPanel.java | 147 +
netx/net/sourceforge/jnlp/Node.java | 147 +
netx/net/sourceforge/jnlp/PackageDesc.java | 105
netx/net/sourceforge/jnlp/ParseException.java | 94
netx/net/sourceforge/jnlp/Parser.java | 1202 +++++++++
netx/net/sourceforge/jnlp/PluginBridge.java | 253 +
netx/net/sourceforge/jnlp/PropertyDesc.java | 66
netx/net/sourceforge/jnlp/RelatedContentDesc.java | 93
netx/net/sourceforge/jnlp/ResourcesDesc.java | 231 +
netx/net/sourceforge/jnlp/SecurityDesc.java | 197 +
netx/net/sourceforge/jnlp/ShortcutDesc.java | 70
netx/net/sourceforge/jnlp/StreamEater.java | 45
netx/net/sourceforge/jnlp/Version.java | 354 ++
netx/net/sourceforge/jnlp/cache/CacheEntry.java | 174 +
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 394 ++
netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 321 ++
netx/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92
netx/net/sourceforge/jnlp/cache/Resource.java | 271 ++
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 1051 +++++++
netx/net/sourceforge/jnlp/cache/UpdatePolicy.java | 90
netx/net/sourceforge/jnlp/cache/package.html | 28
netx/net/sourceforge/jnlp/event/ApplicationEvent.java | 57
netx/net/sourceforge/jnlp/event/ApplicationListener.java | 38
netx/net/sourceforge/jnlp/event/DownloadEvent.java | 72
netx/net/sourceforge/jnlp/event/DownloadListener.java | 51
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 | 174 +
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 | 109
netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 354 ++
netx/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 +
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 282 ++
netx/net/sourceforge/jnlp/runtime/Boot.java | 451 +++
netx/net/sourceforge/jnlp/runtime/Boot13.java | 103
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 1052 +++++++
netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 105
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 559 ++++
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 556 ++++
netx/net/sourceforge/jnlp/runtime/package.html | 29
netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 215 +
netx/net/sourceforge/jnlp/security/AppletWarningPane.java | 121
netx/net/sourceforge/jnlp/security/CertVerifier.java | 92
netx/net/sourceforge/jnlp/security/CertWarningPane.java | 269 ++
netx/net/sourceforge/jnlp/security/CertsInfoPane.java | 340 ++
netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 238 +
netx/net/sourceforge/jnlp/security/MoreInfoPane.java | 127
netx/net/sourceforge/jnlp/security/SecurityDialogUI.java | 204 +
netx/net/sourceforge/jnlp/security/SecurityUtil.java | 285 ++
netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 430 +++
netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 78
netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 286 ++
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 350 ++
netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 +
netx/net/sourceforge/jnlp/services/ExtendedSingleInstanceService.java | 49
netx/net/sourceforge/jnlp/services/InstanceExistsException.java | 35
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 276 ++
netx/net/sourceforge/jnlp/services/SingleInstanceLock.java | 194 +
netx/net/sourceforge/jnlp/services/XBasicService.java | 234 +
netx/net/sourceforge/jnlp/services/XClipboardService.java | 81
netx/net/sourceforge/jnlp/services/XDownloadService.java | 181 +
netx/net/sourceforge/jnlp/services/XExtendedService.java | 54
netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123
netx/net/sourceforge/jnlp/services/XFileContents.java | 123
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 | 179 +
netx/net/sourceforge/jnlp/services/XPrintService.java | 123
netx/net/sourceforge/jnlp/services/XServiceManagerStub.java | 108
netx/net/sourceforge/jnlp/services/XSingleInstanceService.java | 229 +
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 | 545 ++++
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 | 48
netx/net/sourceforge/jnlp/util/PropertiesFile.java | 148 +
netx/net/sourceforge/jnlp/util/Reflect.java | 148 +
netx/net/sourceforge/jnlp/util/WeakList.java | 128
netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 213 +
netx/net/sourceforge/nanoxml/XMLElement.java | 1334 ++++++++++
netx/net/sourceforge/nanoxml/XMLParseException.java | 130
rt/javax/jnlp/BasicService.java | 13
rt/javax/jnlp/ClipboardService.java | 11
rt/javax/jnlp/DownloadService.java | 25
rt/javax/jnlp/DownloadServiceListener.java | 13
rt/javax/jnlp/ExtendedService.java | 51
rt/javax/jnlp/ExtensionInstallerService.java | 22
rt/javax/jnlp/FileContents.java | 18
rt/javax/jnlp/FileOpenService.java | 11
rt/javax/jnlp/FileSaveService.java | 11
rt/javax/jnlp/JNLPRandomAccessFile.java | 46
rt/javax/jnlp/PersistenceService.java | 18
rt/javax/jnlp/PrintService.java | 13
rt/javax/jnlp/ServiceManager.java | 54
rt/javax/jnlp/ServiceManagerStub.java | 11
rt/javax/jnlp/SingleInstanceListener.java | 35
rt/javax/jnlp/SingleInstanceService.java | 46
rt/javax/jnlp/UnavailableServiceException.java | 16
rt/net/sourceforge/jnlp/AppletDesc.java | 125
rt/net/sourceforge/jnlp/ApplicationDesc.java | 76
rt/net/sourceforge/jnlp/AssociationDesc.java | 56
rt/net/sourceforge/jnlp/ComponentDesc.java | 43
rt/net/sourceforge/jnlp/DefaultLaunchHandler.java | 114
rt/net/sourceforge/jnlp/ExtensionDesc.java | 145 -
rt/net/sourceforge/jnlp/IconDesc.java | 138 -
rt/net/sourceforge/jnlp/InformationDesc.java | 268 --
rt/net/sourceforge/jnlp/InstallerDesc.java | 54
rt/net/sourceforge/jnlp/JARDesc.java | 144 -
rt/net/sourceforge/jnlp/JNLPFile.java | 623 ----
rt/net/sourceforge/jnlp/JNLPSplashScreen.java | 93
rt/net/sourceforge/jnlp/JREDesc.java | 167 -
rt/net/sourceforge/jnlp/LaunchException.java | 190 -
rt/net/sourceforge/jnlp/LaunchHandler.java | 68
rt/net/sourceforge/jnlp/Launcher.java | 792 -----
rt/net/sourceforge/jnlp/MenuDesc.java | 38
rt/net/sourceforge/jnlp/NetxPanel.java | 147 -
rt/net/sourceforge/jnlp/Node.java | 147 -
rt/net/sourceforge/jnlp/PackageDesc.java | 105
rt/net/sourceforge/jnlp/ParseException.java | 94
rt/net/sourceforge/jnlp/Parser.java | 1202 ---------
rt/net/sourceforge/jnlp/PluginBridge.java | 253 -
rt/net/sourceforge/jnlp/PropertyDesc.java | 66
rt/net/sourceforge/jnlp/RelatedContentDesc.java | 93
rt/net/sourceforge/jnlp/ResourcesDesc.java | 231 -
rt/net/sourceforge/jnlp/SecurityDesc.java | 197 -
rt/net/sourceforge/jnlp/ShortcutDesc.java | 70
rt/net/sourceforge/jnlp/StreamEater.java | 45
rt/net/sourceforge/jnlp/Version.java | 354 --
rt/net/sourceforge/jnlp/cache/CacheEntry.java | 174 -
rt/net/sourceforge/jnlp/cache/CacheUtil.java | 394 --
rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 321 --
rt/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92
rt/net/sourceforge/jnlp/cache/Resource.java | 271 --
rt/net/sourceforge/jnlp/cache/ResourceTracker.java | 1051 -------
rt/net/sourceforge/jnlp/cache/UpdatePolicy.java | 90
rt/net/sourceforge/jnlp/cache/package.html | 28
rt/net/sourceforge/jnlp/event/ApplicationEvent.java | 57
rt/net/sourceforge/jnlp/event/ApplicationListener.java | 38
rt/net/sourceforge/jnlp/event/DownloadEvent.java | 72
rt/net/sourceforge/jnlp/event/DownloadListener.java | 51
rt/net/sourceforge/jnlp/event/package.html | 28
rt/net/sourceforge/jnlp/package.html | 30
rt/net/sourceforge/jnlp/resources/Manifest.mf | 6
rt/net/sourceforge/jnlp/resources/Messages.properties | 174 -
rt/net/sourceforge/jnlp/resources/about.jnlp | 20
rt/net/sourceforge/jnlp/resources/default.jnlp | 20
rt/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 68
rt/net/sourceforge/jnlp/runtime/AppletAudioClip.java | 109
rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 354 --
rt/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 -
rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 282 --
rt/net/sourceforge/jnlp/runtime/Boot.java | 451 ---
rt/net/sourceforge/jnlp/runtime/Boot13.java | 103
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 1052 -------
rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 105
rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 559 ----
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 556 ----
rt/net/sourceforge/jnlp/runtime/package.html | 29
rt/net/sourceforge/jnlp/security/AccessWarningPane.java | 215 -
rt/net/sourceforge/jnlp/security/AppletWarningPane.java | 121
rt/net/sourceforge/jnlp/security/CertVerifier.java | 92
rt/net/sourceforge/jnlp/security/CertWarningPane.java | 269 --
rt/net/sourceforge/jnlp/security/CertsInfoPane.java | 340 --
rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 238 -
rt/net/sourceforge/jnlp/security/MoreInfoPane.java | 127
rt/net/sourceforge/jnlp/security/SecurityDialogUI.java | 204 -
rt/net/sourceforge/jnlp/security/SecurityUtil.java | 285 --
rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 430 ---
rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 78
rt/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 286 --
rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 350 --
rt/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 -
rt/net/sourceforge/jnlp/services/ExtendedSingleInstanceService.java | 49
rt/net/sourceforge/jnlp/services/InstanceExistsException.java | 35
rt/net/sourceforge/jnlp/services/ServiceUtil.java | 276 --
rt/net/sourceforge/jnlp/services/SingleInstanceLock.java | 194 -
rt/net/sourceforge/jnlp/services/XBasicService.java | 234 -
rt/net/sourceforge/jnlp/services/XClipboardService.java | 81
rt/net/sourceforge/jnlp/services/XDownloadService.java | 181 -
rt/net/sourceforge/jnlp/services/XExtendedService.java | 54
rt/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123
rt/net/sourceforge/jnlp/services/XFileContents.java | 123
rt/net/sourceforge/jnlp/services/XFileOpenService.java | 113
rt/net/sourceforge/jnlp/services/XFileSaveService.java | 140 -
rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java | 208 -
rt/net/sourceforge/jnlp/services/XPersistenceService.java | 179 -
rt/net/sourceforge/jnlp/services/XPrintService.java | 123
rt/net/sourceforge/jnlp/services/XServiceManagerStub.java | 108
rt/net/sourceforge/jnlp/services/XSingleInstanceService.java | 229 -
rt/net/sourceforge/jnlp/services/package.html | 29
rt/net/sourceforge/jnlp/tools/CharacterEncoder.java | 354 --
rt/net/sourceforge/jnlp/tools/HexDumpEncoder.java | 120
rt/net/sourceforge/jnlp/tools/JarRunner.java | 15
rt/net/sourceforge/jnlp/tools/JarSigner.java | 545 ----
rt/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 -
rt/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69
rt/net/sourceforge/jnlp/tools/KeyTool.java | 461 ---
rt/net/sourceforge/jnlp/util/FileUtils.java | 48
rt/net/sourceforge/jnlp/util/PropertiesFile.java | 148 -
rt/net/sourceforge/jnlp/util/Reflect.java | 148 -
rt/net/sourceforge/jnlp/util/WeakList.java | 128
rt/net/sourceforge/jnlp/util/XDesktopEntry.java | 213 -
rt/net/sourceforge/nanoxml/XMLElement.java | 1334 ----------
rt/net/sourceforge/nanoxml/XMLParseException.java | 130
diffs (truncated from 47305 to 500 lines):
diff -r 39180582f106 -r 7fd598f9cf42 ChangeLog
--- a/ChangeLog Thu Mar 11 16:35:10 2010 -0500
+++ b/ChangeLog Fri Mar 12 16:46:26 2010 +0000
@@ -1,3 +1,294 @@ 2010-03-11 Gary Benson <gbenson at redhat
+2010-03-12 Andrew John Hughes <ahughes at redhat.com>
+
+ NetX/plugin build sync (1/3):
+ Build NetX and plugin sources separately.
+ * rt/javax/jnlp/BasicService.java,
+ * rt/javax/jnlp/ClipboardService.java,
+ * rt/javax/jnlp/DownloadService.java,
+ * rt/javax/jnlp/DownloadServiceListener.java,
+ * rt/javax/jnlp/ExtendedService.java,
+ * rt/javax/jnlp/ExtensionInstallerService.java,
+ * rt/javax/jnlp/FileContents.java,
+ * rt/javax/jnlp/FileOpenService.java,
+ * rt/javax/jnlp/FileSaveService.java,
+ * rt/javax/jnlp/JNLPRandomAccessFile.java,
+ * rt/javax/jnlp/PersistenceService.java,
+ * rt/javax/jnlp/PrintService.java,
+ * rt/javax/jnlp/ServiceManager.java,
+ * rt/javax/jnlp/ServiceManagerStub.java,
+ * rt/javax/jnlp/SingleInstanceListener.java,
+ * rt/javax/jnlp/SingleInstanceService.java,
+ * rt/javax/jnlp/UnavailableServiceException.java,
+ * rt/net/sourceforge/jnlp/AppletDesc.java,
+ * rt/net/sourceforge/jnlp/ApplicationDesc.java,
+ * rt/net/sourceforge/jnlp/AssociationDesc.java,
+ * rt/net/sourceforge/jnlp/ComponentDesc.java,
+ * rt/net/sourceforge/jnlp/DefaultLaunchHandler.java,
+ * rt/net/sourceforge/jnlp/ExtensionDesc.java,
+ * rt/net/sourceforge/jnlp/IconDesc.java,
+ * rt/net/sourceforge/jnlp/InformationDesc.java,
+ * rt/net/sourceforge/jnlp/InstallerDesc.java,
+ * rt/net/sourceforge/jnlp/JARDesc.java,
+ * rt/net/sourceforge/jnlp/JNLPFile.java,
+ * rt/net/sourceforge/jnlp/JNLPSplashScreen.java,
+ * rt/net/sourceforge/jnlp/JREDesc.java,
+ * rt/net/sourceforge/jnlp/LaunchException.java,
+ * rt/net/sourceforge/jnlp/LaunchHandler.java,
+ * rt/net/sourceforge/jnlp/Launcher.java,
+ * rt/net/sourceforge/jnlp/MenuDesc.java,
+ * rt/net/sourceforge/jnlp/NetxPanel.java,
+ * rt/net/sourceforge/jnlp/Node.java,
+ * rt/net/sourceforge/jnlp/PackageDesc.java,
+ * rt/net/sourceforge/jnlp/ParseException.java,
+ * rt/net/sourceforge/jnlp/Parser.java,
+ * rt/net/sourceforge/jnlp/PluginBridge.java,
+ * rt/net/sourceforge/jnlp/PropertyDesc.java,
+ * rt/net/sourceforge/jnlp/RelatedContentDesc.java,
+ * rt/net/sourceforge/jnlp/ResourcesDesc.java,
+ * rt/net/sourceforge/jnlp/SecurityDesc.java,
+ * rt/net/sourceforge/jnlp/ShortcutDesc.java,
+ * rt/net/sourceforge/jnlp/StreamEater.java,
+ * rt/net/sourceforge/jnlp/Version.java,
+ * rt/net/sourceforge/jnlp/cache/CacheEntry.java,
+ * rt/net/sourceforge/jnlp/cache/CacheUtil.java,
+ * rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
+ * rt/net/sourceforge/jnlp/cache/DownloadIndicator.java,
+ * rt/net/sourceforge/jnlp/cache/Resource.java,
+ * rt/net/sourceforge/jnlp/cache/ResourceTracker.java,
+ * rt/net/sourceforge/jnlp/cache/UpdatePolicy.java,
+ * rt/net/sourceforge/jnlp/cache/package.html,
+ * rt/net/sourceforge/jnlp/event/ApplicationEvent.java,
+ * rt/net/sourceforge/jnlp/event/ApplicationListener.java,
+ * rt/net/sourceforge/jnlp/event/DownloadEvent.java,
+ * rt/net/sourceforge/jnlp/event/DownloadListener.java,
+ * rt/net/sourceforge/jnlp/event/package.html,
+ * rt/net/sourceforge/jnlp/package.html,
+ * rt/net/sourceforge/jnlp/resources/Manifest.mf,
+ * rt/net/sourceforge/jnlp/resources/Messages.properties,
+ * rt/net/sourceforge/jnlp/resources/about.jnlp,
+ * rt/net/sourceforge/jnlp/resources/default.jnlp,
+ * rt/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
+ * rt/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
+ * rt/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
+ * rt/net/sourceforge/jnlp/runtime/AppletInstance.java,
+ * rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
+ * rt/net/sourceforge/jnlp/runtime/Boot.java,
+ * rt/net/sourceforge/jnlp/runtime/Boot13.java,
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
+ * rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
+ * rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
+ * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
+ * rt/net/sourceforge/jnlp/runtime/package.html,
+ * rt/net/sourceforge/jnlp/security/AccessWarningPane.java,
+ * rt/net/sourceforge/jnlp/security/AppletWarningPane.java,
+ * rt/net/sourceforge/jnlp/security/CertVerifier.java,
+ * rt/net/sourceforge/jnlp/security/CertWarningPane.java,
+ * rt/net/sourceforge/jnlp/security/CertsInfoPane.java,
+ * rt/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
+ * rt/net/sourceforge/jnlp/security/MoreInfoPane.java,
+ * rt/net/sourceforge/jnlp/security/SecurityDialogUI.java,
+ * rt/net/sourceforge/jnlp/security/SecurityUtil.java,
+ * rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
+ * rt/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
+ * rt/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
+ * rt/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
+ * rt/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
+ * rt/net/sourceforge/jnlp/services/ExtendedSingleInstanceService.java,
+ * rt/net/sourceforge/jnlp/services/InstanceExistsException.java,
+ * rt/net/sourceforge/jnlp/services/ServiceUtil.java,
+ * rt/net/sourceforge/jnlp/services/SingleInstanceLock.java,
+ * rt/net/sourceforge/jnlp/services/XBasicService.java,
+ * rt/net/sourceforge/jnlp/services/XClipboardService.java,
+ * rt/net/sourceforge/jnlp/services/XDownloadService.java,
+ * rt/net/sourceforge/jnlp/services/XExtendedService.java,
+ * rt/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
+ * rt/net/sourceforge/jnlp/services/XFileContents.java,
+ * rt/net/sourceforge/jnlp/services/XFileOpenService.java,
+ * rt/net/sourceforge/jnlp/services/XFileSaveService.java,
+ * rt/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
+ * rt/net/sourceforge/jnlp/services/XPersistenceService.java,
+ * rt/net/sourceforge/jnlp/services/XPrintService.java,
+ * rt/net/sourceforge/jnlp/services/XServiceManagerStub.java,
+ * rt/net/sourceforge/jnlp/services/XSingleInstanceService.java,
+ * rt/net/sourceforge/jnlp/services/package.html,
+ * rt/net/sourceforge/jnlp/tools/CharacterEncoder.java,
+ * rt/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
+ * rt/net/sourceforge/jnlp/tools/JarRunner.java,
+ * rt/net/sourceforge/jnlp/tools/JarSigner.java,
+ * rt/net/sourceforge/jnlp/tools/JarSignerResources.java,
+ * rt/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
+ * rt/net/sourceforge/jnlp/tools/KeyTool.java,
+ * rt/net/sourceforge/jnlp/util/FileUtils.java,
+ * rt/net/sourceforge/jnlp/util/PropertiesFile.java,
+ * rt/net/sourceforge/jnlp/util/Reflect.java,
+ * rt/net/sourceforge/jnlp/util/WeakList.java,
+ * rt/net/sourceforge/jnlp/util/XDesktopEntry.java,
+ * rt/net/sourceforge/nanoxml/XMLElement.java,
+ * rt/net/sourceforge/nanoxml/XMLParseException.java:
+ Move NetX sources to netx subdirectory.
+ * Makefile.am:
+ (NETX_SRCDIR): Source directory containing NetX sources.
+ (NETX_RESOURCE_DIR): Path to NetX resource files.
+ (NETX_EXTRA_DIR): Path to extra NetX resource files.
+ (SOURCEPATH_DIRS): Renamed from ABS_SOURCE_DIRS. Drop
+ rt source directory (now plugs only) and plugin sources
+ so it only includes OpenJDK sources.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Explicitly compile BasicDirectoryModel
+ due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42003
+ (LIVECONNECT_DIR): Use liveconnect build directory not rt.
+ (distclean-local): Call clean-netx, clean-plugin and clean-liveconnect
+ targets. Remove duplicate plugin cleanup.
+ (stamps/icedtea.stamp): Use NETX_RESOURCE_DIR for about.jnlp.
+ (stamps/icedtea-debug.stamp): Likewise.
+ (liveconnect-source-files.txt): Compile list of plugin sources.
+ (stamps/liveconnect.stamp): Build the plugin Java source code.
+ (stamps/liveconnect-dist.stamp): Create classes.jar and src.zip
+ for plugin (unused at present).
+ (clean-liveconnect): Remove build of Java plugin code.
+ (netx-source-files.txt): Compile list of NetX sources.
+ (stamps/netx.stamp): Build the NetX source code and copy the
+ resources to the build directory..
+ (stamps/netx-dist.stamp): Create classes.jar and src.zip
+ for NetX (unused at present).
+ (clean-netx): Remove build of NetX code.
+ (stamps/extra-class-files.stamp): Use NETX_EXTRA_DIR.
+ (rt-source-files.txt): Don't search rt directory in build tree
+ or plugin sources.
+ (stamps/rt.stamp): Use SOURCEPATH_DIRS. Don't copy NetX resources;
+ now part of the NetX build.
+ (stamps/rt.stamp): Depend on liveconnect.stamp as plugin classes
+ are currently included in rt.jar.
+ (stamps/plugs.stamp): Depend on liveconnect.stamp and netx.stamp as
+ plugin and NetX classes are currently included in rt-closed.jar.
+ (liveconnect): New alias.
+ (liveconncet-dist): Likewise.
+ (netx): Likewise.
+ (netx-dist): Likewise.
+ * 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/SecurityDialogUI.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:
+ New location of NetX sources.
+
2010-03-11 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
diff -r 39180582f106 -r 7fd598f9cf42 Makefile.am
--- a/Makefile.am Thu Mar 11 16:35:10 2010 -0500
+++ b/Makefile.am Fri Mar 12 16:46:26 2010 +0000
@@ -61,12 +61,14 @@ LANGTOOLS = openjdk-ecj/langtools/src/sh
LANGTOOLS = openjdk-ecj/langtools/src/share/classes
CORBA = openjdk-ecj/corba/src/share/classes
-# FIXME (netx): NetX source directories go here
+NETX_SRCDIR = $(abs_top_srcdir)/netx
+NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
+NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
OPENJDK_SOURCEPATH_DIRS = \
$(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA)
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
+SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
# Sources used from OpenJDK.
ICEDTEA_BOOTSTRAP_DIRS = \
@@ -89,10 +91,15 @@ ICEDTEA_BOOTSTRAP_DIRS = \
$(LANGTOOLS)/com/sun/mirror \
$(LANGTOOLS)/com/sun/tools/apt
+ICEDTEA_BOOTSTRAP_CLASSES = \
+ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
+
# FIXME (javac): Settings for javac go here
# Flags
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
+IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS)
# Conditional defintions
@@ -130,7 +137,7 @@ ICEDTEANPPLUGIN_CLEAN = clean-IcedTeaNPP
ICEDTEANPPLUGIN_CLEAN = clean-IcedTeaNPPlugin
ICEDTEANPPLUGIN_TARGET = $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt sun/applet
+LIVECONNECT_DIR = -C liveconnect netscape -C liveconnect sun/applet
NPPLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
NPPLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
LIVECONNECT_SRCS = $(NPPLUGIN_SRCDIR)/java
@@ -139,7 +146,7 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugi
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt sun/applet
+LIVECONNECT_DIR = -C liveconnect netscape -C liveconnect sun/applet
NPPLUGIN_DIR =
LIVECONNECT_SRCS = $(abs_top_srcdir)/plugin/icedtea
else
@@ -621,7 +628,8 @@ check-local: jtregcheck
check-local: jtregcheck
#FIXME (clean): Should become clean-local.
-distclean-local: clean-copy clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET)
+distclean-local: clean-copy clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET) \
+ clean-netx clean-plugin clean-liveconnect
rm -rf stamps
rm -f rt-source-files.txt \
extra-source-files.txt
@@ -633,13 +641,6 @@ distclean-local: clean-copy clean-jtreg
rm -rf rt/netscape
rm -rf visualvm
rm -rf netbeans
-if ENABLE_NPPLUGIN
- rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
-else
-if ENABLE_PLUGIN
- rm -f IcedTeaPlugin.o IcedTeaPlugin.so
-endif
-endif
if BUILD_CACAO
rm -rf cacao
@@ -1386,11 +1387,9 @@ if WITH_VISUALVM
cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
$(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
endif
- cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib ; \
- cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
@@ -1487,11 +1486,9 @@ if WITH_VISUALVM
cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
$(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm
endif
- cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib ; \
- cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
- extra-lib/about.jar \
+ cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
if ZERO_BUILD
printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
@@ -1679,14 +1676,81 @@ clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(I
clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
rm -f stamps/plugin.stamp
-#FIXME (plugin): Missing liveconnect-source-files.txt
-#FIXME (plugin): Missing liveconnect.stamp
-#FIXME (plugin): Missing liveconnect-dist.stamp
-#FIXME (clean): Missing clean-liveconnect
-#FIXME (netx): Missing netx-source-files.txt
-#FIXME (netx): Missing netx.stamp
-#FIXME (netx): Missing netx-dist.stamp
-#FIXME (clean): Missing clean-netx
+liveconnect-source-files.txt:
+ if test "x${LIVECONNECT_DIR}" != x; then \
+ find $(LIVECONNECT_SRCS) -name '*.java' | sort > $@ ; \
+ fi
+ touch $@
+
+stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
+ if test "x${LIVECONNECT_DIR}" != x; then \
+ mkdir -p $(abs_top_builddir)/liveconnect && \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d $(abs_top_builddir)/liveconnect \
+ -classpath $(abs_top_builddir)/lib/rt:$(abs_top_builddir)/netx.build:$(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
+ -sourcepath $(SOURCEPATH_DIRS) \
+ -bootclasspath \'\' \
+ @liveconnect-source-files.txt ; \
+ fi
+ mkdir -p stamps
+ touch $@
+
+stamps/liveconnect-dist.stamp: stamps/liveconnect.stamp
+ if test "x${LIVECONNECT_DIR}" != x; then \
+ (cd $(abs_top_builddir)/liveconnect ; \
+ mkdir -p lib ; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar sun/applet netscape ; \
+ cp -a $(LIVECONNECT_SRCS) src; \
+ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
+ cd src ; \
+ $(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip sun/applet netscape ) ; \
+ fi
+ mkdir -p stamps
+ touch $@
+
+clean-liveconnect:
+ rm -rf $(abs_top_builddir)/liveconnect
+ rm -f stamps/liveconnect-dist.stamp
+ rm -f liveconnect-source-files.txt
+ rm -f stamps/liveconnect.stamp
+
+# NetX
+# requires availability of OpenJDK source code including
+# a patch applied to sun.plugin.AppletViewerPanel and generated sources
+
+netx-source-files.txt:
+ find $(NETX_SRCDIR) -name '*.java' | sort > $@
+
+stamps/netx.stamp: netx-source-files.txt stamps/rt-class-files.stamp
+ mkdir -p $(abs_top_builddir)/netx.build
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d $(abs_top_builddir)/netx.build \
+ -classpath $(abs_top_builddir)/lib/rt:$(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
+ -sourcepath $(NETX_SRCDIR):$(SOURCEPATH_DIRS) \
+ -bootclasspath \'\' \
+ @netx-source-files.txt
+ cp -r $(NETX_RESOURCE_DIR) $(abs_top_builddir)/netx.build/net/sourceforge/jnlp
+ mkdir -p stamps
+ touch $@
+
+stamps/netx-dist.stamp: stamps/netx.stamp
+ (cd $(abs_top_builddir)/netx.build ; \
+ mkdir -p lib ; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
+ cp -a $(NETX_SRCDIR) src; \
+ find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
+ cd src ; \
+ $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \
+ `find . -type f -not -name '*.java'` ; \
+ $(ZIP) -qr $(abs_top_builddir)/netx.build/lib/src.zip javax net )
+ mkdir -p stamps
+ touch $@
+
+clean-netx:
+ rm -rf $(abs_top_builddir)/netx.build
+ rm -f stamps/netx-dist.stamp
+ rm -f netx-source-files.txt
+ rm -f stamps/netx.stamp
# extras -- used to create about.jar for javaws.
extra-source-files.txt:
@@ -1698,9 +1762,8 @@ stamps/extra-class-files.stamp: $(INITIA
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
-source 1.5 \
-sourcepath extra -cp $(ICEDTEA_RT):$(ICEDTEA_PLUGS) \
- -bootclasspath \'\' @extra-source-files.txt ;
- cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
More information about the distro-pkg-dev
mailing list