changeset in /hg/icedtea: 2008-02-27 Joshua Sumali <jsumali at re...
Joshua Sumali
jsumali at redhat.com
Wed Feb 27 11:49:49 PST 2008
changeset f0adf44bfba4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f0adf44bfba4
description:
2008-02-27 Joshua Sumali <jsumali at redhat.com>
Francis Kung <fkung at redhat.com>
* Makefile.am:
(tools.stamp): Removed since NetX sources moved from tools/ to rt/
(tools): Likewise.
(tools-source-files.txt): Likewise.
(tools-class-files.stamp): Likewise.
(clean-tools): Likewise.
(default-jnlp.stamp): New target.
(default-jnlp): Likewise.
(rt-closed.jar): Add rt/net when creating jar.
(ICEDTEA_PATCHES): Add NETX_PLUGIN conditional.
* Makefile.in: Regeneraged.
* acinclude.m4: (ENABLE_NETX_PLUGIN): New macro
* configure: Regenerated.
* configure.ac: Add ENABLE_NETX_PLUGIN.
* README: Updated.
* patches/icedtea-copy-plugs.patch: Added importing of rt/net/* as binary
plugs to rt.jar.
* patches/icedtea-netx-plugin.patch: New file. This patch is used when
NETX_PLUGIN is true.
* patches/icedtea-webservices.patch: New file. This is
icedtea-jnlp-launcher.patch and icedtea-plugin.patch combined into one.
* patches/icedtea-jnlp-launcher.patch: Removed.
* patches/icedtea-plugin.patch: Removed.
* tools/: This former directory for holding NetX sources was deleted and the
sources were moved to ...
* rt/net/sourceforge/: Here. NetX sources now follow correct package
naming.
diffstat:
204 files changed, 19576 insertions(+), 18834 deletions(-)
ChangeLog | 31
Makefile.am | 83
Makefile.in | 81
README | 19
acinclude.m4 | 15
configure | 53
configure.ac | 1
patches/icedtea-copy-plugs.patch | 117
patches/icedtea-jnlp-launcher.patch | 23
patches/icedtea-netx-plugin.patch | 49
patches/icedtea-plugin.patch | 1350 ---------
patches/icedtea-webservices.patch | 1373 ++++++++++
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/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/UnavailableServiceException.java | 16
rt/net/sourceforge/jnlp/AppletDesc.java | 125
rt/net/sourceforge/jnlp/ApplicationDesc.java | 76
rt/net/sourceforge/jnlp/ComponentDesc.java | 43
rt/net/sourceforge/jnlp/DefaultLaunchHandler.java | 116
rt/net/sourceforge/jnlp/ExtensionDesc.java | 146 +
rt/net/sourceforge/jnlp/IconDesc.java | 135
rt/net/sourceforge/jnlp/InformationDesc.java | 241 +
rt/net/sourceforge/jnlp/InstallerDesc.java | 54
rt/net/sourceforge/jnlp/JARDesc.java | 131
rt/net/sourceforge/jnlp/JNLPFile.java | 512 +++
rt/net/sourceforge/jnlp/JREDesc.java | 123
rt/net/sourceforge/jnlp/LaunchException.java | 190 +
rt/net/sourceforge/jnlp/LaunchHandler.java | 68
rt/net/sourceforge/jnlp/Launcher.java | 583 ++++
rt/net/sourceforge/jnlp/NetxPanel.java | 159 +
rt/net/sourceforge/jnlp/PackageDesc.java | 105
rt/net/sourceforge/jnlp/ParseException.java | 94
rt/net/sourceforge/jnlp/Parser.java | 1101 ++++++++
rt/net/sourceforge/jnlp/PluginBridge.java | 188 +
rt/net/sourceforge/jnlp/PropertyDesc.java | 66
rt/net/sourceforge/jnlp/ResourcesDesc.java | 231 +
rt/net/sourceforge/jnlp/SecurityDesc.java | 173 +
rt/net/sourceforge/jnlp/Version.java | 354 ++
rt/net/sourceforge/jnlp/cache/CacheEntry.java | 174 +
rt/net/sourceforge/jnlp/cache/CacheUtil.java | 391 ++
rt/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 318 ++
rt/net/sourceforge/jnlp/cache/DownloadIndicator.java | 92
rt/net/sourceforge/jnlp/cache/Resource.java | 259 +
rt/net/sourceforge/jnlp/cache/ResourceTracker.java | 926 ++++++
rt/net/sourceforge/jnlp/cache/UpdatePolicy.java | 89
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 | 157 +
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 | 343 ++
rt/net/sourceforge/jnlp/runtime/AppletInstance.java | 139 +
rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 248 +
rt/net/sourceforge/jnlp/runtime/Boot.java | 359 ++
rt/net/sourceforge/jnlp/runtime/Boot13.java | 103
rt/net/sourceforge/jnlp/runtime/InstallDialog.java | 169 +
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 781 +++++
rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java | 89
rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 469 +++
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 349 ++
rt/net/sourceforge/jnlp/runtime/package.html | 29
rt/net/sourceforge/jnlp/security/AccessWarningPane.java | 199 +
rt/net/sourceforge/jnlp/security/AppletWarningPane.java | 120
rt/net/sourceforge/jnlp/security/CertWarningPane.java | 263 +
rt/net/sourceforge/jnlp/security/CertsInfoPane.java | 347 ++
rt/net/sourceforge/jnlp/security/MoreInfoPane.java | 110
rt/net/sourceforge/jnlp/security/SecurityDialogUI.java | 197 +
rt/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 349 ++
rt/net/sourceforge/jnlp/services/ServiceUtil.java | 200 +
rt/net/sourceforge/jnlp/services/XBasicService.java | 174 +
rt/net/sourceforge/jnlp/services/XClipboardService.java | 81
rt/net/sourceforge/jnlp/services/XDownloadService.java | 181 +
rt/net/sourceforge/jnlp/services/XExtensionInstallerService.java | 123
rt/net/sourceforge/jnlp/services/XFileContents.java | 122
rt/net/sourceforge/jnlp/services/XFileOpenService.java | 113
rt/net/sourceforge/jnlp/services/XFileSaveService.java | 140 +
rt/net/sourceforge/jnlp/services/XPersistenceService.java | 176 +
rt/net/sourceforge/jnlp/services/XServiceManagerStub.java | 102
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 | 515 +++
rt/net/sourceforge/jnlp/tools/JarSignerResources.java | 212 +
rt/net/sourceforge/jnlp/tools/KeyStoreUtil.java | 69
rt/net/sourceforge/jnlp/tools/KeyTool.java | 541 +++
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/nanoxml/XMLElement.java | 1205 ++++++++
rt/net/sourceforge/nanoxml/XMLParseException.java | 130
tools/default.jnlp | 20
tools/javax/jnlp/BasicService.java | 13
tools/javax/jnlp/ClipboardService.java | 11
tools/javax/jnlp/DownloadService.java | 25
tools/javax/jnlp/DownloadServiceListener.java | 13
tools/javax/jnlp/ExtensionInstallerService.java | 22
tools/javax/jnlp/FileContents.java | 18
tools/javax/jnlp/FileOpenService.java | 11
tools/javax/jnlp/FileSaveService.java | 11
tools/javax/jnlp/JNLPRandomAccessFile.java | 46
tools/javax/jnlp/PersistenceService.java | 18
tools/javax/jnlp/PrintService.java | 13
tools/javax/jnlp/ServiceManager.java | 54
tools/javax/jnlp/ServiceManagerStub.java | 11
tools/javax/jnlp/UnavailableServiceException.java | 16
tools/nanoxml/XMLElement.java | 1205 --------
tools/nanoxml/XMLParseException.java | 130
tools/netx/jnlp/AppletDesc.java | 125
tools/netx/jnlp/ApplicationDesc.java | 76
tools/netx/jnlp/ComponentDesc.java | 43
tools/netx/jnlp/DefaultLaunchHandler.java | 116
tools/netx/jnlp/ExtensionDesc.java | 145 -
tools/netx/jnlp/IconDesc.java | 135
tools/netx/jnlp/InformationDesc.java | 241 -
tools/netx/jnlp/InstallerDesc.java | 54
tools/netx/jnlp/JARDesc.java | 131
tools/netx/jnlp/JNLPFile.java | 511 ---
tools/netx/jnlp/JREDesc.java | 123
tools/netx/jnlp/LaunchException.java | 191 -
tools/netx/jnlp/LaunchHandler.java | 69
tools/netx/jnlp/Launcher.java | 578 ----
tools/netx/jnlp/PackageDesc.java | 105
tools/netx/jnlp/ParseException.java | 94
tools/netx/jnlp/Parser.java | 1101 --------
tools/netx/jnlp/PropertyDesc.java | 66
tools/netx/jnlp/ResourcesDesc.java | 231 -
tools/netx/jnlp/SecurityDesc.java | 173 -
tools/netx/jnlp/Version.java | 354 --
tools/netx/jnlp/cache/CacheEntry.java | 173 -
tools/netx/jnlp/cache/CacheUtil.java | 390 --
tools/netx/jnlp/cache/DefaultDownloadIndicator.java | 317 --
tools/netx/jnlp/cache/DownloadIndicator.java | 91
tools/netx/jnlp/cache/Resource.java | 258 -
tools/netx/jnlp/cache/ResourceTracker.java | 925 ------
tools/netx/jnlp/cache/UpdatePolicy.java | 89
tools/netx/jnlp/cache/package.html | 28
tools/netx/jnlp/event/ApplicationEvent.java | 56
tools/netx/jnlp/event/ApplicationListener.java | 38
tools/netx/jnlp/event/DownloadEvent.java | 71
tools/netx/jnlp/event/DownloadListener.java | 51
tools/netx/jnlp/event/package.html | 28
tools/netx/jnlp/package.html | 30
tools/netx/jnlp/resources/Manifest.mf | 6
tools/netx/jnlp/resources/Messages.properties | 157 -
tools/netx/jnlp/resources/default.jnlp | 20
tools/netx/jnlp/runtime/AppThreadGroup.java | 68
tools/netx/jnlp/runtime/AppletAudioClip.java | 109
tools/netx/jnlp/runtime/AppletEnvironment.java | 342 --
tools/netx/jnlp/runtime/AppletInstance.java | 137
tools/netx/jnlp/runtime/ApplicationInstance.java | 248 -
tools/netx/jnlp/runtime/Boot.java | 355 --
tools/netx/jnlp/runtime/Boot13.java | 103
tools/netx/jnlp/runtime/InstallDialog.java | 168 -
tools/netx/jnlp/runtime/JNLPClassLoader.java | 752 -----
tools/netx/jnlp/runtime/JNLPPolicy.java | 89
tools/netx/jnlp/runtime/JNLPRuntime.java | 466 ---
tools/netx/jnlp/runtime/JNLPSecurityManager.java | 348 --
tools/netx/jnlp/runtime/package.html | 29
tools/netx/jnlp/security/AccessWarningPane.java | 199 -
tools/netx/jnlp/security/CertWarningPane.java | 225 -
tools/netx/jnlp/security/CertsInfoPane.java | 346 --
tools/netx/jnlp/security/MoreInfoPane.java | 108
tools/netx/jnlp/security/SecurityDialogUI.java | 196 -
tools/netx/jnlp/security/SecurityWarningDialog.java | 321 --
tools/netx/jnlp/services/ServiceUtil.java | 199 -
tools/netx/jnlp/services/XBasicService.java | 173 -
tools/netx/jnlp/services/XClipboardService.java | 80
tools/netx/jnlp/services/XDownloadService.java | 180 -
tools/netx/jnlp/services/XExtensionInstallerService.java | 122
tools/netx/jnlp/services/XFileContents.java | 121
tools/netx/jnlp/services/XFileOpenService.java | 112
tools/netx/jnlp/services/XFileSaveService.java | 139 -
tools/netx/jnlp/services/XPersistenceService.java | 175 -
tools/netx/jnlp/services/XServiceManagerStub.java | 101
tools/netx/jnlp/services/package.html | 29
tools/netx/jnlp/tools/CharacterEncoder.java | 354 --
tools/netx/jnlp/tools/HexDumpEncoder.java | 120
tools/netx/jnlp/tools/JarRunner.java | 15
tools/netx/jnlp/tools/JarSigner.java | 516 ---
tools/netx/jnlp/tools/JarSignerResources.java | 212 -
tools/netx/jnlp/tools/KeyStoreUtil.java | 69
tools/netx/jnlp/tools/KeyTool.java | 541 ---
tools/netx/jnlp/util/PropertiesFile.java | 147 -
tools/netx/jnlp/util/Reflect.java | 148 -
tools/netx/jnlp/util/WeakList.java | 128
diffs (truncated from 39541 to 500 lines):
diff -r ee1600d2de1e -r f0adf44bfba4 ChangeLog
--- a/ChangeLog Tue Feb 26 13:44:38 2008 -0500
+++ b/ChangeLog Wed Feb 27 14:49:20 2008 -0500
@@ -1,3 +1,34 @@ 2008-02-26 Lillian Angel <langel at redha
+2008-02-27 Joshua Sumali <jsumali at redhat.com>
+ Francis Kung <fkung at redhat.com>
+
+ * Makefile.am:
+ (tools.stamp): Removed since NetX sources moved from tools/ to rt/
+ (tools): Likewise.
+ (tools-source-files.txt): Likewise.
+ (tools-class-files.stamp): Likewise.
+ (clean-tools): Likewise.
+ (default-jnlp.stamp): New target.
+ (default-jnlp): Likewise.
+ (rt-closed.jar): Add rt/net when creating jar.
+ (ICEDTEA_PATCHES): Add NETX_PLUGIN conditional.
+ * Makefile.in: Regeneraged.
+ * acinclude.m4: (ENABLE_NETX_PLUGIN): New macro
+ * configure: Regenerated.
+ * configure.ac: Add ENABLE_NETX_PLUGIN.
+ * README: Updated.
+ * patches/icedtea-copy-plugs.patch: Added importing of rt/net/* as binary
+ plugs to rt.jar.
+ * patches/icedtea-netx-plugin.patch: New file. This patch is used when
+ NETX_PLUGIN is true.
+ * patches/icedtea-webservices.patch: New file. This is
+ icedtea-jnlp-launcher.patch and icedtea-plugin.patch combined into one.
+ * patches/icedtea-jnlp-launcher.patch: Removed.
+ * patches/icedtea-plugin.patch: Removed.
+ * tools/: This former directory for holding NetX sources was deleted and the
+ sources were moved to ...
+ * rt/net/sourceforge/: Here. NetX sources now follow correct package
+ naming.
+
2008-02-26 Lillian Angel <langel at redhat.com>
* Makefile.am
diff -r ee1600d2de1e -r f0adf44bfba4 Makefile.am
--- a/Makefile.am Tue Feb 26 13:44:38 2008 -0500
+++ b/Makefile.am Wed Feb 27 14:49:20 2008 -0500
@@ -7,13 +7,17 @@ else
else
ICEDTEAPLUGIN_CLEAN =
ICEDTEAPLUGIN_TARGET =
-PLUGIN_PATCH = patches/icedtea-plugin.patch
+PLUGIN_PATCH = patches/icedtea-webservices.patch
if ENABLE_PLUGIN
GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin
GCJWEBPLUGIN_TARGET = gcjwebplugin.so
+if NETX_PLUGIN
+NETX_PATCH = patches/icedtea-netx-plugin.patch
+endif
else
GCJWEBPLUGIN_CLEAN =
GCJWEBPLUGIN_TARGET =
+NETX_PATCH =
endif
endif
@@ -246,6 +250,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-ssl.patch \
patches/icedtea-license-headers.patch \
$(PLUGIN_PATCH) \
+ $(NETX_PATCH) \
patches/icedtea-rmi_amd64.patch \
patches/icedtea-tools.patch \
patches/icedtea-certbundle.patch \
@@ -272,7 +277,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-ports.patch \
patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-jnlp-launcher.patch \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero.patch \
@@ -494,10 +498,16 @@ endif
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
-icedtea: stamps/bootstrap-directory-symlink.stamp \
+icedtea: stamps/icedtea-compile.stamp stamps/default-jnlp.stamp
+ @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+
+# if you are working on tools.jar or netx, you can add
+# "touch stamps/icedtea-compile.stamp" to the end of this rule to avoid
+# rebuilding OpenJDK on each run.
+stamps/icedtea-compile.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
- $(ICEDTEAPLUGIN_TARGET) stamps/tools.stamp
+ $(ICEDTEAPLUGIN_TARGET)
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/
@@ -514,14 +524,20 @@ if ENABLE_PLUGIN
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
endif
- $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
- -C lib/tools .
+ touch stamps/icedtea-compile.stamp
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
-icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
+icedtea-debug: stamps/icedtea-compile-debug.stamp
+ @echo "IcedTea (debug build) is served:" \
+ $(BUILD_OUTPUT_DIR)-debug
+
+# if you are working on tools.jar or netx, you can add
+# "touch stamps/icedtea-compile-debug.stamp" to the end of this rule to avoid
+# rebuilding OpenJDK on each run.
+stamps/icedtea-compile-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
- $(ICEDTEAPLUGIN_TARGET) stamps/tools.stamp
+ $(ICEDTEAPLUGIN_TARGET)
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -539,8 +555,7 @@ if ENABLE_PLUGIN
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
endif
endif
- $(FASTJAR) uf $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/lib/tools.jar \
- -C lib/tools .
+ touch stamps/icedtea-compile-debug.stamp
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
@@ -548,6 +563,7 @@ clean-icedtea: stamps/clone.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ clobber
+ rm -f stamps/icedtea-compile*.stamp
icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
@@ -765,6 +781,8 @@ stamps/rt-class-files.stamp: rt-source-f
-sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
@$< ; \
fi
+ cp -r rt/net/sourceforge/jnlp/resources \
+ lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -779,10 +797,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt org ; \
+ -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt org ; \
+ -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
fi
if test -d bootstrap/ecj/jre/lib ; \
then \
@@ -824,37 +842,12 @@ endif
endif
endif
-#extra tools
-stamps/tools.stamp: stamps/tools-class-files.stamp
- touch stamps/tools.stamp
-
-tools-source-files.txt: stamps/clone.stamp
- find tools -name '*.java' | sort > $@
-
-stamps/tools-class-files.stamp: tools-source-files.txt \
- stamps/rt-class-files.stamp
- mkdir -p lib/tools
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
- -sourcepath tools \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
- -sourcepath tools \
- @$< ; \
- fi
- cp tools/default.jnlp lib/tools
- cp -R tools/netx/jnlp/resources lib/tools/netx/jnlp
- mkdir -p stamps
- touch stamps/tools-class-files.stamp
-
-clean-tools:
- rm -rf lib/tools
- rm -rf stamps/tools-class-files.stamp
- rm -rf tools-source-files.txt
+stamps/default-jnlp.stamp:
+ cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib
+ cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+ touch stamps/default-jnlp.stamp
# Target Aliases
# ===============
@@ -891,10 +884,10 @@ hotspot-tools-copy-source-files: stamps/
hotspot-tools: stamps/hotspot-tools.stamp
-tools: stamps/tools.stamp
-
tools-class-files: stamps/tools-class-files.stamp
+default-jnlp: stamps/default-jnlp.stamp
+
ports: stamps/ports.stamp
ports-ecj: stamps/ports-ecj.stamp
diff -r ee1600d2de1e -r f0adf44bfba4 Makefile.in
--- a/Makefile.in Tue Feb 26 13:44:38 2008 -0500
+++ b/Makefile.in Wed Feb 27 14:49:20 2008 -0500
@@ -216,12 +216,14 @@ OPENJDK_VERSION = b24
@ENABLE_LIVECONNECT_TRUE at ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
@ENABLE_LIVECONNECT_FALSE at ICEDTEAPLUGIN_TARGET =
@ENABLE_LIVECONNECT_TRUE at ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
- at ENABLE_LIVECONNECT_FALSE@PLUGIN_PATCH = patches/icedtea-plugin.patch
+ at ENABLE_LIVECONNECT_FALSE@PLUGIN_PATCH = patches/icedtea-webservices.patch
@ENABLE_LIVECONNECT_TRUE at PLUGIN_PATCH = patches/icedtea-liveconnect.patch
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_FALSE at GCJWEBPLUGIN_CLEAN =
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE at GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_FALSE at GCJWEBPLUGIN_TARGET =
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE at GCJWEBPLUGIN_TARGET = gcjwebplugin.so
+ at ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_FALSE at NETX_PATCH =
+ at ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
tools patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch \
@@ -343,6 +345,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-ssl.patch \
patches/icedtea-license-headers.patch \
$(PLUGIN_PATCH) \
+ $(NETX_PATCH) \
patches/icedtea-rmi_amd64.patch \
patches/icedtea-tools.patch \
patches/icedtea-certbundle.patch \
@@ -369,7 +372,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-ports.patch \
patches/icedtea-lcms-leak.patch \
patches/icedtea-timerqueue.patch \
- patches/icedtea-jnlp-launcher.patch \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero.patch \
@@ -976,10 +978,16 @@ clean-bootstrap-directory-symlink-ecj:
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
-icedtea: stamps/bootstrap-directory-symlink.stamp \
+icedtea: stamps/icedtea-compile.stamp stamps/default-jnlp.stamp
+ @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+
+# if you are working on tools.jar or netx, you can add
+# "touch stamps/icedtea-compile.stamp" to the end of this rule to avoid
+# rebuilding OpenJDK on each run.
+stamps/icedtea-compile.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
- $(ICEDTEAPLUGIN_TARGET) stamps/tools.stamp
+ $(ICEDTEAPLUGIN_TARGET)
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/
@@ -991,14 +999,20 @@ icedtea: stamps/bootstrap-directory-syml
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@ cp -pPRf gcjwebplugin.so \
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
- -C lib/tools .
+ touch stamps/icedtea-compile.stamp
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
-icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
+icedtea-debug: stamps/icedtea-compile-debug.stamp
+ @echo "IcedTea (debug build) is served:" \
+ $(BUILD_OUTPUT_DIR)-debug
+
+# if you are working on tools.jar or netx, you can add
+# "touch stamps/icedtea-compile-debug.stamp" to the end of this rule to avoid
+# rebuilding OpenJDK on each run.
+stamps/icedtea-compile-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
- $(ICEDTEAPLUGIN_TARGET) stamps/tools.stamp
+ $(ICEDTEAPLUGIN_TARGET)
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -1011,8 +1025,7 @@ icedtea-debug: stamps/bootstrap-director
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@ cp -pPRf gcjwebplugin.so \
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
- $(FASTJAR) uf $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/lib/tools.jar \
- -C lib/tools .
+ touch stamps/icedtea-compile-debug.stamp
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
@@ -1020,6 +1033,7 @@ clean-icedtea: stamps/clone.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ clobber
+ rm -f stamps/icedtea-compile*.stamp
icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
@@ -1209,6 +1223,8 @@ stamps/rt-class-files.stamp: rt-source-f
-sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
@$< ; \
fi
+ cp -r rt/net/sourceforge/jnlp/resources \
+ lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -1223,10 +1239,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt org ; \
+ -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt org ; \
+ -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
fi
if test -d bootstrap/ecj/jre/lib ; \
then \
@@ -1263,37 +1279,12 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE at clean-gcjwebplugin:
@ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@ rm -f gcjwebplugin.so
-#extra tools
-stamps/tools.stamp: stamps/tools-class-files.stamp
- touch stamps/tools.stamp
-
-tools-source-files.txt: stamps/clone.stamp
- find tools -name '*.java' | sort > $@
-
-stamps/tools-class-files.stamp: tools-source-files.txt \
- stamps/rt-class-files.stamp
- mkdir -p lib/tools
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
- -sourcepath tools \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/tools \
- -source 1.6 \
- -sourcepath tools \
- @$< ; \
- fi
- cp tools/default.jnlp lib/tools
- cp -R tools/netx/jnlp/resources lib/tools/netx/jnlp
- mkdir -p stamps
- touch stamps/tools-class-files.stamp
-
-clean-tools:
- rm -rf lib/tools
- rm -rf stamps/tools-class-files.stamp
- rm -rf tools-source-files.txt
+stamps/default-jnlp.stamp:
+ cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib
+ cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+ touch stamps/default-jnlp.stamp
# Target Aliases
# ===============
@@ -1330,9 +1321,9 @@ hotspot-tools-copy-source-files: stamps/
hotspot-tools: stamps/hotspot-tools.stamp
-tools: stamps/tools.stamp
-
tools-class-files: stamps/tools-class-files.stamp
+
+default-jnlp: stamps/default-jnlp.stamp
ports: stamps/ports.stamp
diff -r ee1600d2de1e -r f0adf44bfba4 README
--- a/README Tue Feb 26 13:44:38 2008 -0500
+++ b/README Wed Feb 27 14:49:20 2008 -0500
@@ -102,7 +102,13 @@ openjdk/jdk/src/share/classes/sun/applet
openjdk/jdk/src/share/classes/sun/applet/PluginMain.java are added to
rt.jar and tools.jar to provide gcjwebplugin with an interface into
the appletviewer code. This support code is provided in
-patches/icedtea-plugin.patch.
+patches/icedtea-webservices.patch.
+
+If the option --enable-netx-plugin is passed to configure, this will
+make all applets run through NetX security instead of the default
+security manager. This feature is experimental, and is not enabled by
+default. Note that if --disable-gcjwebplugin is used, --enable-netx-plugin
+will not work.
Experimental LiveConnect support
================================
@@ -122,11 +128,12 @@ NetX
NetX provides a drop-in replacement for javaws (Java Web Start). Since
upstream NetX is dormant, we will be hosting and modifying the sources
-in the IcedTea repository, particularly in the icedtea/tools directory.
+in the IcedTea repository, particularly in the rt/net/sourceforge/jnlp
+directory.
-The NetX sources are built into openjdk/build/arch/j2sdk-image/lib/tools.jar
-and a javaws binary is created in openjdk/build/arch/j2sdk-image/bin/.
+The NetX sources are currently built into rt.jar
-IcedTea's NetX currently supports verification of signed jars by default
-and provides some services specified by the jnlp API.
+IcedTea's NetX currently supports verification of signed jars, trusted
+certificate storing, system certificate store checking, and provides
+some services specified by the jnlp API.
diff -r ee1600d2de1e -r f0adf44bfba4 acinclude.m4
--- a/acinclude.m4 Tue Feb 26 13:44:38 2008 -0500
+++ b/acinclude.m4 Wed Feb 27 14:49:20 2008 -0500
@@ -535,3 +535,18 @@ AC_DEFUN([SET_CORE_BUILD],
fi
fi
])
+
+AC_DEFUN([ENABLE_NETX_PLUGIN],
+[
+ AC_ARG_ENABLE([netx-plugin],
+ [AS_HELP_STRING(--enable-netx-plugin,enable experimental caching and security support in applet plugin)],
+ [
+ AC_MSG_CHECKING(netx plugin)
+ AC_MSG_RESULT(will enable netx plugin)
+ AM_CONDITIONAL(NETX_PLUGIN, test x = x)
+ ],
+ [
+ AM_CONDITIONAL(NETX_PLUGIN, test x != x)
+ ])
+])
+
diff -r ee1600d2de1e -r f0adf44bfba4 configure
--- a/configure Tue Feb 26 13:44:38 2008 -0500
+++ b/configure Wed Feb 27 14:49:20 2008 -0500
@@ -746,6 +746,8 @@ FAST_BUILD_FALSE
FAST_BUILD_FALSE
ZERO_BUILD_TRUE
ZERO_BUILD_FALSE
+NETX_PLUGIN_TRUE
+NETX_PLUGIN_FALSE
CORE_BUILD_TRUE
CORE_BUILD_FALSE
MERCURIAL
@@ -1412,6 +1414,8 @@ Optional Features:
--enable-fast-build optimize for quick building: use -O0 and do not
build documentation
--enable-zero use zero-assembler port on non-zero platforms
+ --enable-netx-plugin enable experimental caching and security support in
+ applet plugin
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -7016,6 +7020,37 @@ fi
+ # Check whether --enable-netx-plugin was given.
+if test "${enable_netx_plugin+set}" = set; then
+ enableval=$enable_netx_plugin;
+ { echo "$as_me:$LINENO: checking netx plugin" >&5
+echo $ECHO_N "checking netx plugin... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: will enable netx plugin" >&5
+echo "${ECHO_T}will enable netx plugin" >&6; }
+ if test x = x; then
+ NETX_PLUGIN_TRUE=
+ NETX_PLUGIN_FALSE='#'
+else
+ NETX_PLUGIN_TRUE='#'
+ NETX_PLUGIN_FALSE=
+fi
+
+
+else
+
+ if test x != x; then
+ NETX_PLUGIN_TRUE=
+ NETX_PLUGIN_FALSE='#'
+else
+ NETX_PLUGIN_TRUE='#'
+ NETX_PLUGIN_FALSE=
+fi
More information about the distro-pkg-dev
mailing list