Revision 1d36aa54 - merge 3.0.2 to trunk - EDIT - EDIT Project Management

« Previous | Next »

Revision 1d36aa54

Added by Andreas Müller almost 14 years ago

ID 1d36aa543c3acc5c2d7cd81e35ddca50a70a4f11
Parent 91e33e81
Child e13d024c

merge 3.0.2 to trunk

added
modified
copied
renamed
deleted

.gitattributes (diff)
cdmlib-commons
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        common
        CdmUtils.java (diff)
        DefaultProgressMonitor.java (diff)
cdmlib-ext
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        ext
        bci
        BciSchemaAdapter.java (diff)
        BciServiceWrapper.java (diff)
        dc
        DublinCoreSchemaAdapter.java (diff)
        ipni
        IIpniService.java (diff)
        IpniService.java (diff)
        sru
        SruServiceWrapper.java (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        ext
        ipni
        IpniServiceTest.java (diff)
        sru
        SruServiceWrapperTest.java (diff)
cdmlib-io
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        io
        berlinModel
        BerlinModelTransformer.java (diff)
        in
        BerlinModelCommonNamesImport.java (diff)
        BerlinModelFactsImport.java (diff)
        BerlinModelImportBase.java (diff)
        BerlinModelImportConfigurator.java (diff)
        BerlinModelNameFactsImport.java (diff)
        BerlinModelNameStatusImport.java (diff)
        BerlinModelOccurrenceImport.java (diff)
        BerlinModelOccurrenceSourceImport.java (diff)
        BerlinModelRefDetailImport.java (diff)
        BerlinModelReferenceImport.java (diff)
        BerlinModelTaxonImport.java (diff)
        BerlinModelTaxonNameImport.java (diff)
        BerlinModelTaxonNameRelationImport.java (diff)
        BerlinModelTaxonRelationImport.java (diff)
        BerlinModelTypesImport.java (diff)
        out
        BerlinModelClassificationExport.java
        BerlinModelExportConfigurator.java (diff)
        BerlinModelFactExport.java (diff)
        BerlinModelNameRelationExport.java (diff)
        BerlinModelReferenceExport.java (diff)
        BerlinModelTaxonomicTreeExport.java
        mapper
        FactCategoryMapper.java (diff)
        RefDetailMapper.java (diff)
        common
        CacheUpdater.java (diff)
        CacheUpdaterConfigurator.java (diff)
        CdmApplicationAwareDefaultExport.java (diff)
        CdmApplicationAwareDefaultImport.java (diff)
        CdmImportBase.java (diff)
        DbExportConfiguratorBase.java (diff)
        DbImportStateBase.java (diff)
        ExportConfiguratorBase.java (diff)
        IImportConfigurator.java (diff)
        ImportConfiguratorBase.java (diff)
        ImportHelper.java (diff)
        ImportStateBase.java (diff)
        IoConfiguratorBase.java (diff)
        mapping
        DbImportDefinedTermCreationMapperBase.java (diff)
        DbImportDescriptionElementCreationMapperBase.java (diff)
        DbImportDescriptionElementSourceCreationMapper.java (diff)
        DbImportImageGalleryMapper.java (diff)
        DbImportMediaMapper.java (diff)
        DbImportNameTypeDesignationMapper.java (diff)
        DbImportObjectCreationMapperBase.java (diff)
        DbImportSynonymMapper.java (diff)
        DbImportTaxIncludedInMapper.java (diff)
        excel
        common
        ExcelImportConfiguratorBase.java (diff)
        distribution
        DistributionImportConfigurator.java (diff)
        taxa
        NormalExplicitImport.java (diff)
        NormalExplicitImportConfigurator.java (diff)
        jaxb
        CdmIDResolver.java (diff)
        DataSet.java (diff)
        JaxbExport.java (diff)
        JaxbExportConfigurator.java (diff)
        JaxbImport.java (diff)
        JaxbImportConfigurator.java (diff)
        pilotOutputHtml
        PilotOutputDescriptionExporter.java (diff)
        PilotOutputExporter.java (diff)
        reference
        endnote
        in
        EndNoteImportBase.java (diff)
        EndnoteImportConfigurator.java (diff)
        EndnoteRecordsImport.java (diff)
        IEndnotePlaceholderClass.java (diff)
        sdd
        in
        SDDImport.java (diff)
        SDDImportConfigurator.java (diff)
        out
        SDDCdmExporter.java (diff)
        SDDDataSet.java (diff)
        SDDDocumentBuilder.java (diff)
        specimen
        abcd206
        in
        Abcd206Import.java (diff)
        Abcd206ImportConfigurator.java (diff)
        excel
        in
        SpecimenExcelImport.java (diff)
        SpecimenExcelImportConfigurator.java (diff)
        taxonx
        TaxonXDescriptionImport.java (diff)
        TaxonXImportConfigurator.java (diff)
        TaxonXImportState.java (diff)
        TaxonXModsImport.java (diff)
        TaxonXNomenclatureImport.java (diff)
        tcsrdf
        TcsRdfImportConfigurator.java (diff)
        TcsRdfReferenceImport.java (diff)
        TcsRdfTaxonImport.java (diff)
        TcsRdfTaxonNameImport.java (diff)
        TcsRdfTaxonNameRelationsImport.java (diff)
        TcsRdfTaxonRelationsImport.java (diff)
        TcsRdfTransformer.java (diff)
        tcsxml
        DefaultTcsXmlPlaceholders.java (diff)
        ITcsXmlPlaceholderClass.java (diff)
        TcsXmlTransformer.java (diff)
        in
        TcsXmlImportBase.java (diff)
        TcsXmlImportConfigurator.java (diff)
        TcsXmlMetaDataImport.java (diff)
        TcsXmlPublicationsImport.java (diff)
        TcsXmlTaxonImport.java (diff)
        TcsXmlTaxonNameImport.java (diff)
        TcsXmlTaxonNameRelationsImport.java (diff)
        TcsXmlTaxonRelationsImport.java (diff)
    - resources
      - schema
        cdm
        cdm.xsd (diff)
        taxon.xsd (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        io
        excel
        taxa
        NormalExplicitImportTest.java (diff)
        jaxb
        CdmImporterTest.java (diff)
        ReferenceTest.java (diff)
        sdd
        in
        SDDImportTest.java (diff)
        test
        function
        TestDatabase.java (diff)
        test
        integration
        TestCdmDbComparator.java (diff)
    - resources
      - dbscripts
        001_cdm.ddl (diff)
      - eu
        etaxonomy
        cdm
        io
        dataset.dtd (diff)
        jaxb
        CdmImporterTest.testImport-result.xml (diff)
        CdmImporterTest.xml (diff)
        ReferenceTest.xml (diff)
        sdd
        SDDDescriptionIOTest-input.xml
        SDDImportTest-input.xml
cdmlib-model
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        hibernate
        PartialUserType.java
        URIUserType.java
        UUIDUserType.java
        WSDLDefinitionUserType.java
        model
        agent
        Person.java (diff)
        TeamOrPersonBase.java (diff)
        common
        CdmBase.java (diff)
        CdmMetaData.java (diff)
        DefaultTermInitializer.java (diff)
        DescriptionElementSource.java (diff)
        ExtensionType.java (diff)
        IReferencedEntity.java (diff)
        ISourceable.java (diff)
        IdentifiableEntity.java (diff)
        IdentifiableSource.java (diff)
        LSIDAuthority.java (diff)
        Language.java (diff)
        MarkerType.java (diff)
        PartialUserType.java
        ReferencedEntityBase.java (diff)
        RelationshipBase.java (diff)
        UUIDUserType.java
        VocabularyEnum.java (diff)
        WSDLDefinitionUserType.java
        package-info.java (diff)
        description
        DescriptionBase.java (diff)
        DescriptionElementBase.java (diff)
        FeatureNode.java (diff)
        FeatureTree.java (diff)
        IIdentificationKey.java (diff)
        KeyStatement.java
        MediaKey.java (diff)
        MultiAccessKey.java (diff)
        PolytomousKey.java (diff)
        PolytomousKeyNode.java
        TaxonDescription.java (diff)
        TaxonNameDescription.java (diff)
        TextData.java (diff)
        WorkingSet.java (diff)
        media
        AudioFile.java (diff)
        ImageFile.java (diff)
        Media.java (diff)
        MediaRepresentation.java (diff)
        MediaRepresentationPart.java (diff)
        MovieFile.java (diff)
        ReferencedMedia.java (diff)
        molecular
        Sequence.java (diff)
        name
        HomotypicalGroup.java (diff)
        HybridRelationship.java (diff)
        NameRelationship.java (diff)
        NameTypeDesignation.java (diff)
        NomenclaturalStatus.java (diff)
        NonViralName.java (diff)
        SpecimenTypeDesignation.java (diff)
        TaxonNameBase.java (diff)
        TypeDesignationBase.java (diff)
        occurrence
        DerivationEvent.java (diff)
        DerivedUnitBase.java (diff)
        DeterminationEvent.java (diff)
        DeterminationModifier.java (diff)
        FieldObservation.java (diff)
        GatheringEvent.java (diff)
        Specimen.java (diff)
        SpecimenOrObservationBase.java (diff)
        reference
        Article.java
        Book.java
        BookSection.java
        CdDvd.java
        Database.java
        Generic.java
        IGeneric.java (diff)
        INomenclaturalReference.java (diff)
        IPatent.java (diff)
        IPersonalCommunication.java (diff)
        IPublicationBase.java (diff)
        IReference.java
        IReferenceBase.java
        ISectionBase.java (diff)
        IVolumeReference.java (diff)
        IWebPage.java (diff)
        InProceedings.java
        Journal.java
        Map.java
        Patent.java
        PersonalCommunication.java
        PrintSeries.java
        PrintedUnitBase.java
        Proceedings.java
        PublicationBase.java
        Reference.java
        ReferenceBase.java
        ReferenceFactory.java (diff)
        ReferenceIdentity.java (diff)
        ReferenceType.java (diff)
        Report.java
        SectionBase.java
        Thesis.java
        WebPage.java
        taxon
        AlternativeTreeRoot.java (diff)
        Classification.java
        ITreeNode.java (diff)
        Synonym.java (diff)
        SynonymRelationship.java (diff)
        Taxon.java (diff)
        TaxonBase.java (diff)
        TaxonComparator.java (diff)
        TaxonNode.java (diff)
        TaxonRelationship.java (diff)
        TaxonRelationshipType.java (diff)
        TaxonomicTree.java
        view
        View.java (diff)
        strategy
        cache
        media
        MediaDefaultCacheStrategy.java (diff)
        name
        INameCacheStrategy.java (diff)
        reference
        ArticleDefaultCacheStrategy.java (diff)
        BookDefaultCacheStrategy.java (diff)
        BookSectionDefaultCacheStrategy.java (diff)
        CdDvdDefaultCacheStrategy.java (diff)
        GenericDefaultCacheStrategy.java (diff)
        INomenclaturalReferenceCacheStrategy.java (diff)
        IReferenceBaseCacheStrategy.java (diff)
        JournalDefaultCacheStrategy.java (diff)
        NomRefDefaultCacheStrategyBase.java (diff)
        ReferenceBaseDefaultCacheStrategy.java (diff)
        ThesisDefaultCacheStrategy.java (diff)
        merge
        DefaultMergeStrategy.java (diff)
        parser
        NonViralNameParserImpl.java (diff)
    - resources
      - ValidationMessages.properties (diff)
      - terms
        DeterminationModifier.csv (diff)
        Language.csv (diff)
        UndefinedLanguage.csv
  - test
    - java
      - eu
        etaxonomy
        cdm
        datagenerator
        TaxonGenerator.java (diff)
        model
        DatabaseInitialiser.java (diff)
        common
        DefaultTermInitializerTest.java (diff)
        ExtensionTypeTest.java (diff)
        LanguageTest.java
        MarkerTypeTest.java (diff)
        description
        PolytomousKeyTest.java
        TextDataTest.java (diff)
        media
        MediaTest.java (diff)
        name
        BotanicalNameTest.java (diff)
        NonViralNameTest.java (diff)
        TaxonNameBaseTest.java (diff)
        reference
        PublicationBaseTest.java (diff)
        taxon
        ClassificationTest.java
        TaxonBaseTest.java (diff)
        TaxonComparatorTest.java (diff)
        TaxonNodeTest.java (diff)
        TaxonTest.java (diff)
        TaxonomicTreeTest.java
        strategy
        cache
        description
        TaxonDescriptionDefaultCacheStrategyTest.java (diff)
        media
        MediaDefaultCacheStrategyTest.java (diff)
        name
        BotanicNameCacheStrategyTest.java (diff)
        NonViralNameDefaultCacheStrategyTest.java (diff)
        reference
        ArticleDefaultCacheStrategyTest.java (diff)
        CdDvdDefaultCacheStrategyTest.java (diff)
        taxon
        TaxonBaseDefaultCacheStrategyTest.java (diff)
        match
        DefaultMatchStrategyTest.java (diff)
        merge
        DefaultMergeStrategyTest.java (diff)
        parser
        NonViralNameParserImplTest.java (diff)
        test
        function
        TestModel.java (diff)
        TestSpecimen.java (diff)
        strategy
        TestBookDefaultCacheStrategies.java (diff)
cdmlib-persistence
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        database
        PersistentTermInitializer.java (diff)
        update
        CdmUpdater.java (diff)
        ColumnAdder.java (diff)
        ColumnNameChanger.java (diff)
        ColumnRemover.java
        DatabaseTypeNotSupportedException.java
        ISchemaUpdater.java (diff)
        ISchemaUpdaterStep.java (diff)
        ITermUpdater.java (diff)
        ITermUpdaterStep.java
        IUpdater.java
        MapTableCreator.java
        MnTableCreator.java
        SchemaUpdaterBase.java (diff)
        SchemaUpdaterStepBase.java (diff)
        SchemaUpdater_24_25.java
        SchemaUpdater_25_26.java
        SequenceTableCreator.java
        SingleTermUpdater.java (diff)
        SortIndexUpdater.java
        TableCreator.java
        TableDroper.java
        TermUpdaterBase.java (diff)
        TermUpdater_24_25.java
        UpdaterBase.java
        VocabularyCreator.java
        v24_25
        SchemaUpdater_24_25.java
        SortIndexUpdater.java
        TermUpdater_24_25.java
        v25_30
        FeatureNodeTreeColumnUpdater.java
        PolytomousKeyDataMover.java
        SchemaUpdater_25_30.java
        SequenceTableCreator.java
        TermUpdater_25_30.java
        persistence
        dao
        description
        IIdentificationKeyDao.java (diff)
        IPolytomousKeyDao.java
        IPolytomousKeyNodeDao.java
        hibernate
        common
        CdmEntityDaoBase.java (diff)
        CdmGenericDaoImpl.java (diff)
        description
        DescriptionElementDaoImpl.java (diff)
        FeatureTreeDaoImpl.java (diff)
        PolytomousKeyDaoImpl.java
        PolytomousKeyNodeDaoImpl.java
        media
        MediaDaoHibernateImpl.java (diff)
        reference
        ReferenceDaoHibernateImpl.java (diff)
        taxon
        ClassificationDaoHibernateImpl.java
        TaxonDaoHibernateImpl.java (diff)
        TaxonomicTreeDaoHibernateImpl.java
        reference
        IReferenceDao.java (diff)
        taxon
        IClassificationDao.java
        ITaxonDao.java (diff)
        ITaxonomicTreeDao.java
    - resources
      - eu
        etaxonomy
        cdm
        hibernate.cfg.xml (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        database
        TestingTermInitializer.java (diff)
        datagenerator
        TaxonGenerator.java (diff)
        persistence
        dao
        MethodCacheImplTest.java (diff)
        hibernate
        common
        CdmGenericDaoImplTest.java (diff)
        description
        DescriptionDaoHibernateImplTest.java (diff)
        DescriptionElementDaoHibernateImplTest.java
        IdentificationKeyDaoHibernateImplTest.java (diff)
        PolytomousKeyDaoHibernateImplTest.java
        media
        MediaDaoImplTest.java (diff)
        MediaRepresentationPartDaoImplTest.java
        reference
        ReferenceDaoHibernateImplTest.java (diff)
        taxon
        TaxonDaoHibernateImplTest.java (diff)
        TaxonNodeDaoHibernateImplTest.java (diff)
        view
        AuditEventDaoTest.java (diff)
        hibernate
        CacheStrategyGeneratorTest.java (diff)
        test
        function
        TestPersistence.java (diff)
    - resources
cdmlib-print
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        print
        XMLHelper.java (diff)
        out
        odf
        OdfOutputModule.java (diff)
    - resources
      - eu
        etaxonomy
        cdm
        print
        out
        odf
        cdmToOdfText.xsl
        pdf
        cdmToPdf.xsl
        package.html
        printpublisher
        out
        odf
        cdmToOdfText.xsl
        pdf
        cdmToPdf.xsl
  - site
    - apt
      - index.apt (diff)
    - site.xml (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        print
        PublisherTest.java
        TransformatorTest.java
        out
        odf
        OdfOutputModuleTest.java
        printpublisher
        PublisherTest.java
        TransformatorTest.java
        out
        odf
        OdfOutputModuleTest.java
    - resources
      - eu
        etaxonomy
        cdm
        print
        out
        odf
        input.xml
        single_input.xml
        printpublisher
        out
        odf
        input.xml
        single_input.xml
cdmlib-remote
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        remote
        controller
        ClassificationController.java (diff)
        ClassificationListController.java (diff)
        ClassificationPortalController.java
        ClassificationPortalListController.java
        MediaController.java (diff)
        ReferenceController.java (diff)
        ReferenceListController.java (diff)
        TaxonPortalController.java (diff)
        TaxonomicTreePortalController.java
        TaxonomicTreePortalListController.java
        ext
        ExternalBhleController.java (diff)
        oaipmh
        ReferenceOaiPmhController.java (diff)
        dto
        oaipmh
        SetSpec.java (diff)
        json
        processor
        bean
        DerivedUnitFacadeBeanProcessor.java (diff)
        MediaBeanProcessor.java (diff)
        ReferenceBaseBeanProcessor.java (diff)
        TaxonNameBaseBeanProcessor.java (diff)
        TaxonNodeDaoBeanProcessor.java (diff)
        matcher
        CdmProxyBeanProcessorMatcher.java (diff)
        value
        PartialJSONValueProcessor.java (diff)
        URIJSONValueProcessor.java
    - resources
      - eu
        etaxonomy
        cdm
        remote
        dto
        oaipmh
        mappings.xml (diff)
        json
        jsonConfigurations.xml (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        remote
        dto
        assembler
        lsid
        AssemblerTest.java (diff)
cdmlib-remote-webapp
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        remote
        config
        DataSourceConfigurer.java (diff)
    - webapp
      - WEB-INF
        json-views.xml (diff)
        xml-views.xml (diff)
cdmlib-services
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        api
        application
        CdmApplicationController.java (diff)
        CdmApplicationDefaultConfiguration.java (diff)
        ICdmApplicationConfiguration.java (diff)
        facade
        DerivedUnitFacade.java (diff)
        DerivedUnitFacadeCacheStrategy.java (diff)
        service
        ClassificationServiceImpl.java
        IClassificationService.java
        IPolytomousKeyService.java
        IReferenceService.java (diff)
        ITaxonService.java (diff)
        ITaxonTreeService.java
        IdentifiableServiceBase.java (diff)
        IdentificationKeyGenerator.java (diff)
        PolytomousKeyServiceImpl.java
        ReferenceServiceImpl.java (diff)
        TaxonServiceImpl.java (diff)
        TaxonTreeServiceImpl.java
        WorkingSetService.java (diff)
        config
        IIdentifiableEntityServiceConfigurator.java (diff)
        ITaxonServiceConfigurator.java (diff)
        impl
        IdentifiableServiceConfiguratorImpl.java (diff)
        TaxonServiceConfiguratorImpl.java (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        api
        facade
        DerivedUnitFacadeCacheStrategyTest.java (diff)
        DerivedUnitFacadeTest.java (diff)
        service
        ClassificationServiceImplTest.java
        CommonServiceImplTest.java (diff)
        IdentifiableServiceBaseTest.java (diff)
        NaturalLanguageGeneratorTest.java (diff)
        TaxonServiceImplTest.java (diff)
        TaxonTreeServiceImplTest.java
        test
        function
        Datasource.java (diff)
        TestConcurrentSession.java (diff)
        TestDatabase.java (diff)
        TestService.java (diff)
        TestTaxonFunction.java (diff)
        hibernate.cfg.xml (diff)
        integration
        TestTaxonServices.java (diff)
        validation
        NameValidCharactersTest.java (diff)
        ReferenceValidationTest.java (diff)
        TaxonNameCannotBeAcceptedAndSynonymTest.java (diff)
        ValidationTest.java (diff)
    - resources
      - dbscripts
        001_cdm.ddl (diff)
      - eu
        etaxonomy
        cdm
        api
        service
        CommonServiceImplTest.xml (diff)
        IdentifiableServiceBaseTest.testUpdateTitleCache-result.xml (diff)
        IdentifiableServiceBaseTest.xml (diff)
        lsid
        LSIDAuthorityServiceTest.testGetAvailableServices.xml (diff)
pom.xml (diff)