Revision 6837d5b7 - Merging revisions 7377-7378,7390-7396,7400-7405,7412-7414,7442-7443,7448-7449... - EDIT - EDIT Project Management

« Previous | Next »

Revision 6837d5b7

Added by Andreas Kohlbecker almost 15 years ago

ID 6837d5b79048592f40edb60a218eb45b5d2449f5
Parent f67dc7a6
Child 6f842a9d

Merging revisions 7377-7378,7390-7396,7400-7405,7412-7414,7442-7443,7448-7449,7453-7456 of http://dev.e-taxonomy.eu/svn/branches/cdmlib/2.2 into trunk - test in error, see #1274, #1275

added
modified
copied
renamed
deleted

.gitattributes (diff)
app-import
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        app
        common
        CdmDestinations.java (diff)
        images
        ImageImportConfigurator.java (diff)
        wp6
        palmae
        PalmaeActivator.java (diff)
        PalmaeExcelProtologueActivator.java (diff)
        PalmaeImageActivator.java (diff)
        io
        PalmaeImageImport.java (diff)
cdmlib-io
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        io
        berlinModel
        in
        BerlinModelAuthorTeamImport.java (diff)
        BerlinModelOccurrenceImport.java (diff)
cdmlib-model
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        model
        agent
        Team.java (diff)
        common
        IdentifiableEntity.java (diff)
        media
        MediaRepresentation.java (diff)
        strategy
        cache
        agent
        TeamDefaultCacheStrategy.java (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        model
        taxon
        TaxonTest.java (diff)
        strategy
        cache
        agent
        TeamDefaultCacheStrategyTest.java (diff)
cdmlib-persistence
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        persistence
        dao
        hibernate
        reference
        ReferenceDaoHibernateImpl.java (diff)
        reference
        IReferenceDao.java (diff)
        hibernate
        CacheStrategyGenerator.java (diff)
cdmlib-remote
- pom.xml (diff)
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        remote
        controller
        TaxonPortalController.java (diff)
        service
        AuthorityController.java (diff)
    - resources
      - linux
        initscript
        cdmserver
cdmlib-services
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        api
        service
        IReferenceService.java (diff)
        ReferenceServiceImpl.java (diff)