Andreas Müller [Wed, 14 Oct 2015 14:21:52 +0000 (16:21 +0200)]
cleanup
Cherian Mathew [Wed, 14 Oct 2015 08:48:50 +0000 (10:48 +0200)]
#5268 Add convert methods which take uuid as input
Katja Luther [Tue, 13 Oct 2015 10:44:31 +0000 (12:44 +0200)]
fixing getUUIDAndTitleCache for Classification and excluding taxa
Andreas Müller [Mon, 12 Oct 2015 13:11:31 +0000 (15:11 +0200)]
Fully remove old vocabulary.byClass methods #3843
Katja Luther [Mon, 12 Oct 2015 11:16:51 +0000 (13:16 +0200)]
accept the change from a number to null in TimePeriod fields #5319
Andreas Müller [Mon, 12 Oct 2015 10:08:36 +0000 (12:08 +0200)]
Remove listEmpty method from TermVocabularyDao #3843
Andreas Müller [Mon, 12 Oct 2015 09:55:41 +0000 (11:55 +0200)]
Add vocabulary list method by term types #3843
Katja Luther [Mon, 12 Oct 2015 07:15:23 +0000 (09:15 +0200)]
minor
U-BGBM\k.luther [Tue, 6 Oct 2015 07:48:38 +0000 (09:48 +0200)]
minor
U-BGBM\k.luther [Mon, 5 Oct 2015 07:44:34 +0000 (09:44 +0200)]
move description fix
U-BGBM\k.luther [Mon, 28 Sep 2015 08:33:13 +0000 (10:33 +0200)]
move descriptions and elements
Andreas Müller [Fri, 9 Oct 2015 12:38:52 +0000 (14:38 +0200)]
Merge branch 'ticket-5066' into develop
Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
Andreas Müller [Fri, 9 Oct 2015 12:15:35 +0000 (14:15 +0200)]
minor clean ups
Andreas Müller [Fri, 9 Oct 2015 08:30:17 +0000 (10:30 +0200)]
Cleanup SecurityTest
Andreas Müller [Fri, 9 Oct 2015 08:08:41 +0000 (10:08 +0200)]
Adapt listeners and tests to new pre-insert strategy #5066
Cherian Mathew [Thu, 8 Oct 2015 15:02:33 +0000 (17:02 +0200)]
Add cascade merge to members field
Cherian Mathew [Thu, 8 Oct 2015 13:10:45 +0000 (15:10 +0200)]
#5309, #5310 Switch on write transaction annotation for delete, Add load methof for updating session cache
Cherian Mathew [Thu, 8 Oct 2015 12:17:25 +0000 (14:17 +0200)]
Fix recursive merge call
Cherian Mathew [Thu, 8 Oct 2015 10:47:22 +0000 (12:47 +0200)]
Add new merge method for root entitites which returns the newly created MergeResult object
Patrick Plitzner [Wed, 7 Oct 2015 15:26:09 +0000 (17:26 +0200)]
Add new service method for retrieving all associated taxa for a specimen
Andreas Müller [Wed, 7 Oct 2015 11:39:59 +0000 (13:39 +0200)]
Merge branch 'develop' into ticket-5066
Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
Andreas Kohlbecker [Tue, 6 Oct 2015 12:25:03 +0000 (14:25 +0200)]
typos in documentation
Cherian Mathew [Tue, 6 Oct 2015 11:26:23 +0000 (13:26 +0200)]
Add commented code for copying properties
Cherian Mathew [Fri, 2 Oct 2015 14:49:01 +0000 (16:49 +0200)]
Set transient id for root merge object
Patrick Plitzner [Fri, 2 Oct 2015 13:18:44 +0000 (15:18 +0200)]
Extend media gathering for taxon specimens
Cherian Mathew [Fri, 2 Oct 2015 09:10:18 +0000 (11:10 +0200)]
Add merge method to return updated transient object for lists
Cherian Mathew [Thu, 1 Oct 2015 15:23:25 +0000 (17:23 +0200)]
#5281 Make SingleReadAlignment.Shift serializable
Cherian Mathew [Thu, 1 Oct 2015 13:11:14 +0000 (15:11 +0200)]
#5299 Add new entity listener and event firing
Cherian Mathew [Thu, 1 Oct 2015 12:48:19 +0000 (14:48 +0200)]
#5256 Add test for description reference problem
Andreas Kohlbecker [Mon, 28 Sep 2015 15:34:25 +0000 (17:34 +0200)]
Updating develop poms back to pre merge state
Andreas Kohlbecker [Mon, 28 Sep 2015 15:34:23 +0000 (17:34 +0200)]
Merge branch 'master' into develop
Andreas Kohlbecker [Mon, 28 Sep 2015 15:34:22 +0000 (17:34 +0200)]
Updating develop poms to hotfix version to avoid merge conflicts
Andreas Kohlbecker [Mon, 28 Sep 2015 15:34:16 +0000 (17:34 +0200)]
Merge branch 'hotfix/3.11.1'
Andreas Kohlbecker [Mon, 28 Sep 2015 14:28:44 +0000 (16:28 +0200)]
updating poms for branch'hotfix/3.11.1' with non-snapshot versions
Andreas Kohlbecker [Mon, 28 Sep 2015 13:26:55 +0000 (15:26 +0200)]
resolving conficts in project versions after hotfixrelease
Andreas Kohlbecker [Mon, 28 Sep 2015 13:23:18 +0000 (15:23 +0200)]
Merge branch 'hotfix/3.11.1'
Andreas Kohlbecker [Mon, 28 Sep 2015 11:46:48 +0000 (13:46 +0200)]
#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods
jenkins [Mon, 28 Sep 2015 12:15:22 +0000 (14:15 +0200)]
updating poms for 3.11.1 branch with snapshot versions
Andreas Kohlbecker [Mon, 28 Sep 2015 12:14:34 +0000 (14:14 +0200)]
Revert "#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods" since this commit needs to be in a hotfix release.
This reverts commit
2693f7105470815383cdf485355e7fc5ad81ed68.
Andreas Kohlbecker [Mon, 28 Sep 2015 11:46:48 +0000 (13:46 +0200)]
#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods
Cherian Mathew [Thu, 24 Sep 2015 09:01:25 +0000 (11:01 +0200)]
Add a new merge method in the service base class which allows the option to return the transient object
k.luther [Wed, 23 Sep 2015 09:12:30 +0000 (11:12 +0200)]
minor
k.luther [Wed, 23 Sep 2015 09:01:31 +0000 (11:01 +0200)]
minor
k.luther [Wed, 23 Sep 2015 08:57:49 +0000 (10:57 +0200)]
adapt CacheUpdater to changes in ImportConfiguratorBase
minor changes in TcsXmlNameImport
k.luther [Wed, 23 Sep 2015 08:53:22 +0000 (10:53 +0200)]
minor
k.luther [Wed, 23 Sep 2015 08:50:35 +0000 (10:50 +0200)]
minor
k.luther [Wed, 23 Sep 2015 09:17:15 +0000 (11:17 +0200)]
fixing merge conflict
Andreas M��ller [Fri, 18 Sep 2015 14:16:00 +0000 (14:16 +0000)]
minor
Andreas M��ller [Fri, 18 Sep 2015 14:11:21 +0000 (14:11 +0000)]
minor
Andreas M��ller [Fri, 18 Sep 2015 13:56:52 +0000 (13:56 +0000)]
minor
jenkins [Wed, 16 Sep 2015 17:41:46 +0000 (19:41 +0200)]
Updating develop poms back to pre merge state
jenkins [Wed, 16 Sep 2015 17:41:45 +0000 (19:41 +0200)]
Merge branch 'master' into develop
jenkins [Wed, 16 Sep 2015 17:41:44 +0000 (19:41 +0200)]
updating develop poms to master versions to avoid merge conflicts
jenkins [Wed, 16 Sep 2015 17:41:40 +0000 (19:41 +0200)]
Merge branch 'release/3.11.0'
jenkins [Wed, 16 Sep 2015 17:26:52 +0000 (19:26 +0200)]
updating poms for branch'release/3.11.0' with non-snapshot versions
jenkins [Wed, 16 Sep 2015 16:24:10 +0000 (18:24 +0200)]
updating poms for 3.12.0-SNAPSHOT development
Cherian Mathew [Wed, 16 Sep 2015 12:58:24 +0000 (14:58 +0200)]
#5259 Add method to init defaul terms
jenkins [Tue, 15 Sep 2015 17:03:57 +0000 (19:03 +0200)]
Updating develop poms back to pre merge state
jenkins [Tue, 15 Sep 2015 17:03:56 +0000 (19:03 +0200)]
Merge branch 'master' into develop
jenkins [Tue, 15 Sep 2015 17:03:56 +0000 (19:03 +0200)]
updating develop poms to master versions to avoid merge conflicts
jenkins [Tue, 15 Sep 2015 17:03:53 +0000 (19:03 +0200)]
Merge branch 'release/3.10.0'
jenkins [Tue, 15 Sep 2015 16:31:16 +0000 (18:31 +0200)]
updating poms for branch'release/3.10.0' with non-snapshot versions
jenkins [Tue, 15 Sep 2015 16:16:14 +0000 (18:16 +0200)]
updating poms for 3.11.0-SNAPSHOT development
Andreas M��ller [Tue, 15 Sep 2015 15:27:29 +0000 (15:27 +0000)]
remove ignore from IPNI test
Andreas M��ller [Tue, 15 Sep 2015 15:25:13 +0000 (15:25 +0000)]
Ignore Ipni test preliminary
Cherian Mathew [Tue, 15 Sep 2015 14:09:13 +0000 (16:09 +0200)]
#5249 Correct if statements
jenkins [Mon, 14 Sep 2015 16:29:49 +0000 (18:29 +0200)]
Updating develop poms back to pre merge state
jenkins [Mon, 14 Sep 2015 16:29:48 +0000 (18:29 +0200)]
Merge branch 'master' into develop
jenkins [Mon, 14 Sep 2015 16:29:48 +0000 (18:29 +0200)]
updating develop poms to master versions to avoid merge conflicts
jenkins [Mon, 14 Sep 2015 16:29:45 +0000 (18:29 +0200)]
Merge branch 'release/3.9.0'
jenkins [Mon, 14 Sep 2015 16:08:49 +0000 (18:08 +0200)]
updating poms for branch'release/3.9.0' with non-snapshot versions
jenkins [Mon, 14 Sep 2015 15:57:56 +0000 (17:57 +0200)]
updating poms for 3.10.0-SNAPSHOT development
Andreas Müller [Mon, 14 Sep 2015 11:23:57 +0000 (13:23 +0200)]
Preliminary ignore IPNI test
Cherian Mathew [Fri, 11 Sep 2015 15:35:14 +0000 (17:35 +0200)]
#5223 Copy utility method from service to derived unit
Andreas Müller [Fri, 11 Sep 2015 15:10:02 +0000 (17:10 +0200)]
Deprecate getCharacterData method in service layer
Andreas Müller [Fri, 11 Sep 2015 15:07:47 +0000 (17:07 +0200)]
Implement hasCharacterData and isCharacterData.
And fix characterData semantics.
Andreas Müller [Fri, 11 Sep 2015 14:34:11 +0000 (16:34 +0200)]
move specimen.getCharacterData to model
Cherian Mathew [Thu, 10 Sep 2015 16:39:11 +0000 (18:39 +0200)]
Add taxon to updated objects when taxon is not to be deleted
jenkins [Thu, 10 Sep 2015 15:55:53 +0000 (17:55 +0200)]
Updating develop poms back to pre merge state
jenkins [Thu, 10 Sep 2015 15:55:52 +0000 (17:55 +0200)]
Merge branch 'master' into develop
jenkins [Thu, 10 Sep 2015 15:55:51 +0000 (17:55 +0200)]
updating develop poms to master versions to avoid merge conflicts
jenkins [Thu, 10 Sep 2015 15:55:45 +0000 (17:55 +0200)]
Merge branch 'release/3.8.0'
jenkins [Thu, 10 Sep 2015 15:37:40 +0000 (17:37 +0200)]
updating poms for branch'release/3.8.0' with non-snapshot versions
jenkins [Thu, 10 Sep 2015 14:52:49 +0000 (16:52 +0200)]
updating poms for 3.9.0-SNAPSHOT development
Andreas Müller [Thu, 10 Sep 2015 14:47:49 +0000 (16:47 +0200)]
minor
Andreas Kohlbecker [Thu, 10 Sep 2015 14:15:54 +0000 (16:15 +0200)]
Revert "updating poms for 3.9.0-SNAPSHOT development"
This reverts commit
1a052a9893afe93249cf81603f410a4e454c305a.
jenkins [Thu, 10 Sep 2015 13:51:01 +0000 (15:51 +0200)]
updating poms for 3.9.0-SNAPSHOT development
U-BGBM\k.luther [Thu, 10 Sep 2015 10:35:48 +0000 (12:35 +0200)]
fixing move Accepted taxon to synonym
Andreas Müller [Thu, 10 Sep 2015 12:52:51 +0000 (14:52 +0200)]
clean up taxon cache strategy
Andreas Müller [Thu, 10 Sep 2015 12:52:28 +0000 (14:52 +0200)]
Document new initListener method (#5161)
Cherian Mathew [Thu, 10 Sep 2015 12:02:39 +0000 (14:02 +0200)]
#5234 Add required updated taxon nodes
Andreas Müller [Thu, 10 Sep 2015 10:58:13 +0000 (12:58 +0200)]
Simplify getNameTags in Taxon cache strategy (#5229)
Andreas Müller [Thu, 10 Sep 2015 10:26:50 +0000 (12:26 +0200)]
Create new tag type for secundum reference (#5229)
Andreas Müller [Thu, 10 Sep 2015 09:40:31 +0000 (11:40 +0200)]
Allow retrieving objects via ICommonService and UUID (#5160)
Andreas Kohlbecker [Thu, 10 Sep 2015 09:40:15 +0000 (11:40 +0200)]
#3991 hiding the delegeate boolean properties in TaggedText by making them protected
Andreas Kohlbecker [Thu, 10 Sep 2015 09:24:49 +0000 (11:24 +0200)]
#5229 avoiding LIE by autoinitializing the taggedTitle for TaxonBase
Andreas Kohlbecker [Thu, 10 Sep 2015 08:47:17 +0000 (10:47 +0200)]
#5229 implementing output of TaxonBase.getTaggedTitle in web services
- turning the TaxonBeanProcessor into TaxonBaseBeanProcessor
- adding taggedTitle to the taxon instances returned by the portal service
Andreas Kohlbecker [Mon, 7 Sep 2015 12:09:04 +0000 (14:09 +0200)]
bug fixes regarding performacne measuring
Andreas Kohlbecker [Fri, 4 Sep 2015 06:35:29 +0000 (08:35 +0200)]
more detailed measuring time of accumulation in TransmissionEngineDistribution for performance testing
Andreas Kohlbecker [Fri, 4 Sep 2015 06:22:03 +0000 (08:22 +0200)]
measuring time of accumulation in TransmissionEngineDistribution for performance testing