Project

General

Profile

« Previous | Next » 

Revision 3f87d726

Added by Katja Luther over 4 years ago

fix compile errors in app-import

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/CaryophyllalesCacheUpdater.java
1 1
package eu.etaxonomy.cdm.app.caryophyllales;
2 2
import java.util.Arrays;
3 3
import java.util.List;
4
import java.util.UUID;
4 5

  
5 6
import org.apache.log4j.Logger;
6 7

  
8
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
7 9
import eu.etaxonomy.cdm.api.service.config.CacheUpdaterConfigurator;
8 10
import eu.etaxonomy.cdm.app.common.CdmDestinations;
11
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
9 12
import eu.etaxonomy.cdm.database.DbSchemaValidation;
10 13
import eu.etaxonomy.cdm.database.ICdmDataSource;
14
import eu.etaxonomy.cdm.io.api.application.CdmIoApplicationController;
11 15
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
12 16
import eu.etaxonomy.cdm.io.common.ImportResult;
17
import eu.etaxonomy.cdm.model.name.TaxonName;
13 18
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
14 19

  
15 20
public class CaryophyllalesCacheUpdater {
......
18 23

  
19 24
		//database validation status (create, update, validate ...)
20 25
		static DbSchemaValidation hbm2dll = DbSchemaValidation.VALIDATE;
21
		static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_caryo();
26
		static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_algaterranew();
22 27

  
23 28
		static final List<String> classListStrings =  Arrays.asList(new String[]{
24 29
				//IdentifiableEntity.class.getName(),
25 30
//				IdentifiableEntity.class.getName(),
26 31
				//AgentBase.class.getName(),
27 32
				//Reference.class.getName(),
28
				//TaxonName.class.getName(),
33
				TaxonName.class.getName(),
29 34
				TaxonBase.class.getName()
30 35

  
31 36

  
......
87 92

  
88 93
			CacheUpdaterConfigurator config;
89 94
			try {
90
				config = CacheUpdaterConfigurator.NewInstance(destination, classListStrings, true);
91

  
92
				// invoke import
93
				CdmDefaultImport<CacheUpdaterConfigurator> myImport = new CdmDefaultImport<>();
94
				result=myImport.invoke(config);
95
				//String successString = success ? "successful" : " with errors ";
96
				//System.out.println("End updating caches for "+ destination.getDatabase() + "..." +  successString);
95
				config = CacheUpdaterConfigurator.NewInstance(classListStrings, true);
96
				CdmApplicationController appCtrInit = CdmIoApplicationController.NewInstance(destination, DbSchemaValidation.VALIDATE, false);
97
				appCtrInit.authenticate("admin", "kups366+RU");
98
				UUID monitUuid = appCtrInit.getLongRunningTasksService().monitLongRunningTask(config);
99
				IRemotingProgressMonitor monitor = appCtrInit.getProgressMonitorService().getRemotingMonitor(monitUuid);
100
				while(monitor != null && (!monitor.isCanceled() || !monitor.isDone() || !monitor.isFailed())) {
101
					try {
102
						Thread.sleep(10);
103
					} catch (InterruptedException e) {
104
						// TODO Auto-generated catch block
105
						e.printStackTrace();
106
					}
107
	                logger.info("Waiting for monitered work to start ..");
108
	                monitor = appCtrInit.getProgressMonitorService().getRemotingMonitor(monitUuid);
109
				}
110
				
97 111
				return result;
98 112
			} catch (ClassNotFoundException e) {
99 113
				logger.error(e);
app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
422 422
		String cdmUserName = "root";
423 423
		return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
424 424
	}
425
	
426
	public static ICdmDataSource cdm_local_algaterranew(){
427
		DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
428
		String cdmServer = "127.0.0.1";
429
		String cdmDB = "cdm_production_algaterranew";
430
		String cdmUserName = "root";
431
		return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
432
	}
425 433

  
426 434
	public static ICdmDataSource cdm_test_globis(){
427 435
		DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
app-import/src/main/java/eu/etaxonomy/cdm/app/common/tasks/CacheUpdater.java
11 11

  
12 12
import java.util.Arrays;
13 13
import java.util.List;
14
import java.util.UUID;
14 15

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

  
18
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
17 19
import eu.etaxonomy.cdm.api.service.config.CacheUpdaterConfigurator;
18 20
import eu.etaxonomy.cdm.app.common.CdmDestinations;
21
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
22
import eu.etaxonomy.cdm.database.DbSchemaValidation;
19 23
import eu.etaxonomy.cdm.database.ICdmDataSource;
24
import eu.etaxonomy.cdm.io.api.application.CdmIoApplicationController;
20 25
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
21 26
import eu.etaxonomy.cdm.io.common.ImportResult;
22 27

  
......
64 69

  
65 70
		CacheUpdaterConfigurator config;
66 71
		try {
67
			config = CacheUpdaterConfigurator.NewInstance(destination, classListStrings);
72
			config = CacheUpdaterConfigurator.NewInstance( classListStrings);
68 73

  
69 74
			// invoke import
70
			CdmDefaultImport<CacheUpdaterConfigurator> myImport = new CdmDefaultImport<>();
71
			result = myImport.invoke(config);
75
			CdmApplicationController appCtrInit = CdmIoApplicationController.NewInstance(destination, DbSchemaValidation.VALIDATE, false);
76
			appCtrInit.authenticate("admin", "kups366+RU");
77
			UUID monitUuid = appCtrInit.getLongRunningTasksService().monitLongRunningTask(config);
78
			IRemotingProgressMonitor monitor = appCtrInit.getProgressMonitorService().getRemotingMonitor(monitUuid);
79
			while(monitor != null && (!monitor.isCanceled() || !monitor.isDone() || !monitor.isFailed())) {
80
				try {
81
					Thread.sleep(10);
82
				} catch (InterruptedException e) {
83
					// TODO Auto-generated catch block
84
					e.printStackTrace();
85
				}
86
                logger.info("Waiting for monitered work to start ..");
87
                monitor = appCtrInit.getProgressMonitorService().getRemotingMonitor(monitUuid);
88
			}
72 89
			//String successString = success ? "successful" : " with errors ";
73 90
			//System.out.println("End updating caches for "+ destination.getDatabase() + "..." +  successString);
74 91
			return result;
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeCacheUpdater.java
11 11

  
12 12
import java.util.Arrays;
13 13
import java.util.List;
14
import java.util.UUID;
14 15

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

  
18
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
17 19
import eu.etaxonomy.cdm.api.service.config.CacheUpdaterConfigurator;
18 20
import eu.etaxonomy.cdm.app.common.CdmDestinations;
21
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
19 22
import eu.etaxonomy.cdm.database.DbSchemaValidation;
20 23
import eu.etaxonomy.cdm.database.ICdmDataSource;
24
import eu.etaxonomy.cdm.io.api.application.CdmIoApplicationController;
21 25
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
22 26
import eu.etaxonomy.cdm.io.common.ImportResult;
23 27
import eu.etaxonomy.cdm.model.name.TaxonName;
......
103 107

  
104 108

  
105 109
	private ImportResult doInvoke(ICdmDataSource destination){
106
		ImportResult success;
110
		ImportResult success = null;
107 111

  
108 112
		CacheUpdaterConfigurator config;
109 113
		try {
110
			config = CacheUpdaterConfigurator.NewExludedInstance(destination, classListStrings);
114
			config = CacheUpdaterConfigurator.NewInstance(classListStrings);
111 115

  
112 116
			// invoke import
113
			CdmDefaultImport<CacheUpdaterConfigurator> myImport = new CdmDefaultImport<>();
114
			success = myImport.invoke(config);
115
			String successString = success.isSuccess() ? "successful" : " with errors ";
117
			CdmApplicationController appCtrInit = CdmIoApplicationController.NewInstance(destination, DbSchemaValidation.VALIDATE, false);
118
			appCtrInit.authenticate("admin", "kups366+RU");
119
			UUID monitUuid = appCtrInit.getLongRunningTasksService().monitLongRunningTask(config);
120
			IRemotingProgressMonitor monitor = appCtrInit.getProgressMonitorService().getRemotingMonitor(monitUuid);
121
			while(monitor != null && (!monitor.isCanceled() || !monitor.isDone() || !monitor.isFailed())) {
122
				try {
123
					Thread.sleep(10);
124
				} catch (InterruptedException e) {
125
					// TODO Auto-generated catch block
126
					e.printStackTrace();
127
				}
128
                logger.info("Waiting for monitered work to start ..");
129
                monitor = appCtrInit.getProgressMonitorService().getRemotingMonitor(monitUuid);
130
			}
131
			
132
			
133
			String successString = monitor == null || monitor.isDone() ? "successful" : " with errors ";
116 134
			System.out.println("End updating caches for "+ destination.getDatabase() + "..." +  successString);
117 135
			return success;
118 136
		} catch (ClassNotFoundException e) {
cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsImportActivator.java
37 37
	static final Source ermsSource = PesiSources.PESI2019_ERMS();
38 38

  
39 39
//	static final ICdmDataSource cdmDestination = CdmDestinations.test_cdm_pesi_erms();
40
	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_erms();
40

  
41
//	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_erms();
41 42
//	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_erms2();
43
	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_faunaEu_mysql();
44

  
42 45

  
43
	static final Source pesiDestination =
44
	        cdmDestination == CdmDestinations.cdm_test_local_mysql_erms()?
45
	                PesiDestinations.pesi_test_local_CDM_ERMS2PESI():
46
	                PesiDestinations.pesi_test_local_CDM_ERMS2PESI_2()    ;
46
//	static final Source pesiDestination =
47
//	        cdmDestination == CdmDestinations.cdm_test_local_mysql_erms()?
48
//	                PesiDestinations.pesi_test_local_CDM_ERMS2PESI():
49
//	                PesiDestinations.pesi_test_local_CDM_ERMS2PESI_2()    ;
47 50

  
48 51
	static final boolean includeExport2PESI = false;
49 52

  
......
59 62

  
60 63
// ***************** ALL ************************************************//
61 64

  
65
//	static final DO_REFERENCES doReferences = DO_REFERENCES.ALL;
66
//	static final boolean doTaxa = true;
67
//	static final boolean doRelTaxa = doTaxa; //should always run with doTaxa because dependent on state from doTaxa
68
//	static final boolean doSourceUse = true;
69
//	static final boolean doCommonNames = true;
70
//    static final boolean doNotes = true;
71
//	static final boolean doDistributions = true;
72
//	static final boolean doLinks = true;
73
//	static final boolean doImages = true;
74

  
75
//******************** NONE ***************************************//
76
//
62 77
	static final DO_REFERENCES doReferences = DO_REFERENCES.ALL;
63 78
	static final boolean doTaxa = true;
64
	static final boolean doRelTaxa = doTaxa; //should always run with doTaxa because dependent on state from doTaxa
79
	static final boolean doRelTaxa = doTaxa; //should always run with doTaxa because depends on state from doTaxa
80

  
65 81
	static final boolean doSourceUse = true;
66 82
	static final boolean doCommonNames = true;
67 83
    static final boolean doNotes = true;
......
81 97
//	static final boolean doLinks = false;
82 98
//	static final boolean doImages = false;
83 99

  
84
	private static DbSchemaValidation hbm2dll = (doReferences ==  DO_REFERENCES.ALL)? DbSchemaValidation.CREATE:DbSchemaValidation.VALIDATE;
100
	//private static DbSchemaValidation hbm2dll = (doReferences ==  DO_REFERENCES.ALL)? DbSchemaValidation.CREATE:DbSchemaValidation.VALIDATE;
101
	private static DbSchemaValidation hbm2dll = DbSchemaValidation.VALIDATE;
85 102

  
86 103
	private void doImport(Source source, ICdmDataSource destination, DbSchemaValidation hbm2dll){
87 104
		System.out.println("Start import from ("+ ermsSource.getDatabase() + ") to " + destination.getDatabase() + " ..." );
......
142 159
//            ermsExport.doInferredSynonyms = doRelTaxa;
143 160
            ermsExport.doDescriptions = doImages;
144 161

  
145
			ermsExport.doExport(cdmDB, pesiDestination);
162
//			ermsExport.doExport(cdmDB, pesiDestination);
146 163
		}
147 164
		System.exit(0);
148 165
	}

Also available in: Unified diff