Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040046.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java,v diff -u -r1.24.2.2 -r1.24.2.3 --- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java 15 Dec 2014 10:09:24 -0000 1.24.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java 28 Oct 2015 08:36:19 -0000 1.24.2.3 @@ -126,14 +126,6 @@ Iterator itemIterator = itemList.iterator(); while (itemIterator.hasNext()) { ConfigurationItem item = itemIterator.next(); - - // init ssl truststore path and password - if (StringUtils.equals(item.getKey(), ConfigurationKeys.TRUSTSTORE_PATH)) { - Configuration.setSystemProperty(item.getKey(), item.getValue()); - } else if (StringUtils.equals(item.getKey(), ConfigurationKeys.TRUSTSTORE_PASSWORD)) { - Configuration.setSystemProperty(item.getKey(), item.getValue()); - } - itemMap.put(item.getKey(), item); } } @@ -283,11 +275,6 @@ } public void persistUpdate() { - // update ssl truststore path and password - Configuration.setSystemProperty(ConfigurationKeys.TRUSTSTORE_PATH, - Configuration.get(ConfigurationKeys.TRUSTSTORE_PATH)); - Configuration.setSystemProperty(ConfigurationKeys.TRUSTSTORE_PASSWORD, - Configuration.get(ConfigurationKeys.TRUSTSTORE_PASSWORD)); updatePublicFolderName(); Configuration.configurationDAO.insertOrUpdateAll(Configuration.items.values()); } Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.53.2.3 -r1.53.2.4 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 21 Oct 2015 11:44:54 -0000 1.53.2.3 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 28 Oct 2015 08:36:19 -0000 1.53.2.4 @@ -147,10 +147,6 @@ public static String LDAP_SECURITY_PROTOCOL = "LDAPSecurityProtocol"; - public static String TRUSTSTORE_PATH = "TruststorePath"; - - public static String TRUSTSTORE_PASSWORD = "TruststorePassword"; - public static String LDAP_LOGIN_ATTR = "LDAPLoginAttr"; public static String LDAP_FIRST_NAME_ATTR = "LDAPFNameAttr";