EDIT

Add log4j extras to apply expression filters

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/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

Update cdmlib version to 3.6.3-SNAPSHOT

eu.etaxonomy.taxeditor.cdmlib/.classpath,MANIFEST.MF : removed cdm-server jar from classpath
OperationTestBase, TaxonNameEditorTest, : refactoring
MockConversationEnabled : class to mock interface IConversationEnabled
TaxonNavigatorTest (.xml) : added test + data...

corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven

fixed classpath issues and issues from last merge

fixed update to snapshot

version updates for 3.6.1

fixing classpath config

fixing classpath config

Release 3.6.0 merge

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...

updated to snapshot version

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

Updated version in config files to 3.6.1-SNAPSHOT

Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

Updated version in config files to 3.6.0

eu.etaxonomy.taxeditor.cdmlib/.classpath, eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF, eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF : moved test jars to test project
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF : added packages required by test project to exported package list...

MANIFEST.MF : added apache commons exception package for use in messaging utils
MessagingUtils : updated to add all causes in the child statuses

Merge branch 'move-to-luna' into remoting-4.0

Conflicts:
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.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...

dependency changes to move to e4

.classpath, MANIFEST.MF, build.properties, pom.xml : added cdm-server jar to lib dir and project classpath
/lib : added ignore for cdm-server jar
CacheLoader : reverted update of cached entity field
cdmlib-remote-webapp.war : updated to latest version

Updated version in config files to 3.5.2-SNAPSHOT

Updated version in config files to 3.5.1

• exported missing package

Updated version in config files to 3.5.1-SNAPSHOT

Updated version in config files to 3.5.0

3.4.1->3.5.0 in MANIFEST

update Manifest from 3.4.1 -> 3.5.0

wrong target revision in the last commit

reverting back wrongly committed files

Updated version in config files to 3.4.1-SNAPSHOT

Updated version in config files to 3.4.0

CdmRemoteCacheManager : added cache getter methods
CdmTransientEntityCacher, CdmEntitySession, CdmEntitySessionManager, ICdmEntitySession, ICdmEntitySessionManager, ICdmEntitySessionManagerObserver, MockCdmEntitySession, MockCdmEntitySessionManager , eu.etaxonomy.taxeditor.cdmlib/src/main/resources/cdmlib-ehcache.xml : added statistics config , getter method for live stats and observer to update when sessions are bound and disposed...

merge from trunk

merge from trunk

MANIFEST.MF : New apache http client packages added
CdmServerInfo : changed name and added inner class for cdm instance
httpInvokerServiceClients : added new services
remotingApplicationContext : refactor for cache package

• added swagger annotations jar to taxeditor.cdmlib

CdmServerInstanceInfo, RemotingLoginDialog, ShowRemotingLoginWindowHandler : functionality for remoting login
moved classes to appropriate locations.
merged from trunk.

merge from trunk

merge validation editor branch to trunk

Updated version in config files to 3.4.1-SNAPSHOT

Updated version in config files to 3.4.0

upgrade poi to 3.10-FINAL and add ooxml functionality

updated manifest for deleted test dir
removed unnecessary commit root entity methods in session and session manager

merge from trunk

last fix for revision number of classpath

merge from trunk

moving all source files from the remoting project to the cdmlib project

moving code to remoting project

changed classpath to 3.5.0

• exported eu.etaxonomy.cdm.io.csv.redlist.demo package to fix compile errors

merge-update from trunk

adapted cdmlib dependencies

increased version number

Updated version in config files to 3.3.8-SNAPSHOT

Updated version in config files to 3.3.7

reintegrated redlist branch into trunk

Updated version in config files to 3.3.7-SNAPSHOT

Updated version in config files to 3.3.6

remotingApplicationContext : added CdmCacher as bean to be initialised
META-INF/MANIFEST.MF, .classpath, lib/ehcache-core-2.4.3.jar, lib/ehcache-core-2.6.9.jar: replaced ehcache-core-2.4.3 with ehcache-core-2.6.9 for the CdmCacher.
It seems that even though hibernate-ehcache-4.1.10.Final is embedded with ehcache-core-2.4.3, it is compatible with ehcache-core-2.6.9 according to http://architects.dzone.com/articles/hibernate-4-and-ehcache-higher.

Updated version in config files to 3.3.6-SNAPSHOT

Updated version in config files to 3.3.5

• exported missing package

• refactored BioCaseQuery to more generic OccurrenceQuery
  • for import wizard
  • for DataImportEditor
  • exported new cdmlib package structure for gbif and biocase querying in taxeditor.cdmlib

Updated version in config files to 3.3.5-SNAPSHOT

Updated version in config files to 3.3.4

• reverted unwanted merge of branch code

• only allow dragging in DerivateView when view is not dirty
  • added missing methods to transient services
  • exposed dto package in cdmlib project
  • some renaming

Updated version in config files to 3.3.4-SNAPSHOT

Updated version in config files to 3.3.3

Updated version in config files to 3.3.3-SNAPSHOT

Updated version in config files to 3.3.2

added new remote package

• fix cdmlib version number in .classpath (why does maven not generate this anymore?)
  • added "molecular" package to exported packages
  • organize imports for new molecular services

Updated version in config files to 3.3.2-SNAPSHOT

Updated version in config files to 3.3.1

adding missing manifest file

removing unavailable extension eu.etaxonomy.cdm.remote.controller.csv

RolesSourceProvider to enable activities by cdm roles and protecting bulkeditors and term editors - #4055 (action enablement adapts to the users granted authorities)

updaed build properties to include source / resource files when packaging with maven

removing aspetcj capability and reverting to default

changed package name to be consistent with cdmlib
remotingApplicationContext.xml : cleaning up component scan

erging from remoting-1.0 branch

• adding new confugration / controller classes for remoting
• adding aspect and related aop.xml config file
• added aspect and spring remoting jars
• updated manifest , pom and classpath for the new dependencies

Updated version in config files to 3.3.1-SNAPSHOT

merge-update from trunk

Updated version in config files to 3.3.0

• removed incorrect cdmlib dependencies

merge-update from trunk

• removed unused berlin model imports

merge-update from trunk

• fixed org.hamcrest dependency error which occurs when doing a fresh set up of the editor workspace

• DataImportSpecimenEditorInput now call cdmlib-ext to query BioCASE provider and calls cmlib-io to use ABCD-import for converting ABCD into SpecimenOrObservationBase objects
  • implemented TransientCdmRepository an TransientOccurenceService for that

merge-update from trunk

adapting to latest model changes for change of package

Updated version in config files to 3.3.0-SNAPSHOT

merge-update from trunk