Revision a400ae0f
Added by Andreas Kohlbecker almost 7 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/util/ConfigFileUtils.java | ||
---|---|---|
23 | 23 |
*/ |
24 | 24 |
public class ConfigFileUtils extends CdmUtils { |
25 | 25 |
|
26 |
private static final String CDM_VAADIN_CONFIG_FOLDER = "cdm-vaadin"; |
|
27 |
|
|
28 | 26 |
//TODO better store in VaadinSession? |
29 | 27 |
static Properties uiprops = null; |
30 | 28 |
|
31 | 29 |
public static File getPropertiesFile(String instanceName, String propertiesSet) { |
32 | 30 |
|
33 |
File vaadinConfigFolder = getCdmSubDir(CDM_VAADIN_CONFIG_FOLDER);
|
|
34 |
return new File(vaadinConfigFolder, instanceName + (propertiesSet == null? "" : "-" + propertiesSet) + ".properties");
|
|
31 |
File configFolder = getCdmHomeSubDir(CdmUtils.SUBFOLDER_WEBAPP);
|
|
32 |
return new File(configFolder, instanceName + (propertiesSet == null? "" : "-" + propertiesSet) + ".properties");
|
|
35 | 33 |
|
36 | 34 |
} |
37 | 35 |
|
Also available in: Unified diff
ref #6628 harmonizing cdm home folder utils and providing a default subfolder suggestion for cdm-remote-webapp instances