Merge branch 'remoting-4.0' into develop
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 22 Sep 2015 16:44:14 +0000 (18:44 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 22 Sep 2015 16:44:14 +0000 (18:44 +0200)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java

1  2 
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionToOtherTaxonHandler.java
eu.etaxonomy.taxeditor.navigation/plugin.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveFactualDataHandler.java

- <?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.12.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>      
-       <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\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)" to="\1SNAPSHOT\2" />
-               </move>                           
-               <move todir="./lib">
-                 <fileset dir="./lib" />
-                 <mapper type="regexp" from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-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
-     -->
-   </dependencies>
- </project>
+ <?xml version="1.0" encoding="UTF-8"?>\r
+ <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">\r
+   <parent>\r
+     <groupId>eu.etaxonomy</groupId>\r
+     <artifactId>taxeditor-parent</artifactId>\r
+     <version>3.12.0-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 Dependencies Plugin</name>\r
+   <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
+       <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-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>\r
+       </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\-remote\-webapp).*(\.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\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)"\r
+                     to="\1SNAPSHOT\2" />\r
+                 </move>\r
+                 <move todir="./lib">\r
+                   <fileset dir="./lib" />\r
+                   <mapper type="regexp"\r
+                     from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-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
\r
+   </dependencies>\r
+ </project>\r
++
@@@ -88,8 -89,8 +89,9 @@@ public class ChangeSynonymToAcceptedTax
  
                List<UUID> excludeTaxa = null;
  
 -              TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select parent", excludeTaxa, null, null);
 +              TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), "Select parent", excludeTaxa, null, ((TaxonEditorInput) input).getTaxonNode().getClassification());
 +
                if(newParentNode != null){
  
                        // TODO get synonyms from homotypical group and add them as homotypic synonyms to new accepted taxon
                        Set<TaxonNameBase> namesInGroup = group.getTypifiedNames();
                        // FIXME with this implementation we can not create a taxonNode that is a direct child of the classification node
                        AbstractPostOperation operation = new ChangeSynonymToAcceptedTaxonOperation("Change synonym to accepted taxon", EditorUtil.getUndoContext(),
-                                       taxon, newParentNode, synonym, namesInGroup, this, editor); //$NON-NLS-1$
+                                       taxon, newParentNode, synonym, namesInGroup, this, editor, (ICdmEntitySessionEnabled)editor.getEditorInput()); //$NON-NLS-1$
++
                        EditorUtil.executeOperation(operation);
                }