History | View | Annotate | Download (234 KB)
removing all (almost all) spy6 references and dependencies
fix gitattributes and add derived file to gitignore
setting merge driver to ours in gitattributes for all pom.xml - helps avoiding conflicts in gitflow
cacheUpdater for caryophyllales
Caryophyllales stuff
only a test
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0
Conflicts: cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java...
merge trunk into 3.6 branch
Move FullCoverageDataGenerator from test to real, to avoid dependency problems.
add SortMode enum and change the param for sorting of loadChildNodesOfTaxonNode from boolean to SortMode enum see #4226
more getters/adders, update script, vocabulary and test vocabulary for TaxonNodeAgentRelation #3583
first implementation of TaxonNodeAgentRelation #3583
fix naming of ClassificationServiceDeepTest
merging trunk into 3.6 branche
remove ExcelImportMapping.properties
clean up old AbcdImport test #3279
rename ABCD import tests
moving UuidAndTitleCache from model to persistence. #4799
merge trunk into model change 3.6
add MnTableRemover
Conflicts: cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java...
make the taxonomic tree editable in natural order (see #3771), adding comparator
implement datasource type inference for external datasources: #3910
Create updater for cdm36 and update schema/term version
first implementation of team->person->team conversion #4769, #4770
Make deduplication of TeamOrPersonBase possible in cdmlib #4768 and solve test problem in CdmGenericDaoImplTest #2096, finding some bugs in between
Fixing failing search test, using better utf8 handling
implementing better namedAreasInUse service for #3994 (Select widget to choose the filter areas for the advanced search)
first implementation of WrappedCdmDataSource #3910
new launchers for JettyLauncher plugin, also new structure in ide folder
handle empty Shift #4734
merge validation commits r23146, r23162, r23163 into trunk
add listener for taxon name in determination event and run update script again
make identifier annotatable #4673
merge validation2 and model 3.5 into trunk
added class to override Hibernate EntityType class to fix problem with merge replace
merge from trunk
MockCdmCacher : not required TaxonServiceSearchTest : removed reference to mock cacher
ICdmCacher, ICdmUuidCacher, CdmCacher, CdmTermCacher : refactored and added load method Language, NameRelationshipType, Rank : now uses cacher only if termap is null or empty and only when class matches the specific term type MockCdmCacher: not required anymore...
created new service in classificationService
it is a first draft of the createHierarchyService based on taxonNames and until genus level.
activating the swagger rest service documentation by reverting the revertion of the premature committed experimental branch (swagger) svn: r21387, git: be528c1edf
improve and rename findByIdentifier service
removed vaadin references
pom.xml : added maven dependency goal to unpack the corresponding cdm-vaadin war into a directory in the target dir and added this directory as a resource when building the cdmlib-remote-webapp war pom.xml, applicationContext.xml, cdmlib-remote-servlet.xml, web.xml, SpringMVCConfig.java : removed references to Vaadin...
removed references to vaadin in pom file removed vaadin classes as they have been migrated to cdm-vaadin project
adding ISelfDescriptive from validation branch
rename abstract class
merge cdmlib-persistence from validation branch to trunk
merge cdmlib-service from validation branch to trunk
first tests for listByIdentifier
add xslx test in io
refactor validation classes
test for Amplification labelCache
merge-update from trunk
separate Amplification and AmplificationResult.java #4541
implement SingleReadAlignment.java #4529 not yet ready
add first version of BigDecimal (still unclear if we want to keep the UserType) #4499
merge PresenceTerm and AbsenceTerm #4521
Fix (more of a hack) for conversation holder problem, subclassing the current servlet and setting the conversation so that it is bound every time a service call is made.
add DnaMarker to Primer #4470
add DNA Quality Type vocabulary
Add DnaQuality.csv (not fully ready)
ICdmCacher, DefaultTermInitializer : added comments CdmCacher : added code to disallow null values in cache and moved term initialisation code to specific subclass CdmDaoCacher : replaced with specialised CdmTermCacher defaultApplicationContext : removed remoting exception
latest changes for Vaadin Editor * added in Web.XML production mode
removed useless widgetset
add WebPageDefaultCacheStrategyTest