version="0.0.0"\r
unpack="false"/>\r
\r
- <plugin\r
- id="eu.etaxonomy.taxeditor.webapp"\r
- download-size="0"\r
- install-size="0"\r
- version="0.0.0"\r
- unpack="false"/>\r
-\r
<plugin\r
id="eu.etaxonomy.taxeditor.workbench"\r
download-size="0"\r
<elements xsi:type="commands:Command" xmi:id="_zDy74KqZEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.store.command.exportCsvName" commandName="%wizard.name.19"/>
<elements xsi:type="commands:Command" xmi:id="_zIKegKqZEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.store.command.exportCsvPrint" commandName="%wizard.name.20"/>
<elements xsi:type="commands:Command" xmi:id="_zLKvMKqZEeeXcJGhyhlrKA" elementId="eu.etaxonomy.taxeditor.store.command.exportCdmLight" commandName="%wizard.name.22"/>
- <elements xsi:type="commands:Command" xmi:id="_R00rwK2dEeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow" commandName="%command.name.CONNECT"/>
+ <elements xsi:type="commands:Command" xmi:id="_R00rwK2dEeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow" commandName="%command.label.CONNECT"/>
<elements xsi:type="commands:Command" xmi:id="_S868QK2dEeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.store.operations.showLoginWindow" commandName="%command.name.4"/>
<elements xsi:type="commands:Command" xmi:id="_bfjZwK2fEeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardHandler" commandName="%command.name.11"/>
- <elements xsi:type="commands:Command" xmi:id="_KQP_sK2gEeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.store.operations.reconnect" commandName="%command.name.RE_CONNECT"/>
+ <elements xsi:type="commands:Command" xmi:id="_KQP_sK2gEeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.store.operations.reconnect" commandName="%command.label.RE_CONNECT"/>
<elements xsi:type="commands:Command" xmi:id="_SXZF8K2gEeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.store.openPasswordWizzard" commandName="%command.name.10"/>
<elements xsi:type="commands:Command" xmi:id="_dQ0swL-rEeegz7IDD8MJaw" elementId="eu.etaxonomy.taxeditor.store.open.InspectSessionsDialog" commandName="%command.commandname.5"/>
<elements xsi:type="commands:Command" xmi:id="_jSJrsBWPEeiazYUJirF0Pw" elementId="eu.etaxonomy.taxeditor.store.command.update" commandName="%command.commandname.6"/>
<elements xsi:type="commands:Command" xmi:id="_QnWnMGZ-Eemew5ARzf3JfA" elementId="eu.etaxonomy.taxeditor.store.open.OpenDistributionAreaWizardHandler" commandName="%command.commandname.19"/>
<elements xsi:type="commands:Command" xmi:id="_WISF0H1LEem6uMX-L-maww" elementId="eu.etaxonomy.taxeditor.store.command.export.term.owl" commandName="%command.commandname.21"/>
<elements xsi:type="commands:Command" xmi:id="_sKIVINL6Eem35L6JVBxwwA" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" commandName="%command.name.120"/>
+ <elements xsi:type="commands:Command" xmi:id="_qENOgP5VEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.store.command.nacherweiterungensuchen" commandName="Nach Erweiterungen suchen"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_swGH0GhvEee3K4uKJljEYg" featurename="handlers" parentElementId="xpath:/">
<elements xsi:type="commands:Handler" xmi:id="_rVEdIGcjEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
<elements xsi:type="commands:Handler" xmi:id="_XxpDoGZ-Eemew5ARzf3JfA" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenDistributionAreaWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenDistributionAreaWizardHandler" command="_QnWnMGZ-Eemew5ARzf3JfA"/>
<elements xsi:type="commands:Handler" xmi:id="_nhGLwH1LEem6uMX-L-maww" elementId="eu.etaxonomy.taxeditor.io.e4.out.owl.OpenOwlTermExportWizard" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.io.e4.out.owl.OpenOwlTermExportWizard" command="_WISF0H1LEem6uMX-L-maww"/>
<elements xsi:type="commands:Handler" xmi:id="_3AxAINL9Eem35L6JVBxwwA" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" command="_sKIVINL6Eem35L6JVBxwwA"/>
+ <elements xsi:type="commands:Handler" xmi:id="_wSjnIP5VEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.store.handler.searchForPlugin" command="_qENOgP5VEeqwiqpCwftRog"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_qT4hgIfTEeecZ4F2Y9Z0Og" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.window" positionInList="before:eu.etaxonomy.taxeditor.application.windowMenu.last">
<elements xsi:type="menu:Menu" xmi:id="_LT3P8IfcEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.menu.termeditor" label="%menu.label.1">
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_lnmLABWNEeiazYUJirF0Pw" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.help" positionInList="after:eu.etaxonomy.taxeditor.workbench.menuseparator.beforeHelp">
<elements xsi:type="menu:HandledMenuItem" xmi:id="_uHiLwBWNEeiazYUJirF0Pw" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel6" label="%handledmenuitem.label.11" command="_jSJrsBWPEeiazYUJirF0Pw"/>
+ <elements xsi:type="menu:HandledMenuItem" xmi:id="_g-dAYP5UEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.erweiterungensuchen" label="Erweiterungen suchen"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_S2CIED8oEempU5gGjh-zOg" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.databaseRepair">
<elements xsi:type="menu:HandledMenuItem" xmi:id="_67xR4D8oEempU5gGjh-zOg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.UpdateCaches" label="%handledmenuitem.label.18" command="_qYxw8D85EemTy7SLZkowuQ">
--- /dev/null
+/**
+* Copyright (C) 2020 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* 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.handler.update;
+
+import java.net.URI;
+
+import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.di.UISynchronize;
+import org.eclipse.e4.ui.workbench.IWorkbench;
+import org.eclipse.equinox.p2.core.IProvisioningAgent;
+import org.eclipse.equinox.p2.operations.ProvisioningJob;
+import org.eclipse.equinox.p2.operations.ProvisioningSession;
+import org.eclipse.equinox.p2.operations.UpdateOperation;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.taxeditor.l10n.Messages;
+
+/**
+ * @author k.luther
+ * @since Sep 24, 2020
+ */
+public class SearchPluginHandler {
+ private Logger logger = Logger.getLogger(getClass());
+
+ private UpdateOperation operation;
+
+ @Execute
+ public void execute(final IProvisioningAgent agent, final Shell shell, final UISynchronize sync,
+ final IWorkbench workbench) {
+ Job checkUpdateJob = new Job(Messages.UpdateHandler_CHECK_UPDATE_JOB) {
+ @Override
+ protected IStatus run(final IProgressMonitor monitor) {
+ return checkForPlugins(agent, shell, sync, monitor);
+ }
+ };
+ checkUpdateJob.schedule();
+
+
+ checkUpdateJob.addJobChangeListener(new JobChangeAdapter() {
+ @Override
+ public void done(IJobChangeEvent event) {
+ if (event.getResult().isOK()) {
+ sync.syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ if(MessageDialog.openConfirm(shell, Messages.UpdateHandler_UPDATES_FOUND_TITLE, Messages.UpdateHandler_UPDATES_FOUND_MESSAGE)){
+ Job installUpdateJob = new Job(Messages.UpdateHandler_INSTALL_JOB) {
+ @Override
+ protected IStatus run(final IProgressMonitor monitor) {
+ // run installation
+ ProvisioningJob provisioningJob = operation.getProvisioningJob(monitor);
+
+ // updates cannot run from within Eclipse IDE!!!
+ if (provisioningJob == null) {
+ logger.error("Trying to update from the Eclipse IDE? This won't work!"); //$NON-NLS-1$
+ return Status.CANCEL_STATUS;
+ }
+ configureProvisioningJob(provisioningJob, shell, sync, workbench);
+ provisioningJob.schedule();
+ return Status.OK_STATUS;
+ }
+ };
+ installUpdateJob.schedule();
+ }
+ }
+ });
+ }
+ }
+ });
+ }
+
+ private IStatus checkForPlugins(final IProvisioningAgent agent, final Shell shell, final UISynchronize sync,
+ IProgressMonitor monitor) {
+
+ // configure update operation
+ final ProvisioningSession session = new ProvisioningSession(agent);
+ operation = new UpdateOperation(session);
+ configureUpdate(operation);
+
+ // check for updates, this causes I/O
+ final IStatus status = operation.resolveModal(monitor);
+
+ // failed to find updates (inform user and exit)
+ if (status.getCode() == UpdateOperation.STATUS_NOTHING_TO_UPDATE) {
+ showMessage(shell, sync);
+ return Status.CANCEL_STATUS;
+ }
+ return Status.OK_STATUS;
+ }
+
+ private void configureProvisioningJob(ProvisioningJob provisioningJob, final Shell shell, final UISynchronize sync,
+ final IWorkbench workbench) {
+
+ // register a job change listener to track
+ // installation progress and notify user upon success
+ provisioningJob.addJobChangeListener(new JobChangeAdapter() {
+ @Override
+ public void done(IJobChangeEvent event) {
+ if (event.getResult().isOK()) {
+ sync.syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ boolean restart = MessageDialog.openQuestion(shell, Messages.UpdateHandler_UPDATE_INSTALLED_TITLE,
+ Messages.UpdateHandler_UPDATE_INSTALLED_TITLE_MESSAGE);
+ if (restart) {
+ workbench.restart();
+ }
+ }
+ });
+ }
+ super.done(event);
+ }
+ });
+
+ }
+
+ private void showMessage(final Shell parent, final UISynchronize sync) {
+ sync.syncExec(()->
+ MessageDialog.openWarning(parent, Messages.UpdateHandler_NO_UPDATE_TITLE,
+ Messages.UpdateHandler_NO_UPDATE_MESSAGE)
+ );
+ }
+
+ private UpdateOperation configureUpdate(final UpdateOperation operation) {
+ // create uri and check for validity
+ URI uri = null;
+ uri = P2Util.getP2UpdateRepository();
+
+ // set location of artifact and metadata repo
+ operation.getProvisioningContext().setArtifactRepositories(new URI[] { uri });
+ operation.getProvisioningContext().setMetadataRepositories(new URI[] { uri });
+
+ return operation;
+ }
+}
// set location of artifact and metadata repo
operation.getProvisioningContext().setArtifactRepositories(new URI[] { uri });
operation.getProvisioningContext().setMetadataRepositories(new URI[] { uri });
+ //if local plugin is installed, then check for updates
+ //operation.getProvisioningContext().setExtraInstallableUnits(extraIUs);
return operation;
}
import eu.etaxonomy.taxeditor.store.LoginManager;
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
import eu.etaxonomy.taxeditor.workbench.datasource.ICdmServerError;
-/*
-import eu.etaxonomy.taxeditor.webapp.CdmEmbeddedServerException;
-import eu.etaxonomy.taxeditor.webapp.CdmServer;
-import eu.etaxonomy.taxeditor.webapp.ICDMServerError;
-*/
+
/**
* @author cmathew
* @date 20 Jan 2015
org.eclipse.swtbot.eclipse.core,
org.eclipse.swtbot.eclipse.finder,
eu.etaxonomy.taxeditor.workbench,
- eu.etaxonomy.taxeditor.webapp
+ eu.etaxonomy.taxeditor.local
Eclipse-RegisterBuddy: org.apache.log4j, org.eclipse.swtbot.swt.finder
Bundle-ClassPath: .,
lib/byte-buddy-0.5.1.jar,
lib/commons-dbcp-1.4.jar,
lib/commons-pool-1.6.jar,
lib/hamcrest-core-1.3.jar
-Import-Package: eu.etaxonomy.taxeditor.webapp
+Import-Package: eu.etaxonomy.taxeditor.local
import org.junit.Test;
import org.osgi.framework.Bundle;
+import eu.etaxonomy.taxeditor.local.CdmServer;
import eu.etaxonomy.taxeditor.remoting.server.CdmServerUtils;
-import eu.etaxonomy.taxeditor.webapp.CdmServer;
import eu.etaxonomy.taxeditor.workbench.datasource.CdmEmbeddedServerException;
import eu.etaxonomy.taxeditor.workbench.datasource.ICdmServerError;
org.eclipse.core.expressions,
org.eclipse.ui.forms,
org.eclipse.ui.workbench,
- eu.etaxonomy.taxeditor.webapp,
javax.servlet
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Export-Package: eu.etaxonomy.taxeditor.webapp
+Export-Package: eu.etaxonomy.taxeditor.local
Bundle-ClassPath: .,
lib/log4j-1.2.17.jar,
lib/c3p0-0.9.5.2.jar,
<imports xsi:type="commands:Command" xmi:id="_bnVKsCZxEeeQLpuomSmVoQ" elementId="eu.etaxonomy.taxeditor.command.openPart"/>
<imports xsi:type="commands:Command" xmi:id="_LlbAMEq2EeeN-dEYnw7m3g" elementId="org.eclipse.ui.file.save"/>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_xVa1wCXXEeex9MwMOgUeWw" featurename="descriptors" parentElementId="xpath:/" positionInList="">
- <elements xsi:type="basic:PartDescriptor" xmi:id="_eKzREIcpEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource" label="Datasource" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/system-file-manager.png" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.view.datasource.e4.CdmDataSourceViewPartE4">
- <handlers xmi:id="_hAnq0IctEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource.e4.handler.EditDataSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler.EditDataSourceHandlerE4" command="_cs5L0IctEee-HITNnU9cVw"/>
- <handlers xmi:id="_rsmsYIctEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource.e4.handler.CloneDataSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler.CloneDataSourceHandlerE4" command="_o0HcUIctEee-HITNnU9cVw"/>
- <handlers xmi:id="_ASDGYIcuEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource.e4.handler.DeleteDataSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler.DeleteDataSourceHandlerE4" command="_-g_YcIctEee-HITNnU9cVw"/>
+ <elements xsi:type="basic:PartDescriptor" xmi:id="_eKzREIcpEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource" label="Datasource" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/system-file-manager.png" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.local/eu.etaxonomy.taxeditor.webapp.view.datasource.e4.CdmDataSourceViewPartE4">
+ <handlers xmi:id="_hAnq0IctEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource.e4.handler.EditDataSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.local.view.datasource.e4.handler.EditDataSourceHandlerE4" command="_cs5L0IctEee-HITNnU9cVw"/>
+ <handlers xmi:id="_rsmsYIctEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource.e4.handler.CloneDataSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.local.view.datasource.e4.handler.CloneDataSourceHandlerE4" command="_o0HcUIctEee-HITNnU9cVw"/>
+ <handlers xmi:id="_ASDGYIcuEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.view.datasource.e4.handler.DeleteDataSourceHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.local.view.datasource.e4.handler.DeleteDataSourceHandlerE4" command="_-g_YcIctEee-HITNnU9cVw"/>
<menus xsi:type="menu:PopupMenu" xmi:id="_3aJ1cIcpEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.store.popupmenu.datasourceview">
<children xsi:type="menu:HandledMenuItem" xmi:id="_-ALHMIcpEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.store.datasource.handledmenuitem.edit" label="Edit" command="_cs5L0IctEee-HITNnU9cVw"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_8ciKMIcpEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.store.datasource.handledmenuitem.clone" label="Clone" command="_o0HcUIctEee-HITNnU9cVw"/>
<elements xsi:type="commands:Command" xmi:id="_ShWvcIcuEee-HITNnU9cVw" elementId="eu.etaxonomy.taxeditor.store.datasource.update" commandName="Update"/>
<elements xsi:type="commands:Command" xmi:id="_OlOO0O0HEeqksLQRVeqFGA" elementId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow" commandName="%command.name.connect"/>
<elements xsi:type="commands:Command" xmi:id="_3uvF0P5KEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.command.benutzerwechseln" commandName="Benutzer wechseln"/>
+ <elements xsi:type="commands:Command" xmi:id="_us_lAP75EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.local.command.reconnect" commandName="%command.name.RE_CONNECT"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_pVVyEJFJEeeDJpjGQES7gw" featurename="addons" parentElementId="xpath:/">
<elements xsi:type="application:Addon" xmi:id="_q4JBkJFJEeeDJpjGQES7gw" elementId="eu.etaxonomy.taxeditor.event.EventUtility" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.event.EventUtility"/>
</elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_hSGlEPv3EeqwiqpCwftRog" featurename="handlers" parentElementId="xpath:/">
- <elements xsi:type="commands:Handler" xmi:id="_j7DkUPv3EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handler.connect" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.handler.ShowRemotingLoginWindowHandlerE4" command="_OlOO0O0HEeqksLQRVeqFGA"/>
- <elements xsi:type="commands:Handler" xmi:id="_6GckEP5KEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handler.0" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.webapp.handler.SwitchUserHandlerE4" command="_3uvF0P5KEeqwiqpCwftRog"/>
+ <elements xsi:type="commands:Handler" xmi:id="_j7DkUPv3EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handler.connect" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.local.handler.ShowRemotingLoginWindowHandlerE4" command="_OlOO0O0HEeqksLQRVeqFGA"/>
+ <elements xsi:type="commands:Handler" xmi:id="_6GckEP5KEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handler.0" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.local.handler.SwitchUserHandlerE4" command="_3uvF0P5KEeqwiqpCwftRog"/>
+ <elements xsi:type="commands:Handler" xmi:id="_q26rUP75EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.local.handler.reconnect" contributionURI="bundleclass://eu.etaxonomy.taxeditor.webapp/eu.etaxonomy.taxeditor.local.handler.ReconnectHandlerE4" command="_us_lAP75EeqwiqpCwftRog"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_udC8YPv3EeqwiqpCwftRog" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.file">
<elements xsi:type="menu:HandledMenuItem" xmi:id="_z4gfgPv3EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handledmenuitem.commandlabelconnect" label="%command.name.connect" command="_OlOO0O0HEeqksLQRVeqFGA">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_5Sv6oPv3EeqwiqpCwftRog" coreExpressionId="isCdmStoreConnected"/>
</elements>
<elements xsi:type="menu:HandledMenuItem" xmi:id="_1OTwcP5KEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.webapp.handledmenuitem.benutzerwechseln" label="Benutzer wechseln"/>
+ <elements xsi:type="menu:HandledMenuItem" xmi:id="_9aCBMP75EeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.local.handledmenuitem.commandnamere_connect" label="%command.name.RE_CONNECT" command="_us_lAP75EeqwiqpCwftRog"/>
</fragments>
</fragment:ModelFragments>
<version>5.18.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
+ <artifactId>eu.etaxonomy.taxeditor.local</artifactId>
<packaging>eclipse-plugin</packaging>
- <name>CDM Library Webapp Plugin</name>
- <description>CDM Library webapp as a plugin</description>
+ <name>Local Plugin</name>
<build>
<pluginManagement>
<plugins>
<version>${jetty-version}</version>
</dependency>
</dependencies>
+ <description>Enables acces to a local managed cdm server</description>
</project>
* 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;
+package eu.etaxonomy.taxeditor.local;
/**
* @author cmathew
* 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;
+package eu.etaxonomy.taxeditor.local;
import java.io.File;
import java.io.IOException;
-package eu.etaxonomy.taxeditor.webapp;
+package eu.etaxonomy.taxeditor.local;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
*
* @author n.hoffmann
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.common;
+package eu.etaxonomy.taxeditor.local.datasource.common;
import java.io.File;
import java.io.FileNotFoundException;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.wizard;
+package eu.etaxonomy.taxeditor.local.datasource.wizard;
import java.sql.SQLException;
import eu.etaxonomy.cdm.database.CdmDataSource;
import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.taxeditor.webapp.datasource.common.CdmDataSourceRepository;
+import eu.etaxonomy.taxeditor.local.datasource.common.CdmDataSourceRepository;
/**
* <p>Abstract CdmDataSourceCredentialsWizardPage class.</p>
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.wizard;
+package eu.etaxonomy.taxeditor.local.datasource.wizard;
import eu.etaxonomy.cdm.database.CdmDataSource;
import eu.etaxonomy.cdm.database.ICdmDataSource;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.wizard;
+package eu.etaxonomy.taxeditor.local.datasource.wizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
/**
*
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.wizard;
+package eu.etaxonomy.taxeditor.local.datasource.wizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.wizard;
+package eu.etaxonomy.taxeditor.local.datasource.wizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.wizard;
+package eu.etaxonomy.taxeditor.local.datasource.wizard;
import java.util.ArrayList;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
import eu.etaxonomy.cdm.database.ICdmDataSource;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.taxeditor.webapp.datasource.common.CdmDataSourceRepository;
+import eu.etaxonomy.taxeditor.local.datasource.common.CdmDataSourceRepository;
/**
* <p>CdmDataSourceTypeSelectionWizardPage class.</p>
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.datasource.wizard;
+package eu.etaxonomy.taxeditor.local.datasource.wizard;
import org.eclipse.jface.wizard.Wizard;
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.taxeditor.webapp.datasource.common.CdmDataSourceRepository;
+import eu.etaxonomy.taxeditor.local.datasource.common.CdmDataSourceRepository;
/**
* <p>CdmDataSourceWizard class.</p>
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.handler;
+package eu.etaxonomy.taxeditor.local.handler;
import javax.inject.Named;
import eu.etaxonomy.taxeditor.event.EventUtility;
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
+import eu.etaxonomy.taxeditor.local.server.RemotingLoginDialogLocal;
import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.webapp.server.RemotingLoginDialogLocal;
/**
* @author pplitzner
* 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.handler;
+package eu.etaxonomy.taxeditor.local.handler;
import javax.inject.Named;
import eu.etaxonomy.taxeditor.event.EventUtility;
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
-import eu.etaxonomy.taxeditor.webapp.server.RemotingLoginDialogLocal;
+import eu.etaxonomy.taxeditor.local.server.RemotingLoginDialogLocal;
/**
* @author pplitzner
* 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.handler;
+package eu.etaxonomy.taxeditor.local.handler;
import java.util.Collection;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import eu.etaxonomy.taxeditor.local.server.RemotingLoginDialogLocal;
import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.webapp.server.RemotingLoginDialogLocal;
/**
* @author pplitzner
* 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.l10n;
+package eu.etaxonomy.taxeditor.local.l10n;
import org.eclipse.osgi.util.NLS;
* 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.lang.reflect.InvocationTargetException;
import java.util.concurrent.CancellationException;
* 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 org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.widgets.Display;
import eu.etaxonomy.cdm.cache.CdmRemoteCacheManager;
import eu.etaxonomy.cdm.config.ICdmSource;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
+import eu.etaxonomy.taxeditor.local.CdmServer;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.webapp.CdmServer;
/**
* 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;
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;
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
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource;
+package eu.etaxonomy.taxeditor.local.view.datasource;
import java.util.List;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource;
+package eu.etaxonomy.taxeditor.local.view.datasource;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource;
+package eu.etaxonomy.taxeditor.local.view.datasource;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource;
+package eu.etaxonomy.taxeditor.local.view.datasource;
import java.util.HashMap;
import java.util.Map;
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource.e4;
+package eu.etaxonomy.taxeditor.local.view.datasource.e4;
import java.util.ArrayList;
import java.util.List;
import eu.etaxonomy.cdm.config.ICdmSource;
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
+import eu.etaxonomy.taxeditor.local.datasource.common.CdmDataSourceRepository;
+import eu.etaxonomy.taxeditor.local.l10n.Messages;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmDataSourceContentProvider;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmDataSourceLabelProvider;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmDataSourceViewerComparator;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmMetaDataAwareDataSourceContainer;
import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
import eu.etaxonomy.taxeditor.model.IContextListener;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.webapp.datasource.common.CdmDataSourceRepository;
-import eu.etaxonomy.taxeditor.webapp.l10n.Messages;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmDataSourceContentProvider;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmDataSourceLabelProvider;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmDataSourceViewerComparator;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmMetaDataAwareDataSourceContainer;
/**
* @author pplitzner
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler;
+package eu.etaxonomy.taxeditor.local.view.datasource.e4.handler;
import javax.inject.Named;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmMetaDataAwareDataSourceContainer;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.e4.CdmDataSourceViewPartE4;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmMetaDataAwareDataSourceContainer;
+import eu.etaxonomy.taxeditor.local.view.datasource.e4.CdmDataSourceViewPartE4;
/**
*
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler;
+package eu.etaxonomy.taxeditor.local.view.datasource.e4.handler;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.wizard.Wizard;
import eu.etaxonomy.cdm.config.ICdmSource;
import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.taxeditor.webapp.datasource.wizard.CdmDataSourceWizard;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmMetaDataAwareDataSourceContainer;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.e4.CdmDataSourceViewPartE4;
+import eu.etaxonomy.taxeditor.local.datasource.wizard.CdmDataSourceWizard;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmMetaDataAwareDataSourceContainer;
+import eu.etaxonomy.taxeditor.local.view.datasource.e4.CdmDataSourceViewPartE4;
/**
*
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler;
+package eu.etaxonomy.taxeditor.local.view.datasource.e4.handler;
import javax.inject.Named;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.taxeditor.webapp.datasource.wizard.CdmDataSourceWizard;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.e4.CdmDataSourceViewPartE4;
+import eu.etaxonomy.taxeditor.local.datasource.wizard.CdmDataSourceWizard;
+import eu.etaxonomy.taxeditor.local.view.datasource.e4.CdmDataSourceViewPartE4;
/**
*
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler;
+package eu.etaxonomy.taxeditor.local.view.datasource.e4.handler;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
import eu.etaxonomy.cdm.database.CdmPersistentDataSource;
-import eu.etaxonomy.taxeditor.webapp.datasource.common.CdmDataSourceRepository;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmMetaDataAwareDataSourceContainer;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.e4.CdmDataSourceViewPartE4;
+import eu.etaxonomy.taxeditor.local.datasource.common.CdmDataSourceRepository;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmMetaDataAwareDataSourceContainer;
+import eu.etaxonomy.taxeditor.local.view.datasource.e4.CdmDataSourceViewPartE4;
/**
*
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource.e4.handler;
+package eu.etaxonomy.taxeditor.local.view.datasource.e4.handler;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.wizard.Wizard;
import eu.etaxonomy.cdm.config.ICdmSource;
import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.taxeditor.webapp.datasource.wizard.CdmDataSourceWizard;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmMetaDataAwareDataSourceContainer;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.e4.CdmDataSourceViewPartE4;
+import eu.etaxonomy.taxeditor.local.datasource.wizard.CdmDataSourceWizard;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmMetaDataAwareDataSourceContainer;
+import eu.etaxonomy.taxeditor.local.view.datasource.e4.CdmDataSourceViewPartE4;
/**
*
* See LICENSE.TXT at the top of this package for the full license terms.
*/
-package eu.etaxonomy.taxeditor.webapp.view.datasource.handler;
+package eu.etaxonomy.taxeditor.local.view.datasource.handler;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.jface.viewers.IStructuredSelection;
import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName;
-import eu.etaxonomy.taxeditor.webapp.view.datasource.CdmMetaDataAwareDataSourceContainer;
+import eu.etaxonomy.taxeditor.local.view.datasource.CdmMetaDataAwareDataSourceContainer;
/**
* @author n.hoffmann
BGBM BDI Projects / taxeditor.git / commitdiff