From: Cherian Mathew Date: Tue, 22 Sep 2015 16:44:14 +0000 (+0200) Subject: Merge branch 'remoting-4.0' into develop X-Git-Tag: 3.12.0^2~135^2~1 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/28f75e331b82490d677298d62fd494c295a6cd69 Merge branch 'remoting-4.0' into develop 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 --- 28f75e331b82490d677298d62fd494c295a6cd69 diff --cc eu.etaxonomy.taxeditor.cdmlib/pom.xml index 0154836ae,f23532844..7e24daa53 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@@ -1,158 -1,592 +1,593 @@@ - - - - eu.etaxonomy - taxeditor-parent - 3.12.0-SNAPSHOT - - 4.0.0 - eu.etaxonomy.taxeditor.cdmlib - eclipse-plugin - CDM Library Dependencies Plugin - CDM Library and dependencies as a plugin - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - copy-dependencies - validate - - copy-dependencies - - - cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io - lib - true - true - true - - - - copy-dependencies-sources - validate - - copy-dependencies - - - sources - cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io - lib - true - true - true - false - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - remove-existing-jars - clean - - run - - - - Remove all cdmlib jars - - - - - - - - update-snapshot-jar-names - validate - - run - - - - Update cdmlib jars to SNAPSHOT when build with timestamp - - - - - - - - - - - - - - - - - - identificationKeyAPI - identificationKeyAPI - 1.0-SNAPSHOT - - - eu.etaxonomy - cdmlib-commons - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-model - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-persistence - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-remote - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-print - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-services - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-io - ${cdmlib.version} - - - eu.etaxonomy - cdmlib-ext - ${cdmlib.version} - - - org.aspectj - aspectjrt - 1.7.1 - - - org.aspectj - aspectjweaver - 1.7.1 - - - - - + + + + eu.etaxonomy + taxeditor-parent + 3.12.0-SNAPSHOT + + 4.0.0 + eu.etaxonomy.taxeditor.cdmlib + eclipse-plugin + CDM Library Dependencies Plugin + CDM Library and dependencies as a plugin + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + copy-dependencies + validate + + copy-dependencies + + + + cdmlib-remote-webapp + + + cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote + + ${basedir}/lib + true + true + true + + + + copy-dependency-war + validate + + copy-dependencies + + + + cdmlib-remote-webapp + + + ${basedir}/src/main/resources/etc/jetty + + true + true + true + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + update-snapshot-jar-names + validate + + run + + + + Anonymizing war + + + + + Update cdmlib jars to SNAPSHOT when build with + timestamp + + + + + + + + + + + + + + + + + + + cleanCdmlibJars + + + + maven-clean-plugin + 2.3 + + + + ${basedir}/lib + + cdmlib-* + + false + + + + + + + + + cleanAllJars + + + + maven-clean-plugin + 2.3 + + + + ${basedir}/lib + + * + + false + + + + + + + + + copyAllJars + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + copy-all-dependencies + validate + + copy-dependencies + + + + cdmlib-remote-webapp + + ${basedir}/lib + true + true + true + + + + + + + + + + + SpringSource Enterprise Bundle Repository - External Bundle + Milestones + + http://repository.springsource.com/maven/bundles/milestone + + + + SpringSource Enterprise Bundle Repository - SpringSource + Bundle + Releases + + http://repository.springsource.com/maven/bundles/release + + + + SpringSource Enterprise Bundle Repository - External Bundle + Releases + + http://repository.springsource.com/maven/bundles/external + + + + + + eu.etaxonomy + cdmlib-remote-webapp + ${cdmlib.version} + war + + + eu.etaxonomy + cdmlib-commons + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-model + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-persistence + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-remote + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-print + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-services + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-io + ${cdmlib.version} + + + eu.etaxonomy + cdmlib-ext + ${cdmlib.version} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + net.sf.ehcache + ehcache-core + 2.4.3 + + + org.hibernate + hibernate-core + 4.1.10.Final + + + org.hibernate.common + hibernate-commons-annotations + 4.0.1.Final + + + org.hibernate + hibernate-search-engine + 4.2.0.Final + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.1.Final + + + org.hibernate + hibernate-envers + 4.1.10.Final + + + org.hibernate + hibernate-entitymanager + 4.1.10.Final + + + dom4j + dom4j + 1.6 + + + org.jadira.usertype + usertype.jodatime + 2.0.1 + + + org.jadira.usertype + usertype.spi + 2.0.1 + + + + junit + junit + 4.11 + test + + + log4j + log4j + 1.2.17 + + + org.jdom + jdom + 1.1.3 + + + org.springframework + org.springframework.context + 3.2.2.RELEASE + + + org.springframework + org.springframework.context.support + 3.2.2.RELEASE + + + org.springframework + org.springframework.aspects + 3.2.2.RELEASE + + + org.springframework + org.springframework.test + 3.2.2.RELEASE + + + org.springframework + org.springframework.beans + 3.2.2.RELEASE + + + org.springframework + org.springframework.transaction + 3.2.2.RELEASE + + + org.springframework + org.springframework.web + 3.2.2.RELEASE + + + org.springframework + org.springframework.core + 3.2.2.RELEASE + + + org.springframework + org.springframework.aop + 3.2.2.RELEASE + + + org.springframework + org.springframework.expression + 3.2.2.RELEASE + + + org.springframework + org.springframework.orm + 3.2.2.RELEASE + + + org.springframework + org.springframework.jdbc + 3.2.2.RELEASE + + + org.springframework.security + spring-security-core + 3.1.3.RELEASE + + + org.springframework.security + spring-security-config + 3.1.3.RELEASE + + + org.springframework.security + spring-security-remoting + 3.1.3.RELEASE + + + org.jboss.logging + jboss-logging + 3.1.3.GA + + + org.hamcrest + hamcrest-core + 1.3 + + + com.mchange + c3p0 + 0.9.2 + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.1_spec + 1.0.0.Final + + + org.aspectj + aspectjrt + 1.7.1 + + + commons-logging + commons-logging + 1.1.1 + + + commons-lang + commons-lang + 2.6 + + + aopalliance + aopalliance + 1.0 + + + joda-time + joda-time + 2.1 + + + com.ibm.lsid + lsid-client + 1.1.2 + + + com.ibm.lsid + lsid-server + 1.1.2 + + + org.apache.lucene + lucene-core + 3.6.2 + + + org.slf4j + slf4j-api + 1.7.2 + + + org.javassist + javassist + 3.17.1-GA + + + au.com.bytecode + opencsv + 2.4 + + + + + + org.unitils + unitils-core + 3.4.2 + + + org.unitils + unitils-spring + 3.4.2 + + + org.unitils + unitils-database + 3.4.2 + + + commons-dbcp + commons-dbcp + 1.4 + + + commons-pool + commons-pool + 1.5.4 + + + org.unitils + unitils-dbmaintainer + 3.4.2 + + + com.h2database + h2 + 1.4.181 + + + org.unitils + unitils-dbunit + 3.4.2 + + + org.dbunit + dbunit + 2.4.9 + + + + + + wsdl4j + wsdl4j + 1.6.3 + + + javax.validation + validation-api + 1.1.0.Final + + + + + ++ diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java index b25601b21,98475aec1..d0eca25f8 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java @@@ -88,8 -89,8 +89,9 @@@ public class ChangeSynonymToAcceptedTax List 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 @@@ -98,7 -99,7 +100,8 @@@ Set 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); }