/hg/icedtea-web: IcedTea-Web is now following XDG .config and .c...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Jul 17 23:54:04 PDT 2013
changeset 7c75bf721d7c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7c75bf721d7c
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jul 18 08:53:46 2013 +0200
IcedTea-Web is now following XDG .config and .cache specification(RH947647)
diffstat:
ChangeLog | 38 +-
Makefile.am | 23 +-
NEWS | 1 +
launcher/launchers.in | 11 +-
netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 7 +-
netx/net/sourceforge/jnlp/config/Defaults.java | 47 +-
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 150 +-
netx/net/sourceforge/jnlp/controlpanel/CachePane.java | 3 +-
netx/net/sourceforge/jnlp/controlpanel/CommandLine.java | 1 +
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 1 +
netx/net/sourceforge/jnlp/runtime/Boot.java | 2 +
netx/net/sourceforge/jnlp/util/FileUtils.java | 72 +
plugin/icedteanp/java/sun/applet/PluginMain.java | 2 +-
tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java | 2 +-
tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java | 3 +-
tests/reproducers/simple/simpletest1/testcases/XDGspecificationTests.java | 1103 ++++++++++
tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java | 10 +-
tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java | 30 +-
18 files changed, 1440 insertions(+), 66 deletions(-)
diffs (truncated from 1853 to 500 lines):
diff -r fc1923f295cf -r 7c75bf721d7c ChangeLog
--- a/ChangeLog Wed Jul 17 18:59:39 2013 +0200
+++ b/ChangeLog Thu Jul 18 08:53:46 2013 +0200
@@ -1,4 +1,40 @@
-2013-07-13 Jiri Vanek <jvanek at redhat.com>
+2013-07-18 Jiri Vanek <jvanek at redhat.com>
+
+ IcedTea-Web is now following XDG .config and .cache specification(RH947647)
+ * tests/reproducers/simple/simpletest1/testcases/XDGspecificationTests.java
+ new file, test if XDG specification and trasnfer to it are followed correctly,
+ * NEWS: mentioned new feature
+ * Makefile.am: (PUBLIC_KEYSTORE) repalced by (PUBLIC_KEYSTORE_STUB) which
+ is now holding only internal part of path.(exported-test-certs)
+ (netx-dist-tests-import-cert-to-public) (netx-dist-tests-remove-cert-from-public)
+ are now resolving XDG variable and setting real path of PUBLIC_KEYSTORE
+ by resolved value and (PUBLIC_KEYSTORE)
+ * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: changed to be public
+ and recently_used strign extracted to (CACHE_INDEX_FILE_NAME) constant
+ * netx/net/sourceforge/jnlp/config/Defaults.java: is now resovling and
+ propagating XDG_CONFIG/CACHE_HOME specification. (USER_HOME) repalced by
+ (USER_CACHE_HOME) and (USER_CONFIG_HOME).
+ (move14AndOlderFilesTo15Structure) new method responsible for moving
+ of old data to new locations. (move14AndOlderFilesTo15StructureCatched)
+ the same but with catch block
+ * netx/net/sourceforge/jnlp/controlpanel/CachePane.java:
+ * tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java:
+ * tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java:
+ are now using (CACHE_INDEX_FILE_NAME)
+ * netx/net/sourceforge/jnlp/controlpanel/CommandLine.java: (main)
+ * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java: (main)
+ * netx/net/sourceforge/jnlp/runtime/Boot.java: (main)
+ * plugin/icedteanp/java/sun/applet/PluginMain.java: (main)
+ are now calling DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched
+ asap.
+ * netx/net/sourceforge/jnlp/util/FileUtils.java: various file manipulation
+ methods moved inside here from test-extensions - (saveFile) (getContentOfStream)
+ (loadFileAsString) - to avoid duplications
+ * tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java: for puposes of
+ new test added constructor with string instead of URL
+ * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: see FileUtils.java
+
+2013-07-17 Jiri Vanek <jvanek at redhat.com>
About dialogue made accessible from plugin
* netx/net/sourceforge/jnlp/about/AboutDialog.java: (frame) re-declared
diff -r fc1923f295cf -r 7c75bf721d7c Makefile.am
--- a/Makefile.am Wed Jul 17 18:59:39 2013 +0200
+++ b/Makefile.am Thu Jul 18 08:53:46 2013 +0200
@@ -37,7 +37,7 @@
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_STUB=icedtea-web/security/trusted.certs
export PUBLIC_KEYSTORE_PASS=changeit
export SOFTKILLER=softkiller
@@ -727,8 +727,13 @@
#with depending to not stamped target we always have to rerun reproducers targets
stamps/exported-test-certs.stamp: stamps/change-dots-to-paths.stamp
-types=($(SIGNED_REPRODUCERS)) ; \
+ PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \
+ if test "x$$PUBLIC_KEYSTORE" = x; then \
+ PUBLIC_KEYSTORE=${HOME}/.config ; \
+ fi ;\
+ PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
for which in "$${types[@]}" ; do \
- $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) ; \
+ $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \
done ;
types=($(SIGNED_REPRODUCERS)) ; \
for which in "$${types[@]}" ; do \
@@ -739,16 +744,26 @@
stamps/netx-dist-tests-import-cert-to-public: stamps/exported-test-certs.stamp
types=($(SIGNED_REPRODUCERS)) ; \
+ PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \
+ if test "x$$PUBLIC_KEYSTORE" = x; then \
+ PUBLIC_KEYSTORE=${HOME}/.config ; \
+ fi ;\
+ PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
for which in "$${types[@]}" ; do \
- yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\
+ yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\
done ;
mkdir -p stamps && \
touch $@
netx-dist-tests-remove-cert-from-public:
-types=($(SIGNED_REPRODUCERS)) ; \
+ PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \
+ if test "x$$PUBLIC_KEYSTORE" = x; then \
+ PUBLIC_KEYSTORE=${HOME}/.config ; \
+ fi ;\
+ PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
for which in "$${types[@]}" ; do \
- $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) ; \
+ $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \
done ;
-rm -rf stamps/netx-dist-tests-import-cert-to-public
diff -r fc1923f295cf -r 7c75bf721d7c NEWS
--- a/NEWS Wed Jul 17 18:59:39 2013 +0200
+++ b/NEWS Thu Jul 18 08:53:46 2013 +0200
@@ -11,6 +11,7 @@
New in release 1.5 (2013-XX-XX):
* IcedTea-Web now using tagsoup as default (tagsoup dependence) sanitizer for input
* JDK older then 1.5 no longer supported
+* IcedTea-Web is now following XDG .config and .cache specification(RH947647)
* NetX
- PR1465 - java.io.FileNotFoundException while trying to download a JAR file
- Netx can now parse malformed jnlp files using tagsoup
diff -r fc1923f295cf -r 7c75bf721d7c launcher/launchers.in
--- a/launcher/launchers.in Wed Jul 17 18:59:39 2013 +0200
+++ b/launcher/launchers.in Thu Jul 18 08:53:46 2013 +0200
@@ -9,9 +9,18 @@
PROGRAM_NAME=@PROGRAM_NAME@
CP=@JRE@/lib/rt.jar
+CONFIG_HOME=$XDG_CONFIG_HOME
+if [ "x$CONFIG_HOME" = "x" ] ; then
+ CONFIG_HOME=~/.config
+fi;
PROPERTY_NAME=deployment.jre.dir
CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *"
-CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"`
+CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" $CONFIG_HOME/icedtea-web/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"`
+#now check in legacy one
+if [ "x$CUSTOM_JRE" = "x" ] ; then
+ CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"`
+fi;
+#now check in global one
if [ "x$CUSTOM_JRE" = "x" ] ; then
CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"`
fi;
diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java
--- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Wed Jul 17 18:59:39 2013 +0200
+++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Thu Jul 18 08:53:46 2013 +0200
@@ -62,7 +62,7 @@
* @author Andrew Su (asu at redhat.com, andrew.su at utoronto.ca)
*
*/
-enum CacheLRUWrapper {
+public enum CacheLRUWrapper {
INSTANCE;
private int lockCount = 0;
@@ -80,9 +80,10 @@
* accessed) followed by folder of item. value = path to file.
*/
private PropertiesFile cacheOrder = new PropertiesFile(
- new File(cacheDir + File.separator + "recently_used"));
+ new File(cacheDir + File.separator + CACHE_INDEX_FILE_NAME));
+ public static final String CACHE_INDEX_FILE_NAME = "recently_used";
- private CacheLRUWrapper(){
+ private CacheLRUWrapper() {
File f = cacheOrder.getStoreFile();
if (!f.exists()) {
try {
diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/config/Defaults.java
--- a/netx/net/sourceforge/jnlp/config/Defaults.java Wed Jul 17 18:59:39 2013 +0200
+++ b/netx/net/sourceforge/jnlp/config/Defaults.java Thu Jul 18 08:53:46 2013 +0200
@@ -51,28 +51,43 @@
* This class stores the default configuration
*/
public class Defaults {
+
+ final static String SYSTEM_HOME = System.getProperty("java.home");
+ final static String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security";
+ final static String USER_CONFIG_HOME;
+ final static String USER_CACHE_HOME;
+ final static String USER_SECURITY;
+ final static String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator
+ + System.getProperty("user.name") + File.separator + "netx" + File.separator
+ + "locks";
+ final static File userFile;
+
+ static {
+ String configHome = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_CONFIG_DIR;
+ String cacheHome = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_CACHE_DIR;
+ String XDG_CONFIG_HOME = System.getenv("XDG_CONFIG_HOME");
+ String XDG_CACHE_HOME = System.getenv("XDG_CACHE_HOME");
+ if (XDG_CONFIG_HOME != null) {
+ configHome = XDG_CONFIG_HOME + File.separator + DeploymentConfiguration.DEPLOYMENT_SUBDIR_DIR;
+ }
+ if (XDG_CACHE_HOME != null) {
+ cacheHome = XDG_CACHE_HOME + File.separator + DeploymentConfiguration.DEPLOYMENT_SUBDIR_DIR;
+ }
+ USER_CONFIG_HOME = configHome;
+ USER_CACHE_HOME = cacheHome;
+ USER_SECURITY = USER_CONFIG_HOME + File.separator + "security";
+ userFile = new File(USER_CONFIG_HOME + File.separator + DeploymentConfiguration.DEPLOYMENT_PROPERTIES);
+ }
/**
* Get the default settings for deployment
*/
public static Map<String, Setting<String>> getDefaults() {
- File userFile = new File(System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_DIR
- + File.separator + DeploymentConfiguration.DEPLOYMENT_PROPERTIES);
-
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkRead(userFile.toString());
}
- final String SYSTEM_HOME = System.getProperty("java.home");
- final String SYSTEM_SECURITY = SYSTEM_HOME + File.separator + "lib" + File.separator + "security";
-
- final String USER_HOME = System.getProperty("user.home") + File.separator + DeploymentConfiguration.DEPLOYMENT_DIR;
- final String USER_SECURITY = USER_HOME + File.separator + "security";
-
- final String LOCKS_DIR = System.getProperty("java.io.tmpdir") + File.separator
- + System.getProperty("user.name") + File.separator + "netx" + File.separator
- + "locks";
/*
* This is more or less a straight copy from the deployment
@@ -90,12 +105,12 @@
{
DeploymentConfiguration.KEY_USER_CACHE_DIR,
BasicValueValidators.getFilePathValidator(),
- USER_HOME + File.separator + "cache"
+ USER_CACHE_HOME + File.separator + "cache"
},
{
DeploymentConfiguration.KEY_USER_PERSISTENCE_CACHE_DIR,
BasicValueValidators.getFilePathValidator(),
- USER_HOME + File.separator + "pcache"
+ USER_CACHE_HOME + File.separator + "pcache"
},
{
DeploymentConfiguration.KEY_SYSTEM_CACHE_DIR,
@@ -105,12 +120,12 @@
{
DeploymentConfiguration.KEY_USER_LOG_DIR,
BasicValueValidators.getFilePathValidator(),
- USER_HOME + File.separator + "log"
+ USER_CONFIG_HOME + File.separator + "log"
},
{
DeploymentConfiguration.KEY_USER_TMP_DIR,
BasicValueValidators.getFilePathValidator(),
- USER_HOME + File.separator + "tmp"
+ USER_CACHE_HOME + File.separator + "tmp"
},
{
DeploymentConfiguration.KEY_USER_LOCKS_DIR,
diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Wed Jul 17 18:59:39 2013 +0200
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Thu Jul 18 08:53:46 2013 +0200
@@ -36,6 +36,7 @@
import java.util.Set;
import javax.naming.ConfigurationException;
+import net.sourceforge.jnlp.cache.CacheLRUWrapper;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.util.FileUtils;
@@ -48,8 +49,10 @@
*/
public final class DeploymentConfiguration {
- public static final String DEPLOYMENT_DIR = ".icedtea";
- public static final String DEPLOYMENT_CONFIG = "deployment.config";
+ public static final String DEPLOYMENT_SUBDIR_DIR = "icedtea-web";
+ public static final String DEPLOYMENT_CACHE_DIR = ".cache" + File.separator + DEPLOYMENT_SUBDIR_DIR;
+ public static final String DEPLOYMENT_CONFIG_DIR = ".config" + File.separator + DEPLOYMENT_SUBDIR_DIR;
+ public static final String DEPLOYMENT_CONFIG_FILE = "deployment.config";
public static final String DEPLOYMENT_PROPERTIES = "deployment.properties";
public static final String APPLET_TRUST_SETTINGS = ".appletTrustSettings";
@@ -181,8 +184,7 @@
private File userPropertiesFile = null;
/*default user file*/
- public static final File USER_DEPLOYMENT_PROPERTIES_FILE = new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_DIR
- + File.separator + DEPLOYMENT_PROPERTIES);
+ public static final File USER_DEPLOYMENT_PROPERTIES_FILE = new File(Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES);
/** the current deployment properties */
private Map<String, Setting<String>> currentConfiguration;
@@ -206,8 +208,7 @@
}
public static File getAppletTrustUserSettingsPath() {
- return new File(System.getProperty("user.home") + File.separator + DEPLOYMENT_DIR
- + File.separator + APPLET_TRUST_SETTINGS);
+ return new File(Defaults.USER_CONFIG_HOME + File.separator + APPLET_TRUST_SETTINGS);
}
public static File getAppletTrustGlobalSettingsPath() {
@@ -251,7 +252,7 @@
if (systemConfigFile != null) {
if (loadSystemConfiguration(systemConfigFile)) {
if (JNLPRuntime.isDebug()) {
- System.out.println("System level " + DEPLOYMENT_CONFIG + " is mandatory: " + systemPropertiesMandatory);
+ System.out.println("System level " + DEPLOYMENT_CONFIG_FILE + " is mandatory: " + systemPropertiesMandatory);
}
/* Second, read the System level deployment.properties file */
systemProperties = loadProperties(ConfigType.System, systemPropertiesFile,
@@ -414,7 +415,7 @@
*/
private File findSystemConfigFile() {
File etcFile = new File(File.separator + "etc" + File.separator + ".java" + File.separator
- + "deployment" + File.separator + DEPLOYMENT_CONFIG);
+ + "deployment" + File.separator + DEPLOYMENT_CONFIG_FILE);
if (etcFile.isFile()) {
return etcFile;
}
@@ -435,10 +436,10 @@
File jreFile;
if (jrePath != null) {
jreFile = new File(jrePath + File.separator + "lib"
- + File.separator + DEPLOYMENT_CONFIG);
+ + File.separator + DEPLOYMENT_CONFIG_FILE);
} else {
jreFile = new File(System.getProperty("java.home") + File.separator + "lib"
- + File.separator + DEPLOYMENT_CONFIG);
+ + File.separator + DEPLOYMENT_CONFIG_FILE);
}
if (jreFile.isFile()) {
return jreFile;
@@ -681,4 +682,133 @@
+ (value.isLocked() ? " [LOCKED]" : ""));
}
}
+
+ public static void move14AndOlderFilesTo15StructureCatched() {
+ try {
+ move14AndOlderFilesTo15Structure();
+ } catch (Throwable t) {
+ System.err.println("Critical error during converting old files to new. Continuing");
+ t.printStackTrace();
+ }
+
+ }
+
+ private static void move14AndOlderFilesTo15Structure() {
+ int errors = 0;
+ String PRE_15_DEPLOYMENT_DIR = ".icedtea";
+ String LEGACY_USER_HOME = System.getProperty("user.home") + File.separator + PRE_15_DEPLOYMENT_DIR;
+ File legacyUserDir = new File(LEGACY_USER_HOME);
+ if (legacyUserDir.exists()) {
+ System.out.println("Legacy configuration and cache found. Those will be now transported to new locations");
+ System.out.println(Defaults.USER_CONFIG_HOME + " and " + Defaults.USER_CACHE_HOME);
+ System.out.println("You should not see this message next time you run icedtea-web!");
+ System.out.println("Your custom dirs will not be touched and will work");
+ System.out.println("-----------------------------------------------");
+
+ System.out.println("Preparing new directories:");
+ System.out.println(" " + Defaults.USER_CONFIG_HOME);
+ File f1 = new File(Defaults.USER_CONFIG_HOME);
+ errors += resultToStd(f1.mkdirs());
+ System.out.println(" " + Defaults.USER_CACHE_HOME);
+ File f2 = new File(Defaults.USER_CACHE_HOME);
+ errors += resultToStd(f2.mkdirs());
+
+ String legacySecurity = LEGACY_USER_HOME + File.separator + "security";
+ String currentSecurity = Defaults.USER_SECURITY;
+ errors += moveLegacyToCurrent(legacySecurity, currentSecurity);
+
+ String legacyCache = LEGACY_USER_HOME + File.separator + "cache";
+ String currentCache = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_CACHE_DIR).getDefaultValue();
+ errors += moveLegacyToCurrent(legacyCache, currentCache);
+ System.out.println("Adapting " + CacheLRUWrapper.CACHE_INDEX_FILE_NAME + " to new destination");
+ //replace all legacyCache by currentCache in new recently_used
+ try {
+ File f = new File(currentCache, CacheLRUWrapper.CACHE_INDEX_FILE_NAME);
+ String s = FileUtils.loadFileAsString(f);
+ s = s.replace(legacyCache, currentCache);
+ FileUtils.saveFile(s, f);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ errors++;
+ }
+
+ String legacyPcahceDir = LEGACY_USER_HOME + File.separator + "pcache";
+ String currentPcacheDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_PERSISTENCE_CACHE_DIR).getDefaultValue();
+ errors += moveLegacyToCurrent(legacyPcahceDir, currentPcacheDir);
+
+ String legacyLogDir = LEGACY_USER_HOME + File.separator + "log";
+ String currentLogDir = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_LOG_DIR).getDefaultValue();
+ errors += moveLegacyToCurrent(legacyLogDir, currentLogDir);
+
+ String legacyProperties = LEGACY_USER_HOME + File.separator + DEPLOYMENT_PROPERTIES;
+ String currentProperties = Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES;
+ errors += moveLegacyToCurrent(legacyProperties, currentProperties);
+
+ String legacyPropertiesOld = LEGACY_USER_HOME + File.separator + DEPLOYMENT_PROPERTIES + ".old";
+ String currentPropertiesOld = Defaults.USER_CONFIG_HOME + File.separator + DEPLOYMENT_PROPERTIES + ".old";
+ errors += moveLegacyToCurrent(legacyPropertiesOld, currentPropertiesOld);
+
+
+ String legacyAppletTrust = LEGACY_USER_HOME + File.separator + APPLET_TRUST_SETTINGS;
+ String currentAppletTrust = getAppletTrustUserSettingsPath().getAbsolutePath();
+ errors += moveLegacyToCurrent(legacyAppletTrust, currentAppletTrust);
+
+ String legacyTmp = LEGACY_USER_HOME + File.separator + "tmp";
+ String currentTmp = Defaults.getDefaults().get(DeploymentConfiguration.KEY_USER_TMP_DIR).getDefaultValue();
+ errors += moveLegacyToCurrent(legacyTmp, currentTmp);
+
+ System.out.println("Removing now empty " + LEGACY_USER_HOME);
+ errors += resultToStd(legacyUserDir.delete());
+
+ if (errors != 0) {
+ System.out.println("There occureed " + errors + " errors");
+ System.out.println("Please double check content of old data in " + LEGACY_USER_HOME + " with ");
+ System.out.println("new " + Defaults.USER_CONFIG_HOME + " and " + Defaults.USER_CACHE_HOME);
+ System.out.println("To disable this check again, please remove " + LEGACY_USER_HOME);
+ }
+
+ } else {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("System is already following XDG .cache and .config specifications");
+ try {
+ System.out.println("config: " + Defaults.USER_CONFIG_HOME + " file exists: " + new File(Defaults.USER_CONFIG_HOME).exists());
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ try {
+ System.out.println("cache: " + Defaults.USER_CACHE_HOME + " file exists:" + new File(Defaults.USER_CACHE_HOME));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ }
+
+ private static int moveLegacyToCurrent(String legacy, String current) {
+ System.out.println("Moving " + legacy + " to " + current);
+ File cf = new File(current);
+ File old = new File(legacy);
+ if (cf.exists()) {
+ System.out.println("Warning! Destination " + current + " exists!");
+ }
+ if (old.exists()) {
+ boolean moved = old.renameTo(cf);
+ return resultToStd(moved);
+ } else {
+ System.out.println("Source " + legacy + " do not exists, nothing to do");
+ return 0;
+ }
+
+ }
+
+ private static int resultToStd(boolean securityMove) {
+ if (securityMove) {
+ System.out.println("OK");
+ return 0;
+ } else {
+ System.out.println("ERROR");
+ return 1;
+ }
+ }
}
diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/controlpanel/CachePane.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Wed Jul 17 18:59:39 2013 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/CachePane.java Thu Jul 18 08:53:46 2013 +0200
@@ -49,6 +49,7 @@
import javax.swing.table.TableRowSorter;
import net.sourceforge.jnlp.cache.CacheDirectory;
+import net.sourceforge.jnlp.cache.CacheLRUWrapper;
import net.sourceforge.jnlp.cache.DirectoryNode;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.Translator;
@@ -202,7 +203,7 @@
}
private void updateRecentlyUsed(File f) {
- File recentlyUsedFile = new File(location + File.separator + "recently_used");
+ File recentlyUsedFile = new File(location + File.separator + CacheLRUWrapper.CACHE_INDEX_FILE_NAME);
PropertiesFile pf = new PropertiesFile(recentlyUsedFile);
pf.load();
Enumeration<Object> en = pf.keys();
diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/controlpanel/CommandLine.java
--- a/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Wed Jul 17 18:59:39 2013 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/CommandLine.java Thu Jul 18 08:53:46 2013 +0200
@@ -453,6 +453,7 @@
* @param args the command line arguments to this program
*/
public static void main(String[] args) throws Exception {
+ DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched();
if (args.length == 0) {
ControlPanel.main(new String[] {});
} else {
diff -r fc1923f295cf -r 7c75bf721d7c netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Wed Jul 17 18:59:39 2013 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Thu Jul 18 08:53:46 2013 +0200
@@ -399,6 +399,7 @@
}
public static void main(String[] args) throws Exception {
+ DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched();
final DeploymentConfiguration config = new DeploymentConfiguration();
try {
config.load();
More information about the distro-pkg-dev
mailing list