Project

General

Profile

« Previous | Next » 

Revision ad3ad9e0

Added by Andreas Kohlbecker over 12 years ago

  • ID ad3ad9e0f0560d0bb782836297c4ffe39b2625c8
  • Parent 55d84577

Merging r13295 through r13325 from trunk

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmIoApplicationController.java
1 1
package eu.etaxonomy.cdm.api.application;
2 2

  
3
import java.util.List;
4

  
3 5
import org.apache.log4j.Logger;
6
import org.springframework.context.ApplicationListener;
4 7
import org.springframework.core.io.ClassPathResource;
5 8
import org.springframework.core.io.Resource;
6 9

  
......
23 26
	}
24 27
	
25 28
	
26
	public static CdmApplicationController NewInstance() {
29
	public static CdmIoApplicationController NewInstance() {
27 30
		return CdmIoApplicationController.NewInstance(getDefaultDatasource(), defaultDbSchemaValidation, false);
28 31
	}
29 32
	
30
	public static CdmApplicationController NewInstance(DbSchemaValidation dbSchemaValidation) {
33
	public static CdmIoApplicationController NewInstance(DbSchemaValidation dbSchemaValidation) {
31 34
		return CdmIoApplicationController.NewInstance(getDefaultDatasource(), dbSchemaValidation, false);
32 35
	}
33 36
	/**
......
35 38
	 * default database schema validation type
36 39
	 * @param dataSource
37 40
	 */
38
	public static CdmApplicationController NewInstance(ICdmDataSource dataSource) {
39
		return CdmApplicationController.NewInstance(getClasspathResource(), dataSource, defaultDbSchemaValidation, false);
41
	public static CdmIoApplicationController NewInstance(ICdmDataSource dataSource) {
42
		return (CdmIoApplicationController) CdmIoApplicationController.NewInstance(getClasspathResource(), dataSource, defaultDbSchemaValidation, false);
40 43
	}
41 44

  
42 45
	
43
	public static CdmApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation) {
44
		return CdmApplicationController.NewInstance(getClasspathResource(), dataSource, dbSchemaValidation, false);
45
	}
46

  
47
	public static CdmApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {
48
		return CdmApplicationController.NewInstance(getClasspathResource(), dataSource, dbSchemaValidation, omitTermLoading);
46
	public static CdmIoApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation) {
47
		return (CdmIoApplicationController) CdmIoApplicationController.NewInstance(getClasspathResource(), dataSource, dbSchemaValidation, false);
49 48
	}
50 49

  
50
	public static CdmIoApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation, boolean omitTermLoading) {
51
		return (CdmIoApplicationController) CdmIoApplicationController.NewInstance(getClasspathResource(), dataSource, dbSchemaValidation, omitTermLoading);
52
	}	
51 53

  
52 54
	/**
53 55
	 * @return

Also available in: Unified diff