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
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...
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...
fixed classpath issues and issues from last merge
removed test source from classpath
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 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
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...
removed test dir as source dir
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
Updated version in config files to 3.5.1-SNAPSHOT
Updated version in config files to 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
merge from trunk
merge validation editor branch to trunk
updated manifest for deleted test dir removed unnecessary commit root entity methods in session and session manager
Fix for ticket #4519
CdmDataSourceRepository : added a new method to create default h2 data source eu.etaxonomy.taxeditor.cdmlib : updated build paths to output test classes in test-classes dir and moved resources package to avoid conflict ApplicationWorkbenchWindowAdvisor : added call to the new method (above) to create a default H2 db
too many fixes on classpath for today
fixed classpath
moving all source files from the remoting project to the cdmlib project
made bug fixes for:
changed classpath to 3.5.0
removed version dependency for org.eclipse.nebula.widgets.compositetable and added the composite table jar to the p2 update
merge-update from trunk
adapted cdmlib dependencies
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.
added sourcepath to all cdm libs
Updated version in config files to 3.3.6-SNAPSHOT
Updated version in config files to 3.3.5
.classpath : added test resources in classpath CdmPersistentRemoteSourceTest : added new tests for remote source connection CdmRemoteSourceBase : added code to connect to the target database (before initialising the full application context) to retrieve metadata...
changed package name to be consistent with cdmlib remotingApplicationContext.xml : cleaning up component scan
erging from remoting-1.0 branch
merge-update fixes
updating to latest eclipse rcp indigo jars
adapting to latest model changes for change of package
reintegrated model changes from branch 3.3-MC-SNAPSHOT
merged/implemented cdm3.3 model adaptations
reintegrated campanula branch: removed enum DetailType and all its uses
added merge-info to sub folder my merging with sub folder from trunk