clearer getters for DerivedUnitFacade + PointBeanProcessor

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 4488616c0f19cfa673b0c835d7952391a6601356..5365b046630aba2174614d7664f3c5063ead7b2f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -23,6 +23,7 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/EfloraSources.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/excelImport/distribution/CichorieaeDistributionActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/excelImport/taxa/NormalExplicitActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/exel/NormalExplicitTestActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/images/AbstractImageImporter.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportConfigurator.java -text
@@ -123,6 +124,7 @@ app-import/src/main/resources/AsteraceaeSpecimenImagesVienna.mdb -text
 app-import/src/main/resources/arecaceae.rdf -text
 app-import/src/main/resources/collections/Acronyms.tab -text
 app-import/src/main/resources/distribution/distribution_cich.xls -text
+app-import/src/main/resources/excel/NormalExplicit.xls -text
 app-import/src/main/resources/globis.rdf.xml -text
 app-import/src/main/resources/globis_valid.rdf.xml -text
 app-import/src/main/resources/images/images_cich.xls -text
@@ -139,7 +141,9 @@ app-import/src/main/resources/sdd/Erythroneura.sdd11.xml -text
 app-import/src/main/resources/sdd/LIAS_Main.sdd11.xml -text
 app-import/src/main/resources/sdd/SDD-Test-Simple.xml -text
 app-import/src/main/resources/sdd/Val-Rosandra-FRIDA-Key.sdd11.xml -text
+app-import/src/main/resources/sdd/Xper2-import-export.sdd.xml -text
 app-import/src/main/resources/sdd/cichorieae-Xper2.xml -text
+app-import/src/main/resources/sdd/phlebo.sdd.xml -text
 app-import/src/main/resources/specimenABCD/CDMtabular9c04a474e2_23_09_08.xls -text
 app-import/src/main/resources/specimenABCD/multiABCD.xml -text
 app-import/src/main/resources/taxonX/palm_tc_100446.xml -text
@@ -1188,7 +1192,8 @@ app-import/src/main/resources/taxonX/palm_tc_98853.xml -text
 app-import/src/main/resources/taxonX/palm_tc_98863.xml -text
 app-import/src/main/resources/taxonX/palm_tc_98882.xml -text
 app-import/src/main/resources/taxonX/palm_tc_98886.xml -text
-app-import/src/main/resources/tcsXmlTest.xml -text
+app-import/src/main/resources/tcs/Cichorium_tcs.xml -text
+app-import/src/main/resources/tcs/tcsXmlTest.xml -text
 cdm-server/LICENSE.TXT -text
 cdm-server/ide/eclipse/Bootloader[!!-~]-[!!-~]Help.launch -text
 cdm-server/ide/eclipse/Bootloader.launch -text
@@ -1204,7 +1209,7 @@ cdm-server/src/main/installer/linux/copyright -text
 cdm-server/src/main/installer/linux/postinst -text
 cdm-server/src/main/installer/linux/postrm -text
 cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml -text
-cdm-server/src/main/installer/templates/copyright -text
+cdm-server/src/main/installer/templates/copyright.txt -text
 cdm-server/src/main/installer/win32/Launch4JavaCDMSERVER.xml -text
 cdm-server/src/main/installer/win32/cdmserver.nsi -text
 cdm-server/src/main/installer/win32/cdmserver/bin/cdmserver.bat -text
@@ -1239,6 +1244,7 @@ cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/NullProgressMonitor.java -t
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ResultWrapper.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/Tree.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/TreeNode.java -text
+cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UriUtils.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/XmlHelp.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/AudioMetaData.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/ImageMetaData.java -text
@@ -1582,7 +1588,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDExportState.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenIoBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringEvent.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206DataHolder.java -text
@@ -1681,6 +1687,7 @@ cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.dtd -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalExplicit.xls -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalImplied.xls -text
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest-input-original.xls -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest-input.xls -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/NormalImplied.xls -text
@@ -2399,6 +2406,7 @@ cdmlib-persistence/src/main/java/org/hibernate/dialect/H2CorrectedDialect.java -
 cdmlib-persistence/src/main/java/org/hibernate/dialect/HSQLCorrectedDialect.java -text
 cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5InnoDBUtf8Dialect.java -text
 cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5MyISAMUtf8Dialect.java -text
+cdmlib-persistence/src/main/resources/c3p0-config.xml -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/h2-datasource.xml -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml -text
@@ -3203,6 +3211,7 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseListControlle
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java -text
@@ -3326,10 +3335,13 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/exception/CdmExceptionResolv
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/exception/NoRecordsMatchException.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/JsonConfigFactoryBean.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/CdmBeanProcessingRegistry.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/AbstractBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/AbstractCdmBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/HibernateProxyBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/MediaBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/NameRelationshipBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/PointBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/ReferenceBaseBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java -text
@@ -3406,15 +3418,13 @@ cdmlib-remote/src/test/resources/eu/etaxonomy/cdm/override.properties -text
 cdmlib-remote/src/test/resources/eu/etaxonomy/cdm/remote/view/RdfViewTest.rdf -text
 cdmlib-remote/src/test/resources/eu/etaxonomy/cdm/remote/view/oaipmh/IdentifyView.xml -text
 cdmlib-remote/src/test/resources/log4j.properties -text
+cdmlib-remote/src/test/resources/unitils.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/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
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/ConversationHolder.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/IConversationEnabled.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java -text
@@ -3457,6 +3467,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMarkerService.java -
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMediaService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INaturalLanguageGenerator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INaturalLanguageTextDataProcessor.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IReferenceService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java -text