Andreas Kohlbecker [Tue, 11 Dec 2012 12:24:44 +0000 (12:24 +0000)]
service for #3234 (implement cdm service method to collect SpecimensAndObservations via taxon)
l.morris [Mon, 10 Dec 2012 12:38:22 +0000 (12:38 +0000)]
Merged sdd-branch to trunk.
Andreas Kohlbecker [Thu, 6 Dec 2012 12:39:27 +0000 (12:39 +0000)]
fixing #3176 (NPE in EditGeoService.registerDerivedUnitLocations())
l.morris [Wed, 5 Dec 2012 16:32:01 +0000 (16:32 +0000)]
removed not needed export file SDDImportExportTest.sdd.xml. Other minor changes
l.morris [Wed, 5 Dec 2012 13:45:23 +0000 (13:45 +0000)]
added another SDD test file.
Andreas Kohlbecker [Wed, 5 Dec 2012 13:39:32 +0000 (13:39 +0000)]
restoring r16675 (reintegrating ^/branches/cdmlib/campanula with pom.xml modifications for maven 3 and fix for ticket #3148 termBase titleCache problems)
Andreas Kohlbecker [Wed, 5 Dec 2012 13:22:07 +0000 (13:22 +0000)]
surefire plugin: update to 2.12 and fixed runOrder = alphabetical
Andreas Kohlbecker [Tue, 4 Dec 2012 15:07:49 +0000 (15:07 +0000)]
fixing spelling
l.morris [Mon, 3 Dec 2012 13:52:31 +0000 (13:52 +0000)]
minor
edit-jenkins [Mon, 3 Dec 2012 13:35:41 +0000 (13:35 +0000)]
[maven-release-plugin] prepare for next development iteration
edit-jenkins [Mon, 3 Dec 2012 13:35:38 +0000 (13:35 +0000)]
[maven-release-plugin] prepare release cdmlib-parent-3.1.2
Andreas Kohlbecker [Mon, 3 Dec 2012 13:15:31 +0000 (13:15 +0000)]
reverting r16675 (reintegrating ^/branches/cdmlib/campanula with pom.xml modifications for maven 3 and fix for ticket #3148 termBase titleCache problems)
Andreas Kohlbecker [Mon, 3 Dec 2012 13:04:01 +0000 (13:04 +0000)]
reverting changes from r16676 r16677 (maven 3 related)
l.morris [Mon, 3 Dec 2012 12:36:18 +0000 (12:36 +0000)]
Cleaned up debug statements.
l.morris [Mon, 3 Dec 2012 12:21:13 +0000 (12:21 +0000)]
Added logging to debug media objects.
l.morris [Mon, 3 Dec 2012 12:12:47 +0000 (12:12 +0000)]
Added @ignore as currently don't want to run SDD import and export during the build.
Andreas Kohlbecker [Mon, 3 Dec 2012 12:05:34 +0000 (12:05 +0000)]
next try to resolve test dependencies
Andreas Kohlbecker [Mon, 3 Dec 2012 11:22:31 +0000 (11:22 +0000)]
using CleanSweepInsertLoadStrategy to resolve test dependencies
Andreas Kohlbecker [Mon, 3 Dec 2012 08:09:08 +0000 (08:09 +0000)]
reintegrating ^/branches/cdmlib/campanula with pom.xml modifications for maven 3 and fix for ticket #3148 termBase titleCache problems
s.buers [Fri, 30 Nov 2012 17:59:07 +0000 (17:59 +0000)]
s.buers [Fri, 30 Nov 2012 17:40:53 +0000 (17:40 +0000)]
tests are not ready yet
s.buers [Fri, 30 Nov 2012 17:27:13 +0000 (17:27 +0000)]
just added the files of my statistics1 branche manually because reintegration failed
s.buers [Fri, 30 Nov 2012 17:07:54 +0000 (17:07 +0000)]
i put a distinct in the hibernate query of the getAllNomenclaturalReferences(). because the return list held doubles.
s.buers [Fri, 30 Nov 2012 16:59:55 +0000 (16:59 +0000)]
just added the files of my statistics1 branche manually because reintegration failed
Patric Plitzner [Fri, 30 Nov 2012 10:47:02 +0000 (10:47 +0000)]
merged changes from trunk for later reintegration
Cherian Mathew [Thu, 29 Nov 2012 16:25:28 +0000 (16:25 +0000)]
added datasetid and datasetname to the taxon information response
Patric Plitzner [Thu, 29 Nov 2012 12:38:15 +0000 (12:38 +0000)]
ticket #3148:
- changed and renamed resetTitleCache method to actually generate and set the titleCache
Patric Plitzner [Thu, 29 Nov 2012 12:36:23 +0000 (12:36 +0000)]
ticket #3178:
- merged changes from trunk (null check for representation.language)
Patric Plitzner [Thu, 29 Nov 2012 12:19:00 +0000 (12:19 +0000)]
Added UTF-8 encoding to parent pom
Patric Plitzner [Thu, 29 Nov 2012 12:13:33 +0000 (12:13 +0000)]
ticket #3178:
- merged changes from trunk (null check for representation.language)
Patric Plitzner [Wed, 28 Nov 2012 15:11:33 +0000 (15:11 +0000)]
ticket #3178:
- merged changes from trunk (revision 16633)
Patric Plitzner [Wed, 28 Nov 2012 15:10:41 +0000 (15:10 +0000)]
ticket #3178:
- added test case for title cache update
Patric Plitzner [Wed, 28 Nov 2012 15:10:02 +0000 (15:10 +0000)]
ticket #3178:
- merged changes from trunk (revision 16633)
Patric Plitzner [Wed, 28 Nov 2012 12:23:16 +0000 (12:23 +0000)]
ticket #3178:
- added null check
Patric Plitzner [Wed, 28 Nov 2012 10:37:58 +0000 (10:37 +0000)]
ticket #3178:
- made resetTitleCache() protected
- moved invocation of resetTitleCache() to from setLabel() to addRepresentation() method
Cherian Mathew [Wed, 28 Nov 2012 09:42:13 +0000 (09:42 +0000)]
checking for null state (happens when initializing new state for new categorical data) to avoid NPE (ticket 3184)
Cherian Mathew [Wed, 28 Nov 2012 09:18:40 +0000 (09:18 +0000)]
Added source dataset and taxonomic scrutiny elements to dto and updated calls in the controller to handle new elements
Andreas Kohlbecker [Tue, 27 Nov 2012 16:11:53 +0000 (16:11 +0000)]
fixing #2830 (NPE in /description/{uuid}/DistributionTree) - missing bit
Andreas Kohlbecker [Tue, 27 Nov 2012 16:09:44 +0000 (16:09 +0000)]
fixing #2830 (NPE in /description/{uuid}/DistributionTree)
Andreas Kohlbecker [Tue, 27 Nov 2012 16:09:42 +0000 (16:09 +0000)]
attempt to fix #2830 (NPE in /description/{uuid}/DistributionTree)
Andreas Kohlbecker [Tue, 27 Nov 2012 14:19:49 +0000 (14:19 +0000)]
fixing #2866: NPE in DerivedUnitFacadeController.doGetDerivedUnitMedia
Andreas Kohlbecker [Tue, 27 Nov 2012 14:19:47 +0000 (14:19 +0000)]
organizing imports
Alexander Oppermann [Fri, 23 Nov 2012 15:37:37 +0000 (15:37 +0000)]
BugFix? for Ticket #3178. Now the TitleCache? will be updated everytime if the label is changed too.
Andreas Kohlbecker [Fri, 23 Nov 2012 13:04:20 +0000 (13:04 +0000)]
refactoring
l.morris [Fri, 23 Nov 2012 12:12:38 +0000 (12:12 +0000)]
Created an ICdemDataSource for a MySQLInstance to run the test in MySQL instead of H2.
l.morris [Thu, 22 Nov 2012 13:10:35 +0000 (13:10 +0000)]
Added more SDD files for testing.
l.morris [Thu, 22 Nov 2012 12:57:12 +0000 (12:57 +0000)]
Created SDDImportExportTest to test SDD import and export of a simple SDD file. Fixed associated bugs causing IOExceptions in SDCdmExporter.
l.morris [Thu, 22 Nov 2012 10:37:32 +0000 (10:37 +0000)]
Creating branch for SDD export
Cherian Mathew [Wed, 21 Nov 2012 14:25:11 +0000 (14:25 +0000)]
corrected bug with name of from taxon in the 'to taxon' relationship in the taxon service
edit-jenkins [Wed, 21 Nov 2012 10:37:37 +0000 (10:37 +0000)]
[maven-release-plugin] prepare for next development iteration
edit-jenkins [Wed, 21 Nov 2012 10:37:35 +0000 (10:37 +0000)]
[maven-release-plugin] prepare release cdmlib-parent-3.1.1
Alexander Oppermann [Wed, 21 Nov 2012 09:23:52 +0000 (09:23 +0000)]
reintegrating redlist branch into trunk with minor fixes for the csv exporter. These are a dynamical file name and a div tag hide if no options are available
Alexander Oppermann [Wed, 21 Nov 2012 08:33:11 +0000 (08:33 +0000)]
merge from trunk into branch
Alexander Oppermann [Wed, 21 Nov 2012 08:02:57 +0000 (08:02 +0000)]
Alexander Oppermann [Tue, 20 Nov 2012 17:34:21 +0000 (17:34 +0000)]
*Fixed the static file name -> takes the filename from the selected classification
*Fixed the div container for download options -> if no featureTree is selected no download options will be displayed
Alexander Oppermann [Tue, 20 Nov 2012 14:03:55 +0000 (14:03 +0000)]
Reintegration of the red list branch into trunk
Alexander Oppermann [Tue, 20 Nov 2012 13:46:35 +0000 (13:46 +0000)]
Final commit
l.morris [Tue, 20 Nov 2012 13:23:31 +0000 (13:23 +0000)]
Fixes #3203
Alexander Oppermann [Tue, 20 Nov 2012 13:01:58 +0000 (13:01 +0000)]
replaced hard coded .json path by GET Variables for classification.json and featureTree.json
Alexander Oppermann [Tue, 20 Nov 2012 09:54:17 +0000 (09:54 +0000)]
Alexander Oppermann [Tue, 20 Nov 2012 09:54:01 +0000 (09:54 +0000)]
renaming print method
Alexander Oppermann [Mon, 19 Nov 2012 15:07:54 +0000 (15:07 +0000)]
Alexander Oppermann [Mon, 19 Nov 2012 15:07:46 +0000 (15:07 +0000)]
Alexander Oppermann [Mon, 19 Nov 2012 15:07:37 +0000 (15:07 +0000)]
*renaming files
*replace Rl specific features through generalized features
Alexander Oppermann [Mon, 19 Nov 2012 15:06:43 +0000 (15:06 +0000)]
Alexander Oppermann [Mon, 19 Nov 2012 15:06:28 +0000 (15:06 +0000)]
Alexander Oppermann [Mon, 19 Nov 2012 15:06:07 +0000 (15:06 +0000)]
Alexander Oppermann [Mon, 19 Nov 2012 15:05:41 +0000 (15:05 +0000)]
*Renaming and code cleaning
*Removing Redlist specific things and replace it with a more generalized technique
Alexander Oppermann [Mon, 19 Nov 2012 15:03:24 +0000 (15:03 +0000)]
*renaming to csv
*code cleaning
Alexander Oppermann [Mon, 19 Nov 2012 14:53:31 +0000 (14:53 +0000)]
Patric Plitzner [Mon, 19 Nov 2012 14:14:02 +0000 (14:14 +0000)]
Patric Plitzner [Mon, 19 Nov 2012 14:00:32 +0000 (14:00 +0000)]
fixed encoding to UTF-8
Andreas Müller [Fri, 16 Nov 2012 12:14:53 +0000 (12:14 +0000)]
add NullSafeFloat
Alexander Oppermann [Fri, 16 Nov 2012 10:18:17 +0000 (10:18 +0000)]
renaming
Alexander Oppermann [Fri, 16 Nov 2012 10:16:58 +0000 (10:16 +0000)]
organizing into subfolder
Alexander Oppermann [Fri, 16 Nov 2012 10:12:39 +0000 (10:12 +0000)]
renamed file
Alexander Oppermann [Fri, 16 Nov 2012 10:07:13 +0000 (10:07 +0000)]
*Added simple form validation
Andreas Müller [Fri, 16 Nov 2012 09:32:10 +0000 (09:32 +0000)]
remove imports
Cherian Mathew [Thu, 15 Nov 2012 15:35:06 +0000 (15:35 +0000)]
- updated tests to reflect new node numbering
- removed print out in PolytomousKeyNode.java
Cherian Mathew [Thu, 15 Nov 2012 14:53:16 +0000 (14:53 +0000)]
updated and corrected the node numbering by,
- updating node numbers when adding children
- providing a node number refresh possibility to be used as is as well as when removing nodes
Alexander Oppermann [Wed, 14 Nov 2012 16:37:20 +0000 (16:37 +0000)]
* code cleaning
* external css and js files
Andreas Müller [Wed, 14 Nov 2012 13:18:16 +0000 (13:18 +0000)]
change constructor for DbImportBase
Andreas Müller [Wed, 14 Nov 2012 13:01:52 +0000 (13:01 +0000)]
minor
Alexander Oppermann [Wed, 14 Nov 2012 11:49:16 +0000 (11:49 +0000)]
dynamical checkboxes through featureTree.json
Alexander Oppermann [Wed, 14 Nov 2012 11:48:41 +0000 (11:48 +0000)]
Alexander Oppermann [Wed, 14 Nov 2012 11:48:31 +0000 (11:48 +0000)]
dynamical checkboxes through featureTree.json
check for uuids instead of a simple string check
Andreas Müller [Wed, 14 Nov 2012 11:13:35 +0000 (11:13 +0000)]
new DbImportBase and DbImportConfigurator
Andreas Müller [Wed, 14 Nov 2012 11:01:05 +0000 (11:01 +0000)]
improve resultSetProxy for NULL values
Andreas Müller [Wed, 14 Nov 2012 10:59:29 +0000 (10:59 +0000)]
remove import
Andreas Müller [Wed, 14 Nov 2012 09:05:28 +0000 (09:05 +0000)]
make setOriginalSource available for all ISourceable not only IdentifiableEntitity
Alexander Oppermann [Mon, 12 Nov 2012 15:20:14 +0000 (15:20 +0000)]
renamed test.jsp to export.jsp
Alexander Oppermann [Mon, 12 Nov 2012 09:59:23 +0000 (09:59 +0000)]
*print redlist status from congruent concept relations
*code cleaning
Alexander Oppermann [Fri, 9 Nov 2012 15:20:13 +0000 (15:20 +0000)]
Implemented to get several RedList Status from different related concepts
Andreas Müller [Tue, 6 Nov 2012 10:31:41 +0000 (10:31 +0000)]
add filter to StatisticsConfigurator
Patric Plitzner [Fri, 2 Nov 2012 10:43:37 +0000 (10:43 +0000)]
Removed method causing mvn install to fail due to name clash for same method erasure.
Patric Plitzner [Fri, 2 Nov 2012 10:01:50 +0000 (10:01 +0000)]
delete unused files
Patric Plitzner [Fri, 2 Nov 2012 09:45:18 +0000 (09:45 +0000)]
reverted accidentally committed java code level to 1.6
Patric Plitzner [Fri, 2 Nov 2012 09:21:47 +0000 (09:21 +0000)]
merge changes from trunk (increase version number)
Patric Plitzner [Fri, 2 Nov 2012 09:21:27 +0000 (09:21 +0000)]
merge changes from trunk (increase version number)
edit-jenkins [Thu, 1 Nov 2012 09:41:05 +0000 (09:41 +0000)]
[maven-release-plugin] prepare for next development iteration