From: Alexander Oppermann Date: Tue, 25 Nov 2014 12:56:30 +0000 (+0000) Subject: changed classpath to 3.5.0 X-Git-Tag: 3.6.0~308^2~6 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/fd6cdafb3cd03df01d06b7d4c7d0f2cf3a8b6ccb changed classpath to 3.5.0 --- diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 9bbc0cb9b..14558d073 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -195,21 +195,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 1885ddd71..06b551fc6 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -597,20 +597,20 @@ Bundle-ClassPath: ., lib/spring-security-remoting-3.1.3.RELEASE.jar, lib/jena-core-2.11.2.jar, lib/jena-iri-1.0.2.jar, - lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-commons-3.4.0-SNAPSHOT.jar, - lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-ext-3.4.0-SNAPSHOT.jar, - lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-io-3.4.0-SNAPSHOT.jar, - lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-model-3.4.0-SNAPSHOT.jar, - lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar, - lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-print-3.4.0-SNAPSHOT.jar, - lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-remote-3.4.0-SNAPSHOT.jar, - lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar, - lib/cdmlib-services-3.4.0-SNAPSHOT.jar + lib/cdmlib-commons-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-commons-3.5.0-SNAPSHOT.jar, + lib/cdmlib-ext-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-ext-3.5.0-SNAPSHOT.jar, + lib/cdmlib-io-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-io-3.5.0-SNAPSHOT.jar, + lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-model-3.5.0-SNAPSHOT.jar, + lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar, + lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-print-3.5.0-SNAPSHOT.jar, + lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-remote-3.5.0-SNAPSHOT.jar, + lib/cdmlib-services-3.5.0-SNAPSHOT-sources.jar, + lib/cdmlib-services-3.5.0-SNAPSHOT.jar Import-Package: eu.etaxonomy.cdm.api.application diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index 4278186a3..babad4f1f 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -187,25 +187,25 @@ bin.includes = META-INF/,\ lib/odfdom-0.8.jar,\ lib/h2mig_pagestore_addon.jar,\ lib/spring-security-remoting-3.1.3.RELEASE.jar,\ - lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-io-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-model-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-print-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,\ - lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-services-3.4.0-SNAPSHOT.jar,\ lib/spring-security-remoting-3.1.3.RELEASE.jar,\ lib/jena-core-2.11.2.jar,\ - lib/jena-iri-1.0.2.jar + lib/jena-iri-1.0.2.jar,\ + lib/cdmlib-commons-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-commons-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-ext-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-ext-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-io-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-io-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-model-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-print-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-remote-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-services-3.5.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-services-3.5.0-SNAPSHOT.jar jars.compile.order = . output.. = bin/ source.. = src/main/java/,\ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java index 9521b5345..efcd9d570 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java @@ -79,10 +79,12 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler { } }); status = Status.OK_STATUS; + }else{ + throw new RuntimeException("An error occurred during the update."); } }catch(Exception e){ status = new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, e.getMessage(), e); - MessagingUtils.messageDialog("Could not run updater", getClass(), status.getMessage()); + MessagingUtils.errorDialog("Could not complete updater", updater, status.getMessage(), status.getPlugin(), e, true); } }