update classpath to 1.8
ref #6419 renaming CdmApplicationDefaultConfiguration to CdmRepository
Revert "removing all .classpath and .project files"
This reverts commit c02ad176b4c6452b302560e254f319b7260cd6d8.
removing all .classpath and .project files
ref #6401 Update taxeditor workspace plugins to java 8
remove private source path
Updated version in pom / project files to taxeditor version : 4.6.0-SNAPSHOT and cdmlib version : 4.6.0-SNAPSHOT
Merge branch 'develop' into LibrAlign
Updated version in pom / project files to taxeditor version : 4.5.0-SNAPSHOT and cdmlib version : 4.5.0-SNAPSHOT
Missing files from last commit added.
Revert "update model for cdm cache in TaxEditor" classpath changes
This partly reverts commit cfb2c8db2bd6905fd8b5805915556b87af14984f.
update model for cdm cache in TaxEditor
Add spring oauth2 dependency
Removed p6spy from classpath
Updated version in pom / project files to taxeditor version : 4.4.0-SNAPSHOT and cdmlib version : 4.4.0-SNAPSHOT
minor
remove accidentally comitted source information
Updated version in pom / project files to taxeditor version : 4.3.0-SNAPSHOT and cdmlib version : 4.3.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.2.0-SNAPSHOT and cdmlib version : 4.2.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.1.0-SNAPSHOT and cdmlib version : 4.1.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 4.0.0-SNAPSHOT and cdmlib version : 4.0.0-SNAPSHOT
classpath updates
Remove spring security remoting jar
Add spring-security-remoting jar
Update dependencies
Added missing libraries and adjusted classpath (still unstable)
Updated dependencies for taxeditor (still unstable)
Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT
Update eclipse compile / runtime to JavaSE-1.7
Conflicts: eu.etaxonomy.taxeditor.application/.classpath
Revert "Updated version in pom / project files to taxeditor version : 3.13.0-SNAPSHOT and cdmlib version : 3.13.0-SNAPSHOT"
This reverts commit 9524fa3910c8335a6cbcb656f9aacaca01a3f5ca.
Merge branch 'develop' 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
Fix versions
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties
Correct versions
Updated version in pom / project files to taxeditor version : 3.10.0-SNAPSHOT and cdmlib version : 3.10.0-SNAPSHOT
Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT
Revert "Updated version in pom / project files to taxeditor version : 3.9.0-SNAPSHOT and cdmlib version : 3.9.0-SNAPSHOT"
This reverts commit 7ed2ce1e9eca6a9dd72c740e72efdcd6ef1135c9.
Correct transient service method
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.editor/plugin.xml eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...
change preferences page for taxonnode sort
#5129 Extend export ui for remoting
#4932 Remove autowired members, Use serliaised cdm model map
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...
Updated version in pom / project files to taxeditor version : 3.8.0-SNAPSHOT and cdmlib version : 3.8.0-SNAPSHOT
Merge branch 'release/3.7.0'
Conflicts: eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF...
Updated version in pom / project files to taxeditor version : 3.7.0 and cdmlib version : 3.7.0
Updated version in pom / project files to taxeditor version : 3.7.0-SNAPSHOT and cdmlib version : 3.7.0-SNAPSHOT
Fix merge commit
#5054 Integrate remoting session in Term Editor
This commit also fixes a loading bug in the CdmServiceCacher, adds a test for creating term vocabulary and adapts to the change in the save call (#5056)
Add log4j extras to apply expression filters
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
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
changed output dir to classes
removed test source from classpath
fixed update to snapshot
fixed manifest problems
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