ref #9190: rename webapp to local

[taxeditor.git] / eu.etaxonomy.taxeditor.webapp / src / main / java / eu / etaxonomy / taxeditor / local / server / RemotingLoginDialogLocal.java

diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/server/RemotingLoginDialogLocal.java b/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
similarity index 99%
rename from eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/server/RemotingLoginDialogLocal.java
rename to eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
index a7b97b480e945a0011d7253c2d2b38a8a1a35b8b..86ac28bc02437c2347b932f455249db237c121c2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/server/RemotingLoginDialogLocal.java
+++ b/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
@@ -6,7 +6,7 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-package eu.etaxonomy.taxeditor.webapp.server;
+package eu.etaxonomy.taxeditor.local.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -65,6 +65,8 @@ import eu.etaxonomy.cdm.config.CdmSourceException;
 import eu.etaxonomy.cdm.model.metadata.CdmMetaData;
 import eu.etaxonomy.cdm.persistence.permission.Role;
 import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.local.CdmEmbeddedServerException;
+import eu.etaxonomy.taxeditor.local.CdmServer;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -78,9 +80,13 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.LoginManager;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.ui.dialog.RemotingLoginDialog;
+<<<<<<< HEAD:eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/server/RemotingLoginDialogLocal.java
 import eu.etaxonomy.taxeditor.webapp.CdmEmbeddedServerException;
 import eu.etaxonomy.taxeditor.webapp.CdmServer;
 import eu.etaxonomy.taxeditor.workbench.datasource.ICdmServerError;
+=======
+import eu.etaxonomy.taxeditor.workbench.datasource.ICDMServerError;
+>>>>>>> ref #9190: rename webapp to local:eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java