Revision 0219b768
Added by Andreas Müller about 9 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java | ||
---|---|---|
18 | 18 |
import org.eclipse.core.runtime.Status; |
19 | 19 |
import org.eclipse.core.runtime.jobs.Job; |
20 | 20 |
import org.eclipse.swt.widgets.Display; |
21 |
import org.hibernate.collection.internal.AbstractPersistentCollection; |
|
22 |
import org.hibernate.proxy.AbstractLazyInitializer; |
|
23 | 21 |
import org.springframework.core.io.Resource; |
24 | 22 |
|
25 | 23 |
import eu.etaxonomy.cdm.api.application.CdmApplicationController; |
26 | 24 |
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController; |
27 | 25 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
28 |
import eu.etaxonomy.cdm.config.ICdmSource; |
|
29 |
import eu.etaxonomy.cdm.remote.ICdmRemoteSource; |
|
30 | 26 |
import eu.etaxonomy.cdm.config.CdmSourceException; |
31 |
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
|
|
27 |
import eu.etaxonomy.cdm.config.ICdmSource;
|
|
32 | 28 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
33 | 29 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
34 | 30 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData; |
35 |
import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName;
|
|
31 |
import eu.etaxonomy.cdm.remote.ICdmRemoteSource;
|
|
36 | 32 |
import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; |
37 | 33 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
38 | 34 |
import eu.etaxonomy.taxeditor.ui.dialog.LoginDialog; |
... | ... | |
68 | 64 |
public IStatus run(final IProgressMonitor monitor) { |
69 | 65 |
|
70 | 66 |
monitor.beginTask(getConnectionMessage(), 10); |
71 |
|
|
67 |
|
|
72 | 68 |
// check if database is up and running |
73 | 69 |
checkDatabaseReachable(monitor); |
74 | 70 |
|
... | ... | |
97 | 93 |
CdmProgressMonitorAdapter subprogressMonitor = CdmProgressMonitorAdapter |
98 | 94 |
.CreateSubMonitor(monitor, 7); |
99 | 95 |
// This is where we instantiate the application controller |
96 |
int oldPriority = Thread.currentThread().getPriority(); |
|
100 | 97 |
try { |
101 |
|
|
98 |
Thread.currentThread().setPriority(10); |
|
102 | 99 |
applicationController = getApplicationController(cdmSource,subprogressMonitor); |
103 |
|
|
104 | 100 |
} catch (Exception e) { |
105 | 101 |
if(! causeIsCancelationExceptionRecursive(e)){ |
106 | 102 |
return new Status(IStatus.ERROR, "Could not connect to CDM Store", "An error occurred while trying to connect to datasource: " + cdmSource.getName(), e); |
107 | 103 |
} |
108 | 104 |
} finally { |
109 | 105 |
monitor.done(); |
106 |
Thread.currentThread().setPriority(oldPriority); |
|
110 | 107 |
} |
111 | 108 |
} |
112 | 109 |
|
Also available in: Unified diff
merge taxeditor validation2 into trunk