merging branches/cdmlib/2.2 [7345:7377] to trunk
authorKatja Luther <k.luther@bgbm.org>
Tue, 20 Oct 2009 15:42:09 +0000 (15:42 +0000)
committerKatja Luther <k.luther@bgbm.org>
Tue, 20 Oct 2009 15:42:09 +0000 (15:42 +0000)
commit455284167ed4bcde124948617422b6e424d5f3c0
tree18780d6da4beeeec5fd181386dd19e6df955c1d8
parent1fcf387e56295c79975f6477aaf20e38c87c5d37
merging branches/cdmlib/2.2   [7345:7377] to trunk

see also:
https://dev.e-taxonomy.eu/trac/changeset?new=branches%2Fcdmlib%2F2.2%407377&old=branches%2Fcdmlib%2F2.2%407345
76 files changed:
.gitattributes
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Article.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Book.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/BookSection.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/CdDvd.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Database.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IArticle.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IBook.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IBookSection.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ICdDvd.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IDatabase.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IGeneric.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IInProceedings.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IJournal.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IMap.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/INomenclaturalReference.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPatent.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPersonalCommunication.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPrintSeries.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPrintedUnitBase.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IProceedings.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPublicationBase.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IReferenceBase.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IReport.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ISectionBase.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IThesis.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IWebPage.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Journal.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PrintSeries.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PrintedUnitBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceFactory.java [new file with mode: 0644]
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Thesis.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/WebPage.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/package.html
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationship.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BookDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BookSectionDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/CdDvdDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/JournalDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ReferenceBaseDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ThesisDefaultCacheStrategy.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/AnnotationTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/reference/PublicationBaseTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonomicTreeTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/description/TaxonDescriptionDefaultCacheStrategyTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/CdDvdDefaultCacheStrategyTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestModel.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/strategy/TestBookDefaultCacheStrategies.java