Andreas Müller [Fri, 17 Oct 2014 18:10:04 +0000 (18:10 +0000)]
minor
Andreas Müller [Fri, 17 Oct 2014 18:06:31 +0000 (18:06 +0000)]
remove series from Reference #4293
Andreas Müller [Fri, 17 Oct 2014 17:33:40 +0000 (17:33 +0000)]
add IdentifierType Vocabulary
Andreas Müller [Fri, 17 Oct 2014 16:49:00 +0000 (16:49 +0000)]
fix update script to run with MySQL, add TermType IdentifierType, add List index on identifiers
Andreas Müller [Fri, 17 Oct 2014 14:13:42 +0000 (14:13 +0000)]
adapt tests to 3.4
Andreas Müller [Fri, 17 Oct 2014 12:11:40 +0000 (12:11 +0000)]
merge trunk for pom.xml
Andreas Müller [Fri, 17 Oct 2014 10:41:06 +0000 (10:41 +0000)]
minor
Andreas Müller [Fri, 17 Oct 2014 10:40:34 +0000 (10:40 +0000)]
latest update script update
Andreas Müller [Fri, 17 Oct 2014 10:38:55 +0000 (10:38 +0000)]
make Identifiers a List
Patric Plitzner [Thu, 16 Oct 2014 14:35:23 +0000 (14:35 +0000)]
merge-update from trunk
Patric Plitzner [Thu, 16 Oct 2014 07:15:41 +0000 (07:15 +0000)]
- extended ABCD import test to check for AgentBase
Patric Plitzner [Thu, 16 Oct 2014 07:14:52 +0000 (07:14 +0000)]
- added additional ABCD path to search for gathering agents
Andreas Müller [Wed, 15 Oct 2014 12:22:29 +0000 (12:22 +0000)]
minor
Andreas Müller [Wed, 15 Oct 2014 10:10:25 +0000 (10:10 +0000)]
adapt jena pom to work with parent version numbers
Andreas Müller [Wed, 15 Oct 2014 09:51:25 +0000 (09:51 +0000)]
Andreas Müller [Wed, 15 Oct 2014 09:50:31 +0000 (09:50 +0000)]
minor
Andreas Müller [Wed, 15 Oct 2014 09:34:48 +0000 (09:34 +0000)]
Move jena version number to parent pom
Alexander Oppermann [Wed, 15 Oct 2014 08:03:19 +0000 (08:03 +0000)]
replaced taxontree with classification for the rest api documentation
Katja Luther [Tue, 14 Oct 2014 12:31:17 +0000 (12:31 +0000)]
@Audited has to be added to the sourceType then the sourceType column of the OriginalSource_aud allows null values. (#4396)
Patric Plitzner [Tue, 14 Oct 2014 11:21:54 +0000 (11:21 +0000)]
merge-update from trunk
Katja Luther [Tue, 14 Oct 2014 11:21:18 +0000 (11:21 +0000)]
Katja Luther [Tue, 14 Oct 2014 10:38:24 +0000 (10:38 +0000)]
use an older version of jena because 2.12.0 needs java7
Patric Plitzner [Tue, 14 Oct 2014 07:56:40 +0000 (07:56 +0000)]
merge-update from trunk
Patric Plitzner [Tue, 14 Oct 2014 07:53:52 +0000 (07:53 +0000)]
- re-enabled identifier set in IdentifiableEntity
Patric Plitzner [Tue, 14 Oct 2014 07:40:36 +0000 (07:40 +0000)]
- fixed copy&paste error in Primer.change()
Andreas Müller [Mon, 13 Oct 2014 14:03:07 +0000 (14:03 +0000)]
add serial version number
Patric Plitzner [Mon, 13 Oct 2014 12:50:44 +0000 (12:50 +0000)]
merge-update from trunk
Patric Plitzner [Mon, 13 Oct 2014 11:51:33 +0000 (11:51 +0000)]
merge-update from trunk
Patric Plitzner [Thu, 9 Oct 2014 13:31:50 +0000 (13:31 +0000)]
merge-update from trunk
Patric Plitzner [Thu, 9 Oct 2014 11:44:19 +0000 (11:44 +0000)]
merge-update from trunk
Patric Plitzner [Thu, 9 Oct 2014 11:28:48 +0000 (11:28 +0000)]
merge-update from trunk
Katja Luther [Wed, 8 Oct 2014 10:59:32 +0000 (10:59 +0000)]
Katja Luther [Tue, 7 Oct 2014 11:48:09 +0000 (11:48 +0000)]
Katja Luther [Tue, 7 Oct 2014 11:37:08 +0000 (11:37 +0000)]
Katja Luther [Tue, 7 Oct 2014 11:26:47 +0000 (11:26 +0000)]
the error in 2.12.0 pom of jena is fixed in 2.12.1 (https://issues.apache.org/jira/browse/JENA-790)
Katja Luther [Mon, 6 Oct 2014 11:20:26 +0000 (11:20 +0000)]
Katja Luther [Mon, 6 Oct 2014 11:12:36 +0000 (11:12 +0000)]
Katja Luther [Mon, 6 Oct 2014 11:04:09 +0000 (11:04 +0000)]
Katja Luther [Mon, 6 Oct 2014 10:54:19 +0000 (10:54 +0000)]
Katja Luther [Mon, 6 Oct 2014 10:53:36 +0000 (10:53 +0000)]
Katja Luther [Mon, 6 Oct 2014 10:45:34 +0000 (10:45 +0000)]
Katja Luther [Mon, 6 Oct 2014 10:39:12 +0000 (10:39 +0000)]
move the profiler back to persistence
Katja Luther [Mon, 6 Oct 2014 10:17:44 +0000 (10:17 +0000)]
Katja Luther [Mon, 6 Oct 2014 10:13:08 +0000 (10:13 +0000)]
Katja Luther [Mon, 6 Oct 2014 10:03:02 +0000 (10:03 +0000)]
moving profiler to commons
Katja Luther [Mon, 6 Oct 2014 09:59:33 +0000 (09:59 +0000)]
Katja Luther [Thu, 2 Oct 2014 13:21:42 +0000 (13:21 +0000)]
Katja Luther [Thu, 2 Oct 2014 13:11:03 +0000 (13:11 +0000)]
Katja Luther [Thu, 2 Oct 2014 13:09:34 +0000 (13:09 +0000)]
Katja Luther [Thu, 2 Oct 2014 11:08:01 +0000 (11:08 +0000)]
minor
Katja Luther [Thu, 2 Oct 2014 11:00:16 +0000 (11:00 +0000)]
adapted tcs rdf and xml import, using apache jena for rdf import
tcs import for caryophylales
minor
Alexander Oppermann [Fri, 26 Sep 2014 08:31:35 +0000 (08:31 +0000)]
Added a classification selector view for vaadin client.
Andreas Müller [Mon, 22 Sep 2014 16:28:12 +0000 (16:28 +0000)]
fix Specimen import test
Patric Plitzner [Mon, 22 Sep 2014 07:56:44 +0000 (07:56 +0000)]
- add determination to field unit when importing via SpecimenImportView
- do not add IndividualAssociation between taxon and field unit
Alexander Oppermann [Fri, 19 Sep 2014 09:11:55 +0000 (09:11 +0000)]
Added null checks for comparator
Andreas Müller [Thu, 18 Sep 2014 09:08:19 +0000 (09:08 +0000)]
Ignore new Specimen Test as it fails to run in suite
Andreas Müller [Thu, 18 Sep 2014 08:49:37 +0000 (08:49 +0000)]
remove warn logging form media data
Patric Plitzner [Wed, 17 Sep 2014 16:51:14 +0000 (16:51 +0000)]
merge-update from trunk
Patric Plitzner [Wed, 17 Sep 2014 16:49:12 +0000 (16:49 +0000)]
- fixed multiple creation of subspecies nodes
Cherian Mathew [Wed, 17 Sep 2014 16:13:48 +0000 (16:13 +0000)]
HandlingCdmEntitiesTest.java / HandlingCdmEntitiesTest.xml : Added new test to describe save, update, merge of cdm entities (mimicking remoting)
cdmlib-remote-servlet.xml : added commented option to expose remoting
CdmIntegrationTest.java : added comment on how to disable transactional behaviour in tests
Patric Plitzner [Wed, 17 Sep 2014 12:36:25 +0000 (12:36 +0000)]
merge-update from trunk
Patric Plitzner [Wed, 17 Sep 2014 12:35:50 +0000 (12:35 +0000)]
- fixed the unnecessary creation of multiple references and taxon nodes in ABCD import
- added new ABCD import test
Patric Plitzner [Tue, 16 Sep 2014 13:17:06 +0000 (13:17 +0000)]
-added CleanSweepInsertLoadStrategy to fix failing test
Patric Plitzner [Tue, 16 Sep 2014 11:52:10 +0000 (11:52 +0000)]
- refactored data structure for taxon identifications in ABCD import
- trimming scientific names avoids creation of multiple taxa/taxon nodes
- added check for number of taxon nodes to test
Patric Plitzner [Tue, 16 Sep 2014 06:48:18 +0000 (06:48 +0000)]
- cleaned up code
Patric Plitzner [Tue, 16 Sep 2014 04:16:32 +0000 (04:16 +0000)]
- fixed typo
Katja Luther [Mon, 15 Sep 2014 12:41:29 +0000 (12:41 +0000)]
fix delete taxon nodes with children
Patric Plitzner [Mon, 15 Sep 2014 12:15:11 +0000 (12:15 +0000)]
merge-update from trunk
Patric Plitzner [Mon, 15 Sep 2014 12:14:27 +0000 (12:14 +0000)]
- added resetFields() method to avoid NonUniqueObjectExceptions
Andreas Müller [Thu, 11 Sep 2014 12:29:51 +0000 (12:29 +0000)]
bugfix for null rank in #4374
Andreas Müller [Thu, 11 Sep 2014 12:05:29 +0000 (12:05 +0000)]
update javadoc for OrderedTermBase.compareTo
Andreas Müller [Thu, 11 Sep 2014 12:02:15 +0000 (12:02 +0000)]
minor javadoc
Andreas Müller [Thu, 11 Sep 2014 11:52:56 +0000 (11:52 +0000)]
remove generics
Katja Luther [Thu, 11 Sep 2014 11:21:19 +0000 (11:21 +0000)]
compare classes instead of voc
Andreas Müller [Thu, 11 Sep 2014 10:44:13 +0000 (10:44 +0000)]
add override
Andreas Müller [Thu, 11 Sep 2014 10:20:41 +0000 (10:20 +0000)]
generics
Andreas Müller [Thu, 11 Sep 2014 10:11:23 +0000 (10:11 +0000)]
typos
Katja Luther [Thu, 11 Sep 2014 10:02:00 +0000 (10:02 +0000)]
overwrite the performCompareTo method in PresenceAbsenceTermBase for a comparison of presence and absence terms (presence terms are sorted before absence terms)
Andreas Müller [Wed, 10 Sep 2014 14:22:00 +0000 (14:22 +0000)]
handle null name
Patric Plitzner [Wed, 10 Sep 2014 14:01:24 +0000 (14:01 +0000)]
- fixed case where a DerivedUnit is given as method parameter -> needed also to check for parent FieldUnits
Patric Plitzner [Wed, 10 Sep 2014 13:01:40 +0000 (13:01 +0000)]
- reverted accidentally removed methods due to merge with trunk
Patric Plitzner [Wed, 10 Sep 2014 12:56:31 +0000 (12:56 +0000)]
merge-update from trunk
Patric Plitzner [Wed, 10 Sep 2014 12:52:27 +0000 (12:52 +0000)]
- removed @Cascade for country in GatheringEvent because DefinedTerms should not be cascaded
- added new service method to occurence service to find all CDM entities that are not saved via cascading
- added tests for new method
- added test for concurrent session saving of terms
- made use of method for specimen import via DataImportView
Andreas Müller [Wed, 10 Sep 2014 10:43:51 +0000 (10:43 +0000)]
typos
Andreas Müller [Wed, 10 Sep 2014 10:42:39 +0000 (10:42 +0000)]
typos
Andreas Müller [Wed, 10 Sep 2014 10:41:18 +0000 (10:41 +0000)]
typos
Andreas Müller [Wed, 10 Sep 2014 10:38:38 +0000 (10:38 +0000)]
typos
Andreas Müller [Wed, 10 Sep 2014 10:37:27 +0000 (10:37 +0000)]
typos
Andreas Müller [Wed, 10 Sep 2014 10:35:51 +0000 (10:35 +0000)]
typos
Patric Plitzner [Tue, 9 Sep 2014 13:44:28 +0000 (13:44 +0000)]
- temporarily disabled test
Patric Plitzner [Tue, 9 Sep 2014 12:41:55 +0000 (12:41 +0000)]
- used utility method for modifier
Patric Plitzner [Tue, 9 Sep 2014 11:23:19 +0000 (11:23 +0000)]
merge-update from trunk; added import preference to add media as media specimen
Patric Plitzner [Tue, 9 Sep 2014 11:07:57 +0000 (11:07 +0000)]
- replaced save() with saveOrUpdate()
Patric Plitzner [Tue, 9 Sep 2014 10:03:25 +0000 (10:03 +0000)]
- adpated test to model changes (cascading)
Patric Plitzner [Tue, 9 Sep 2014 10:02:21 +0000 (10:02 +0000)]
- added cascading to setOfReferences in DeterminationEvent
Patric Plitzner [Tue, 9 Sep 2014 07:47:17 +0000 (07:47 +0000)]
- changed from MySql to H2
Patric Plitzner [Tue, 9 Sep 2014 07:02:30 +0000 (07:02 +0000)]
- added test for saving non-cascaded CDM entities
Patric Plitzner [Mon, 8 Sep 2014 13:01:43 +0000 (13:01 +0000)]
- fixed possible NPE
Patric Plitzner [Mon, 8 Sep 2014 12:10:19 +0000 (12:10 +0000)]
- adapted some save method to allow transient services (#3726)
edit-jenkins [Thu, 4 Sep 2014 14:38:44 +0000 (14:38 +0000)]
[maven-release-plugin] prepare for next development iteration