changeset in /hg/icedtea: Completely restructure the building an...
Andrew John Hughes
ahughes at redhat.com
Thu May 28 02:15:44 PDT 2009
changeset 31b0ba36a6b7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=31b0ba36a6b7
description:
Completely restructure the building and inclusion of netx and plugin code.
We were relying on the binary plugs process (and thus importing unneeded
SNMP classes). We now use the same method as jaxws, jaxp, langtools and corba,
and the binary plugs process is turned off (the default, we were turning
it on by setting ALT_BINARY_PLUGS_PATH).
2009-05-27 Andrew John Hughes <ahughes at redhat.com>
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java:
Moved to...
* Makefile.am:
Remove use of ALT_BINARY_PLUGS_PATH (and thus turn off the binary plugs build),
add a INITIAL_BOOTSTRAP_LINK_STAMP target which allows us to depend on $(ICEDTEA_BOOT_DIR)
for both types of build, output to lib/tools.jar not jre/lib/tools.jar, add targets
for building netx and liveconnect classes and make icedtea targets dependent on this.
* netx/javax/jnlp/BasicService.java,
* netx/javax/jnlp/ClipboardService.java,
* netx/javax/jnlp/DownloadService.java,
* netx/javax/jnlp/DownloadServiceListener.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/UnavailableServiceException.java,
* netx/net/sourceforge/jnlp/AppletDesc.java,
* netx/net/sourceforge/jnlp/ApplicationDesc.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/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/ResourcesDesc.java,
* netx/net/sourceforge/jnlp/SecurityDesc.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/ServiceUtil.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/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/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/PropertiesFile.java,
* netx/net/sourceforge/jnlp/util/Reflect.java,
* netx/net/sourceforge/jnlp/util/WeakList.java,
* netx/net/sourceforge/nanoxml/XMLElement.java,
* netx/net/sourceforge/nanoxml/XMLParseException.java: to here.
* patches/ecj/icedtea.patch:
Recreated.
* patches/icedtea-ant.patch:
Remove hack to jaxws which uses plugs directory (now undefined).
* patches/icedtea-javac-debuginfo.patch: Recreated.
* patches/icedtea-netx.patch:
Include netx and netscape classes via the same import mechanism
as jaxws, jaxp, corba and langtools (extracting a classes.zip).
diffstat:
222 files changed, 21056 insertions(+), 20656 deletions(-)
ChangeLog | 233 +
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/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/UnavailableServiceException.java | 16
netx/net/sourceforge/jnlp/AppletDesc.java | 125
netx/net/sourceforge/jnlp/ApplicationDesc.java | 76
netx/net/sourceforge/jnlp/ComponentDesc.java | 43
netx/net/sourceforge/jnlp/DefaultLaunchHandler.java | 114
netx/net/sourceforge/jnlp/ExtensionDesc.java | 157 +
netx/net/sourceforge/jnlp/IconDesc.java | 135 +
netx/net/sourceforge/jnlp/InformationDesc.java | 241 +
netx/net/sourceforge/jnlp/InstallerDesc.java | 54
netx/net/sourceforge/jnlp/JARDesc.java | 144 +
netx/net/sourceforge/jnlp/JNLPFile.java | 523 +++
netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 93
netx/net/sourceforge/jnlp/JREDesc.java | 123
netx/net/sourceforge/jnlp/LaunchException.java | 190 +
netx/net/sourceforge/jnlp/LaunchHandler.java | 68
netx/net/sourceforge/jnlp/Launcher.java | 710 +++++
netx/net/sourceforge/jnlp/NetxPanel.java | 150 +
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 | 979 +++++++
netx/net/sourceforge/jnlp/PluginBridge.java | 250 +
netx/net/sourceforge/jnlp/PropertyDesc.java | 66
netx/net/sourceforge/jnlp/ResourcesDesc.java | 231 +
netx/net/sourceforge/jnlp/SecurityDesc.java | 173 +
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 | 282 ++
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 973 +++++++
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 | 163 +
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 | 248 +
netx/net/sourceforge/jnlp/runtime/Boot.java | 442 +++
netx/net/sourceforge/jnlp/runtime/Boot13.java | 103
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 986 +++++++
netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 105
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 496 +++
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 490 +++
netx/net/sourceforge/jnlp/runtime/package.html | 29
netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 212 +
netx/net/sourceforge/jnlp/security/AppletWarningPane.java | 121
netx/net/sourceforge/jnlp/security/CertVerifier.java | 92
netx/net/sourceforge/jnlp/security/CertWarningPane.java | 287 ++
netx/net/sourceforge/jnlp/security/CertsInfoPane.java | 357 ++
netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 175 +
netx/net/sourceforge/jnlp/security/MoreInfoPane.java | 127
netx/net/sourceforge/jnlp/security/SecurityDialogUI.java | 204 +
netx/net/sourceforge/jnlp/security/SecurityUtil.java | 200 +
netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 429 +++
netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 78
netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 219 +
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 350 ++
netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 +
netx/net/sourceforge/jnlp/services/ServiceUtil.java | 214 +
netx/net/sourceforge/jnlp/services/XBasicService.java | 174 +
netx/net/sourceforge/jnlp/services/XClipboardService.java | 81
netx/net/sourceforge/jnlp/services/XDownloadService.java | 181 +
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 | 104
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 | 544 ++++
netx/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 +
netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69
netx/net/sourceforge/jnlp/tools/KeyTool.java | 478 +++
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/nanoxml/XMLElement.java | 1334 ++++++++++
netx/net/sourceforge/nanoxml/XMLParseException.java | 130
overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java | 13
overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java | 11
overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java | 25
overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java | 13
overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java | 22
overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java | 18
overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java | 11
overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java | 11
overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java | 46
overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java | 18
overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java | 13
overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java | 54
overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java | 11
overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java | 16
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java | 125
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java | 76
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java | 43
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java | 114
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java | 157 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java | 135 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java | 241 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java | 54
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java | 144 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java | 523 ---
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java | 93
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java | 123
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java | 190 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java | 68
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java | 710 -----
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java | 150 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java | 147 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java | 105
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java | 94
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java | 979 -------
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java | 250 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java | 66
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java | 231 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java | 173 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java | 354 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java | 174 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java | 394 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 321 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java | 282 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java | 973 -------
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java | 90
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html | 28
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java | 57
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java | 38
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java | 72
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java | 51
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html | 28
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html | 30
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf | 6
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties | 163 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp | 20
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp | 20
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java | 68
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java | 109
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 354 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 248 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java | 442 ---
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java | 103
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 986 -------
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 105
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 496 ---
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 490 ---
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html | 29
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java | 212 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java | 121
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java | 92
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java | 287 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java | 357 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java | 175 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java | 127
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java | 204 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java | 200 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 429 ---
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java | 78
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java | 219 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 350 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java | 148 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java | 214 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java | 174 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java | 81
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java | 181 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java | 123
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java | 113
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java | 140 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java | 208 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java | 179 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java | 123
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java | 104
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html | 29
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java | 354 --
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java | 120
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java | 15
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java | 544 ----
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java | 478 ---
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java | 148 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java | 148 -
overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java | 128
overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java | 1334 ----------
overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java | 130
patches/ecj/icedtea.patch | 149 -
patches/icedtea-ant.patch | 11
patches/icedtea-javac-debuginfo.patch | 30
patches/icedtea-netx.patch | 126
diffs (truncated from 43159 to 500 lines):
diff -r cecded2429ca -r 31b0ba36a6b7 ChangeLog
--- a/ChangeLog Wed May 27 20:20:48 2009 +0100
+++ b/ChangeLog Thu May 28 10:18:19 2009 +0100
@@ -1,3 +1,236 @@ 2009-05-27 Andrew John Hughes <ahughes
+2009-05-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java,
+ * overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java,
+ * overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java:
+ Moved to...
+ * Makefile.am:
+ Remove use of ALT_BINARY_PLUGS_PATH (and thus turn off the binary plugs build),
+ add a INITIAL_BOOTSTRAP_LINK_STAMP target which allows us to depend on $(ICEDTEA_BOOT_DIR)
+ for both types of build, output to lib/tools.jar not jre/lib/tools.jar, add targets
+ for building netx and liveconnect classes and make icedtea targets dependent on this.
+ * netx/javax/jnlp/BasicService.java,
+ * netx/javax/jnlp/ClipboardService.java,
+ * netx/javax/jnlp/DownloadService.java,
+ * netx/javax/jnlp/DownloadServiceListener.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/UnavailableServiceException.java,
+ * netx/net/sourceforge/jnlp/AppletDesc.java,
+ * netx/net/sourceforge/jnlp/ApplicationDesc.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/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/ResourcesDesc.java,
+ * netx/net/sourceforge/jnlp/SecurityDesc.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/ServiceUtil.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/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/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/PropertiesFile.java,
+ * netx/net/sourceforge/jnlp/util/Reflect.java,
+ * netx/net/sourceforge/jnlp/util/WeakList.java,
+ * netx/net/sourceforge/nanoxml/XMLElement.java,
+ * netx/net/sourceforge/nanoxml/XMLParseException.java: to here.
+ * patches/ecj/icedtea.patch:
+ Recreated.
+ * patches/icedtea-ant.patch:
+ Remove hack to jaxws which uses plugs directory (now undefined).
+ * patches/icedtea-javac-debuginfo.patch: Recreated.
+ * patches/icedtea-netx.patch:
+ Include netx and netscape classes via the same import mechanism
+ as jaxws, jaxp, corba and langtools (extracting a classes.zip).
+
2009-05-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r cecded2429ca -r 31b0ba36a6b7 Makefile.am
--- a/Makefile.am Wed May 27 20:20:48 2009 +0100
+++ b/Makefile.am Thu May 28 10:18:19 2009 +0100
@@ -26,14 +26,14 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlu
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
+LIVECONNECT_DIR = -C lib/rt netscape
JNLP_ABOUT_TARGET = extra-lib/about.jar
else
if ENABLE_PLUGIN
ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
+LIVECONNECT_DIR = -C lib/rt netscape
JNLP_ABOUT_TARGET = extra-lib/about.jar
else
ICEDTEAPLUGIN_CLEAN =
@@ -62,6 +62,18 @@ if ENABLE_NIMBUS_GENERATION
if ENABLE_NIMBUS_GENERATION
JIBX_DEPS_DIR=$(abs_top_builddir)/jibx
endif
+
+SHARE = openjdk/jdk/src/share/classes
+SOLARIS = openjdk/jdk/src/solaris/classes
+LANGTOOLS = openjdk/langtools/src/share/classes
+JAXP = openjdk/jaxp/src/share/classes
+CORBA = openjdk/corba/src/share/classes
+JAXWS = openjdk/jaxws/src/share/classes
+
+OPENJDK_SOURCEPATH_DIRS = \
+ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+
+SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
# Top-Level Targets
# =================
@@ -1527,7 +1539,6 @@ ICEDTEA_ENV = \
"LANG=C" \
"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -1556,7 +1567,9 @@ ICEDTEA_ENV = \
"JAVAC=" \
"RHINO_JAR=$(RHINO_JAR)" \
"DISTRIBUTION_ID=$(DIST_ID)" \
- "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)"
+ "ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \
+ "ALT_NETX_DIST=$(abs_top_builddir)/netx" \
+ "ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
if WITH_CACAO
ICEDTEA_ENV += \
@@ -1603,7 +1616,6 @@ ICEDTEA_ENV_ECJ = \
"LANG=C" \
"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
- "ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -1639,7 +1651,9 @@ ICEDTEA_ENV_ECJ = \
"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \
- "DISABLE_NIMBUS=true"
+ "DISABLE_NIMBUS=true" \
+ "ALT_NETX_DIST=$(abs_top_builddir)/netx" \
+ "ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
@@ -2060,6 +2074,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-jvmtiEnv.patch \
patches/icedtea-xml-encodinginfo.patch \
patches/icedtea-cc-interp-backedge.patch \
+ patches/icedtea-netx.patch \
$(DISTRIBUTION_PATCHES)
if WITH_RHINO
@@ -2277,12 +2292,12 @@ stamps/patch.stamp: stamps/patch-fsg.sta
test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
fi ; \
done ; \
- mv stamps/patch.stamp.tmp stamps/patch.stamp ; \
if ! test x$${all_patches_ok} = "xyes"; then \
echo ERROR patch $${all_patches_ok} FAILED! ; \
echo WARNING make clean-patch before retrying a fix ; \
exit 2; \
- fi
+ fi ; \
+ mv stamps/patch.stamp.tmp stamps/patch.stamp
if ENABLE_NPPLUGIN
cp -a $(abs_top_srcdir)/plugin/icedteanp/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
@@ -2539,13 +2554,16 @@ if WITH_OPENJDK
if WITH_OPENJDK
BOOTSTRAP_DIRECTORY_STAMP =
ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
+ INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
else
if WITH_ICEDTEA
BOOTSTRAP_DIRECTORY_STAMP =
ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+ INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
else
BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
+ INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
endif
endif
@@ -2601,10 +2619,10 @@ stamps/bootstrap-directory-ecj.stamp: st
rm -f bootstrap/ecj/include/$$i; \
ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
done; \
- if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+ if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar ; \
then \
mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
- ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+ ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \
$(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \
fi
if test -f \
@@ -2654,7 +2672,8 @@ else
ICEDTEA_DEBUG_BUILD_TARGET=debug_build
endif
-NETX_RESOURCE_DIR=openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources
+NETX_DIR=$(abs_top_srcdir)/netx/net/sourceforge
+NETX_RESOURCE_DIR=$(NETX_DIR)/jnlp/resources
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
@@ -2662,8 +2681,8 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
- stamps/jibx.stamp stamps/cacao.stamp \
- stamps/pulse-java.stamp stamps/visualvm.stamp
+ stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
+ stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -2748,8 +2767,8 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
- stamps/jibx.stamp stamps/cacao.stamp \
- stamps/pulse-java.stamp stamps/visualvm.stamp
+ stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
+ stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -2861,8 +2880,9 @@ endif
touch stamps/native-ecj.stamp
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
+ stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/netx-dist.stamp \
+ stamps/liveconnect.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp \
+ stamps/cacao.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj \
@@ -2908,7 +2928,7 @@ stamps/plugs.stamp: bootstrap/jdk1.7.0/j
mkdir -p stamps
touch stamps/plugs.stamp
-stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
+stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/lib/tools.jar
mkdir -p stamps
touch stamps/hotspot-tools.stamp
@@ -2919,7 +2939,7 @@ clean-plugs: clean-plugs clean-shared-ob
clean-tools-jar: clean-hotspot-tools
rm -f stamps/hotspot-tools.stamp
- rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
+ rm -f bootstrap/jdk1.7.0/lib/tools.jar
# Sources copied from OpenJDK.
ICEDTEA_COPY_DIRS = \
@@ -2953,16 +2973,6 @@ clean-copy:
do \
rm -rf rt/$$copy_dir ; \
done
-
-SHARE = openjdk/jdk/src/share/classes
-SOLARIS = openjdk/jdk/src/solaris/classes
-LANGTOOLS = openjdk/langtools/src/share/classes
-JAXP = openjdk/jaxp/src/share/classes
-CORBA = openjdk/corba/src/share/classes
-JAXWS = openjdk/jaxws/src/share/classes
-
-OPENJDK_SOURCEPATH_DIRS = \
- $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
# tools.jar class files.
stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp
@@ -3002,21 +3012,21 @@ hotspot-tools-source-files.txt: stamps/g
find hotspot-tools -name '*.java' | sort > $@
mkdir -p lib/hotspot-tools
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated
-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
+stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
+ $(INITIAL_BOOTSTRAP_LINK_STAMP)
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-source 1.5 \
-sourcepath \
- 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+ 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
-bootclasspath \'\' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
-d lib/hotspot-tools \
-source 1.5 \
-sourcepath \
- 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+ 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
-bootclasspath \'\' @$< ; \
fi
mkdir -p stamps
@@ -3029,8 +3039,8 @@ clean-hotspot-tools:
rm -f stamps/hotspot-tools-copy-source-files.stamp
# tools.jar
-bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
- mkdir -p bootstrap/jdk1.7.0/jre/lib/
+bootstrap/jdk1.7.0/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
+ mkdir -p bootstrap/jdk1.7.0/lib/
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
@@ -3045,7 +3055,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
- ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+ ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \
$(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
fi
@@ -3054,20 +3064,20 @@ rt-source-files.txt: stamps/extract.stam
find $(abs_top_builddir)/rt -name '*.java' \
| sort -u > $@
-stamps/rt-class-files.stamp: rt-source-files.txt
More information about the distro-pkg-dev
mailing list