/hg/icedtea-web: JNLPRuntime.config changed to proper singleton.
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Dec 18 06:41:43 PST 2013
changeset 7c226ed27626 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7c226ed27626
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Dec 18 15:41:28 2013 +0100
JNLPRuntime.config changed to proper singleton.
diffstat:
ChangeLog | 18 ++++
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 10 ++
netx/net/sourceforge/jnlp/resources/Messages.properties | 2 +-
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 40 ++++++----
netx/net/sourceforge/jnlp/util/logging/LogConfig.java | 20 +-----
5 files changed, 53 insertions(+), 37 deletions(-)
diffs (175 lines):
diff -r bb1f288a297a -r 7c226ed27626 ChangeLog
--- a/ChangeLog Sun Dec 15 11:07:05 2013 +0100
+++ b/ChangeLog Wed Dec 18 15:41:28 2013 +0100
@@ -1,3 +1,21 @@
+2013-12-17 Jiri Vanek <jvanek at redhat.com>
+
+ JNLPRuntime.config changed to proper singleton.
+ * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: added
+ field with getter rand setter to save loading exception.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: (config) field is no
+ longer initialized in static block, but on demand in (getConfig).
+ (initialize) no longer load (config) nor exit on loading exception, but
+ warn in case that it have loading exception. (initialize) call to
+ KeyStores.setConfiguration is using (getConfig) instead (config).
+ (initialize) call to BrowserAwareProxySelector constructor likewise.
+ (getConfig) is initializing and loading (config), marking exception and sterr
+ it in case of debug on. Made synchronized.
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: (RConfigurationError)
+ enhanced to fit.
+ * netx/net/sourceforge/jnlp/util/logging/LogConfig.java: no longer use own
+ copy of (config) but using (JNLPRuntime.getConfig).
+
2013-12-15 Jiri Vanek <jvanek at redhat.com>
Console made aware of plugin messages
diff -r bb1f288a297a -r 7c226ed27626 netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Sun Dec 15 11:07:05 2013 +0100
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Wed Dec 18 15:41:28 2013 +0100
@@ -206,6 +206,16 @@
*/
public static final String KEY_PLUGIN_JVM_ARGUMENTS= "deployment.plugin.jvm.arguments";
public static final String KEY_JRE_DIR= "deployment.jre.dir";
+ private ConfigurationException loadingException = null;
+
+ public void setLoadingException(ConfigurationException ex) {
+ loadingException = ex;
+ }
+
+ public ConfigurationException getLoadingException() {
+ return loadingException;
+ }
+
public enum ConfigType {
System, User
diff -r bb1f288a297a -r 7c226ed27626 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Sun Dec 15 11:07:05 2013 +0100
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Dec 18 15:41:28 2013 +0100
@@ -172,7 +172,7 @@
RNoLockDir=Unable to create locks directory ({0})
RNestedJarExtration=Unable to extract nested jar.
RUnexpected=Unexpected {0} at {1}
-RConfigurationError=Fatal error while reading the configuration
+RConfigurationError=Fatal error while reading the configuration, continuing with empty. Please fix
RConfigurationFatal=ERROR: a fatal error has occurred while loading configuration. Perhaps a global configuration was required but could not be found
RPRoxyPacNotSupported=Using Proxy Auto Config (PAC) files is not supported.
RProxyFirefoxNotFound=Unable to use Firefox's proxy settings. Using "DIRECT" as proxy type.
diff -r bb1f288a297a -r 7c226ed27626 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Sun Dec 15 11:07:05 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Dec 18 15:41:28 2013 +0100
@@ -90,7 +90,7 @@
/** the localized resource strings */
private static ResourceBundle resources;
- private static final DeploymentConfiguration config = new DeploymentConfiguration();
+ private static DeploymentConfiguration config;
/** the security manager */
private static JNLPSecurityManager security;
@@ -185,21 +185,14 @@
public static void initialize(boolean isApplication) throws IllegalStateException {
checkInitialized();
- try {
- config.load();
- config.copyTo(System.getProperties());
- if (JavaConsole.canShowOnStartup(isApplication)) {
- JavaConsole.getConsole().showConsoleLater();
- }
- } catch (ConfigurationException e) {
- /* exit if there is a fatal exception loading the configuration */
- if (isApplication) {
- OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, getMessage("RConfigurationError"));
- JNLPRuntime.exit(1);
- }
+ if (JavaConsole.canShowOnStartup(isApplication)) {
+ JavaConsole.getConsole().showConsoleLater();
}
-
- KeyStores.setConfiguration(config);
+ /* exit if there is a fatal exception loading the configuration */
+ if (isApplication && getConfiguration().getLoadingException() != null) {
+ OutputController.getLogger().log(OutputController.Level.WARNING_ALL, getMessage("RConfigurationError")+": "+getConfiguration().getLoadingException().getMessage());
+ }
+ KeyStores.setConfiguration(getConfiguration());
isWebstartApplication = isApplication;
@@ -261,7 +254,7 @@
// plug in a custom authenticator and proxy selector
Authenticator.setDefault(new JNLPAuthenticator());
- BrowserAwareProxySelector proxySelector = new BrowserAwareProxySelector(config);
+ BrowserAwareProxySelector proxySelector = new BrowserAwareProxySelector(getConfiguration());
proxySelector.initialize();
ProxySelector.setDefault(proxySelector);
@@ -362,7 +355,20 @@
* @return a {@link DeploymentConfiguration} object that can be queried to
* find relevant configuration settings
*/
- public static DeploymentConfiguration getConfiguration() {
+ public synchronized static DeploymentConfiguration getConfiguration() {
+ if (config == null){
+ config = new DeploymentConfiguration();
+ try{
+ config.load();
+ config.copyTo(System.getProperties());
+ }catch(ConfigurationException ex){
+ OutputController.getLogger().log(ex);
+ //mark first occurence of exception so we can react later
+ if (config.getLoadingException() == null){
+ config.setLoadingException(ex);
+ }
+ }
+ }
return config;
}
diff -r bb1f288a297a -r 7c226ed27626 netx/net/sourceforge/jnlp/util/logging/LogConfig.java
--- a/netx/net/sourceforge/jnlp/util/logging/LogConfig.java Sun Dec 15 11:07:05 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/LogConfig.java Wed Dec 18 15:41:28 2013 +0100
@@ -55,19 +55,11 @@
private boolean logToFile;
private boolean logToStreams;
private boolean logToSysLog;
- private DeploymentConfiguration config;
private static LogConfig logConfig;
public LogConfig() {
- try {
- config = JNLPRuntime.getConfiguration();
- if (config.getRaw().isEmpty()){
- config = new DeploymentConfiguration();//JNLPRuntime.getConfiguration() cannotbe loaded time
- config.load(); //read one prior
- //todo fix JNLPRuntime.getConfiguration(); to be correct singleton - not easy task!
- }
-
+ DeploymentConfiguration config = JNLPRuntime.getConfiguration();
// Check whether logging and tracing is enabled.
enableLogging = Boolean.parseBoolean(config.getProperty(DeploymentConfiguration.KEY_ENABLE_LOGGING));
//enagle disable headers
@@ -87,9 +79,6 @@
enableLogging = false;
}
}
- } catch (ConfigurationException e) {
- throw new RuntimeException(e);
- }
}
public static LogConfig getLogConfig() {
@@ -162,11 +151,4 @@
return JavaConsole.isEnabled();
}
- /*
- * logging stuff may be interested in used config
- */
- public DeploymentConfiguration getConfig() {
- return config;
- }
-
}
More information about the distro-pkg-dev
mailing list