Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 17 Jul 2015 16:07:58 +0000 (18:07 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 17 Jul 2015 16:07:58 +0000 (18:07 +0200)
Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java

16 files changed:
1  2 
eu.etaxonomy.taxeditor.application/.classpath
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor/pom.xml
pom.xml

@@@ -3,6 -3,6 +3,7 @@@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 -      <classpathentry kind="src" path="src/main/resources"/>
 +      <classpathentry kind="src" path="src/test/java"/>
++      <classpathentry kind="src" path="src/main/resources/"/>
        <classpathentry kind="output" path="target/classes"/>
  </classpath>
@@@ -9,7 -9,7 +9,8 @@@ Bundle-Localization: OSGI-INF/l10n/plug
  Export-Package: eu.etaxonomy.taxeditor
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
--Import-Package: org.apache.log4j,
++Import-Package: eu.etaxonomy.cdm.database,
++ org.apache.log4j,
   org.eclipse.equinox.app,
   org.eclipse.equinox.p2.repository.metadata,
   org.osgi.framework,
@@@ -17,33 -22,45 +17,15 @@@ import org.eclipse.jface.viewers.ISelec
  import org.eclipse.jface.viewers.IStructuredSelection;
  import org.eclipse.ui.IEditorInput;
  import org.eclipse.ui.IEditorPart;
 -import org.eclipse.ui.IViewPart;
 -import org.eclipse.ui.IViewReference;
 -import org.eclipse.ui.PlatformUI;
  import org.eclipse.ui.handlers.HandlerUtil;
  import org.eclipse.ui.texteditor.IDocumentProvider;
 -import org.eclipse.ui.IWorkbenchPage;
 -
 -import eu.etaxonomy.cdm.api.service.DeleteResult;
 -import eu.etaxonomy.cdm.api.service.IAgentService;
 -import eu.etaxonomy.cdm.api.service.IGroupService;
 -import eu.etaxonomy.cdm.api.service.INameService;
 -import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 -import eu.etaxonomy.cdm.api.service.IReferenceService;
 -import eu.etaxonomy.cdm.api.service.ITaxonService;
 -import eu.etaxonomy.cdm.api.service.IUserService;
 -import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
 -import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 -import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 -import eu.etaxonomy.cdm.model.common.CdmBase;
 -import eu.etaxonomy.cdm.model.common.Group;
 -import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 -import eu.etaxonomy.cdm.model.common.User;
 -import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 -import eu.etaxonomy.cdm.model.reference.Reference;
 -import eu.etaxonomy.cdm.model.taxon.Synonym;
 -import eu.etaxonomy.cdm.model.taxon.Taxon;
 -import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 -import eu.etaxonomy.cdm.persistence.dao.hibernate.HibernateBeanInitializer;
 -import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 +
- import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
- import eu.etaxonomy.cdm.api.service.DeleteResult;
- import eu.etaxonomy.cdm.api.service.IAgentService;
- import eu.etaxonomy.cdm.api.service.IGroupService;
- import eu.etaxonomy.cdm.api.service.INameService;
- import eu.etaxonomy.cdm.api.service.IOccurrenceService;
- import eu.etaxonomy.cdm.api.service.IReferenceService;
- import eu.etaxonomy.cdm.api.service.ITaxonService;
- import eu.etaxonomy.cdm.api.service.IUserService;
- import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
- import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
- import eu.etaxonomy.cdm.model.common.Group;
- import eu.etaxonomy.cdm.model.common.User;
- import eu.etaxonomy.cdm.model.name.TaxonNameBase;
- import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
- import eu.etaxonomy.cdm.model.reference.Reference;
- import eu.etaxonomy.cdm.model.taxon.Synonym;
- import eu.etaxonomy.cdm.model.taxon.Taxon;
- import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;
  import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
  import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
  import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 -import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView;
+ import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
 -import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 -import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  import eu.etaxonomy.taxeditor.store.CdmStore;
  
  
@@@ -126,18 -152,29 +108,28 @@@ public class DeleteHandler extends Abst
                                                }
                                        } else if (object instanceof TeamOrPersonBase){
                                                IAgentService service = controller.getAgentService();
 -                                              TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());
 -                                              result = service.delete((TeamOrPersonBase)object);
 +                                              //TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());
 +                                              result = service.delete(((TeamOrPersonBase)object).getUuid());
                                        }
                                } catch (Exception e){
-                                       MessagingUtils.messageDialog("Exception occured. Could not delete", getClass(), e.getMessage(), null);
+                                       MessagingUtils.errorDialog("Exception occured. Delete not possible", getClass(), e.getMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID, null, true);
                                }
                                if (result.isError() || result.isAbort()){
                                        if (!result.getExceptions().isEmpty()) {
-                                               MessagingUtils.messageDialog("Could not delete", getClass(), result.getExceptions().toString(), null);
-                                       }else{
-                                               MessagingUtils.messageDialog("Could not delete", getClass(), "The object could not be deleted. An exception occured.", null);
+                                               String message = null;
+                                               int i = result.getExceptions().size();
+                                               for (Exception e:result.getExceptions()){
+                                                       i--;
+                                                       message+= e.getMessage();
+                                                       if (i>0){
+                                                               message+= ", ";
+                                                       }
+                                               }
 -                                              
 -                                              
 +
++
+                                               MessagingUtils.messageDialog("Delete not possible", getClass(), result.getExceptions().toString(), null);
+                                       }else{
+                                               MessagingUtils.messageDialog("Delete not possible", getClass(), "The object could not be deleted. An exception occured.", null);
 -                                              
                                        }
                                }
                                if (result.isOk() ){
        <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.3-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.3-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.3-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.3-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.3-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.3-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.3-SNAPSHOT.jar"/>
 -      <classpathentry kind="output" path="target/classes"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.8.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
 +      <classpathentry kind="output" path="bin"/>
  </classpath>
@@@ -655,13 -612,12 +655,13 @@@ Bundle-ClassPath: .
   lib/xmlbeans-2.3.0.jar,
   lib/poi-ooxml-schemas-3.10-FINAL.jar,
   lib/swagger-annotations-1.3.5.jar,
-  lib/cdmlib-commons-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-io-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-model-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-print-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-services-3.6.3-SNAPSHOT.jar,
+  lib/cdmlib-commons-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-ext-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-io-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-model-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-print-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-remote-3.8.0-SNAPSHOT.jar,
 - lib/cdmlib-services-3.8.0-SNAPSHOT.jar
++ lib/cdmlib-services-3.8.0-SNAPSHOT.jar,
 + lib/apache-log4j-extras-1.2.17.jar
  Import-Package: eu.etaxonomy.cdm.api.application
@@@ -185,15 -194,14 +185,15 @@@ bin.includes = META-INF/,
                 lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                 lib/xmlbeans-2.3.0.jar,\\r
                 lib/swagger-annotations-1.3.5.jar,\\r
-                lib/cdmlib-commons-3.6.3-SNAPSHOT.jar,\\r
-                lib/cdmlib-ext-3.6.3-SNAPSHOT.jar,\\r
-                lib/cdmlib-io-3.6.3-SNAPSHOT.jar,\\r
-                lib/cdmlib-model-3.6.3-SNAPSHOT.jar,\\r
-                lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar,\\r
-                lib/cdmlib-print-3.6.3-SNAPSHOT.jar,\\r
-                lib/cdmlib-remote-3.6.3-SNAPSHOT.jar,\\r
-                lib/cdmlib-services-3.6.3-SNAPSHOT.jar,\\r
+                lib/cdmlib-commons-3.8.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-ext-3.8.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-io-3.8.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-model-3.8.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-print-3.8.0-SNAPSHOT.jar,\\r
+                lib/cdmlib-remote-3.8.0-SNAPSHOT.jar,\\r
 -               lib/cdmlib-services-3.8.0-SNAPSHOT.jar\r
++               lib/cdmlib-services-3.8.0-SNAPSHOT.jar,\\r
 +               lib/apache-log4j-extras-1.2.17.jar\r
  \r
  jars.compile.order = .\r
  output.. = bin/\r
- <?xml version="1.0" encoding="UTF-8"?>\r
- <project>\r
\r
-   <parent>\r
-     <groupId>eu.etaxonomy</groupId>\r
-     <artifactId>taxeditor-parent</artifactId>\r
-     <version>3.6.1-SNAPSHOT</version>\r
-   </parent>\r
-   <modelVersion>4.0.0</modelVersion>\r
-   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
-   <packaging>eclipse-plugin</packaging>\r
-   <name>CDM Library Bundle</name>\r
-   <description>Cdm Library Plugin Taxonomic Editor</description>\r
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <parent>
+     <groupId>eu.etaxonomy</groupId>
+     <artifactId>taxeditor-parent</artifactId>
+     <version>3.8.0-SNAPSHOT</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
+   <packaging>eclipse-plugin</packaging>
+   <name>CDM Library Dependencies Plugin</name>
 -  <description>CDM Library and dependencies as a plugin</description>
 -  <build>
 -    <plugins>      
++  <description>CDM Library and dependencies as a plugin</description>\r
 +\r
 +  <build>\r
 +    <pluginManagement>\r
 +      <plugins>\r
 +        <plugin>\r
 +          <groupId>org.apache.maven.plugins</groupId>\r
 +          <artifactId>maven-surefire-plugin</artifactId>\r
 +          <version>2.7</version>\r
 +        </plugin>\r
 +      </plugins>\r
 +    </pluginManagement>\r
-     <plugins>\r
++    <plugins>
        <plugin>
 -      <groupId>org.apache.maven.plugins</groupId>
 -      <artifactId>maven-dependency-plugin</artifactId>
 -      <version>2.4</version>
 -      <executions>
 -        <execution>
 -          <id>copy-dependencies</id>
 -          <phase>validate</phase>
 -          <goals>
 -            <goal>copy-dependencies</goal>
 -          </goals>
 -          <configuration>
 -            <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
 -            <outputDirectory>lib</outputDirectory>
 -            <overWriteReleases>true</overWriteReleases>
 -            <overWriteSnapshots>true</overWriteSnapshots>
 -            <excludeTransitive>true</excludeTransitive>             
 -          </configuration>
 -        </execution>
 -        <execution>
 -          <id>copy-dependencies-sources</id>
 -          <phase>validate</phase>
 -          <goals>
 -            <goal>copy-dependencies</goal>
 -          </goals>
 -          <configuration>
 -            <classifier>sources</classifier>
 -            <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
 -            <outputDirectory>lib</outputDirectory>
 -            <overWriteReleases>true</overWriteReleases>
 -            <overWriteSnapshots>true</overWriteSnapshots>
 -            <excludeTransitive>true</excludeTransitive>
 -            <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
 -          </configuration>
 -        </execution>
 -      </executions>
 -      </plugin>
 -      <plugin>
 -      <groupId>org.apache.maven.plugins</groupId>
 -      <artifactId>maven-antrun-plugin</artifactId>
 -      <version>1.7</version>
 -      <executions>
 -        <execution>
 -          <id>remove-existing-jars</id>
 -          <phase>clean</phase>
 -          <goals>
 -            <goal>run</goal>
 -          </goals>
 -          <configuration>
 -            <target>
 -              <echo>Remove all cdmlib jars</echo>
 -              <delete>
 -                <fileset dir="./lib" includes="cdmlib-*" />
 -              </delete>
 -            </target> 
 -          </configuration>
 -        </execution>
 -        <execution>
 -          <id>update-snapshot-jar-names</id>
 -          <phase>validate</phase>
 -          <goals>
 -            <goal>run</goal>
 -          </goals>
 -          <configuration>           
 -            <target>
 -              <echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>
 -              <move todir="./lib">
 -                <fileset dir="./lib" />
 -                <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
 -              </move>                           
 -              <move todir="./lib">
 -                <fileset dir="./lib" />
 -                <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />
 -              </move>                           
 -            </target> 
 -          </configuration>
 -        </execution>
 -      </executions>
 -      </plugin>
 -    </plugins>
 -  </build>
 -  <dependencies>
 -    <dependency>
 -      <groupId>identificationKeyAPI</groupId>
 -      <artifactId>identificationKeyAPI</artifactId>
 -      <version>1.0-SNAPSHOT</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-commons</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-model</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-persistence</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-remote</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-print</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-services</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-io</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-ext</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -      <dependency>
 -      <groupId>org.aspectj</groupId>
 -      <artifactId>aspectjrt</artifactId>
 -        <version>1.7.1</version>
 -      </dependency>
 -        <dependency>
 -        <groupId>org.aspectj</groupId>
 -        <artifactId>aspectjweaver</artifactId>
 -        <version>1.7.1</version>
 -       </dependency>
 -       
 -    <!--  for ikey-plus 
 -       TODO this should not be needed but the utils class contained  in this jar 
 -       seems to be loaded as bean by spring
 -    -->
 +        <groupId>org.apache.maven.plugins</groupId>\r
 +        <artifactId>maven-dependency-plugin</artifactId>\r
 +        <version>2.4</version>\r
 +        <executions>\r
 +          <execution>\r
 +            <id>copy-dependencies</id>\r
 +            <phase>validate</phase>\r
 +            <goals>\r
 +              <goal>copy-dependencies</goal>\r
 +            </goals>\r
 +            <configuration>\r
 +              <excludeArtifactIds>\r
 +                cdmlib-remote-webapp\r
 +              </excludeArtifactIds>\r
 +              <includeArtifactIds>\r
 +                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote\r
 +              </includeArtifactIds>\r
 +              <outputDirectory>${basedir}/lib</outputDirectory>\r
 +              <overWriteReleases>true</overWriteReleases>\r
 +              <overWriteSnapshots>true</overWriteSnapshots>\r
 +              <excludeTransitive>true</excludeTransitive>\r
 +            </configuration>\r
 +          </execution>\r
 +          <execution>\r
 +            <id>copy-dependency-war</id>\r
 +            <phase>validate</phase>\r
 +            <goals>\r
 +              <goal>copy-dependencies</goal>\r
 +            </goals>\r
 +            <configuration>\r
 +              <includeArtifactIds>\r
 +                cdmlib-remote-webapp\r
 +              </includeArtifactIds>\r
 +              <outputDirectory>\r
 +                ${basedir}/src/main/resources/etc/jetty\r
 +              </outputDirectory>\r
 +              <overWriteReleases>true</overWriteReleases>\r
 +              <overWriteSnapshots>true</overWriteSnapshots>\r
 +              <excludeTransitive>true</excludeTransitive>\r
 +            </configuration>\r
 +          </execution>\r
 +        </executions>
 +      </plugin>\r
 +      <plugin>\r
 +        <groupId>org.apache.maven.plugins</groupId>\r
 +        <artifactId>maven-antrun-plugin</artifactId>\r
 +        <version>1.7</version>\r
 +        <executions>\r
 +          <execution>\r
 +            <id>update-snapshot-jar-names</id>\r
 +            <phase>validate</phase>\r
 +            <goals>\r
 +              <goal>run</goal>\r
 +            </goals>\r
 +            <configuration>\r
 +              <target>\r
 +                <echo>Anonymizing war</echo>\r
 +                <move todir="./src/main/resources/etc/jetty">\r
 +                  <fileset dir="./src/main/resources/etc/jetty" />\r
 +                  <mapper type="regexp"\r
 +                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)"\r
 +                    to="\1\2" />\r
 +                </move>\r
 +                <move todir="./src/main/resources/etc/jetty">\r
 +                  <fileset dir="./src/main/resources/etc/jetty" />\r
 +                  <mapper type="regexp"\r
 +                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)"\r
 +                    to="\1\2" />\r
 +                </move>\r
 +                <echo>Update cdmlib jars to SNAPSHOT when build with\r
 +                  timestamp\r
 +                </echo>\r
 +                <move todir="./lib">\r
 +                  <fileset dir="./lib" />\r
 +                  <mapper type="regexp"\r
 +                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)"\r
 +                    to="\1SNAPSHOT\2" />\r
 +                </move>\r
 +                <move todir="./lib">\r
 +                  <fileset dir="./lib" />\r
 +                  <mapper type="regexp"\r
 +                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"\r
 +                    to="\1SNAPSHOT\2" />                \r
 +                </move>\r
 +              </target>\r
 +            </configuration>\r
 +          </execution>\r
 +        </executions>\r
 +      </plugin>\r
 +    </plugins>\r
 +  </build>\r
 +  <profiles>\r
 +    <profile>\r
 +      <id>cleanCdmlibJars</id>\r
 +      <build>\r
 +        <plugins>\r
 +          <plugin>\r
 +            <artifactId>maven-clean-plugin</artifactId>\r
 +            <version>2.3</version>\r
 +            <configuration>\r
 +              <filesets>\r
 +                <fileset>\r
 +                  <directory>${basedir}/lib</directory>\r
 +                  <includes>\r
 +                    <include>cdmlib-*</include>\r
 +                  </includes>\r
 +                  <followSymlinks>false</followSymlinks>\r
 +                </fileset>\r
 +              </filesets>\r
 +            </configuration>\r
 +          </plugin>\r
 +        </plugins>\r
 +      </build>\r
 +    </profile>\r
 +    <profile>\r
 +      <id>cleanAllJars</id>\r
 +      <build>\r
 +        <plugins>\r
 +          <plugin>\r
 +            <artifactId>maven-clean-plugin</artifactId>\r
 +            <version>2.3</version>\r
 +            <configuration>\r
 +              <filesets>\r
 +                <fileset>\r
 +                  <directory>${basedir}/lib</directory>\r
 +                  <includes>\r
 +                    <include>*</include>\r
 +                  </includes>\r
 +                  <followSymlinks>false</followSymlinks>\r
 +                </fileset>\r
 +              </filesets>\r
 +            </configuration>\r
 +          </plugin>\r
 +        </plugins>\r
 +      </build>\r
 +    </profile>\r
 +    <profile>\r
 +      <id>copyAllJars</id>\r
 +      <build>\r
 +        <plugins>\r
 +          <plugin>\r
 +            <groupId>org.apache.maven.plugins</groupId>\r
 +            <artifactId>maven-dependency-plugin</artifactId>\r
 +            <version>2.4</version>\r
 +            <executions>\r
 +              <execution>\r
 +                <id>copy-all-dependencies</id>\r
 +                <phase>validate</phase>\r
 +                <goals>\r
 +                  <goal>copy-dependencies</goal>\r
 +                </goals>\r
 +                <configuration>\r
 +                  <excludeArtifactIds>\r
 +                    cdmlib-remote-webapp\r
 +                  </excludeArtifactIds>\r
 +                  <outputDirectory>${basedir}/lib</outputDirectory>\r
 +                  <overWriteReleases>true</overWriteReleases>\r
 +                  <overWriteSnapshots>true</overWriteSnapshots>\r
 +                  <excludeTransitive>true</excludeTransitive>\r
 +                </configuration>\r
 +              </execution>\r
 +            </executions>\r
 +          </plugin>\r
 +        </plugins>\r
 +      </build>\r
 +    </profile>\r
 +  </profiles>\r
 +  <repositories>\r
 +    <repository>\r
 +      <id>SpringSource Enterprise Bundle Repository - External Bundle\r
 +        Milestones\r
 +      </id>\r
 +      <url>http://repository.springsource.com/maven/bundles/milestone\r
 +      </url>\r
 +    </repository>\r
 +    <repository>\r
 +      <id>SpringSource Enterprise Bundle Repository - SpringSource\r
 +        Bundle\r
 +        Releases\r
 +      </id>\r
 +      <url>http://repository.springsource.com/maven/bundles/release\r
 +      </url>\r
 +    </repository>\r
 +    <repository>\r
 +      <id>SpringSource Enterprise Bundle Repository - External Bundle\r
 +        Releases\r
 +      </id>\r
 +      <url>http://repository.springsource.com/maven/bundles/external\r
 +      </url>\r
 +    </repository>\r
 +  </repositories>\r
 +  <dependencies>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-remote-webapp</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +      <type>war</type>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-commons</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-model</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-persistence</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-remote</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-print</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-services</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-io</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>eu.etaxonomy</groupId>\r
 +      <artifactId>cdmlib-ext</artifactId>\r
 +      <version>${cdmlib.version}</version>\r
 +    </dependency>\r
 +\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-server</artifactId> -->\r
 +    <!-- <version>9.1.3.v20140225</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-util</artifactId> -->\r
 +    <!-- <version>9.1.3.v20140225</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-xml</artifactId> -->\r
 +    <!-- <version>9.1.3.v20140225</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-servlet</artifactId> -->\r
 +    <!-- <version>9.1.3.v20140225</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-webapp</artifactId> -->\r
 +    <!-- <version>9.1.3.v20140225</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-security</artifactId> -->\r
 +    <!-- <version>9.1.3.v20140225</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-http</artifactId> -->\r
 +    <!-- <version>${jetty.version}</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->\r
 +    <!-- <artifactId>jetty-io</artifactId> -->\r
 +    <!-- <version>${jetty.version}</version> -->\r
 +    <!-- </dependency> -->\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>javax.servlet</groupId> -->\r
 +    <!-- <artifactId>javax.servlet-api</artifactId> -->\r
 +    <!-- <version>3.1.0</version> -->\r
 +    <!-- </dependency> -->\r
 +\r
 +    <!-- <dependency> -->\r
 +    <!-- <groupId>javax.servlet</groupId> -->\r
 +    <!-- <artifactId>jsp-api</artifactId> -->\r
 +    <!-- <version>2.0</version> -->\r
 +    <!-- </dependency> -->\r
 +\r
 +    <dependency>\r
 +      <groupId>net.sf.ehcache</groupId>\r
 +      <artifactId>ehcache-core</artifactId>\r
 +      <version>2.4.3</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.hibernate</groupId>\r
 +      <artifactId>hibernate-core</artifactId>\r
 +      <version>4.1.10.Final</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.hibernate.common</groupId>\r
 +      <artifactId>hibernate-commons-annotations</artifactId>\r
 +      <version>4.0.1.Final</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.hibernate</groupId>\r
 +      <artifactId>hibernate-search-engine</artifactId>\r
 +      <version>4.2.0.Final</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.hibernate.javax.persistence</groupId>\r
 +      <artifactId>hibernate-jpa-2.0-api</artifactId>\r
 +      <version>1.0.1.Final</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.hibernate</groupId>\r
 +      <artifactId>hibernate-envers</artifactId>\r
 +      <version>4.1.10.Final</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.hibernate</groupId>\r
 +      <artifactId>hibernate-entitymanager</artifactId>\r
 +      <version>4.1.10.Final</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>dom4j</groupId>\r
 +      <artifactId>dom4j</artifactId>\r
 +      <version>1.6</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.jadira.usertype</groupId>\r
 +      <artifactId>usertype.jodatime</artifactId>\r
 +      <version>2.0.1</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.jadira.usertype</groupId>\r
 +      <artifactId>usertype.spi</artifactId>\r
 +      <version>2.0.1</version>\r
 +    </dependency>\r
 +\r
 +    <dependency>\r
 +      <groupId>junit</groupId>\r
 +      <artifactId>junit</artifactId>\r
 +      <version>4.11</version>\r
 +      <scope>test</scope>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>log4j</groupId>\r
 +      <artifactId>log4j</artifactId>\r
 +      <version>1.2.17</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.jdom</groupId>\r
 +      <artifactId>jdom</artifactId>\r
 +      <version>1.1.3</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.context</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.context.support</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.aspects</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.test</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.beans</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.transaction</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.web</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.core</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.aop</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.expression</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.orm</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework</groupId>\r
 +      <artifactId>org.springframework.jdbc</artifactId>\r
 +      <version>3.2.2.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework.security</groupId>\r
 +      <artifactId>spring-security-core</artifactId>\r
 +      <version>3.1.3.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework.security</groupId>\r
 +      <artifactId>spring-security-config</artifactId>\r
 +      <version>3.1.3.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.springframework.security</groupId>\r
 +      <artifactId>spring-security-remoting</artifactId>\r
 +      <version>3.1.3.RELEASE</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.jboss.logging</groupId>\r
 +      <artifactId>jboss-logging</artifactId>\r
 +      <version>3.1.3.GA</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.hamcrest</groupId>\r
 +      <artifactId>hamcrest-core</artifactId>\r
 +      <version>1.3</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>com.mchange</groupId>\r
 +      <artifactId>c3p0</artifactId>\r
 +      <version>0.9.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.jboss.spec.javax.transaction</groupId>\r
 +      <artifactId>jboss-transaction-api_1.1_spec</artifactId>\r
 +      <version>1.0.0.Final</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.aspectj</groupId>\r
 +      <artifactId>aspectjrt</artifactId>\r
 +      <version>1.7.1</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>commons-logging</groupId>\r
 +      <artifactId>commons-logging</artifactId>\r
 +      <version>1.1.1</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>commons-lang</groupId>\r
 +      <artifactId>commons-lang</artifactId>\r
 +      <version>2.6</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>aopalliance</groupId>\r
 +      <artifactId>aopalliance</artifactId>\r
 +      <version>1.0</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>joda-time</groupId>\r
 +      <artifactId>joda-time</artifactId>\r
 +      <version>2.1</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>com.ibm.lsid</groupId>\r
 +      <artifactId>lsid-client</artifactId>\r
 +      <version>1.1.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>com.ibm.lsid</groupId>\r
 +      <artifactId>lsid-server</artifactId>\r
 +      <version>1.1.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.apache.lucene</groupId>\r
 +      <artifactId>lucene-core</artifactId>\r
 +      <version>3.6.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.slf4j</groupId>\r
 +      <artifactId>slf4j-api</artifactId>\r
 +      <version>1.7.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.javassist</groupId>\r
 +      <artifactId>javassist</artifactId>\r
 +      <version>3.17.1-GA</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>au.com.bytecode</groupId>\r
 +      <artifactId>opencsv</artifactId>\r
 +      <version>2.4</version>\r
 +    </dependency>\r
 +\r
 +    <!-- For Unit Tests Start -->\r
 +\r
 +    <dependency>\r
 +      <groupId>org.unitils</groupId>\r
 +      <artifactId>unitils-core</artifactId>\r
 +      <version>3.4.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.unitils</groupId>\r
 +      <artifactId>unitils-spring</artifactId>\r
 +      <version>3.4.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.unitils</groupId>\r
 +      <artifactId>unitils-database</artifactId>\r
 +      <version>3.4.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>commons-dbcp</groupId>\r
 +      <artifactId>commons-dbcp</artifactId>\r
 +      <version>1.4</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>commons-pool</groupId>\r
 +      <artifactId>commons-pool</artifactId>\r
 +      <version>1.5.4</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.unitils</groupId>\r
 +      <artifactId>unitils-dbmaintainer</artifactId>\r
 +      <version>3.4.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>com.h2database</groupId>\r
 +      <artifactId>h2</artifactId>\r
 +      <version>1.4.181</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.unitils</groupId>\r
 +      <artifactId>unitils-dbunit</artifactId>\r
 +      <version>3.4.2</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>org.dbunit</groupId>\r
 +      <artifactId>dbunit</artifactId>\r
 +      <version>2.4.9</version>\r
 +    </dependency>\r
 +    <!-- For Unit Tests End -->\r
 +\r
 +    <!-- For Hibernate Mapping Start -->\r
 +    <dependency>\r
 +      <groupId>wsdl4j</groupId>\r
 +      <artifactId>wsdl4j</artifactId>\r
 +      <version>1.6.3</version>\r
 +    </dependency>\r
 +    <dependency>\r
 +      <groupId>javax.validation</groupId>\r
 +      <artifactId>validation-api</artifactId>\r
 +      <version>1.1.0.Final</version>\r
 +    </dependency>\r
 +    <!-- For Hibernate Mapping End -->\r
    </dependencies>
  </project>
Simple merge
@@@ -31,18 -28,14 +31,6 @@@ import org.eclipse.ui.IViewSite
  import org.eclipse.ui.PartInitException;
  import org.eclipse.ui.navigator.CommonNavigator;
  
- import eu.etaxonomy.cdm.api.application.CdmApplicationState;
- import eu.etaxonomy.cdm.api.application.CdmChangeEvent;
- import eu.etaxonomy.cdm.api.application.ICdmChangeListener;
--import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
--import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
--import eu.etaxonomy.cdm.api.service.IClassificationService;
--import eu.etaxonomy.cdm.model.common.CdmBase;
- import eu.etaxonomy.cdm.model.taxon.Classification;
--import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
--import eu.etaxonomy.cdm.model.taxon.TaxonNode;
- import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator;
 -import eu.etaxonomy.cdm.model.taxon.TaxonNodeByRankAndNameComparator;
--import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
  import eu.etaxonomy.taxeditor.model.DataChangeBridge;
  import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
Simple merge
diff --cc pom.xml
+++ b/pom.xml
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <cdmlib.version>3.6.3-SNAPSHOT</cdmlib.version>
-     <!-- TODO can we use project.version ????? -->
+     <cdmlib.version>3.8.0-SNAPSHOT</cdmlib.version>
      <tycho.version>0.22.0</tycho.version>
-     <taxeditor.version>3.6.1-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
 +    <unitils.version>3.4.2</unitils.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>