Revision 291843d5
Added by Andreas Müller over 12 years ago
.gitattributes | ||
---|---|---|
415 | 415 |
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/out/TcsXmlExportState.java -text |
416 | 416 |
cdmlib-io/src/main/resources/CatalogManager.properties -text |
417 | 417 |
cdmlib-io/src/main/resources/catalog.xml -text |
418 |
cdmlib-io/src/main/resources/defaultIoApplicationContext.xml -text |
|
418 |
cdmlib-io/src/main/resources/eu/etaxonomy/cdm/defaultIoApplicationContext.xml -text
|
|
419 | 419 |
cdmlib-io/src/main/resources/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExportConfigurator.properties -text |
420 | 420 |
cdmlib-io/src/main/resources/log4j.properties -text |
421 | 421 |
cdmlib-io/src/main/resources/mapping/lifeStageToGbif.tsv -text |
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java | ||
---|---|---|
43 | 43 |
/* (non-Javadoc) |
44 | 44 |
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) |
45 | 45 |
*/ |
46 |
public void setApplicationContext(ApplicationContext applicationContext) |
|
47 |
throws BeansException { |
|
46 |
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { |
|
48 | 47 |
this.applicationContext = applicationContext; |
49 | 48 |
} |
50 | 49 |
|
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultIOBase.java | ||
---|---|---|
7 | 7 |
package eu.etaxonomy.cdm.io.common; |
8 | 8 |
|
9 | 9 |
import org.apache.log4j.Logger; |
10 |
import org.springframework.core.io.ClassPathResource; |
|
10 | 11 |
|
11 | 12 |
import eu.etaxonomy.cdm.api.application.CdmApplicationController; |
12 | 13 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
... | ... | |
22 | 23 |
*/ |
23 | 24 |
public class CdmDefaultIOBase<T extends IIoConfigurator> { |
24 | 25 |
@SuppressWarnings("unused") |
25 |
private static final Logger logger = Logger |
|
26 |
.getLogger(CdmDefaultIOBase.class); |
|
26 |
private static final Logger logger = Logger.getLogger(CdmDefaultIOBase.class); |
|
27 | 27 |
|
28 |
public static final String DEFAULT_IO_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultIoApplicationContext.xml"; |
|
29 |
|
|
30 |
|
|
28 | 31 |
protected ICdmApplicationConfiguration cdmApp = null; |
29 | 32 |
|
30 | 33 |
/** |
... | ... | |
52 | 55 |
} |
53 | 56 |
|
54 | 57 |
if (createNew == true || cdmApp == null) { |
55 |
cdmApp = CdmApplicationController.NewInstance(cdmSource,schemaValidation, omitTermLoading); |
|
58 |
ClassPathResource applicationContextResource = new ClassPathResource(DEFAULT_IO_APPLICATION_CONTEXT_RESOURCE); |
|
59 |
cdmApp = CdmApplicationController.NewInstance(applicationContextResource, cdmSource,schemaValidation, omitTermLoading); |
|
56 | 60 |
if (cdmApp != null) { |
57 | 61 |
return true; |
58 | 62 |
} else { |
cdmlib-io/src/main/resources/defaultIoApplicationContext.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
<beans xmlns="http://www.springframework.org/schema/beans" |
|
3 |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|
4 |
xmlns:context="http://www.springframework.org/schema/context" |
|
5 |
xsi:schemaLocation= |
|
6 |
"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd |
|
7 |
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> |
|
8 |
|
|
9 |
<import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/> |
|
10 |
|
|
11 |
<!-- includes service beans e.g. in eu/etaxonomy/cdm/api --> |
|
12 |
<context:component-scan base-package="eu/etaxonomy/cdm/io"/> |
|
13 |
|
|
14 |
<!-- includes external services beans e.g. my/cdm/ext/geo/IGeoServiceAreaMapping --> |
|
15 |
<context:component-scan base-package="eu/etaxonomy/cdm/ext"/> |
|
16 |
|
|
17 |
<!-- eu/etaxonomy/cdm/api/service/UserService --> |
|
18 |
|
|
19 |
</beans> |
cdmlib-io/src/main/resources/eu/etaxonomy/cdm/defaultIoApplicationContext.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
<beans xmlns="http://www.springframework.org/schema/beans" |
|
3 |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|
4 |
xmlns:context="http://www.springframework.org/schema/context" |
|
5 |
xsi:schemaLocation= |
|
6 |
"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd |
|
7 |
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> |
|
8 |
|
|
9 |
<import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/> |
|
10 |
|
|
11 |
<!-- includes external services beans e.g. my/cdm/ext/geo/IGeoServiceAreaMapping --> |
|
12 |
<context:component-scan base-package="eu/etaxonomy/cdm/ext"/> |
|
13 |
|
|
14 |
<!-- includes service beans e.g. in eu/etaxonomy/cdm/api --> |
|
15 |
<context:component-scan base-package="eu/etaxonomy/cdm/io"/> |
|
16 |
|
|
17 |
</beans> |
Also available in: Unified diff
bugfix use of application context in io (until now the defaultIoApplicationContext wasn't used due to a wrong implementation