merge from trunk

diff --combined .gitattributes
index cd93b2b7f85196d26a43efbbee4ee9bf96ce024a,71c5387eb332675aaaadad5f6d39c940770363d6..00d216e1fb60cfdbe28e10f92abf50cd86e878de
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -13,6 -13,7 +13,7 @@@ eu.etaxonomy.taxeditor.application/icon
  eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif -text
  eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif -text
  eu.etaxonomy.taxeditor.application/icons/256color_48x48.ico -text
+ eu.etaxonomy.taxeditor.application/icons/check.png -text
  eu.etaxonomy.taxeditor.application/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png -text
  eu.etaxonomy.taxeditor.application/plugin.xml -text
@@@ -31,6 -32,7 +32,7 @@@ eu.etaxonomy.taxeditor.application/src/
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/SaveHandler.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java -text
+ eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Default.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java -text
@@@ -328,76 -330,22 +330,76 @@@ eu.etaxonomy.taxeditor.cdmlib/lib/yjp-c
  eu.etaxonomy.taxeditor.cdmlib/pom.xml -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/RemotingMonitoredGenericApplicationContext.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/RemotingMonitoredListableBeanFactory.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CachedCommonServiceImpl.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmClientCacheException.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmEntityCacheKey.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmModelCacher.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmModelFieldPropertyFromClass.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmRemoteCacheManager.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java -text
 -eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java -text
 -eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/CdmPersistentRemoteSource.java -text
 -eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/CdmRemoteSource.java -text
 -eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/CdmRemoteSourceBase.java -text
 -eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/CdmRemoteSourceException.java -text
 -eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/ICdmRemoteSource.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTransientEntityCacher.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/ICachedCommonService.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/CdmEagerLoadingException.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/CdmRemotingException.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmPersistentRemoteSource.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSource.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceException.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/ICdmRemoteSource.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmClientSessionException.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManager.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionManager.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ISessionEventListener.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySessionManager.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/cdmlib-ehcache.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/.svnignore -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/jetty-runner-9.2.3.v20140905.jar -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/start-9.2.3.v20140905.jar -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/config.properties -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/httpInvokerServiceClients.xml -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/localApplicationContext.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/mappings/hibernate.cfg.xml -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_persistence_security.xml -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remoting_services_security.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/log4j.properties -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/cdm/api/cache/CdmModelGetMethodCacherTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/cdm/polytomouskey/PolytomousKeyTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/exception/CDMServerException.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CDMServer.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmPersistentRemoteSourceTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmRemoteSourceTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTestManager.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/HttpInvokerServicesTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmServiceCacherTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemotePersistentCollectionTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionManagerTest.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/session/MockSessionOwner.java -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/cdmlib-ehcache.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/datasources.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.xml -text
  eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/polytomouskey/PolytomousKeyTest.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/testRemotingApplicationContext.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySessionManagerTest.xml -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/h2/cdmTest.h2.db -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/h2/cdmTest.trace.db -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/log4j.properties -text
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/unitils.properties -text
  eu.etaxonomy.taxeditor.editor/.classpath -text
  eu.etaxonomy.taxeditor.editor/.project -text
  eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF -text
@@@ -407,6 -355,7 +409,7 @@@ eu.etaxonomy.taxeditor.editor/OSGI-INF/
  eu.etaxonomy.taxeditor.editor/build.properties -text
  eu.etaxonomy.taxeditor.editor/icons/address-book-new.png -text
  eu.etaxonomy.taxeditor.editor/icons/camera-photo.png -text
+ eu.etaxonomy.taxeditor.editor/icons/check.png -text
  eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text
  eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
@@@ -969,6 -918,7 +972,7 @@@ eu.etaxonomy.taxeditor.navigation/OSGI-
  eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/messages_de.properties -text
  eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/messages_en.properties -text
  eu.etaxonomy.taxeditor.navigation/build.properties -text
+ eu.etaxonomy.taxeditor.navigation/icons/check.png -text
  eu.etaxonomy.taxeditor.navigation/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.navigation/icons/preferences-system-windows.png -text
  eu.etaxonomy.taxeditor.navigation/icons/system-search.png -text
@@@ -1823,6 -1773,7 +1827,6 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/org/eclipse/wb/swt/ResourceManager.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/org/eclipse/wb/swt/SWTResourceManager.java -text
 -eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml -text
  eu.etaxonomy.taxeditor.store/src/main/resources/log4j.properties -text
  eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java -text
  eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTestBase.java -text

diff --combined eu.etaxonomy.taxeditor.cdmlib/.classpath
index 4a0612e2f815dd8857735e7e12325e3fb3040314,e2ce3e2f35b640b8802f33f80c2209f4ca15a792..936f69db52783a7288113763a930f3ad1678223c
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -60,7 -60,7 +60,7 @@@
        <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar" sourcepath="/home/cmathew/.m2/repository/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
@@@ -204,7 -204,7 +204,7 @@@
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar" />
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>

diff --combined eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index cb24e554dd00a409df9a6e79616ff9bebd5a221b,06b551fc609f9c792426b81a3db3512d95561626..b0f6b689650a697afc204ae5cea0730977d0ff87
--- 1/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -8,9 -8,9 +8,9 @@@ Export-Package: com.google.api
   com.google.api.detect,
   com.google.api.translate,
   eu.etaxonomy.cdm.api.application,
 + eu.etaxonomy.cdm.api.cache,
   eu.etaxonomy.cdm.api.conversation,
   eu.etaxonomy.cdm.api.facade,
 - eu.etaxonomy.cdm.api.lazyloading,
   eu.etaxonomy.cdm.api.service,
   eu.etaxonomy.cdm.api.service.config,
   eu.etaxonomy.cdm.api.service.description,
@@@ -129,6 -129,7 +129,6 @@@
   eu.etaxonomy.cdm.print.out.pdf,
   eu.etaxonomy.cdm.print.out.taxpub,
   eu.etaxonomy.cdm.print.out.xml,
 - eu.etaxonomy.cdm.remote,
   eu.etaxonomy.cdm.remote.config,
   eu.etaxonomy.cdm.remote.controller,
   eu.etaxonomy.cdm.remote.controller.dto,
@@@ -180,15 -181,8 +180,15 @@@
   eu.etaxonomy.cdm.validation.annotation,
   eu.etaxonomy.cdm.validation.constraint,
   eu.etaxonomy.remote.dto.rdf,
 + eu.etaxonomy.taxeditor.remoting.source,
 + eu.etaxonomy.taxeditor.session,
 + eu.etaxonomy.taxeditor.session.mock,
 + javassist.util.proxy,
   javax.persistence,
   junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runner.notification",
 + net.sf.ehcache,
 + net.sf.ehcache.config,
 + net.sf.ehcache.store,
   net.sf.json;uses:="net.sf.json.processors,net.sf.json.util,org.apache.commons.lang.exception",
   org.apache.commons.collections;uses:="org.apache.commons.collections.keyvalue,new org.apache.commons.collections",
   org.apache.commons.io;uses:="org.apache.commons.io.filefilter",
@@@ -261,28 -255,13 +261,28 @@@
   org.hibernate,
   org.hibernate.annotations.common.reflection,
   org.hibernate.cache.internal,
 + org.hibernate.cfg,
   org.hibernate.classic,
   org.hibernate.collection.internal,
 + org.hibernate.collection.spi,
   org.hibernate.criterion,
 + org.hibernate.engine.internal,
 + org.hibernate.engine.spi,
 + org.hibernate.engine.transaction.spi,
   org.hibernate.envers.query.criteria,
 + org.hibernate.internal,
 + org.hibernate.internal.util,
 + org.hibernate.internal.util.collections,
 + org.hibernate.mapping,
 + org.hibernate.persister.collection,
 + org.hibernate.persister.entity,
 + org.hibernate.pretty,
 + org.hibernate.property,
   org.hibernate.proxy,
 + org.hibernate.proxy.pojo.javassist,
   org.hibernate.search,
   org.hibernate.search.spatial.impl,
 + org.hibernate.type,
   org.jadira.usertype.dateandtime.joda,
   org.jadira.usertype.dateandtime.shared.spi,
   org.jboss.logging,
@@@ -321,7 -300,6 +321,7 @@@
   org.odftoolkit.odfdom.dom.element,
   org.odftoolkit.odfdom.dom.element.style,
   org.odftoolkit.odfdom.dom.style,
 + org.springframework.beans,
   org.springframework.beans.factory,
   org.springframework.beans.factory.annotation;
    uses:="org.apache.commons.logging,
@@@ -332,9 -310,6 +332,9 @@@
     org.springframework.beans.factory.wiring,
     org.springframework.core.type,
     org.springframework.beans.factory",
 + org.springframework.beans.factory.config,
 + org.springframework.beans.factory.support,
 + org.springframework.beans.factory.xml,
   org.springframework.cache.ehcache,
   org.springframework.context;
    uses:="org.springframework.core.io,
@@@ -347,11 -322,8 +347,11 @@@
     org.aopalliance.intercept,
     org.springframework.context,
     org.springframework.beans.factory",
 + org.springframework.context.support,
   org.springframework.core;uses:="org.springframework.util",
 + org.springframework.core.env,
   org.springframework.core.io;uses:="org.jboss.virtual",
 + org.springframework.core.io.support,
   org.springframework.core.type.classreading,
   org.springframework.orm.hibernate3;
    uses:="org.apache.commons.logging,
@@@ -379,9 -351,6 +379,9 @@@
     org.springframework.dao,
     org.springframework.transaction.support",
   org.springframework.orm.hibernate4,
 + org.springframework.remoting,
 + org.springframework.remoting.httpinvoker,
 + org.springframework.remoting.support,
   org.springframework.security.access,
   org.springframework.security.authentication,
   org.springframework.security.authentication.event,
@@@ -421,7 -390,6 +421,7 @@@
     org.springframework.transaction,
     org.apache.commons.logging,
     org.springframework.beans.factory",
 + org.springframework.util,
   org.springframework.web.servlet;
    uses:="org.springframework.web.multipart,
     org.apache.commons.logging,
@@@ -434,13 -402,7 +434,13 @@@
     org.springframework.context.event,
     javax.servlet,
     org.springframework.ui,
 -   javax.servlet.http"
 +   javax.servlet.http",
 + org.unitils,
 + org.unitils.database,
 + org.unitils.database.annotations,
 + org.unitils.database.util,
 + org.unitils.dbunit.annotation,
 + org.unitils.spring.annotation
  Bundle-Vendor: EDIT
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Require-Bundle: org.eclipse.osgi,
@@@ -635,19 -597,20 +635,19 @@@ 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 --combined eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 1ae6037def851009e038437ab8d53fc1c096db19,f6b224dfcdd64a69149303684001fb1937b22f60..89a898b8a21c71bf80fc27c307a845d471f772d2
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@@ -25,9 -25,6 +25,9 @@@ import org.springframework.security.cor
  import org.springframework.security.core.context.SecurityContext;
  import org.springframework.security.core.context.SecurityContextHolder;
  
 +
 +import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
 +import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
  import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
  import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
  import eu.etaxonomy.cdm.api.service.IService;
@@@ -39,15 -36,13 +39,15 @@@ import eu.etaxonomy.cdm.model.common.La
  import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
  import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;
  import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
 -import eu.etaxonomy.cdm.remote.CdmRemoteSourceException;
  import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
  import eu.etaxonomy.taxeditor.io.ExportManager;
  import eu.etaxonomy.taxeditor.io.ImportManager;
  import eu.etaxonomy.taxeditor.model.AbstractUtility;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 +
 +import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 +import eu.etaxonomy.taxeditor.session.mock.MockCdmEntitySessionManager;
  import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
  
@@@ -91,8 -86,6 +91,8 @@@ public class CdmStore 
        private ICdmSource cdmSource;
  
        private boolean isConnected;
 +      
 +
  
        /**
         * <p>
@@@ -106,12 -99,7 +106,7 @@@
                        return instance;
                } else{// if (instance == null || !instance.isConnected) {
  
-                       MessagingUtils
-                                       .warningDialog(
-                                                       "Application is not connected to a datastore",
-                                                       instance,
-                                                       "The requested operation is only available when "
-                                                       + "connected to a datasource. You may choose a datasource to connect to or create a new one in the datasource view.");
+                       MessagingUtils.noDataSourceWarningDialog(instance);
  
                        AbstractUtility.showView(CdmDataSourceViewPart.ID);
                        return null;
@@@ -127,7 -115,7 +122,7 @@@
                try {
                        cdmSource = CdmDataSourceRepository.getCurrentCdmSource();
                        connect(cdmSource);
 -              } catch (CdmRemoteSourceException e) {
 +              } catch (Exception e) {
                        MessagingUtils.messageDialog("Connection to CDM Source Failed", CdmStore.class, "Could not connect to target CDM Source", e);
                }
  
@@@ -254,37 -242,13 +249,37 @@@
        public static ConversationHolder createConversation() {
                ConversationHolder conversation = getCurrentApplicationConfiguration()
                                .NewConversation();
 -              try{
 +              try {
                        conversation.startTransaction();
                }catch(Exception e){
                        MessagingUtils.messageDialog("No database connection", CdmStore.class, "No database connection available", e);
                }
                return conversation;
        }
 +      
 +      //FIXME:Remoting should be removed after moving completely to remoting
 +      private MockCdmEntitySessionManager mockCdmEntitySessionManager;
 +      
 +      private ICdmEntitySessionManager getSessionManager() {
 +              //FIXME:Remoting we should only have CdmApplicationRemoteConfiguration after move to remoting
 +              //               bad hack which should be finally removed
 +              if(getCurrentApplicationConfiguration() instanceof CdmApplicationRemoteController) {
 +                      return ((CdmApplicationRemoteController)getCurrentApplicationConfiguration()).getCdmEntitySessionManager();
 +              } else {
 +                      if(mockCdmEntitySessionManager == null) {
 +                              mockCdmEntitySessionManager = new MockCdmEntitySessionManager();
 +                      }
 +                      return mockCdmEntitySessionManager;                     
 +              }
 +      }
 +      
 +      public static  ICdmEntitySessionManager getCurrentSessionManager() {
 +              if (getDefault() != null) {
 +                      return getDefault().getSessionManager();
 +              }
 +              return null;
 +
 +      }
  
        /**
         * Generic method that will scan the getters of {@link ICdmApplicationConfiguration} for the given service