Revision a784f00f - merge cate-development2 branch with trunk - EDIT - EDIT Project Management

« Previous | Next »

Revision a784f00f

Added by Katja Luther over 14 years ago

ID a784f00fdccac7609c1d01399f80dd73e90f2fbc
Parent 7e9136ac
Child 8744a43d

merge cate-development2 branch with trunk

added
modified
copied
renamed
deleted

.gitattributes (diff)
cdmlib-ext
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        ext
        EditGeoServiceUtilities.java (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        ext
        EditGeoServiceTest.java (diff)
cdmlib-io
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        io
        jaxb
        CdmIDResolver.java
        DataSet.java (diff)
        Error.java
        JaxbExport.java (diff)
        JaxbImport.java (diff)
    - resources
      - schema
        cdm
        agent.xsd (diff)
        cdm.xsd (diff)
        common.xsd (diff)
        description.xsd (diff)
        media.xsd (diff)
  - test
    - resources
      - eu
        etaxonomy
        cdm
        applicationContext-test.xml (diff)
        io
        jaxb
        FeatureTest.xml (diff)
cdmlib-model
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        hibernate
        DateTimeBridge.java
        jaxb
        CdmAccessor.java
        CdmAccessorFactoryImpl.java
        model
        agent
        Contact.java (diff)
        Institution.java (diff)
        Person.java (diff)
        Team.java (diff)
        package-info.java (diff)
        common
        AnnotatableEntity.java (diff)
        Annotation.java (diff)
        CdmBase.java (diff)
        GrantedAuthorityImpl.java (diff)
        Group.java (diff)
        IdentifiableEntity.java (diff)
        LanguageStringBase.java (diff)
        Marker.java (diff)
        User.java (diff)
        VersionableEntity.java (diff)
        package-info.java (diff)
        description
        DescriptionElementBase.java (diff)
        FeatureTree.java (diff)
        package-info.java (diff)
        location
        package-info.java (diff)
        media
        IdentifiableMediaEntity.java (diff)
        package-info.java (diff)
        molecular
        package-info.java (diff)
        name
        NameRelationship.java (diff)
        NonViralName.java (diff)
        TaxonNameBase.java (diff)
        package-info.java (diff)
        occurrence
        package-info.java (diff)
        reference
        package-info.java (diff)
        taxon
        SynonymRelationship.java (diff)
        Taxon.java (diff)
        TaxonBase.java (diff)
        TaxonRelationship.java (diff)
        TaxonomicTree.java (diff)
        package-info.java (diff)
        strategy
        match
        DefaultMatchStrategy.java (diff)
        merge
        DefaultMergeStrategy.java (diff)
        validation
        annotation
        BasionymsMustShareEpithetsAndAuthors.java
        ChildTaxaMustBeLowerRankThanParent.java
        ChildTaxaMustDeriveNameFromParent.java
        HomotypicSynonymsShouldBelongToGroup.java
        NamesWithHomotypicRelationshipsMustBelongToSameGroup.java
        constraint
        BasionymsMustShareEpithetsAndAuthorsValidator.java
        ChildTaxaMustBeLowerRankThanParentValidator.java
        ChildTaxaMustDeriveNameFromParentValidator.java
        HomotypicSynonymsShouldBelongToGroupValidator.java
        MustHaveAuthorityValidator.java (diff)
        NamesWithHomotypicRelationshipsMustBelongToSameGroupValidator.java
        TaxonNameCannotBeAcceptedAndSynonymValidator.java (diff)
    - resources
      - ValidationMessages.properties (diff)
cdmlib-persistence
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        persistence
        dao
        common
        IAnnotatableDao.java (diff)
        IMarkerDao.java (diff)
        hibernate
        common
        AnnotatableDaoImpl.java (diff)
        CdmEntityDaoBase.java (diff)
        DaoBase.java (diff)
        IdentifiableDaoBase.java (diff)
        MarkerDaoImpl.java (diff)
        occurrence
        CollectionDaoHibernateImpl.java (diff)
        taxon
        TaxonAlternativeSpellingSuggestionParser.java (diff)
        TaxonDaoHibernateImpl.java (diff)
        hibernate
        CacheStrategyGenerator.java (diff)
        CdmDeleteListener.java (diff)
        SaveEntityListener.java (diff)
        SaveOrUpdateEntityListener.java (diff)
        UpdateEntityListener.java (diff)
        query
        OrderHint.java (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        persistence
        dao
        hibernate
        common
        CdmEntityDaoBaseTest.java (diff)
        UserDaoHibernateImplTest.java (diff)
        hibernate
        CdmDeleteListenerTest.java (diff)
    - resources
      - eu
        etaxonomy
        cdm
        applicationContext-test.xml (diff)
        persistence
        dao
        hibernate
        name
        TaxonNameDaoHibernateImplTest.xml (diff)
        hibernate
        CdmDeleteListenerTest.testOnDelete-result.xml (diff)
        CdmDeleteListenerTest.xml (diff)
cdmlib-remote
cdmlib-services
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        api
        application
        CdmApplicationController.java (diff)
        CdmApplicationDefaultConfiguration.java (diff)
        ICdmApplicationConfiguration.java (diff)
        service
        AnnotatableServiceBase.java (diff)
        IAnnotatableService.java (diff)
        IMarkerService.java
        IUserService.java (diff)
        MarkerServiceImpl.java
        UserService.java (diff)
    - resources
      - eu
        etaxonomy
        cdm
        defaultSecurityContext.xml (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        api
        service
        UserServiceImplTest.java (diff)
        validation
        TaxonNameCannotBeAcceptedAndSynonymTest.java (diff)
    - resources
      - eu
        etaxonomy
        cdm
        applicationContext-test.xml (diff)