BGBM BDI Git - cdmlib.git/commit

author	Andreas Müller <a.mueller@bgbm.org>
	Thu, 6 Jun 2013 11:52:36 +0000 (11:52 +0000)
committer	Andreas Müller <a.mueller@bgbm.org>
	Thu, 6 Jun 2013 11:52:36 +0000 (11:52 +0000)
commit	9f840a1ed4fc0dc3f6867ac2d109108b81869c84
tree	fd02f7c62b79e91098ae67718be686ceb8bbbf4c	tree \| snapshot
parent	897c420b28c9a61e66fb2d10238d8c3c402473c9	commit \| diff

Merge trunk into CDM 3.3

83 files changed:

.gitattributes		diff \| blob \| history
cdmlib-commons/pom.xml		diff \| blob \| history
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/TreeNode.java		diff \| blob \| history
cdmlib-ext/pom.xml		diff \| blob \| history
cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceUtilities.java		diff \| blob \| history
cdmlib-io/pom.xml		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlImportBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IInputTransformer.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/CsvStream.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/CsvStreamItem.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/FeatureSorter.java	[new file with mode: 0644]	blob
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/FeatureSorterInfo.java	[new file with mode: 0644]	blob
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupDocumentImportNoComponent.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupKeyImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupNomenclatureImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupSpecimenImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupTransformer.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/UnmatchedLeads.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/markup/FeatureSorterTest.java	[new file with mode: 0644]	blob
cdmlib-model/pom.xml		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Credit.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/OrderedTermVocabulary.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/PersistentMultiLanguageText.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/PersistentMultiLanguageTextType.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplRegExBase.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/SpecimenTypeParser.java		diff \| blob \| history
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java		diff \| blob \| history
cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestRegExs.java	[moved from cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestUUID.java with 66% similarity]	diff \| blob \| history
cdmlib-persistence/pom.xml		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java		diff \| blob \| history
cdmlib-print/pom.xml		diff \| blob \| history
cdmlib-print/src/main/resources/stylesheets/mediawiki/multipages.xsl		diff \| blob \| history
cdmlib-print/src/main/resources/stylesheets/pdf/flore-afrique-centrale.xsl		diff \| blob \| history
cdmlib-remote-webapp/ide/eclipse/cdmlib-remote-webapp - profile.launch	[moved from cdmlib-remote-webapp/ide/eclipse/cdmserver - profile.launch with 100% similarity]	blob \| history
cdmlib-remote-webapp/ide/eclipse/cdmlib-remote-webapp - run.launch	[moved from cdmlib-remote-webapp/ide/eclipse/cdmserver - run.launch with 100% similarity]	diff \| blob \| history
cdmlib-remote-webapp/pom.xml		diff \| blob \| history
cdmlib-remote-webapp/src/main/webapp/WEB-INF/jsp/index.jsp		diff \| blob \| history
cdmlib-remote/pom.xml		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/config/AbstractWebApplicationConfigurer.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrencePortalController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/PolytomousKeyPortalController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/StatisticsController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ext/ExternalGeoController.java		diff \| blob \| history
cdmlib-services/pom.xml		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DistributionTree.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICollectionService.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NamedAreaNodeComparator.java	[deleted file]	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NamedAreaTree.java	[deleted file]	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/CdmMassIndexer.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/LuceneSearch.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/utility/DescriptionUtility.java		diff \| blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java		diff \| blob \| history

RSS Atom