BGBM BDI Git - cdmlib.git/commit

author	Andreas Müller <a.mueller@bgbm.org>
	Tue, 27 Aug 2013 14:43:02 +0000 (14:43 +0000)
committer	Andreas Müller <a.mueller@bgbm.org>
	Tue, 27 Aug 2013 14:43:02 +0000 (14:43 +0000)
commit	786696e39d330bd3294a4c50ea38aa685b91dba0
tree	2cde4d9a6a8c50c1c95184665e1efe21a661d710	tree \| snapshot
parent	a24ec77b1114fd309981e1f0be50195f80956ab8	commit \| diff

merge trunk into cdm3.3 branch

50 files changed:

.gitattributes		diff \| blob \| history
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/GeneralParser.java	[new file with mode: 0644]	blob
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/monitor/ProgressMonitorWrapper.java		diff \| blob \| history
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/monitor/SubProgressMonitor.java		diff \| blob \| history
cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/GeneralParserTest.java	[new file with mode: 0644]	blob
cdmlib-ext/pom.xml		diff \| blob \| history
cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/scratchpads/ScratchpadsService.java	[new file with mode: 0644]	blob
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/TermUri.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonStreamItem2CdmTaxonConverter.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcaZipToStreamConverter.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/GbifDescriptionCsv2CdmConverter.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/FeatureSorter.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/FeatureSorterInfo.java		diff \| blob \| history
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/MarkupFeatureImport.java	[new file with mode: 0644]	blob
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/MarkupModsImport.java	[new file with mode: 0644]	blob
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupNomenclatureImport.java		diff \| blob \| history
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/markup/FeatureSorterTest.java		diff \| blob \| history
cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.xml		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/AcceptedTaxonBridge.java	[new file with mode: 0644]	blob
cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/ClassInfoBridge.java	[new file with mode: 0644]	blob
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Extension.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java		diff \| blob \| history
cdmlib-print/src/test/java/eu/etaxonomy/cdm/print/PublisherTest.java		diff \| blob \| history
cdmlib-remote/pom.xml		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/DescriptionListPortalController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ManagementController.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/csv/CsvExportController.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/dto/namecatalogue/NameSearch.java		diff \| blob \| history
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/CdmTypePropertyEditor.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java		diff \| 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/DocumentSearchResult.java	[new file with mode: 0644]	blob
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/ICdmMassIndexer.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/ISearchResultBuilder.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResult.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResultBuilder.java		diff \| blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java		diff \| blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.xml		diff \| blob \| history

RSS Atom