/hg/release/icedtea-web-1.7: 8 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Dec 18 10:22:45 UTC 2018
changeset dfc800562a29 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=dfc800562a29
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:15:38 2018 +0100
Fixed PR3637 - making cache work with jdk9+ #runtime jar url anchor
* netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java: (retrieve) if jar is not found in cache, ale url without anchor is attempted
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: usinf localFile.toURI().toURL() instead of direct localFile.toURL()
changeset 19467a2f1f25 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=19467a2f1f25
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:16:10 2018 +0100
PR3645, second part - following windows system paths correctly
* netx/net/sourceforge/jnlp/config/PathsAndFiles.java: following https://docs.oracle.com/javase/7/docs/technotes/guides/jweb/jcp/properties.html (SystemCofigFileDescriptor) now honor WINDIR on windows
changeset fa507388eea5 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=fa507388eea5
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:16:46 2018 +0100
https is preffered only on default port
* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: (getUrls) when http protocol-ed url have set port its https clone is not put to the list of possible urls
changeset 904a29fb4a0f in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=904a29fb4a0f
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:17:16 2018 +0100
http://icedtea.classpath.org/hg/icedtea-web/raw-rev/2739172a7702
changeset 1124d07c3c50 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=1124d07c3c50
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:18:13 2018 +0100
OptionsDefinitions.java: (main) moved from ifelse to switch
changeset 38c1021dda36 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=38c1021dda36
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:18:55 2018 +0100
deployment.config now support generic url instead just file
* netx/net/sourceforge/jnlp/config/Defaults.java: added option KEY_SYSTEM_CONFIG as url and KEY_SYSTEM_CONFIG_MANDATORY as boolean, thus documented
* netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: refactored to work with general url rather then with file only
* netx/net/sourceforge/jnlp/config/InfrastructureFileDescriptor.java: added (getUrl) as shortcut to getFile().toURI().toURL()
* netx/net/sourceforge/jnlp/controlpanel/CommandLine.java: (CommandLine) made aware of MalformedURLException
* tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java: added tests for new DeploymentConfiguration.checkUrl covering ok/not ok file, ok/not ok http
* NEWS: mentioned
changeset 0c8e7d6eff33 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=0c8e7d6eff33
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:21:44 2018 +0100
Replaced hardcoded BOM character with utf representation (PR3671)
* netx/net/sourceforge/nanoxml/XMLElement.java: (scanLeadingWhitespace) resolved PR3671, relaced ' ' by \\ufef
changeset fcb841380712 in /hg/release/icedtea-web-1.7
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.7?cmd=changeset;node=fcb841380712
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Dec 18 11:22:16 2018 +0100
Fixed few javadoc issues.
diffstat:
ChangeLog | 46 +++
NEWS | 1 +
netx/net/sourceforge/jnlp/OptionsDefinitions.java | 18 +-
netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java | 2 +-
netx/net/sourceforge/jnlp/config/Defaults.java | 10 +
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 75 +++--
netx/net/sourceforge/jnlp/config/InfrastructureFileDescriptor.java | 6 +
netx/net/sourceforge/jnlp/config/PathsAndFiles.java | 20 +-
netx/net/sourceforge/jnlp/controlpanel/CommandLine.java | 3 +-
netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java | 6 +
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 2 +-
netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java | 10 +-
netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java | 2 +-
netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java | 2 +-
netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java | 6 +-
netx/net/sourceforge/jnlp/util/lockingfile/LockingReaderWriter.java | 2 +-
netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java | 19 +-
netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java | 23 +-
netx/net/sourceforge/jnlp/util/ui/package-info.java | 2 +-
netx/net/sourceforge/nanoxml/XMLElement.java | 4 +-
netx/net/sourceforge/swing/ThreadCheckingRepaintManager.java | 2 +-
tests/junit-runner/JunitLikeXmlOutputListener.java | 2 +-
tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java | 120 ++++++++-
tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPProxySelectorTest.java | 4 +-
tests/test-extensions/net/sourceforge/jnlp/annotations/Bug.java | 2 +-
tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java | 4 +-
tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java | 4 +-
tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java | 3 +-
tests/test-extensions/sun/applet/mock/PluginPipeMock.java | 2 +-
29 files changed, 296 insertions(+), 106 deletions(-)
diffs (truncated from 967 to 500 lines):
diff -r fd84d9b293df -r fcb841380712 ChangeLog
--- a/ChangeLog Fri Nov 23 15:33:04 2018 +0100
+++ b/ChangeLog Tue Dec 18 11:22:16 2018 +0100
@@ -1,3 +1,49 @@
+2018-12-10 Jiri Vanek <jvanek at redhat.com>
+ jtesdall <jtesdall at mapcon.com>
+
+ Replaced hardcoded BOM character with utf representation (PR3671)
+ * netx/net/sourceforge/nanoxml/XMLElement.java: (scanLeadingWhitespace) resolved PR3671, relaced ' ' by \\ufeff
+
+2018-11-28 Jiri Vanek <jvanek at redhat.com>
+
+ deployment.config now support generic url instead just file
+ * netx/net/sourceforge/jnlp/config/Defaults.java: added option KEY_SYSTEM_CONFIG as url and KEY_SYSTEM_CONFIG_MANDATORY as boolean,
+ thus documented
+ * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: refactored to work with general url rather then with file only
+ * netx/net/sourceforge/jnlp/config/InfrastructureFileDescriptor.java: added (getUrl) as shortcut to getFile().toURI().toURL()
+ * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java: (CommandLine) made aware of MalformedURLException
+ * tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java: added tests for new DeploymentConfiguration.checkUrl
+ covering ok/not ok file, ok/not ok http
+ * NEWS: mentioned
+
+2018-11-27 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/OptionsDefinitions.java: (main) moved from ifelse to switch
+
+2018-11-27 Jiri Vanek <jvanek at redhat.com>
+
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPProxySelectorTest.java: fixed tests in (testConvertingProxyAutoConfigResultToProxyObject)
+
+2018-11-27 Jiri Vanek <jvanek at redhat.com>
+
+ https is preffered only on default port
+ * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: (getUrls) when http protocol-ed url have set port
+ its https clone is not put to the list of possible urls
+
+2018-11-27 Jiri Vanek <jvanek at redhat.com>
+
+ PR3645, second part - following windows system paths correctly
+ * netx/net/sourceforge/jnlp/config/PathsAndFiles.java: following
+ https://docs.oracle.com/javase/7/docs/technotes/guides/jweb/jcp/properties.html
+ (SystemCofigFileDescriptor) now honor WINDIR on windows
+
+2018-11-27 Jiri Vanek <jvanek at redhat.com>
+ Lars Herschke <lhersch at dssgmbh.de>
+
+ Fixed PR3637 - making cache work with jdk9+ #runtime jar url anchor
+ * netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java: (retrieve) if jar is not found in cache, ale url without anchor is attempted
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: usinf localFile.toURI().toURL() instead of direct localFile.toURL()
+
2018-11-23 Lars Herschke <lhersch at dssgmbh.de>
Jiri Vanek <jvanek at redhat.com>
diff -r fd84d9b293df -r fcb841380712 NEWS
--- a/NEWS Fri Nov 23 15:33:04 2018 +0100
+++ b/NEWS Tue Dec 18 11:22:16 2018 +0100
@@ -13,6 +13,7 @@
* --nosecurity enhanced for possibility to skip invalid signatures
* 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
New in release 1.7.1 (2017-12-15):
* better work with authors file
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/OptionsDefinitions.java
--- a/netx/net/sourceforge/jnlp/OptionsDefinitions.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/OptionsDefinitions.java Tue Dec 18 11:22:16 2018 +0100
@@ -234,12 +234,18 @@
}
public static void main(String[] args) throws IOException {
- if (args[0].equals(TextsProvider.JAVAWS)) {
- printOptions(getJavaWsOptions());
- } else if (args[0].equals(TextsProvider.ITWEB_SETTINGS)) {
- printOptions(getItwsettingsCommands());
- } else if (args[0].equals(TextsProvider.POLICY_EDITOR)) {
- printOptions(getPolicyEditorOptions());
+ switch (args[0]) {
+ case TextsProvider.JAVAWS:
+ printOptions(getJavaWsOptions());
+ break;
+ case TextsProvider.ITWEB_SETTINGS:
+ printOptions(getItwsettingsCommands());
+ break;
+ case TextsProvider.POLICY_EDITOR:
+ printOptions(getPolicyEditorOptions());
+ break;
+ default:
+ break;
}
}
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Tue Dec 18 11:22:16 2018 +0100
@@ -102,7 +102,7 @@
//preffering https and owerriding case, when applciation was moved to https, but the jnlp stayed intacted
List<URL> urlsCopy = new LinkedList<>(urls);
for (URL u : urlsCopy) {
- if (u.getProtocol().equals("http")) {
+ if (u.getProtocol().equals("http") && u.getPort() < 0) {
try {
urls.add(0, copyUrltoHttps(u));
} catch (Exception ex) {
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/config/Defaults.java
--- a/netx/net/sourceforge/jnlp/config/Defaults.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/config/Defaults.java Tue Dec 18 11:22:16 2018 +0100
@@ -440,6 +440,16 @@
DeploymentConfiguration.KEY_ENABLE_MANIFEST_ATTRIBUTES_CHECK,
BasicValueValidators.getManifestAttributeCheckValidator(),
String.valueOf(ManifestAttributesChecker.MANIFEST_ATTRIBUTES_CHECK.ALL)
+ },
+ {
+ DeploymentConfiguration.KEY_SYSTEM_CONFIG,
+ BasicValueValidators.getUrlValidator(),
+ null
+ },
+ {
+ DeploymentConfiguration.KEY_SYSTEM_CONFIG_MANDATORY,
+ BasicValueValidators.getBooleanValidator(),
+ String.valueOf(false)
}
};
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Tue Dec 18 11:22:16 2018 +0100
@@ -22,8 +22,9 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.Reader;
@@ -237,6 +238,11 @@
*/
public static final String KEY_PLUGIN_JVM_ARGUMENTS= "deployment.plugin.jvm.arguments";
public static final String KEY_JRE_DIR= "deployment.jre.dir";
+ /**
+ * remote configuration properties
+ */
+ public static final String KEY_SYSTEM_CONFIG = "deployment.system.config";
+ public static final String KEY_SYSTEM_CONFIG_MANDATORY = "deployment.system.config.mandatory";
public static final String TRANSFER_TITLE = "Legacy configuration and cache found. Those will be now transported to new locations";
@@ -255,6 +261,14 @@
currentConfiguration = Defaults.getDefaults();
}
+ static boolean checkUrl(URL file) {
+ try (InputStream s = file.openStream()) {
+ return true;
+ } catch (Throwable ex) {
+ // this should be logged, however, logging botle neck may not be initialised here
+ return false;
+ }
+ }
public enum ConfigType {
System, User
@@ -264,7 +278,7 @@
private boolean systemPropertiesMandatory = false;
/** The system's subdirResult deployment.config file */
- private File systemPropertiesFile = null;
+ private URL systemPropertiesFile = null;
/** Source of always right and only path to file (even if underlying path changes) */
private final InfrastructureFileDescriptor userDeploymentFileDescriptor;
/** The user's subdirResult deployment.config file */
@@ -301,7 +315,11 @@
* @throws ConfigurationException if it encounters a fatal error.
*/
public void load() throws ConfigurationException {
- load(true);
+ try {
+ load(true);
+ } catch (MalformedURLException ex) {
+ throw new ConfigurationException(ex.toString());
+ }
}
/**
@@ -312,18 +330,18 @@
* resorting to the default values
* @throws ConfigurationException if it encounters a fatal error.
*/
- public void load(boolean fixIssues) throws ConfigurationException {
+ public void load(boolean fixIssues) throws ConfigurationException, MalformedURLException {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkRead(userDeploymentFileDescriptor.getFullPath());
}
- File systemConfigFile = findSystemConfigFile();
+ URL systemConfigFile = findSystemConfigFile();
load(systemConfigFile, userDeploymentFileDescriptor.getFile(), fixIssues);
}
- void load(File systemConfigFile, File userFile, boolean fixIssues) throws ConfigurationException {
+ void load(URL systemConfigFile, File userFile, boolean fixIssues) throws ConfigurationException, MalformedURLException {
Map<String, Setting<String>> initialProperties = Defaults.getDefaults();
Map<String, Setting<String>> systemProperties = null;
@@ -357,8 +375,8 @@
* Third, read the user's subdirResult deployment.properties file
*/
userPropertiesFile = userFile;
- Map<String, Setting<String>> userProperties = loadProperties(ConfigType.User, userPropertiesFile, false);
- userComments=loadComments(userPropertiesFile);
+ Map<String, Setting<String>> userProperties = loadProperties(ConfigType.User, userPropertiesFile.toURI().toURL(), false);
+ userComments = loadComments(userPropertiesFile.toURI().toURL());
if (userProperties != null) {
mergeMaps(initialProperties, userProperties);
}
@@ -499,14 +517,14 @@
/**
* @return the location of system-level deployment.config file, or null if none can be found
*/
- private File findSystemConfigFile() {
+ private URL findSystemConfigFile() throws MalformedURLException {
if (PathsAndFiles.ETC_DEPLOYMENT_CFG.getFile().isFile()) {
- return PathsAndFiles.ETC_DEPLOYMENT_CFG.getFile();
+ return PathsAndFiles.ETC_DEPLOYMENT_CFG.getUrl();
}
String jrePath = null;
try {
- Map<String, Setting<String>> tmpProperties = parsePropertiesFile(userDeploymentFileDescriptor.getFile());
+ Map<String, Setting<String>> tmpProperties = parsePropertiesFile(userDeploymentFileDescriptor.getUrl());
Setting<String> jreSetting = tmpProperties.get(KEY_JRE_DIR);
if (jreSetting != null) {
jrePath = jreSetting.getValue();
@@ -524,7 +542,7 @@
jreFile = PathsAndFiles.JAVA_DEPLOYMENT_PROP_FILE.getFile();
}
if (jreFile.isFile()) {
- return jreFile;
+ return jreFile.toURI().toURL();
}
return null;
@@ -534,7 +552,7 @@
* Reads the system configuration file and sets the relevant
* system-properties related variables
*/
- private boolean loadSystemConfiguration(File configFile) throws ConfigurationException {
+ private boolean loadSystemConfiguration(URL configFile) throws ConfigurationException {
OutputController.getLogger().log("Loading system configuation from: " + configFile);
@@ -553,26 +571,21 @@
*/
String urlString = null;
try {
- Setting<String> urlSettings = systemConfiguration.get("deployment.system.config");
+ Setting<String> urlSettings = systemConfiguration.get(KEY_SYSTEM_CONFIG);
if (urlSettings == null || urlSettings.getValue() == null) {
- OutputController.getLogger().log("No System level " + DEPLOYMENT_PROPERTIES + " found in "+configFile.getAbsolutePath());
+ OutputController.getLogger().log("No System level " + DEPLOYMENT_PROPERTIES + " found in "+configFile.toExternalForm());
return false;
}
urlString = urlSettings.getValue();
- Setting<String> mandatory = systemConfiguration.get("deployment.system.config.mandatory");
+ Setting<String> mandatory = systemConfiguration.get(KEY_SYSTEM_CONFIG_MANDATORY);
systemPropertiesMandatory = Boolean.valueOf(mandatory == null ? null : mandatory.getValue()); //never null
OutputController.getLogger().log("System level settings " + DEPLOYMENT_PROPERTIES + " are mandatory:" + systemPropertiesMandatory);
URL url = new URL(urlString);
- if (url.getProtocol().equals("file")) {
- systemPropertiesFile = new File(url.getFile());
- OutputController.getLogger().log("Using System level" + DEPLOYMENT_PROPERTIES + ": " + systemPropertiesFile);
- return true;
- } else {
- OutputController.getLogger().log("Remote + " + DEPLOYMENT_PROPERTIES + " not supported: " + urlString + "in " + configFile.getAbsolutePath());
- return false;
- }
+ systemPropertiesFile = url;
+ OutputController.getLogger().log("Using System level" + DEPLOYMENT_PROPERTIES + ": " + systemPropertiesFile);
+ return true;
} catch (MalformedURLException e) {
- OutputController.getLogger().log("Invalid url for " + DEPLOYMENT_PROPERTIES+ ": " + urlString + "in " + configFile.getAbsolutePath());
+ OutputController.getLogger().log("Invalid url for " + DEPLOYMENT_PROPERTIES+ ": " + urlString + "in " + configFile.toExternalForm());
OutputController.getLogger().log(e);
if (systemPropertiesMandatory){
ConfigurationException ce = new ConfigurationException("Invalid url to system properties, which are mandatory");
@@ -593,9 +606,9 @@
*
* @throws ConfigurationException if the file is mandatory but cannot be read
*/
- private Map<String, Setting<String>> loadProperties(ConfigType type, File file, boolean mandatory)
+ private Map<String, Setting<String>> loadProperties(ConfigType type, URL file, boolean mandatory)
throws ConfigurationException {
- if (file == null || !file.isFile()) {
+ if (file == null || !checkUrl(file)) {
OutputController.getLogger().log("No " + type.toString() + " level " + DEPLOYMENT_PROPERTIES + " found.");
if (!mandatory) {
return null;
@@ -684,12 +697,12 @@
* @param propertiesFile the file to read Properties from
* @throws IOException if an IO problem occurs
*/
- private Map<String, Setting<String>> parsePropertiesFile(File propertiesFile) throws IOException {
+ private Map<String, Setting<String>> parsePropertiesFile(URL propertiesFile) throws IOException {
Map<String, Setting<String>> result = new HashMap<>();
Properties properties = new Properties();
- try (Reader reader = new BufferedReader(new FileReader(propertiesFile))) {
+ try (Reader reader = new BufferedReader(new InputStreamReader(propertiesFile.openStream(), "UTF-8"))) {
properties.load(reader);
}
@@ -904,9 +917,9 @@
//standard date.toString format
public static final SimpleDateFormat pattern = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
- private static String loadComments(File path) {
+ private static String loadComments(URL path) {
StringBuilder r = new StringBuilder();
- try (BufferedReader br = new BufferedReader(new FileReader(path))) {
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(path.openStream(), "UTF-8"))) {
while (true) {
String s = br.readLine();
if (s == null) {
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/config/InfrastructureFileDescriptor.java
--- a/netx/net/sourceforge/jnlp/config/InfrastructureFileDescriptor.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/config/InfrastructureFileDescriptor.java Tue Dec 18 11:22:16 2018 +0100
@@ -38,6 +38,8 @@
package net.sourceforge.jnlp.config;
import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.runtime.Translator;
@@ -75,6 +77,10 @@
public File getFile() {
return new File(getFullPath());
}
+
+ public URL getUrl() throws MalformedURLException {
+ return getFile().toURI().toURL();
+ }
public void setValue(String value) {
setValue(value, JNLPRuntime.getConfiguration());
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/config/PathsAndFiles.java
--- a/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/config/PathsAndFiles.java Tue Dec 18 11:22:16 2018 +0100
@@ -62,6 +62,7 @@
public static final String XDG_CACHE_HOME_VAR = "XDG_CACHE_HOME";
public static final String XDG_RUNTIME_DIR_VAR = "XDG_RUNTIME_DIR";
private static final String XDG_DATA_HOME = "XDG_DATA_HOME";
+ private static final String WINDIR = "WINDIR";
private static final String TMP_PROP = "java.io.tmpdir";
private static final String HOME_PROP = "user.home";
private static final String JAVA_PROP = "java.home";
@@ -362,8 +363,25 @@
private static class SystemCofigFileDescriptor extends InfrastructureFileDescriptor {
+ private static final String windowsPathSuffix = File.separator + "Sun" + File.separator + "Java";
+ private static final String unixPathSuffix = File.separator + "etc" + File.separator + ".java";
+
+ private static String getSystemConfigDir() {
+ if (JNLPRuntime.isWindows()) {
+ return System.getenv(WINDIR) + windowsPathSuffix;
+ } else {
+ return unixPathSuffix;
+ }
+ }
+
+ @Override
+ public String getSystemPathStubAcronym() {
+ //note the hardcoded % instead of VARIABLE (actuall leading to idea, that docs, when generated on windows may not make sense)
+ return "{" + "%" + WINDIR + windowsPathSuffix + " or " + unixPathSuffix + "}";
+ }
+
private SystemCofigFileDescriptor(String fileName, String pathSub, String description, Target... target) {
- super(fileName, pathSub, File.separator + "etc" + File.separator + ".java", description, target);
+ super(fileName, pathSub, getSystemConfigDir(), description, target);
}
}
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Tue Dec 18 11:22:16 2018 +0100
@@ -21,6 +21,7 @@
import static net.sourceforge.jnlp.runtime.Translator.R;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -86,7 +87,7 @@
config = new DeploymentConfiguration();
try {
config.load(false);
- } catch (ConfigurationException e) {
+ } catch (ConfigurationException | MalformedURLException e) {
OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("RConfigurationFatal"));
OutputController.getLogger().log(e);
}
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
--- a/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java Tue Dec 18 11:22:16 2018 +0100
@@ -86,6 +86,12 @@
@Override
public java.util.jar.JarFile retrieve(URL url) throws IOException {
URL localUrl = mapping.get(url);
+ if (localUrl == null) {
+ if (url.getRef() != null) {
+ url = new URL(url.toString().substring(0, url.toString().lastIndexOf(url.getRef()) - 1));
+ localUrl = mapping.get(url);
+ }
+ }
if (localUrl == null) {
/*
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Dec 18 11:22:16 2018 +0100
@@ -1401,7 +1401,7 @@
// there is currently no mechanism to cache files per
// instance.. so only index cached files
if (localFile != null) {
- CachedJarFileCallback.getInstance().addMapping(jar.getLocation(), localFile.toURL());
+ CachedJarFileCallback.getInstance().addMapping(jar.getLocation(), localFile.toURI().toURL());
try (JarFile jarFile = new JarFile(localFile.getAbsolutePath())) {
Manifest mf = jarFile.getManifest();
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java
--- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionStorage.java Tue Dec 18 11:22:16 2018 +0100
@@ -54,8 +54,8 @@
/**
* This methods iterates through records in
- * {@link net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustUserSettingsPath} or
- * {@link net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustGlobalSettingsPath}, and is matching
+ * net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustUserSettingsPath or
+ * net.sourceforge.jnlp.config.DeploymentConfiguration#getAppletTrustGlobalSettingsPath, and is matching
* regexes saved here against params. So parameters here are NOT regexes,
* but are matched against saved regexes.
* <p>
@@ -103,12 +103,12 @@
/**
* Will add new record. Note that regexes are stored for bases matching.
* <p>
- * eg {@link UnsignedAppletActionEntry} which will deny some applet no matter of
- * page will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (}{@link ExecuteUnsignedApplet#NEVER}{@code , new }{@link java.util.Date#Date() Date()}{@code , null, null, someMain, someArchives)}
+ * eg UnsignedAppletActionEntry which will deny some applet no matter of
+ * page will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (} ExecuteUnsignedApplet#NEVER{@code , new }{@link java.util.Date#Date() Date()}{@code , null, null, someMain, someArchives)}
* </p>
* <p>
* eg {@link UnsignedAppletActionEntry} which will
- * allow all applets on page with same codebase will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (}{@link ExecuteUnsignedApplet#NEVER}{@code , new }{@link java.util.Date#Date() Date()}{@code , ".*", ".*", null, null);}
+ * allow all applets on page with same codebase will be {@code new }{@link UnsignedAppletActionEntry#UnsignedAppletActionEntry UnsignedAppletActionEntry}{@code (} ExecuteUnsignedApplet#NEVER {@code , new }{@link java.util.Date#Date() Date()}{@code , ".*", ".*", null, null);}
* </p>
* @param item
*/
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/security/dialogs/ViwableDialog.java Tue Dec 18 11:22:16 2018 +0100
@@ -147,7 +147,7 @@
/**
* Adds an {@link ActionListener} which will be notified if the user makes a
* choice using this SecurityDialog. The listener should use
- * {@link #getValue()} to actually get the user's response.
+ * getValue() to actually get the user's response.
*
* @param listener another action listener to be listen to
*/
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java
--- a/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/splashscreen/parts/InformationElement.java Tue Dec 18 11:22:16 2018 +0100
@@ -48,7 +48,7 @@
import net.sourceforge.jnlp.util.logging.OutputController;
/**
- * This class is wrapper arround <information> tag which should
+ * This class is wrapper arround the *information* tag element which should
* javaws provide from source jnlp file
*/
public class InformationElement {
diff -r fd84d9b293df -r fcb841380712 netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java
--- a/netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java Fri Nov 23 15:33:04 2018 +0100
+++ b/netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java Tue Dec 18 11:22:16 2018 +0100
@@ -116,7 +116,8 @@
}
/**
- * Lock access to the file. Lock is reentrant.
More information about the distro-pkg-dev
mailing list