diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 22 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 1 | ||||
| -rw-r--r-- | tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java | 72 |
5 files changed, 107 insertions, 1 deletions
@@ -1,3 +1,15 @@ +2012-10-29 Omair Majid <[email protected]> + + PR1186 + * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: + (load(boolean)): Delegate to load(File,File,boolean). + (load(File,File,boolean)): New method. + (copyTo): New method. + * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: + (initialize): Copy configuration to system properties. + * tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java: + New File. + 2012-10-29 Jana Fabrikova <[email protected]> * tests/reproducers/simple/JSToJSet @@ -20,6 +20,7 @@ New in release 1.4 (2012-XX-XX): - PR1145: IcedTea-Web can cause ClassCircularityError - PR1161: X509VariableTrustManager does not work correctly with OpenJDK7 - PR822: Applets fail to load if jars have different signers + - PR1186: System.getProperty("deployment.user.security.trusted.cacerts") is null New in release 1.3 (2012-XX-XX): * NetX diff --git a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java index 8261749..0d4875b 100644 --- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java +++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java @@ -209,6 +209,12 @@ public final class DeploymentConfiguration { sm.checkRead(userFile.toString()); } + File systemConfigFile = findSystemConfigFile(); + + load(systemConfigFile, userFile, fixIssues); + } + + void load(File systemConfigFile, File userFile, boolean fixIssues) throws ConfigurationException { Map<String, Setting<String>> initialProperties = Defaults.getDefaults(); Map<String, Setting<String>> systemProperties = null; @@ -218,7 +224,6 @@ public final class DeploymentConfiguration { * there is a system-level deployment.poperties file */ - File systemConfigFile = findSystemConfigFile(); if (systemConfigFile != null) { if (loadSystemConfiguration(systemConfigFile)) { if (JNLPRuntime.isDebug()) { @@ -257,6 +262,21 @@ public final class DeploymentConfiguration { } /** + * Copies the current configuration into the target + */ + public void copyTo(Properties target) { + Set<String> names = getAllPropertyNames(); + + for (String name : names) { + String value = getProperty(name); + // for Properties, missing and null are identical + if (value != null) { + target.setProperty(name, value); + } + } + } + + /** * Get the value for the given key * * @param key the property key diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java index 113e51b..fedf918 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java @@ -184,6 +184,7 @@ public class JNLPRuntime { try { config.load(); + config.copyTo(System.getProperties()); } catch (ConfigurationException e) { /* exit if there is a fatal exception loading the configuration */ if (isApplication) { diff --git a/tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java b/tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java new file mode 100644 index 0000000..1d047ea --- /dev/null +++ b/tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java @@ -0,0 +1,72 @@ +/* DeploymentConfigurationTest.java + Copyright (C) 2012 Red Hat, Inc. + +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, version 2. + +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. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package net.sourceforge.jnlp.config; + +import static org.junit.Assert.assertTrue; + +import java.util.Properties; + +import javax.naming.ConfigurationException; + +import org.junit.Test; + +public class DeploymentConfigurationTest { + + @Test + public void testLoad() throws ConfigurationException { + DeploymentConfiguration config = new DeploymentConfiguration(); + + // FIXME test this more exhaustively + config.load(); + + assertTrue(config.getAllPropertyNames().size() > 0); + } + + @Test + public void testInstallProperties() throws ConfigurationException { + DeploymentConfiguration config = new DeploymentConfiguration(); + + config.load(); + + Properties target = new Properties(); + config.copyTo(target); + + assertTrue(target.size() != 0); + } + +} |