(no commit message)
[cdmlib.git] / .gitattributes
index f23b345206b59f666d53a2c5a603108216dd989f..5af9f0b88ef2f57c37b78a255adabab82700b131 100644 (file)
@@ -1,44 +1,52 @@
 * text=auto !eol
 /INSTALL.TXT -text
+/LICENSE.TXT -text
+cdmlib-commons/LICENSE.TXT -text
 cdmlib-commons/README.TXT -text
 cdmlib-commons/pom.xml -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java -text
+cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UuidGenerator.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/XmlHelp.java -text
 cdmlib-commons/src/main/resources/MUST-EXIST.txt -text
 cdmlib-commons/src/main/resources/log4j.properties -text
-cdmlib-commons/src/site/apt/index.apt -text
 cdmlib-commons/src/site/site.xml -text
 cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/CdmUtilsTest.java -text
 cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/XmlHelpTest.java -text
 cdmlib-commons/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
 cdmlib-commons/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java -text
+cdmlib-io/LICENSE.TXT -text
 cdmlib-io/README.TXT -text
 cdmlib-io/pom.xml -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelAuthorIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelFactsIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceIO.java -text
 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/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/berlinModel/test/BerlinModelSources.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/source/Source.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/source/SourceConnectionException.java -text
 cdmlib-io/src/main/resources/log4j.properties -text
+cdmlib-io/src/site/site.xml -text
+cdmlib-model/LICENSE.TXT -text
 cdmlib-model/README.TXT -text
 cdmlib-model/pom.xml -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/aspectj/PropertyChangeAspect.aj -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Address.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Agent.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/INomenclaturalAuthor.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembership.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java -text
+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
@@ -48,11 +56,13 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Extension.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Figure.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IDefTerm.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/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
@@ -71,6 +81,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabulary.j
 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
@@ -83,7 +94,9 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WrongTermTypeException.
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/DefaultVocabularyStore.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/IVocabularyStore.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermNotFoundException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CommonTaxonName.java -text
@@ -112,6 +125,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.j
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextFormat.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Continent.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaLevel.java -text
@@ -119,11 +133,13 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedAreaType.java -t
 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/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
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/PhylogeneticTree.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java -text
@@ -142,6 +158,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatus.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java -text
+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
@@ -156,6 +173,8 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Observation.java -t
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/PreservationMethod.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Specimen.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/SpecimenOrObservationBase.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/package.html -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/overview.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Article.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexEntryType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/BibtexReference.java -text
@@ -181,6 +200,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java -te
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Thesis.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/WebPage.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationship.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.java -text
@@ -188,22 +208,28 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationship.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/view/View.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/BotanicNameDefaultCacheStrategy.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/INameCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/IStrategy.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/ITaxonNameParser.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/NameCacheStrategyBase.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/NonViralNameDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/TaxonNameParserBotanicalNameImpl.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/ZooNameDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/BotanicNameDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/IIdentifiableEntityCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/INameCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/INomenclaturalAuthorCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/NameCacheStrategyBase.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/NonViralNameDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/PersonDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/TeamDefaultCacheStrategy.java -text
+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/UnknownRankException.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/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/NomenclaturalStatusType.csv -text
 cdmlib-model/src/main/resources/terms/README.TXT -text
@@ -212,36 +238,64 @@ cdmlib-model/src/main/resources/terms/SynonymRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/TypeDesignationStatus.csv -text
 cdmlib-model/src/main/resources/terms/WaterbodyOrCountry.csv -text
-cdmlib-model/src/site/apt/index.apt -text
+cdmlib-model/src/site/resources/images/uml/Agent.png -text
+cdmlib-model/src/site/resources/images/uml/Base_classes.png -text
+cdmlib-model/src/site/resources/images/uml/Defined_terms.png -text
+cdmlib-model/src/site/resources/images/uml/Description.png -text
+cdmlib-model/src/site/resources/images/uml/Keys.png -text
+cdmlib-model/src/site/resources/images/uml/Language.png -text
+cdmlib-model/src/site/resources/images/uml/Location.png -text
+cdmlib-model/src/site/resources/images/uml/Media.png -text
+cdmlib-model/src/site/resources/images/uml/Molecular_section.png -text
+cdmlib-model/src/site/resources/images/uml/Names_section.png -text
+cdmlib-model/src/site/resources/images/uml/Nomenclatural_defined_terms.png -text
+cdmlib-model/src/site/resources/images/uml/Occurrence_section.png -text
+cdmlib-model/src/site/resources/images/uml/Reference_BibTex.png -text
+cdmlib-model/src/site/resources/images/uml/Reference_base.png -text
+cdmlib-model/src/site/resources/images/uml/Reference_types.png -text
+cdmlib-model/src/site/resources/images/uml/Source.png -text
+cdmlib-model/src/site/resources/images/uml/Taxon_section.png -text
+cdmlib-model/src/site/resources/images/uml/Term_base.png -text
+cdmlib-model/src/site/resources/images/uml/Types_section.png -text
+cdmlib-model/src/site/resources/images/uml/package_overview.png -text
 cdmlib-model/src/site/site.xml -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/AnnotationTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/CdmBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefinedTermBaseTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTypeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabularyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/TermVocabularyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/DefaultVocabularyStoreTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/TermLoaderTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java -text
 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/BotanicNameCacheStrategyTest.java -text
-cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/TaxonNameParserBotanicalNameImplTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/BotanicNameCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/TaxonNameParserBotanicalNameImplTest.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/strategy/TestTaxonNameParserBotanicalNameImpl.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/unit/EntityTestBase.java -text
+cdmlib-persistence/LICENSE.TXT -text
 cdmlib-persistence/README.TXT -text
 cdmlib-persistence/pom.xml -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationUtils.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmTermInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DataSourceNotFoundException.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DatabaseTypeEnum.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DbSchemaValidation.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalHsqldb.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/VocabularyStoreImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/DatabaseTypeBase.java -text
@@ -255,11 +309,6 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/PostgreSQLDatab
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2000DatabaseType.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2005DatabaseType.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SybaseDatabaseType.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/AgentDaoImpl.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/CdmEntityDaoBase.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/CdmGenericDaoImpl.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/DaoBase.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/DefinedTermDaoImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IAgentDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java -text
@@ -267,27 +316,32 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IDefine
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IIdentifiableDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ITermVocabularyDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ITitledDao.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IdentifiableDaoBase.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/TermVocabularyDaoImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AgentDaoImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DaoBase.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/TaxonNameDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IReferenceDao.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/ReferenceDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/TaxonDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hsql-datasource.xml -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/persistence.xml -text
 cdmlib-persistence/src/main/resources/log4j.properties -text
-cdmlib-persistence/src/site/apt/index.apt -text
 cdmlib-persistence/src/site/site.xml -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmDataSourceTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/DatabaseEnumTest.java -text
-cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/CdmEntityDaoBaseTest.java -text
-cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/DaoBaseTest.java -text
-cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/DefinedTermDaoImplTest.java -text
-cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/IdentifiableDaoBaseTest.java -text
-cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/taxon/TaxonDaoHibernateImplTest.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTestClass.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DaoBaseTest.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBaseTest.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestPersistence.java -text
@@ -297,7 +351,10 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/jdbc-datasource.xml -text
+cdmlib-remote/LICENSE.TXT -text
 cdmlib-remote/README.TXT -text
+cdmlib-remote/ide/eclipse/cdmlib-remote[!!-~]-[!!-~]jetty[!!-~]run[!!-~]\[debug\].launch -text
+cdmlib-remote/ide/eclipse/cdmlib-remote[!!-~]-[!!-~]remote[!!-~]debug.launch -text
 cdmlib-remote/pom.xml -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathFilter.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathMatcher.java -text
@@ -310,9 +367,13 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/DescriptionTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/DistributionSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/FeatureSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/HomotypicTaxonGroupSTO.java -text
+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/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
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/NameRelationshipTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/NameSTO.java -text
@@ -322,7 +383,7 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ReferenceSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ReferenceTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ReferencedEntityBaseSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ResultSetPageSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/RightsTO.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/RightsSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/SpecimenSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/SpecimenTypeDesignationSTO.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/SynonymRelationshipTO.java -text
@@ -333,6 +394,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/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
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/TaxonAssembler.java -text
@@ -341,8 +403,9 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/CdmObjectNonExisting
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/CdmServiceImpl.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/ICdmService.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/RestController.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/TestDataGenerator.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/Utils.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/BaseView.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/XmlView.java -text
 cdmlib-remote/src/main/resources/log4j.properties -text
 cdmlib-remote/src/main/webapp/WEB-INF/applicationContext.xml -text
@@ -350,16 +413,19 @@ cdmlib-remote/src/main/webapp/WEB-INF/cdmrest-servlet.xml -text
 cdmlib-remote/src/main/webapp/WEB-INF/views.xml -text
 cdmlib-remote/src/main/webapp/WEB-INF/web.xml -text
 cdmlib-remote/src/main/webapp/index.jsp -text
-cdmlib-remote/src/site/apt/index.apt -text
 cdmlib-remote/src/site/site.xml -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/ResultSetPageSTOTest.java -text
+cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/AssemblerTestBase.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/NameSTOAssemblerTest.java -text
-cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/CdmServiceImplTestSupport.java -text
+cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/CdmServiceImplTest.java -text
 cdmlib-remote/src/test/resources/applicationContext.xml -text
+cdmlib-remote/src/test/resources/log4j.properties -text
+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/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
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java -text
@@ -378,23 +444,40 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java -tex
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java -text
 cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services.xml -text
-cdmlib-services/src/site/apt/index.apt -text
 cdmlib-services/src/site/site.xml -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestTaxonFunction.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TermLoaderIntegrationTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-services/src/test/resources/log4j.properties -text
+eclipse-feature-sources/build.properties -text
+eclipse-feature-sources/feature.xml -text
 eclipse-feature/.classpath -text
 eclipse-feature/.project -text
 eclipse-feature/build.properties -text
 eclipse-feature/feature.xml -text
+eclipse-plugin-sources/META-INF/MANIFEST.MF -text
+eclipse-plugin-sources/plugin.xml -text
+eclipse-plugin-sources/pom.xml -text
+eclipse-plugin-sources/spring-aop-2.5src.zip -text
+eclipse-plugin-sources/spring-beans-2.5src.zip -text
+eclipse-plugin-sources/spring-context-2.5src.zip -text
+eclipse-plugin-sources/spring-context-support-2.5src.zip -text
+eclipse-plugin-sources/spring-core-2.5src.zip -text
+eclipse-plugin-sources/spring-jdbc-2.5src.zip -text
+eclipse-plugin-sources/spring-orm-2.5src.zip -text
+eclipse-plugin-sources/spring-test-2.5src.zip -text
+eclipse-plugin-sources/spring-tx-2.5src.zip -text
+eclipse-plugin-sources/spring-web-2.5src.zip -text
+eclipse-plugin-sources/spring-webmvc-2.5src.zip -text
 eclipse-plugin/.classpath -text
 eclipse-plugin/.project -text
 eclipse-plugin/META-INF/MANIFEST.MF -text
@@ -405,15 +488,6 @@ eclipse-plugin/asm.jar -text
 eclipse-plugin/aspectjrt-1.5.4.jar -text
 eclipse-plugin/build.properties -text
 eclipse-plugin/build_ant.xml -text
-eclipse-plugin/cdmLibrary-0.4.1.jar -text
-eclipse-plugin/cdmlib-commons-0.4.7-sources.jar -text
-eclipse-plugin/cdmlib-commons-0.4.7.jar -text
-eclipse-plugin/cdmlib-model-0.4.7-sources.jar -text
-eclipse-plugin/cdmlib-model-0.4.7.jar -text
-eclipse-plugin/cdmlib-persistence-0.4.7-sources.jar -text
-eclipse-plugin/cdmlib-persistence-0.4.7.jar -text
-eclipse-plugin/cdmlib-services-0.4.7-sources.jar -text
-eclipse-plugin/cdmlib-services-0.4.7.jar -text
 eclipse-plugin/cglib-2.1.3.jar -text
 eclipse-plugin/commons-collections-2.1.1.jar -text
 eclipse-plugin/commons-logging-1.0.4.jar -text
@@ -444,13 +518,22 @@ eclipse-plugin/plugin.xml -text
 eclipse-plugin/pom.xml -text
 eclipse-plugin/postgresql-8.2-504.jdbc4.jar -text
 eclipse-plugin/spring-2.5.jar -text
+eclipse-plugin/spring-aop-2.5src.zip -text
 eclipse-plugin/spring-beans-2.5.jar -text
+eclipse-plugin/spring-beans-2.5src.zip -text
 eclipse-plugin/spring-context-2.5.jar -text
+eclipse-plugin/spring-context-2.5src.zip -text
+eclipse-plugin/spring-context-support-2.5src.zip -text
 eclipse-plugin/spring-core-2.5.jar -text
+eclipse-plugin/spring-core-2.5src.zip -text
 eclipse-plugin/spring-jdbc-2.5.jar -text
+eclipse-plugin/spring-jdbc-2.5src.zip -text
 eclipse-plugin/spring-orm-2.5.jar -text
+eclipse-plugin/spring-orm-2.5src.zip -text
 eclipse-plugin/spring-test-2.5.jar -text
+eclipse-plugin/spring-test-2.5src.zip -text
 eclipse-plugin/spring-tx-2.5.jar -text
+eclipse-plugin/spring-tx-2.5src.zip -text
 eclipse-plugin/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
 eclipse-plugin/xercesImpl.jar -text
 eclipse-plugin/xml-apis.jar -text
@@ -459,6 +542,11 @@ eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_0.4.7.6.jar -text
 eclipse-updateSite/index.html -text
 eclipse-updateSite/plugins/eu.etaxonomy.cdmLibrary_0.4.7.6.jar -text
 eclipse-updateSite/site.xml -text
+imports/pom.xml -text
+imports/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportActivator.java -text
+imports/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelSources.java -text
+imports/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmDestinations.java -text
+imports/src/main/resources/log4j.properties -text
 libraryTesterApplication/.classpath -text
 libraryTesterApplication/.project -text
 libraryTesterApplication/cdmResources/applicationContext.xml -text
@@ -533,6 +621,10 @@ musiclib-hibernatetest/src/test/java/org/bgbm/persistence/dao/DatabaseInitialise
 musiclib-hibernatetest/src/test/java/org/bgbm/persistence/dao/RecordDaoImplTest.java -text
 musiclib-hibernatetest/src/test/java/org/bgbm/persistence/dao/TestIt.java -text
 musiclib-hibernatetest/target/mvn-eclipse-cache.properties -text
+pdfdocs/cdm.pdf -text
+pdfdocs/cdmlib-config.properties -text
+pdfdocs/cdmlib-doc.sh -text
+pdfdocs/pdfdoclet-1.0.2-all.jar -text
 pluginTesterApplication/.classpath -text
 pluginTesterApplication/.project -text
 pluginTesterApplication/META-INF/MANIFEST.MF -text
@@ -550,16 +642,6 @@ pluginTesterApplication/src/plugintesterapplication/View.java -text
 pluginTesterApplication/src/test/testClass.java -text
 /pom.xml -text
 /settings.xml -text
-spring-json/LICENSE-2.0.txt -text
-spring-json/README.txt -text
-spring-json/pom.xml -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/JsonErrorHandler.java -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/JsonStringWriter.java -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/JsonView.java -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/converter/DefaultJsonStringWriter.java -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/converter/JsonViewWalkerInterceptor.java -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/converter/MapGraphWalker.java -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/error/HttpStatusError.java -text
-spring-json/src/main/java/org/springframework/web/servlet/view/json/error/ModelFlagError.java -text
-spring-json/src/site/apt/index.apt -text
-spring-json/src/site/site.xml -text
+src/site/resources/images/logos/logo_edit.png -text
+src/site/resources/images/logos/logo_edit2.png -text
+src/site/site.xml -text