cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
rebase from remoting-4.0 branch
plugin.xml : updated plugin for new remoting handlers RemotingCdmHandler, RemotingCdmOperation, RemotingCdmUpdateOperation : new handler / operation architecture RemotingChangeAcceptedTaxonToSynonymHandler : using new remoting handler design CdmStorePropertyTester : added isRemoting test
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/.gitignore eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...
minor
CdmApplicationState:New class to handle application state CdmStore, BaseRemotingTest : using new application state class TaxonNavigatorTest : ignoring test for now TaxonNavigatorTest : increased max memory for jetty
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: .gitattributes eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...
View revisions
Also available in: Atom