Revision 44b37b30
Added by Andreas Kohlbecker about 5 years ago
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DataSourceBeanLoader.java | ||
---|---|---|
8 | 8 |
import org.springframework.core.io.FileSystemResource; |
9 | 9 |
import org.springframework.stereotype.Component; |
10 | 10 |
|
11 |
import eu.etaxonomy.cdm.common.CdmUtils;
|
|
11 |
import eu.etaxonomy.cdm.common.ConfigFileUtil;
|
|
12 | 12 |
|
13 | 13 |
@Component |
14 | 14 |
public class DataSourceBeanLoader { |
... | ... | |
16 | 16 |
private static final Logger logger = Logger.getLogger(DataSourceBeanLoader.class); |
17 | 17 |
|
18 | 18 |
private static final String DATASOURCE_BEANDEF_FILE = "datasources.xml"; |
19 |
private static final String DATASOURCE_BEANDEF_PATH = CdmUtils.getCdmHomeDir().getPath();
|
|
19 |
private static final String DATASOURCE_BEANDEF_PATH = ConfigFileUtil.getCdmHomeDir().getPath();
|
|
20 | 20 |
|
21 | 21 |
private static String userdefinedBeanDefinitionFile = null; |
22 | 22 |
|
... | ... | |
41 | 41 |
T datasource = beanFactory.getBean(beanName, requiredType); |
42 | 42 |
dataSources.put(beanName, datasource); |
43 | 43 |
} |
44 |
return (Map<String, T>) dataSources;
|
|
44 |
return dataSources; |
|
45 | 45 |
} |
46 | 46 |
|
47 | 47 |
} |
Also available in: Unified diff
ref #8189 moving folder funstins from CdmUtils to ConfigFileUtil