Project

General

Profile

« Previous | Next » 

Revision 993072c0

Added by Cherian Mathew about 10 years ago

reverting back the cdm application configuration refactoring

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/JaxbImportActivator.java
14 14

  
15 15
import org.apache.log4j.Logger;
16 16

  
17
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
17
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
18 18
import eu.etaxonomy.cdm.app.common.CdmDestinations;
19 19
import eu.etaxonomy.cdm.app.util.TestDatabase;
20 20
import eu.etaxonomy.cdm.database.DbSchemaValidation;
......
38 38
	private static String importFileNameString = 
39 39
		//"C:\\workspace\\cdmlib_2.2\\cdmlib-io\\src\\test\\resources\\eu\\etaxonomy\\cdm\\io\\jaxb\\export_test_app_import.xml";
40 40
//		"file:/C:/export_test_app_import.xml";
41
	"file:/C:/localCopy/Data/krhen/201206141338-jaxb_export-cdm.xml";
41
	"file:/C:/localCopy/Data/kr?hen/201206141338-jaxb_export-cdm.xml";
42 42
	
43 43

  
44 44
	/** NUMBER_ROWS_TO_RETRIEVE = 0 is the default case to retrieve all rows.
......
95 95
	}
96 96

  
97 97
	
98
	private CdmApplicationDefaultController initDb(ICdmDataSource db) {
98
	private CdmApplicationController initDb(ICdmDataSource db) {
99 99

  
100 100
		// Init source DB
101
		CdmApplicationDefaultController appCtrInit = null;
101
		CdmApplicationController appCtrInit = null;
102 102

  
103 103
		appCtrInit = TestDatabase.initDb(db, DbSchemaValidation.CREATE, false);
104 104

  
......
107 107

  
108 108
	
109 109
	// Load test data to DB
110
	private void loadTestData(CdmApplicationDefaultController appCtrInit) {
110
	private void loadTestData(CdmApplicationController appCtrInit) {
111 111

  
112 112
		TestDatabase.loadTestData("", appCtrInit);
113 113
	}
......
121 121
		JaxbImportActivator jia = new JaxbImportActivator();
122 122
		ICdmDataSource destination = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : cdmDestination;
123 123
		String file = chooseFile(args)!= null ? chooseFile(args) : importFileNameString;
124
		CdmApplicationDefaultController appCtr = null;
124
		CdmApplicationController appCtr = null;
125 125
//		appCtr = jia.initDb(destination);
126 126
				
127 127
		jia.invokeImport(file, destination);

Also available in: Unified diff