Revision f93dab43

« Previous | Next »

ID	f93dab43e8fd5ead08d26181d90aa36faf70e4e1
Parent	fc3932ac
Child	7bd0a31e

Added by Katja Luther about 1 year ago

Revert "minor - fix merge conflict"

This reverts commit fc3932ac4dd186b6f5809863356912f949ae202d.

Files

added
modified
copied
renamed
deleted

View differences

cdmlib-cache
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        cache
        CdmModelCacherConnectionProvider.java (diff)
cdmlib-commons
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        common
        UriUtils.java (diff)
cdmlib-io
- src
  - test
    - java
      - eu
        etaxonomy
        cdm
        io
        jaxb
        MediaTest.java (diff)
cdmlib-persistence
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        config
        ConfigFileUtil.java (diff)
        persistence
        hibernate
        SaveOrUpdateEntityListener.java (diff)
        permission
        CdmPermissionClass.java (diff)
        CdmPermissionEvaluator.java (diff)
        UnanimousBasedUnrevokable.java (diff)
cdmlib-remote
- src
  - main
    - resources
      - log4j.properties (diff)
cdmlib-remote-webapp
- ide
  - eclipse
    - Jetty Launcher
      - cdmlib-remote-webapp - run.launch (diff)
cdmlib-services
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        api
        facade
        DerivedUnitFacadeCacheStrategy.java (diff)
        service
        DescriptionServiceImpl.java (diff)
        IdentifiableServiceBase.java (diff)
        ServiceBase.java (diff)
        TaxonNodeServiceImpl.java (diff)
        TaxonServiceImpl.java (diff)
        util
        CacheUpdater.java (diff)
  - test
    - java
      - eu
        etaxonomy
        cdm
        api
        service
        GroupServiceImplTest.java (diff)
        TypeDesignationSetManagerTest.java (diff)
cdmlib-test
- src
  - main
    - java
      - eu
        etaxonomy
        cdm
        test
        integration
        CdmTransactionalIntegrationTest.java (diff)

Project

General

Profile

Edit

Revision f93dab43

Files