/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Jan 15 17:08:54 UTC 2019
changeset 67eb4fc36fa0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=67eb4fc36fa0
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jan 15 16:12:46 2019 +0100
Added optional windows desktop integration
* AUTHORS: added Joel
* Makefile: Excluded (WindowsDesktopEntry.java) if mslinks are not included, added mslinks to UNIFIED_CLASSPATH_SEGMENTS included mslinks to windows and linux runtime libs, added MSLINKS_JAR to other composeclasspath calls
* NEWS: mentioned windows desktop support, mentioned listing of cache and operations via id.
* acinclude.m4: added check (IT_CHECK_FOR_MSLINKS) for optional mslinks.jar, strong warning printed if build is on windows
* configure.ac: call (IT_CHECK_FOR_MSLINKS)
* netx/net/sourceforge/jnlp/Launcher.java: new variable of (KEY_JAVAWS_LOCATION) to replace hardcoded icedtea-web.bin.location over netx.
* netx/net/sourceforge/jnlp/OptionsDefinitions.java: re-declared clear cache to take none or one argument. Added Xcacheids switch for listing the cache (works with verbose)
* netx/net/sourceforge/jnlp/cache/CacheDirectory.java: refactored hardcoded ".info" to constant.
* netx/net/sourceforge/jnlp/cache/CacheEntry.java: introduced KEY_JNLP_PATH and used to set jnlp-path attribute
* netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: hide private constructor, declared and provided (windowsShortcutList)
* netx/net/sourceforge/jnlp/cache/CacheUtil.java: extracted and used (checkToClearCache). Added second method clearCache with arg to clear only specific part of cache. Clear cache also alerts windows desktop files now via new removeWindowsShortcuts. Added methods to lists ids and details from cache listCacheIds and getCacheIds. Included new inner class CacheId to encapsualte various types of id - CacheJnlpId and CacheDomainId now.
* netx/net/sourceforge/jnlp/cache/DirectoryNode.java: only adapted to .info refactoring
* netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: Save main argument, or jnlp argument or html argument to jnlp-path .info entry if found.
* netx/net/sourceforge/jnlp/controlpanel/CacheAppViewer.java: gui to itweb-settings cache pane to allow comfortable listing of ids and deleting via those grouping. New file.
* netx/net/sourceforge/jnlp/controlpanel/CachePane.java: added logic to show .info details for each file shown by cache viewer. (generateData) made jnlp-path aware, made public and reused several times
* netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java: added button to show dilog which is deleting by id
* netx/net/sourceforge/jnlp/resources/Messages.properties: added BXclearcache BXSingleCacheCleared BXSingleCacheClearNotFound BXSingleCacheMoreThenOneId BXSingleCacheFileCount BXcacheids NOAnonorone WinDesktopError. Modified BXclearcache. Improved EXAWdesktopWants EXAWdesktopDontWants EXAWsubmenu EXAWmenuWants EXAWmenuDontWants EXAWrememberByApp EXAWrememberByPage EXAWrememberByAppTooltip EXAWbrowsersTolltip SDesktopShortcut
* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: added if isWindows reflective calls to WindowsDesktopEntry and original XdesktopEntry work moved to else part.
* netx/net/sourceforge/jnlp/runtime/Boot.java: now offer getter for optionParser (so it van be reused in ResourceDownloader) Added understanding to Xcacheids. Understanding to Xclearcache adapted to its new optional argument
* netx/net/sourceforge/jnlp/util/GenericDesktopEntry.java: interface for (future) WindowsDesktopEntry and XDesktopEntry unification
* netx/net/sourceforge/jnlp/util/WindowsDesktopEntry.java: new file, implementation fo windos desktop integration via lnk files generated by mslinks.jar. Unlike XDesktop integration, it swarms also uninstall shortcuts.
* netx/net/sourceforge/jnlp/util/XDesktopEntry.java: Mostly adapted to refactorings. Extracted extraction of favicon to method, reused, and improved to try more locations on server.
* netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java: adapted to refactorings
* shell-launcher/launchers.bat.in: mslinks included in bootclasspath
* tests/netx/unit/net/sourceforge/jnlp/cache/CacheUtilTest.java: addd tests for CacheId
* tests/netx/unit/net/sourceforge/jnlp/util/XDesktopEntryTest.java: Added tests for favicon extracti
changeset bd5ba061f12c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bd5ba061f12c
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jan 15 17:56:07 2019 +0100
Made Linux launchers portable
* shell-launcher/launchers.bat.in: made aware of the variables substituted from
* shell-launcher/launchers.sh.in: included snippet for current directory resolving. If NEXT_JAR is not found on its location, compose new (boot)classpath, based on current directory.
changeset 4c5a2c8d2db4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4c5a2c8d2db4
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jan 15 18:08:34 2019 +0100
Relaxed vendor and title to be no longer mandatory - based on oracle javaws behavior
* netx/net/sourceforge/jnlp/JNLPFile.java: getVendor/Title refactored to work without values. In strict mode, they keep throwing MisisngElement exception/
* netx/net/sourceforge/jnlp/Parser.java: delegating logic to check title/vendor to JNLPfile. Jsut calling it with possibility of fail.
* netx/net/sourceforge/jnlp/resources/Messages.properties: added PMissingMandatoryWarning and PMissingMandatorySubstitution to inform about missing title/vendor
* tests/netx/unit/net/sourceforge/jnlp/ParserTest.java: adapted to new behavior
diffstat:
AUTHORS | 1 +
ChangeLog | 64 +-
Makefile.am | 29 +-
NEWS | 2 +
acinclude.m4 | 37 +
configure.ac | 1 +
netx/net/sourceforge/jnlp/JNLPFile.java | 73 +-
netx/net/sourceforge/jnlp/Launcher.java | 4 +-
netx/net/sourceforge/jnlp/OptionsDefinitions.java | 5 +-
netx/net/sourceforge/jnlp/Parser.java | 18 +-
netx/net/sourceforge/jnlp/cache/CacheDirectory.java | 6 +-
netx/net/sourceforge/jnlp/cache/CacheEntry.java | 7 +-
netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 8 +-
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 341 +++++++++-
netx/net/sourceforge/jnlp/cache/DirectoryNode.java | 2 +-
netx/net/sourceforge/jnlp/cache/ResourceDownloader.java | 30 +-
netx/net/sourceforge/jnlp/controlpanel/CacheAppViewer.java | 163 ++++
netx/net/sourceforge/jnlp/controlpanel/CachePane.java | 68 +-
netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java | 19 +-
netx/net/sourceforge/jnlp/resources/Messages.properties | 35 +-
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 131 ++-
netx/net/sourceforge/jnlp/runtime/Boot.java | 27 +-
netx/net/sourceforge/jnlp/util/GenericDesktopEntry.java | 51 +
netx/net/sourceforge/jnlp/util/WindowsDesktopEntry.java | 162 ++++
netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 132 ++-
netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java | 13 +-
shell-launcher/launchers.bat.in | 12 +-
shell-launcher/launchers.sh.in | 41 +
tests/netx/unit/net/sourceforge/jnlp/ParserTest.java | 90 +-
tests/netx/unit/net/sourceforge/jnlp/cache/CacheUtilTest.java | 33 +
tests/netx/unit/net/sourceforge/jnlp/util/XDesktopEntryTest.java | 67 +-
31 files changed, 1465 insertions(+), 207 deletions(-)
diffs (truncated from 2778 to 500 lines):
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 AUTHORS
--- a/AUTHORS Mon Jan 14 13:02:58 2019 +0100
+++ b/AUTHORS Tue Jan 15 18:08:34 2019 +0100
@@ -38,6 +38,7 @@
Fridrich Strba <fridrich.strba at suse.com>
Andrew Su <asu at redhat.com>
Joshua Sumali <jsumali at redhat.com>
+Joel Tesdall <jtesdall at mapcon.com>
Michal Vala <mvala at redhat.com>
Jiri Vanek <jvanek at redhat.com>
Tomáš Votava <tomcacolca at gmail.com>
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 ChangeLog
--- a/ChangeLog Mon Jan 14 13:02:58 2019 +0100
+++ b/ChangeLog Tue Jan 15 18:08:34 2019 +0100
@@ -1,3 +1,66 @@
+2019-01-15 Jiri Vanek <jvanek at redhat.com>
+
+ Relaxed vendor and title to be no longer mandatory - based on oracle javaws behavior
+ * netx/net/sourceforge/jnlp/JNLPFile.java: getVendor/Title refactored to work without values. In strict mode,
+ they keep throwing MisisngElement exception/
+ * netx/net/sourceforge/jnlp/Parser.java: delegating logic to check title/vendor to JNLPfile. Jsut calling it with possibility of fail.
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added PMissingMandatoryWarning and PMissingMandatorySubstitution
+ to inform about missing title/vendor
+ * tests/netx/unit/net/sourceforge/jnlp/ParserTest.java: adapted to new behavior
+
+2019-01-15 Jiri Vanek <jvanek at redhat.com>
+
+ Made Linux launchers portable
+ * shell-launcher/launchers.bat.in: made aware of the variables substituted from
+ * shell-launcher/launchers.sh.in: included snippet for current directory resolving. If NEXT_JAR is not found on
+ its location, compose new (boot)classpath, based on current directory.
+
+2018-01-07 Joel Tesdall <jtesdall at mapcon.com>
+ Jiri Vanek <jvanek at redhat.com>
+
+ Added optional windows desktop integration
+ * AUTHORS: added Joel
+ * Makefile: Excluded (WindowsDesktopEntry.java) if mslinks are not included, added mslinks to UNIFIED_CLASSPATH_SEGMENTS
+ included mslinks to windows and linux runtime libs, added MSLINKS_JAR to other composeclasspath calls
+ * NEWS: mentioned windows desktop support, mentioned listing of cache and operations via id.
+ * acinclude.m4: added check (IT_CHECK_FOR_MSLINKS) for optional mslinks.jar, strong warning printed if build is on windows
+ * configure.ac: call (IT_CHECK_FOR_MSLINKS)
+ * netx/net/sourceforge/jnlp/Launcher.java: new variable of (KEY_JAVAWS_LOCATION) to replace hardcoded icedtea-web.bin.location over netx.
+ * netx/net/sourceforge/jnlp/OptionsDefinitions.java: re-declared clear cache to take none or one argument.
+ Added Xcacheids switch for listing the cache (works with verbose)
+ * netx/net/sourceforge/jnlp/cache/CacheDirectory.java: refactored hardcoded ".info" to constant.
+ * netx/net/sourceforge/jnlp/cache/CacheEntry.java: introduced KEY_JNLP_PATH and used to set jnlp-path attribute
+ * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: hide private constructor, declared and provided (windowsShortcutList)
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java: extracted and used (checkToClearCache). Added second method clearCache
+ with arg to clear only specific part of cache. Clear cache also alerts windows desktop files now via new removeWindowsShortcuts.
+ Added methods to lists ids and details from cache listCacheIds and getCacheIds. Included new inner class CacheId to encapsualte
+ various types of id - CacheJnlpId and CacheDomainId now.
+ * netx/net/sourceforge/jnlp/cache/DirectoryNode.java: only adapted to .info refactoring
+ * netx/net/sourceforge/jnlp/cache/ResourceDownloader.java: Save main argument, or jnlp argument or html argument to
+ jnlp-path .info entry if found.
+ * netx/net/sourceforge/jnlp/controlpanel/CacheAppViewer.java: gui to itweb-settings cache pane to allow comfortable
+ listing of ids and deleting via those grouping. New file.
+ * netx/net/sourceforge/jnlp/controlpanel/CachePane.java: added logic to show .info details for each file shown by cache viewer.
+ (generateData) made jnlp-path aware, made public and reused several times
+ * netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java: added button to show dilog which is deleting by id
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added BXclearcache BXSingleCacheCleared BXSingleCacheClearNotFound
+ BXSingleCacheMoreThenOneId BXSingleCacheFileCount BXcacheids NOAnonorone WinDesktopError. Modified BXclearcache. Improved
+ EXAWdesktopWants EXAWdesktopDontWants EXAWsubmenu EXAWmenuWants EXAWmenuDontWants EXAWrememberByApp EXAWrememberByPage
+ EXAWrememberByAppTooltip EXAWbrowsersTolltip SDesktopShortcut
+ * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: added if isWindows reflective calls to WindowsDesktopEntry
+ and original XdesktopEntry work moved to else part.
+ * netx/net/sourceforge/jnlp/runtime/Boot.java: now offer getter for optionParser (so it van be reused in ResourceDownloader)
+ Added understanding to Xcacheids. Understanding to Xclearcache adapted to its new optional argument
+ * netx/net/sourceforge/jnlp/util/GenericDesktopEntry.java: interface for (future) WindowsDesktopEntry and XDesktopEntry unification
+ * netx/net/sourceforge/jnlp/util/WindowsDesktopEntry.java: new file, implementation fo windos desktop integration
+ via lnk files generated by mslinks.jar. Unlike XDesktop integration, it swarms also uninstall shortcuts.
+ * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: Mostly adapted to refactorings. Extracted extraction of favicon to method,
+ reused, and improved to try more locations on server.
+ * netx/net/sourceforge/jnlp/util/optionparser/OptionParser.java: adapted to refactorings
+ * shell-launcher/launchers.bat.in: mslinks included in bootclasspath
+ * tests/netx/unit/net/sourceforge/jnlp/cache/CacheUtilTest.java: addd tests for CacheId
+ * tests/netx/unit/net/sourceforge/jnlp/util/XDesktopEntryTest.java: Added tests for favicon extraction
+
2019-01-14 Jiri Vanek <jvanek at redhat.com>
Refactored arranging of arguments and finding jre on path to be testable
@@ -6,7 +69,6 @@
* rust-launcher/src/utils.rs: introduced get_jdk_from_path_conditionally_testable and
get_jdk_from_given_path_testable; used, tested
-
2019-01-14 Jiri Vanek <jvanek at redhat.com>
Added detection of JDK from PATH
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 Makefile.am
--- a/Makefile.am Mon Jan 14 13:02:58 2019 +0100
+++ b/Makefile.am Tue Jan 15 18:08:34 2019 +0100
@@ -169,9 +169,17 @@
# Conditional defintions
if HAVE_TAGSOUP
+if HAVE_MSLINKS
NETX_EXCLUDE_SRCS=
else
+ NETX_EXCLUDE_SRCS=net.sourceforge.jnlp.util.WindowsDesktopEntry.java
+endif
+else
+if HAVE_MSLINKS
NETX_EXCLUDE_SRCS=net.sourceforge.jnlp.MalformedXMLParser.java
+else
+ NETX_EXCLUDE_SRCS=net.sourceforge.jnlp.MalformedXMLParser.java net.sourceforge.jnlp.util.WindowsDesktopEntry.java
+endif
endif
# Flags
@@ -188,7 +196,7 @@
# IllegalAccessException
# - we want full privileges
#
-export UNIFIED_CLASSPATH_SEGMENTS=$(NETX_JAR) $(PLUGIN_JAR) $(JSOBJECT_JAR) $(RHINO_JAR) $(TAGSOUP_JAR)
+export UNIFIED_CLASSPATH_SEGMENTS=$(NETX_JAR) $(PLUGIN_JAR) $(JSOBJECT_JAR) $(RHINO_JAR) $(TAGSOUP_JAR) $(MSLINKS_JAR)
export UNIFIED_JACOCO_CLASSPATH_SEGMENTS=$(UNIFIED_CLASSPATH_SEGMENTS) $(JACOCO_CLASSPATH)
export UNIFIED_CLASSPATH=$(call joinsegments, $(UNIFIED_CLASSPATH_SEGMENTS))
export UNIFIED_JACOCO_CLASSPATH=$(call joinsegments, $(UNIFIED_JACOCO_CLASSPATH_SEGMENTS))
@@ -324,6 +332,7 @@
-e "s|[@]NETX_JAR[@]|$(NETX_JAR)|g" \
-e "s|[@]PLUGIN_JAR[@]|$(PLUGIN_JAR)|g" \
-e "s|[@]JSOBJECT_JAR[@]|$(JSOBJECT_JAR)|g" \
+ -e "s|[@]MSLINKS_JAR[@]|$(MSLINKS_JAR)|g" \
-e "s|[@]TAGSOUP_JAR[@]|$(TAGSOUP_JAR)|g" \
-e "s|[@]RHINO_JAR[@]|$(RHINO_JAR)|g" \
-e "s|[@]PROGRAM_NAME[@]|$${PROGRAM_NAME}|g"
@@ -422,6 +431,10 @@
filteredName=`basename $(TAGSOUP_JAR) | sed "s/[^a-zA-Z]//g" | sed "s/jar$$/.jar/"` ; \
cp -v $(TAGSOUP_JAR) $(WIN_RUN_DEPS)/$$filteredName
endif
+if HAVE_MSLINKS
+ filteredName=`basename $(MSLINKS_JAR) | sed "s/[^a-zA-Z]//g" | sed "s/jar$$/.jar/"` ; \
+ cp -v $(MSLINKS_JAR) $(WIN_RUN_DEPS)/$$filteredName
+endif
endif
#no npapi plugin at all!
@@ -696,7 +709,7 @@
mkdir -p $(TOP_BUILD_DIR)/liveconnect && \
$(SYSTEM_JDK_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(TOP_BUILD_DIR)/liveconnect \
- $(call composeclasspath,$(NETX_DIR) $(TAGSOUP_JAR) $(RHINO_JAR)) \
+ $(call composeclasspath,$(NETX_DIR) $(MSLINKS_JAR) $(TAGSOUP_JAR) $(RHINO_JAR)) \
-sourcepath $(LIVECONNECT_SRCS) \
@liveconnect-source-files.txt ; \
fi
@@ -855,7 +868,7 @@
$(SYSTEM_JDK_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(NETX_DIR) \
-sourcepath $(NETX_SRCDIR) \
- $(call composeclasspath, $(TAGSOUP_JAR) $(RHINO_JAR)) \
+ $(call composeclasspath, $(MSLINKS_JAR) $(TAGSOUP_JAR) $(RHINO_JAR)) \
@netx-source-files.txt
(cd $(NETX_RESOURCE_DIR); \
for files in $$(find . -type f); \
@@ -1091,7 +1104,7 @@
-doctitle 'IcedTea-Web: NetX API Specification' \
-windowtitle 'IcedTea-Web: NetX ' \
-header '<strong>IcedTea-Web<br/>NetX</strong>' \
- $(call composeclasspath, $(TAGSOUP_JAR) $(RHINO_JAR)) \
+ $(call composeclasspath, $(MSLINKS_JAR) $(TAGSOUP_JAR) $(RHINO_JAR)) \
$(NETX_PKGS)
endif
mkdir -p stamps
@@ -1109,7 +1122,7 @@
-doctitle 'IcedTea-Web: Plugin API Specification' \
-windowtitle 'IcedTea-Web: Plugin ' \
-header '<strong>IcedTea-Web<br/>Plugin</strong>' \
- $(call composeclasspath, $(TAGSOUP_JAR) $(RHINO_JAR)) \
+ $(call composeclasspath, $(MSLINKS_JAR) $(TAGSOUP_JAR) $(RHINO_JAR)) \
$(PLUGIN_PKGS)
endif
endif
@@ -1589,7 +1602,7 @@
mkdir -p $(NETX_UNIT_TEST_DIR) && \
$(SYSTEM_JDK_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(NETX_UNIT_TEST_DIR) \
- $(call composeclasspath, $(JUNIT_RUNTIME) $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(NETX_DIR)/lib/classes.jar $(TEST_EXTENSIONS_DIR) $(TAGSOUP_JAR)) \
+ $(call composeclasspath, $(JUNIT_RUNTIME) $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(NETX_DIR)/lib/classes.jar $(MSLINKS_JAR) $(TEST_EXTENSIONS_DIR) $(TAGSOUP_JAR)) \
@netx-unit-tests-source-files.txt && \
mkdir -p stamps && \
touch $@
@@ -1619,7 +1632,7 @@
done ; \
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
- CLASSPATH="$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR))" ; \
+ CLASSPATH="$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(MSLINKS_JAR) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR))" ; \
$(SYSTEM_JRE_DIR)/bin/java "-Xbootclasspath/a:$$CLASSPATH" CommandLine $$class_names
if WITH_XSLTPROC
-$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html
@@ -1659,7 +1672,7 @@
mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
done ;\
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
- CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) $(JACOCO_CLASSPATH) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \
+ CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) $(JACOCO_CLASSPATH) . $(TEST_EXTENSIONS_SRCDIR) $(MSLINKS_JAR) $(TAGSOUP_JAR)) ; \
$(SYSTEM_JRE_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath/a:$$CLASSPATH CommandLine $$class_names ; \
for file in $(COVERAGE_MODIFIED_FILES) ; do \
mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 NEWS
--- a/NEWS Mon Jan 14 13:02:58 2019 +0100
+++ b/NEWS Tue Jan 15 18:08:34 2019 +0100
@@ -14,6 +14,8 @@
* enhanced to allow resources to be read also from j2se/java element (OmegaT)
* PR3644 - java.lang.NoClassDefFoundError: Could not initialize class net.sourceforge.jnlp.runtime.JNLPRuntime$DeploymentConfigurationHolder
* deployment.config now support generic url instead just file
+* Added support for windows desktop shortcuts via https://github.com/DmitriiShamrikov/mslinks
+* cache can now be operated by groups, list by -Xcacheids (details via -verbose, can filter by regex), Xclearcache now can clear only selected id. There is also gui to operate cache via id in itweb-settings now.
New in release 1.7 (2017-07-19):
* PR3366 - bash completion file was split to three, and is setup-able by bashcompdir environment variable
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 acinclude.m4
--- a/acinclude.m4 Mon Jan 14 13:02:58 2019 +0100
+++ b/acinclude.m4 Tue Jan 15 18:08:34 2019 +0100
@@ -492,6 +492,43 @@
AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ])
])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_MSLINKS],
+[
+ AC_MSG_CHECKING([for mslinks])
+ AC_ARG_WITH([mslinks],
+ [AS_HELP_STRING([--with-mslinks],
+ [mslinks.jar])],
+ [
+ MSLINKS_JAR=${withval}
+ ],
+ [
+ MSLINKS_JAR=
+ ])
+ if test -z "${MSLINKS_JAR}"; then
+ for dir in /usr/share/java /usr/local/share/java ; do
+ if test -f $dir/mslinks.jar; then
+ MSLINKS_JAR=$dir/mslinks.jar
+ break
+ fi
+ done
+ fi
+ AM_COND_IF([WINDOWS], [
+ MSLINKS_JAR=$(cygpath -m ${MSLINKS_JAR})
+ ])
+ AC_MSG_RESULT(${MSLINKS_JAR})
+ AM_COND_IF([WINDOWS], [
+ if test -z "${MSLINKS_JAR}"; then
+ AC_MSG_RESULT(**********************************************)
+ AC_MSG_RESULT(* Warning you are building without mslinks *)
+ AC_MSG_RESULT(* Your windows desktop integration will fail *)
+ AC_MSG_RESULT(**********************************************)
+ fi
+ ])
+ AC_SUBST(MSLINKS_JAR)
+ AM_CONDITIONAL([HAVE_MSLINKS], [test x$MSLINKS_JAR != xno -a x$MSLINKS_JAR != x ])
+])
+
dnl Generic macro to check for a Java class
dnl Takes the name of the class as an argument. The macro name
dnl is usually the name of the class with '.'
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 configure.ac
--- a/configure.ac Mon Jan 14 13:02:58 2019 +0100
+++ b/configure.ac Tue Jan 15 18:08:34 2019 +0100
@@ -202,6 +202,7 @@
[/usr/share/java/objectweb-asm4/asm-all.jar /usr/share/java/objectweb-asm4/asm-all-4.0.jar /usr/share/java/objectweb-asm/asm-all.jar])
IT_CHECK_FOR_TAGSOUP
+IT_CHECK_FOR_MSLINKS
if test "x$build_windows" = xyes ; then
IT_CHECK_FOR_WIX
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Mon Jan 14 13:02:58 2019 +0100
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Tue Jan 15 18:08:34 2019 +0100
@@ -327,13 +327,40 @@
* See PluginBridge
*/
public String getTitle() {
+ try {
+ return getTitle(false);
+ } catch (MissingTitleException cause) {
+ throw new RuntimeException(cause);
+ }
+ }
+
+ public String getTitle(boolean kill) throws MissingTitleException {
+ String title = getTitleImpl();
+ if (title == null) {
+ title = "";
+
+ }
+ if (title.trim().isEmpty() && kill) {
+ throw new MissingTitleException();
+ }
+ if (title.trim().isEmpty()) {
+ OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("PMissingElement", R("PMissingTitle")));
+ title = R("PMissingMandatorySubstitution", R("PMissingTitle"));
+ OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("PMissingMandatoryWarning", R("PMissingTitle")) + ": " + title);
+ } else {
+ OutputController.getLogger().log("Acceptable title tag found, contains: " + title);
+ }
+ return title;
+ }
+
+ private String getTitleImpl() {
String jnlpTitle = getTitleFromJnlp();
String manifestTitle = getTitleFromManifest();
if (jnlpTitle != null && manifestTitle != null) {
if (jnlpTitle.equals(manifestTitle)) {
return jnlpTitle;
}
- return jnlpTitle+" ("+manifestTitle+")";
+ return jnlpTitle + " (" + manifestTitle + ")";
}
if (jnlpTitle != null && manifestTitle == null) {
return jnlpTitle;
@@ -342,32 +369,56 @@
return manifestTitle;
}
String mainClass = getManifestsAttributes().getMainClass();
- return mainClass;
+ return mainClass;
}
-
+
/**
- * @return the JNLP file's best localized title. This method returns the same
- * value as InformationDesc.getTitle().
+ * @return the JNLP file's best localized title. This method returns the
+ * same value as InformationDesc.getTitle().
*/
public String getTitleFromJnlp() {
return getInformation().getTitle();
}
-
+
public String getTitleFromManifest() {
String inManifestTitle = getManifestsAttributes().getApplicationName();
- if (inManifestTitle == null && getManifestsAttributes().isLoader()){
+ if (inManifestTitle == null && getManifestsAttributes().isLoader()) {
OutputController.getLogger().log(OutputController.Level.WARNING_ALL, TITLE_NOT_FOUND);
}
return inManifestTitle;
}
-
-
/**
- * @return the JNLP file's best localized vendor. This method returns the same
- * value as InformationDesc.getVendor().
+ * @return the JNLP file's best localized vendor. This method returns the
+ * same value as InformationDesc.getVendor().
*/
public String getVendor() {
+ try {
+ return getVendor(false);
+ } catch (MissingVendorException cause) {
+ throw new RuntimeException(cause);
+ }
+ }
+
+ public String getVendor(boolean kill) throws MissingVendorException {
+ String vendor = getVendorImpl();
+ if (vendor == null) {
+ vendor = "";
+ }
+ if (vendor.trim().isEmpty() && kill) {
+ throw new MissingVendorException();
+ }
+ if (vendor.trim().isEmpty()) {
+ OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("PMissingElement", R("PMissingVendor")));
+ vendor = R("PMissingMandatorySubstitution", R("PMissingVendor"));
+ OutputController.getLogger().log(OutputController.Level.WARNING_ALL, R("PMissingMandatoryWarning", R("PMissingVendor")) + ": " + vendor);
+ } else {
+ OutputController.getLogger().log("Acceptable vendor tag found, contains: " + vendor);
+ }
+ return vendor;
+ }
+
+ private String getVendorImpl() {
return getInformation().getVendor();
}
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Mon Jan 14 13:02:58 2019 +0100
+++ b/netx/net/sourceforge/jnlp/Launcher.java Tue Jan 15 18:08:34 2019 +0100
@@ -83,6 +83,8 @@
private ParserSettings parserSettings = new ParserSettings();
private Map<String, List<String>> extra = null;
+
+ public static final String KEY_JAVAWS_LOCATION = "icedtea-web.bin.location";
/**
* Create a launcher with the runtime's default update policy
@@ -422,7 +424,7 @@
List<String> commands = new LinkedList<>();
// this property is set by the javaws launcher to point to the javaws binary
- String pathToWebstartBinary = System.getProperty("icedtea-web.bin.location");
+ String pathToWebstartBinary = System.getProperty(KEY_JAVAWS_LOCATION);
commands.add(pathToWebstartBinary);
// use -Jargument format to pass arguments to the JVM through the launcher
for (String arg : vmArgs) {
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 netx/net/sourceforge/jnlp/OptionsDefinitions.java
--- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java Mon Jan 14 13:02:58 2019 +0100
+++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java Tue Jan 15 18:08:34 2019 +0100
@@ -53,7 +53,8 @@
//javaws control-options
ABOUT("-about", "BOAbout"),
VIEWER("-viewer", "BOViewer"),
- CLEARCACHE("-Xclearcache", "BXclearcache"),
+ CLEARCACHE("-Xclearcache", "BXclearcache", NumberOfArguments.NONE_OR_ONE),
+ LISTCACHEIDS("-Xcacheids", "BXcacheids", NumberOfArguments.NONE_OR_ONE),
LICENSE("-license", "BOLicense"),
HELP1("-help", "BOHelp1"),
//javaws run-options
@@ -148,6 +149,7 @@
NONE("NOAnone"),
ONE("NOAone"),
ONE_OR_MORE("NOAonemore"),
+ NONE_OR_ONE("NOAnonorone"),
EVEN_NUMBER_SUPPORTS_EQUALS_CHAR("NOAevennumber");
String messageKey;
@@ -194,6 +196,7 @@
OPTIONS.ABOUT,
OPTIONS.VIEWER,
OPTIONS.CLEARCACHE,
+ OPTIONS.LISTCACHEIDS,
OPTIONS.LICENSE,
OPTIONS.HELP1}
);
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Mon Jan 14 13:02:58 2019 +0100
+++ b/netx/net/sourceforge/jnlp/Parser.java Tue Jan 15 18:08:34 2019 +0100
@@ -29,6 +29,7 @@
import net.sourceforge.jnlp.SecurityDesc.RequestedPermissionLevel;
import net.sourceforge.jnlp.UpdateDesc.Check;
import net.sourceforge.jnlp.UpdateDesc.Policy;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.util.logging.OutputController;
/**
@@ -486,21 +487,8 @@
void checkForInformation() throws RequiredElementException {
OutputController.getLogger().log("Homepage: " + file.getInformation().getHomepage());
OutputController.getLogger().log("Description: " + file.getInformation().getDescription());
-
- String title = file.getTitle();
- String vendor = file.getVendor();
-
- if (title == null || title.trim().isEmpty()) {
- throw new MissingTitleException();
- } else {
- OutputController.getLogger().log("Acceptable title tag found, contains: " + title);
- }
-
- if (vendor == null || vendor.trim().isEmpty()) {
- throw new MissingVendorException();
- } else {
- OutputController.getLogger().log("Acceptable vendor tag found, contains: " + vendor);
- }
+ file.getTitle(strict);
+ file.getVendor(strict);
}
/**
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 netx/net/sourceforge/jnlp/cache/CacheDirectory.java
--- a/netx/net/sourceforge/jnlp/cache/CacheDirectory.java Mon Jan 14 13:02:58 2019 +0100
+++ b/netx/net/sourceforge/jnlp/cache/CacheDirectory.java Tue Jan 15 18:08:34 2019 +0100
@@ -46,6 +46,8 @@
/* Don't allow instantiation of this class */
private CacheDirectory(){}
+
+ public static final String INFO_SUFFIX = ".info";
/**
* Get the structure of directory for keeping track of the protocol and
@@ -56,7 +58,7 @@
public static void getDirStructure(DirectoryNode root) {
for (File f : root.getFile().listFiles()) {
DirectoryNode node = new DirectoryNode(f.getName(), f, root);
- if (f.isDirectory() || (!f.isDirectory() && !f.getName().endsWith(".info")))
+ if (f.isDirectory() || (!f.isDirectory() && !f.getName().endsWith(INFO_SUFFIX)))
root.addChild(node);
if (f.isDirectory())
getDirStructure(node);
@@ -74,7 +76,7 @@
for (DirectoryNode f : root.getChildren()) {
if (f.isDir())
temp.addAll(getLeafData(f));
- else if (!f.getName().endsWith(".info"))
+ else if (!f.getName().endsWith(INFO_SUFFIX))
temp.add(f);
}
return temp;
diff -r 6daad5c31f52 -r 4c5a2c8d2db4 netx/net/sourceforge/jnlp/cache/CacheEntry.java
--- a/netx/net/sourceforge/jnlp/cache/CacheEntry.java Mon Jan 14 13:02:58 2019 +0100
More information about the distro-pkg-dev
mailing list