BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(no commit message)
[cdmlib.git] / .gitattributes
diff --git a/.gitattributes b/.gitattributes
index b8bfbc51e03c2be8b202baa2ba0f463160e48201..65de674b853ffadcd7c62baaf319f0d7506dc612 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,8 @@ app-import/pom.xml -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelSources.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmDestinations.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/vienna/Activator.java -text
+app-import/src/main/resources/Asteraceae[!!-~]Specimen[!!-~]Images[!!-~]Vienna.xls -text
 app-import/src/main/resources/log4j.properties -text
 cdmlib-commons/LICENSE.TXT -text
 cdmlib-commons/README.TXT -text
@@ -30,6 +32,9 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.j
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmBooleanMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmIOMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmStringMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/ImportHelper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/MapWrapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/source/Source.java -text
@@ -54,7 +59,6 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java -t
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AudioFile.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java -text
@@ -64,35 +68,28 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Figure.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ICdmBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IEvent.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ILoadableTerm.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IMediaDocumented.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IOriginalSource.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IParsable.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IReferencedEntity.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IRelated.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifyableMediaEntity.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ImageFile.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Keyword.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageStringBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MarkerType.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Media.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MediaInstance.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MovieFile.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/MultilanguageSet.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/NoDefinedTermClassException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabulary.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OriginalSource.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedMedia.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Representation.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Rights.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RightsTerm.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermLanguageComparator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TimePeriod.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java -text
@@ -140,6 +137,16 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Point.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/package.html -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/AudioFile.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IMediaDocumented.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/IdentifyableMediaEntity.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaInstance.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MovieFile.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ReferencedMedia.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Rights.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/RightsTerm.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/GenBankAccession.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Locus.java -text
@@ -155,6 +162,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.ja
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationship.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatus.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java -text
@@ -168,7 +176,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivationEvent.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivationEventType.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnitBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationEvent.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationModifier.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/FieldObservation.java -text
@@ -230,15 +238,17 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TeamDefaultCacheStrat
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/ZooNameDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/exceptions/StringNotParsableException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/exceptions/UnknownCdmTypeException.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/ITaxonNameParser.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/TaxonNameParserBotanicalNameImpl.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/TaxonNameParserZoologicalNameImpl.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/INonViralNameParser.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java -text
+cdmlib-model/src/main/resources/log4j.properties -text
 cdmlib-model/src/main/resources/terms/Continent.csv -text
 cdmlib-model/src/main/resources/terms/DerivationEventType.csv -text
 cdmlib-model/src/main/resources/terms/HybridRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/Language.csv -text
 cdmlib-model/src/main/resources/terms/MarkerType.csv -text
 cdmlib-model/src/main/resources/terms/NameRelationshipType.csv -text
+cdmlib-model/src/main/resources/terms/NamedAreaType.csv -text
+cdmlib-model/src/main/resources/terms/NomenclaturalCode.csv -text
 cdmlib-model/src/main/resources/terms/NomenclaturalStatusType.csv -text
 cdmlib-model/src/main/resources/terms/README.TXT -text
 cdmlib-model/src/main/resources/terms/Rank.csv -text
@@ -288,8 +298,9 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/BotanicNameCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/ZoologicalNameCacheStrategyTest.java -text
-cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/TaxonNameParserBotanicalNameImplTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestModel.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/strategy/TestNameCacheStrategies.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/strategy/TestTaxonNameParserBotanicalNameImpl.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
@@ -382,7 +393,7 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/IBaseSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/IReferenceSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/IdentifiedString.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/InteractionFeatureSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/LocalisedTermTO.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/LocalisedTermSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/MediaInstanceSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/MediaSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/MediaTO.java -text
@@ -405,6 +416,7 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TaxonSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TaxonTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TreeNode.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/AssemblerBase.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/LocalisedTermAssembler.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/MediaAssembler.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/NameAssembler.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/ReferenceAssembler.java -text
@@ -435,6 +447,8 @@ cdmlib-services/LICENSE.TXT -text
 cdmlib-services/README.TXT -text
 cdmlib-services/pom.xml -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationDefaultConfiguration.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationConfiguration.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/eclipse/EclipseRcpSaveFileSystemXmlApplicationContext.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/eclipse/EclipseRcpSaveGenericApplicationContext.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/eclipse/EclipseRcpSavePathMatchingResourcePatternResolver.java -text
@@ -522,6 +536,7 @@ eclipse-plugin/jta.jar -text
 eclipse-plugin/jtds-1.2.2.jar -text
 eclipse-plugin/junit-4.4.jar -text
 eclipse-plugin/log4j-1.2.14.jar -text
+eclipse-plugin/log4j-1.2.14src.zip -text
 eclipse-plugin/msbase-2000.3.jar -text
 eclipse-plugin/mssqlserver-2000.3.jar -text
 eclipse-plugin/msutil-2000.3.jar -text
@@ -565,10 +580,6 @@ libraryTesterApplication/lib/aopalliance-1.0.jar -text
 libraryTesterApplication/lib/asm-attrs.jar -text
 libraryTesterApplication/lib/asm.jar -text
 libraryTesterApplication/lib/aspectjrt-1.5.2a.jar -text
-libraryTesterApplication/lib/cdmlib-commons-0.4.7.jar -text
-libraryTesterApplication/lib/cdmlib-model-0.4.7.jar -text
-libraryTesterApplication/lib/cdmlib-persistence-0.4.7.jar -text
-libraryTesterApplication/lib/cdmlib-services-0.4.7.jar -text
 libraryTesterApplication/lib/cglib-2.1.3.jar -text
 libraryTesterApplication/lib/commons-collections-2.1.1.jar -text
 libraryTesterApplication/lib/commons-logging-1.0.4.jar -text