/hg/icedtea-web: 4 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Jun 26 02:47:59 PDT 2012
changeset 1d7e18be89f4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1d7e18be89f4
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 26 10:11:53 2012 +0200
Last hope for not downloaded resources to be verified
changeset 76f6be344fef in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=76f6be344fef
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 26 10:17:19 2012 +0200
Reproducer for classes which should be loaded before verification but are not
changeset 1a17a889ace7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1a17a889ace7
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 26 10:35:30 2012 +0200
Added possibility to create and launch reproducers with custom makefile.
changeset e21b37299334 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e21b37299334
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 26 11:12:26 2012 +0200
Added TestInBrowser annotation into new InternalClassloaderWithDownloadedResource's testcases
diffstat:
ChangeLog | 49 ++-
Makefile.am | 200 ++++++---
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 21 +-
tests/jnlp_tests/README | 27 +-
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-hack.jnlp | 62 +++
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-new.jnlp | 62 +++
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-hack.html | 48 ++
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-hack.jnlp | 57 ++
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-new.html | 48 ++
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-new.jnlp | 57 ++
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/srcs/InternalClassloaderWithDownloadedResource.java | 164 ++++++++
tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java | 140 +++++++
12 files changed, 850 insertions(+), 85 deletions(-)
diffs (truncated from 1156 to 500 lines):
diff -r 6e738371cd34 -r e21b37299334 ChangeLog
--- a/ChangeLog Mon Jun 25 14:50:11 2012 -0400
+++ b/ChangeLog Tue Jun 26 11:12:26 2012 +0200
@@ -1,3 +1,50 @@
+2012-06-26 Jiri Vanek <jvanek at redhat.com>
+
+ * Makefile.am: Most crucial variables exported to be used by custom Makefiles
+ (CUSTOM_REPRODUCERS): new variable to hold custom name
+ (ALL_NONCUSTOM_REPRODUCERS): new variable for gathering all except custom reproducers
+ (ALL_REPRODUCERS): now contains also custom ones
+ (stamps/junit-jnlp-dist-dirs): now depends also on junit-jnlp-dist-custom.txt
+ (junit-jnlp-dist-custom.txt): new target scanning for directories in jnlp_tests/custom
+ and saving them as list for future purposes.
+ (stamps/netx-dist-tests-prepare-reproducers.stamp): and
+ ( stamps/change-dots-to-paths.stamp):iterate through ALL_NONCUSTOM_REPRODUCERS instead of ALL__REPRODUCERS
+ (stamps/process-custom-reproducers.stamp) : new target for iterating by junit-jnlp-dist-custom.txt
+ through jnlp_tests/custom/srcs* and launching make prepare-reproducer in each
+ (clean-custom-reproducers): same as above but launching make clean-reproducer
+ (run-netx-dist-tests) now depends on stamps/process-custom-reproducers.stamp
+ (clean-netx-dist-tests): now depends on clean-custom-reproducers and is removing stamps/netx-dist-tests-copy-resources.stamp
+ (stamps/netx-dist-tests-copy-resources.stamp): new target extracting copying of resources from stamps/netx-dist-tests-compile-testcases.stamp
+ * tests/jnlp_tests/README: described this mechanism a bit
+
+2012-06-26 Jiri Vanek <jvanek at redhat.com>
+
+ Reproducer for classes which should be loaded before verification but are not
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-hack.jnlp
+ jnlp launcher of applet variant with injecting new url to classlaoder
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-new.jnlp
+ jnlp launcher of applet variant with custom classlaoder
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-hack.html
+ html launcher of applet variant with injecting new url to classlaoder
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-hack.jnlp
+ jnlp launcher of application variant with injecting new url to classlaoder
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-new.html
+ html launcher of applet variant with custom classlaoder
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-new.jnlp
+ jnlp launcher of application variant with custom classlaoder
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/srcs/InternalClassloaderWithDownloadedResource.java:
+ Both application and applet reproducing behavior of this bug
+ * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java:
+ Testcase launching jnlp application, jnlp applet and html applet
+
+2012-06-26 Jiri Vanek <jvanek at redhat.com>
+
+ Last hope for not downloaded resources to be verified
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ (getCodeSourceSecurity): will now try to download and verify resource
+ which was downloaded outside of netx.
+ (alreadyTried) set for memory of once tried resources to not try again
+
2012-06-25 Adam Domurad <adomurad at redhat.com>
Small comment cleanup to classes with missing or wrong descriptions.
@@ -24,7 +71,7 @@
(NP_Initialize): Make use of initialization helper functions, get
rid of old size tests and error if the helper functions fail.
-2012-06-18 Adam Domurad <adomurad at redhat.com>
+2012-06-20 Adam Domurad <adomurad at redhat.com>
* netx/net/sourceforge/jnlp/tools/JarCertVerifier.java
(verifyJar): two for loops made into for-each loops
diff -r 6e738371cd34 -r e21b37299334 Makefile.am
--- a/Makefile.am Mon Jun 25 14:50:11 2012 -0400
+++ b/Makefile.am Tue Jun 26 11:12:26 2012 +0200
@@ -1,63 +1,65 @@
# Source directories
-NETX_DIR = $(abs_top_builddir)/netx.build
-NETX_SRCDIR = $(abs_top_srcdir)/netx
-NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
-NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
-NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
+export NETX_DIR = $(abs_top_builddir)/netx.build
+export NETX_SRCDIR = $(abs_top_srcdir)/netx
+export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
+export NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
+export NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
-REPORT_STYLES_DIRNAME=report-styles
+export REPORT_STYLES_DIRNAME=report-styles
-TESTS_SRCDIR=$(abs_top_srcdir)/tests
-TESTS_DIR=$(abs_top_builddir)/tests.build
+export TESTS_SRCDIR=$(abs_top_srcdir)/tests
+export TESTS_DIR=$(abs_top_builddir)/tests.build
-NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
-NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
+export NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
+export NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
-JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
-JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
+export JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
+export JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
-JNLP_TESTS_ENGINE_SRCDIR=$(TESTS_SRCDIR)/netx/jnlp_testsengine
-JNLP_TESTS_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests
-JNLP_TESTS_ENGINE_DIR=$(TESTS_DIR)/netx/jnlp_testsengine
-JNLP_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/jnlp_test_server
-JNLP_TESTS_DIR=$(TESTS_DIR)/jnlp_tests
-PRIVATE_KEYSTORE_NAME=teststore.ks
-PRIVATE_KEYSTORE_PASS=123456789
-EXPORTED_TEST_CERT_PREFIX=icedteatests
-EXPORTED_TEST_CERT_SUFFIX=crt
-TEST_CERT_ALIAS=icedteaweb
-PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
-PUBLIC_KEYSTORE_PASS=changeit
+export JNLP_TESTS_ENGINE_SRCDIR=$(TESTS_SRCDIR)/netx/jnlp_testsengine
+export JNLP_TESTS_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests
+export JNLP_TESTS_ENGINE_DIR=$(TESTS_DIR)/netx/jnlp_testsengine
+export JNLP_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/jnlp_test_server
+export JNLP_TESTS_DIR=$(TESTS_DIR)/jnlp_tests
+export PRIVATE_KEYSTORE_NAME=teststore.ks
+export PRIVATE_KEYSTORE_PASS=123456789
+export EXPORTED_TEST_CERT_PREFIX=icedteatests
+export EXPORTED_TEST_CERT_SUFFIX=crt
+export TEST_CERT_ALIAS=icedteaweb
+export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
+export PUBLIC_KEYSTORE_PASS=changeit
-JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
-UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
-REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
-REPRODUCERS_CLASS_WHITELIST = $(abs_top_srcdir)/netx-dist-tests-whitelist
-EMMA_JAVA_ARGS=-Xmx2G
-META_MANIFEST = META-INF/MANIFEST.MF
-SIGNED_REPRODUCERS=signed
-SIMPLE_REPRODUCERS=simple
-ALL_REPRODUCERS=$(SIMPLE_REPRODUCERS) $(SIGNED_REPRODUCERS)
+export JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
+export UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
+export REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
+export REPRODUCERS_CLASS_WHITELIST = $(abs_top_srcdir)/netx-dist-tests-whitelist
+export EMMA_JAVA_ARGS=-Xmx2G
+export META_MANIFEST = META-INF/MANIFEST.MF
+export SIGNED_REPRODUCERS=signed
+export SIMPLE_REPRODUCERS=simple
+export CUSTOM_REPRODUCERS=custom
+export ALL_NONCUSTOM_REPRODUCERS=$(SIMPLE_REPRODUCERS) $(SIGNED_REPRODUCERS)
+export ALL_REPRODUCERS=$(ALL_NONCUSTOM_REPRODUCERS) $(CUSTOM_REPRODUCERS)
# linking variables
-PLUGIN_LINK_NAME=libjavaplugin.so
-MOZILLA_LOCAL_PLUGINDIR=${HOME}/.mozilla/plugins
-MOZILLA_GLOBAL64_PLUGINDIR=/usr/lib64/mozilla/plugins
-MOZILLA_GLOBAL32_PLUGINDIR=/usr/lib/mozilla/plugins
-OPERA_GLOBAL64_PLUGINDIR=/usr/lib64/opera/plugins
-OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
-BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
-MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
-MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
-OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
-MOZILLA_FAMILY_TEST= "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" -o "$(MIDORI)" != "" -o "$(EPIPHANY)" != ""
+export PLUGIN_LINK_NAME=libjavaplugin.so
+export MOZILLA_LOCAL_PLUGINDIR=${HOME}/.mozilla/plugins
+export MOZILLA_GLOBAL64_PLUGINDIR=/usr/lib64/mozilla/plugins
+export MOZILLA_GLOBAL32_PLUGINDIR=/usr/lib/mozilla/plugins
+export OPERA_GLOBAL64_PLUGINDIR=/usr/lib64/opera/plugins
+export OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
+export BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
+export MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
+export MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
+export OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
+export MOZILLA_FAMILY_TEST= "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" -o "$(MIDORI)" != "" -o "$(EPIPHANY)" != ""
# end of linking variables
# Build directories
-BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
+export BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
if WITH_RHINO
RHINO_RUNTIME=:$(RHINO_JAR)
@@ -65,14 +67,14 @@
RHINO_RUNTIME=
endif
-RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME):$(BOOT_DIR)/jre/lib/resources.jar
+export RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME):$(BOOT_DIR)/jre/lib/resources.jar
# Flags
-IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
-IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
-IT_LANGUAGE_SOURCE_VERSION=6
-IT_CLASS_TARGET_VERSION=6
-IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+export IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+export IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
+export IT_LANGUAGE_SOURCE_VERSION=6
+export IT_CLASS_TARGET_VERSION=6
+export IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
#
# We need the jars in bootclasspath for a couple of reasons
@@ -81,18 +83,18 @@
# IllegalAccessException
# - we want full privileges
#
-LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
-PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
+export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
+export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
# Fake update version to work with the Deployment Toolkit script used by Oracle
# http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html
-JDK_UPDATE_VERSION=50
+export JDK_UPDATE_VERSION=50
# Sources list
-PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
+export PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
-NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \
+export NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \
net.sourceforge.jnlp.cache net.sourceforge.jnlp.config \
net.sourceforge.jnlp.controlpanel net.sourceforge.jnlp.event \
net.sourceforge.jnlp.runtime net.sourceforge.jnlp.security \
@@ -101,13 +103,13 @@
# Conditional defintions
if ENABLE_PLUGIN
-ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
-LIVECONNECT_DIR = netscape sun/applet
-PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
-PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
-LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
-ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) stamps/liveconnect-dist.stamp
-PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
+export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
+export LIVECONNECT_DIR = netscape sun/applet
+export PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
+export PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
+export LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
+export ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) stamps/liveconnect-dist.stamp
+export PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
endif
if CP_SUPPORTS_REFLINK
@@ -141,16 +143,16 @@
endif
-PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
+export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
-EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
+export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
itweb-settings.desktop.in $(top_srcdir)/tests
# reproducers `D`shortcuts
-DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
-DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
-DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
-REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS) $(BROWSER_TESTS_MODIFICATION)
+export DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
+export DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
+export DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
+export REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS) $(BROWSER_TESTS_MODIFICATION)
# end of `D`shortcuts
# binary names
@@ -492,11 +494,15 @@
@junit-runner-source-files.txt && \
$(BOOT_DIR)/bin/jar cf $@ -C $(JUNIT_RUNNER_DIR) .
-stamps/junit-jnlp-dist-dirs: junit-jnlp-dist-simple.txt stamps/junit-jnlp-dist-signed.stamp
+stamps/junit-jnlp-dist-dirs: junit-jnlp-dist-simple.txt stamps/junit-jnlp-dist-signed.stamp junit-jnlp-dist-custom.txt
mkdir -p $(JNLP_TESTS_SERVER_DEPLOYDIR)
mkdir -p $(JNLP_TESTS_DIR)
touch $@
+junit-jnlp-dist-custom.txt:
+ cd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
+ find . -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
+
junit-jnlp-dist-simple.txt:
cd $(JNLP_TESTS_SRCDIR)/simple/ ; \
find . -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
@@ -512,7 +518,7 @@
touch $@
stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
- types=($(ALL_REPRODUCERS)); \
+ types=($(ALL_NONCUSTOM_REPRODUCERS)); \
for which in "$${types[@]}" ; do \
. $(abs_top_srcdir)/NEW_LINE_IFS ; \
simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
@@ -538,7 +544,6 @@
fi; \
cd "$$d" ; \
fi; \
- cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"* $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
done ; \
done ; \
mkdir -p stamps && \
@@ -562,7 +567,7 @@
stamps/change-dots-to-paths.stamp: stamps/netx-dist-tests-sign-some-reproducers.stamp
pushd $(JNLP_TESTS_SERVER_DEPLOYDIR); \
- types=($(ALL_REPRODUCERS)); \
+ types=($(ALL_NONCUSTOM_REPRODUCERS)); \
for which in "$${types[@]}" ; do \
. $(abs_top_srcdir)/NEW_LINE_IFS ; \
simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
@@ -638,14 +643,27 @@
IFS="$$IFS_BACKUP" ; \
for dir in "$${simpleReproducers[@]}" ; do \
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
- -d $(JNLP_TESTS_ENGINE_DIR) \
- -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
+ -d $(JNLP_TESTS_ENGINE_DIR) \
+ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
"$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \
done ; \
done ; \
mkdir -p stamps && \
touch $@
+stamps/netx-dist-tests-copy-resources.stamp: stamps/junit-jnlp-dist-dirs
+ types=($(ALL_REPRODUCERS)); \
+ for which in "$${types[@]}" ; do \
+ . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+ simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+ IFS="$$IFS_BACKUP" ; \
+ for dir in "$${simpleReproducers[@]}" ; do \
+ cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"* $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
+ done ; \
+ done ; \
+ mkdir -p stamps && \
+ touch $@
+
$(REPRODUCERS_CLASS_NAMES): $(REPRODUCERS_CLASS_WHITELIST)
whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
cd $(JNLP_TESTS_ENGINE_DIR) ; \
@@ -673,8 +691,8 @@
stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \
stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
- stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) \
- $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES)
+ stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/netx-dist-tests-copy-resources.stamp\
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp
cd $(JNLP_TESTS_ENGINE_DIR) ; \
class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
@@ -686,6 +704,31 @@
endif
touch $@
+stamps/process-custom-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
+ stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/netx-dist-tests-copy-resources.stamp\
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES)
+ . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+ customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
+ IFS="$$IFS_BACKUP" ; \
+ for dir in "$${customReproducers[@]}" ; do \
+ pushd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/$$dir/srcs; \
+ $(MAKE) prepare-reproducer ; \
+ popd ; \
+ done ; \
+ mkdir -p stamps && \
+ touch $@
+
+clean-custom-reproducers: junit-jnlp-dist-custom.txt
+ . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+ customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
+ IFS="$$IFS_BACKUP" ; \
+ for dir in "$${customReproducers[@]}" ; do \
+ pushd $(JNLP_TESTS_SRCDIR)/custom/$$dir/srcs; \
+ $(MAKE) clean-reproducer ; \
+ popd ; \
+ done ; \
+ rm -f stamps/process-custom-reproducers.stamp
+
#for global-links you must be root, for opera there do not exists user-links
#although this targets will indeed create symbolic links to enable
#icedtea-web plugin inside browser it is intended for testing purposes
@@ -1014,7 +1057,7 @@
rm -rf $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)/
rm -f $(TESTS_DIR)/*.html
-clean-netx-dist-tests: clean_tests_reports netx-dist-tests-remove-cert-from-public
+clean-netx-dist-tests: clean_tests_reports netx-dist-tests-remove-cert-from-public clean-custom-reproducers
rm -f netx-dist-tests-source-files.txt
rm -rf $(JNLP_TESTS_DIR)
rm -rf $(JNLP_TESTS_SERVER_DEPLOYDIR)
@@ -1023,6 +1066,7 @@
rm -f stamps/netx-dist-tests-compile.stamp
rm -f stamps/netx-dist-tests-prepare-reproducers.stamp
rm -f stamps/netx-dist-tests-compile-testcases.stamp
+ rm -f stamps/netx-dist-tests-copy-resources.stamp
rm -f stamps/netx-dist-tests-sign-some-reproducers.stamp
rm -f stamps/change-dots-to-paths.stamp
rm -f junit-jnlp-dist-simple.txt
diff -r 6e738371cd34 -r e21b37299334 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jun 25 14:50:11 2012 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jun 26 11:12:26 2012 +0200
@@ -172,6 +172,9 @@
/** Map of specific original (remote) CodeSource Urls to securitydesc */
private HashMap<URL, SecurityDesc> jarLocationSecurityMap =
new HashMap<URL, SecurityDesc>();
+
+ /*Set to prevent once tried-to-get resources to be tried again*/
+ private Set<URL> alreadyTried = Collections.synchronizedSet(new HashSet<URL>());
/** Loader for codebase (which is a path, rather than a file) */
private CodeBaseClassLoader codeBaseLoader;
@@ -1810,11 +1813,27 @@
protected SecurityDesc getCodeSourceSecurity(URL source) {
SecurityDesc sec=jarLocationSecurityMap.get(source);
+ if (sec == null && !alreadyTried.contains(source)) {
+ alreadyTried.add(source);
+ //try to load the jar which is requesting the permissions, but was NOT downloaded by standard way
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Application is trying to get permissions for " + source.toString() + ", which was not added by standard way. Trying to download and verify!");
+ }
+ try {
+ JARDesc des = new JARDesc(source, null, null, false, false, false, false);
+ addNewJar(des);
+ sec = jarLocationSecurityMap.get(source);
+ } catch (Throwable t) {
+ if (JNLPRuntime.isDebug()) {
+ t.printStackTrace();
+ }
+ sec = null;
+ }
+ }
if (sec == null){
System.out.println(Translator.R("LNoSecInstance",source.toString()));
}
return sec;
-
}
/**
diff -r 6e738371cd34 -r e21b37299334 tests/jnlp_tests/README
--- a/tests/jnlp_tests/README Mon Jun 25 14:50:11 2012 -0400
+++ b/tests/jnlp_tests/README Tue Jun 26 11:12:26 2012 +0200
@@ -1,15 +1,32 @@
Each file in directory simple must follows hierarchy conventions and is compiled/jared
automatically into server's working directory and content of resources likewise.
The name of jnlp is independent, and there can be even more jnlps for each future jar.
-Directories are honored in srcs and in resources, but noty in testcases.
-Directories in signed hande their content in similar way as simle's content is handled,
+Directories are honored in srcs and in resources, but not in testcases.
+Directories in signed handle their content in similar way as simple's content is handled,
but in addition final jars are signed with simple testkey.
-Files in advanced directory have to care about themselves, but even those can have some
- parts inside simple directory, so some parts of them are processed automatically.
- There are three reproducers – simpletest1, simpletest2 and deadlocktest, which tests
+Files in custom directory have to care about compilation/packaging and deploying of srcs
+ directory themselves. This can affect also testcase and resources, but testcases and
+ resources are still automatically prepared like they are in the other test types.
+There are three reproducers – simpletest1, simpletest2 and deadlocktest, which tests
test’s suite itself and serve as examples of behaviour.
Directory "signed" is listed in Makefile.am. You can specify as much to-be-signed
directories as you want. And jars in each of those signed directories will be
signed by their's own unique key (number of signed directories == number of certificates).
Do not forget to add each this directory into list n Makefile.am
+
+If the name of a folder in simple/signed is composed of dots, then its contents
+ are deployed from under a directory structure such that each part evaluates to
+ a folder. For example, my.dir.reproducer/ will be deployed as jnlp_test_server/my/dir/reproducer.jar.
+
+Inside custom directory are expected directories which are handling themselves.
+ The only strictly necessary file is custom/reproducerName/srcs/Makefile. Upon
+ all custom/*/srcs are then launched make prepare-reproducer and during cleaning make
+ clean-reproducer. Those targets are run after all simple and signed reproducers are
+ prepared, so they can reuse components of the simple and signed reproducers, eg
+ certificates or dependencies. to keep this custom makefiles as simple as possible.
+ Some comment in makefile or readme file is recommended for each custom reproducer
+ to tell dependencies and what it does. Some readme (or comment in classes) is good
+ advice for any reproducer anyway;)
+Because of automake only small set of variables from icedtea-web Makefile is
+ available for custom makefiles, but feel free to export others if needed.
diff -r 6e738371cd34 -r e21b37299334 tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-hack.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-hack.jnlp Tue Jun 26 11:12:26 2012 +0200
@@ -0,0 +1,62 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
More information about the distro-pkg-dev
mailing list