Revision d60221b5
Added by Andreas Müller almost 4 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java | ||
---|---|---|
66 | 66 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
67 | 67 |
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; |
68 | 68 |
import eu.etaxonomy.taxeditor.preference.PreferencesUtil; |
69 |
import eu.etaxonomy.taxeditor.remoting.server.CDMServerException;
|
|
70 |
import eu.etaxonomy.taxeditor.remoting.server.CDMServerUtils;
|
|
69 |
import eu.etaxonomy.taxeditor.remoting.server.CdmServerException;
|
|
70 |
import eu.etaxonomy.taxeditor.remoting.server.CdmServerUtils;
|
|
71 | 71 |
import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource; |
72 | 72 |
import eu.etaxonomy.taxeditor.remoting.source.CdmServerInfo; |
73 | 73 |
import eu.etaxonomy.taxeditor.remoting.source.CdmServerInfo.CdmInstanceInfo; |
... | ... | |
75 | 75 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
76 | 76 |
import eu.etaxonomy.taxeditor.store.LoginManager; |
77 | 77 |
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; |
78 |
import eu.etaxonomy.taxeditor.webapp.CDMEmbeddedServerException;
|
|
79 |
import eu.etaxonomy.taxeditor.webapp.CDMServer;
|
|
78 |
import eu.etaxonomy.taxeditor.webapp.CdmEmbeddedServerException;
|
|
79 |
import eu.etaxonomy.taxeditor.webapp.CdmServer;
|
|
80 | 80 |
import eu.etaxonomy.taxeditor.webapp.ICDMServerError; |
81 | 81 |
|
82 | 82 |
/** |
... | ... | |
576 | 576 |
comboCdmInstance.removeAll(); |
577 | 577 |
disableCdmInstanceControls("", ""); //$NON-NLS-1$ //$NON-NLS-2$ |
578 | 578 |
} |
579 |
} catch (CDMServerException | IOException e) {
|
|
579 |
} catch (CdmServerException | IOException e) {
|
|
580 | 580 |
txtCdmServerStatus.setText(STATUS_NOT_AVAILABLE); |
581 | 581 |
// TODO distinguish java.net.ConnectException: Connection refused, java.net.SocketTimeoutException: Read timed out |
582 | 582 |
Throwable cause = e; |
583 |
if(e instanceof CDMServerException && e.getCause() != null){
|
|
583 |
if(e instanceof CdmServerException && e.getCause() != null){
|
|
584 | 584 |
cause = e.getCause(); |
585 | 585 |
} |
586 | 586 |
String message = Messages.RemotingLoginDialog_CONNECTION_FAILED_MESSAGE; |
... | ... | |
646 | 646 |
} |
647 | 647 |
}); |
648 | 648 |
} |
649 |
} catch (final CDMServerException e) {
|
|
649 |
} catch (final CdmServerException e) {
|
|
650 | 650 |
MessagingUtils.warn(getClass(), e); |
651 | 651 |
Display.getDefault().asyncExec(new Runnable() { |
652 | 652 |
@Override |
... | ... | |
741 | 741 |
@Override |
742 | 742 |
public IStatus run(IProgressMonitor monitor) { |
743 | 743 |
String mgdServerConfigFileName = "mgd.datasources.xml"; //$NON-NLS-1$ |
744 |
String config = CDMServerUtils.convertEditorToServerConfig();
|
|
744 |
String config = CdmServerUtils.convertEditorToServerConfig();
|
|
745 | 745 |
File managedServerConfigFile; |
746 | 746 |
int maxUnits = 50; |
747 | 747 |
monitor.beginTask(Messages.RemotingLoginDialog_TASK_LAUNCHING_SERVER, maxUnits); |
748 | 748 |
try { |
749 | 749 |
monitor.subTask(String.format(Messages.RemotingLoginDialog_GENERATING_CONFIG_FILE, selectedCdmInstance.getName())); |
750 |
managedServerConfigFile = CDMServerUtils.writeManagedServerConfig(config, mgdServerConfigFileName);
|
|
750 |
managedServerConfigFile = CdmServerUtils.writeManagedServerConfig(config, mgdServerConfigFileName);
|
|
751 | 751 |
monitor.worked(1); |
752 | 752 |
boolean forceSchemaCreate = CdmStore.getManagedServer() != null |
753 | 753 |
&& CdmStore.getManagedServer().getDataSourceName().equals(selectedCdmInstance.getName()) |
754 | 754 |
&& CdmStore.getManagedServer().isForceSchemaCreate(); |
755 |
CdmStore.setManagedServer(new CDMServer(selectedCdmInstance.getName(), managedServerConfigFile));
|
|
755 |
CdmStore.setManagedServer(new CdmServer(selectedCdmInstance.getName(), managedServerConfigFile));
|
|
756 | 756 |
CdmStore.getManagedServer().setForceSchemaCreate(forceSchemaCreate); |
757 | 757 |
monitor.subTask(Messages.RemotingLoginDialog_STARTING_MGD_SERVER); |
758 | 758 |
CdmStore.getManagedServer().start(false, RemotingLoginDialog.this); |
... | ... | |
785 | 785 |
TaxeditorStorePlugin.PLUGIN_ID, |
786 | 786 |
ioe, |
787 | 787 |
true); |
788 |
} catch (CDMEmbeddedServerException cse) {
|
|
788 |
} catch (CdmEmbeddedServerException cese) {
|
|
789 | 789 |
MessagingUtils.errorDialog(Messages.RemotingLoginDialog_ERROR_STARTING_SERVER, |
790 | 790 |
this, |
791 | 791 |
cse.getMessage(), |
Also available in: Unified diff
rename CdmServerUtils, CdmServerException and CdmEmbeddedServerException