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
corrected merge to latest snapshot version updated hibernate config file and test db setup testing framework with jetty and maven
fixed update to snapshot
version updates for 3.6.1
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 version in config files to 3.6.1-SNAPSHOT
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...
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...
.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
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
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
merge from trunk
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
last fix for revision number of classpath
changed classpath to 3.5.0
merge-update from trunk
Updated version in config files to 3.3.8-SNAPSHOT
Updated version in config files to 3.3.7
Updated version in config files to 3.3.7-SNAPSHOT
Updated version in config files to 3.3.6
updating ehcache to 2.6.9
Updated version in config files to 3.3.6-SNAPSHOT
Updated version in config files to 3.3.5
Updated version in config files to 3.3.5-SNAPSHOT
Updated version in config files to 3.3.4
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
Updated version in config files to 3.3.2-SNAPSHOT
Updated version in config files to 3.3.1
updaed build properties to include source / resource files when packaging with maven
erging from remoting-1.0 branch
Updated version in config files to 3.3.1-SNAPSHOT
Updated version in config files to 3.3.0
Updated version in config files to 3.3.0-SNAPSHOT
Updated version in config files to 3.2.4-SNAPSHOT
Updated version in config files to 3.2.3
Updated version in config files to 3.2.3-SNAPSHOT
Updated version in config files to 3.2.2
added h2mig jar to trunk
adding updated manifest and remaining jars
Updated version in config files to 3.2.2-SNAPSHOT
Updated version in config files to 3.2.1
Updated version in config files to 3.2.1-SNAPSHOT
Updated version in config files to 3.2.0
added h2 mig jar to classpath, build, manifest files
merging branch for release
removed unused persistence tests jar from classpath
added all cdmlib dependencies updated classpath files
updated dependent jars in build path for mvn
updating classpath entries for new cdmlib dependency jars
Updated version in config files to 3.2.0-SNAPSHOT
some more TaxEditor dependencies
update TaxEditor dependencies for #3332 (not yet dependencies of dependencies)
Updated version in config files to 3.1.4-SNAPSHOT
Updated version in config files to 3.1.3
changed cdmlib version and jars to 3.1.3-SNAPSHOT
updates for release 3.1.2
Moving trunk from 3.2-SNAPSHOT to 3.1.2-SNAPSHOT to be in sync with the latest cdmlib snapshot
bumping up trunk version to 3.2 SNAPSHOT
merge of security branch with trunk
final commits for move of trunk to 3.0.14-SNAPSHOT
commits for preparing 3.0.13 release
switching to cdmlib 3.0.14-SNAPSHOT
adding missing dependency and switching to cdmlib 3.0.13 RELEASE
update postgresql dependency to version 9.1 in TaxEditor
include new classpath to 3.0.13-SNAPSHOT cdmlib
integrate 3.0.12 branch and adapt for 3.0.12 release
TaxEditor release 3.0.11
add spring xml 156 to build path
add cdmlib 3.0.11-SNAPSHOT to MANIFEST
Change to cdmlib-3.0.10
Bumped tycho to version 0.14
Bumped trunk to version 3.0.10-SNAPSHOT
Preparing 3.0.9 release version