Merge branch 'development' into feature/EDELIVERY-3687-smp-ui-add-edit-user
# Conflicts: # smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/UserRO.java # smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceUIDataIntegrationTest.java
No related branches found
No related tags found
Showing
- pom.xml 1 addition, 1 deletionpom.xml
- smp-angular/pom.xml 1 addition, 1 deletionsmp-angular/pom.xml
- smp-api/pom.xml 1 addition, 1 deletionsmp-api/pom.xml
- smp-docker/pom.xml 1 addition, 1 deletionsmp-docker/pom.xml
- smp-parent-pom/pom.xml 32 additions, 21 deletionssmp-parent-pom/pom.xml
- smp-server-library/pom.xml 47 additions, 1 deletionsmp-server-library/pom.xml
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/SMPRole.java 8 additions, 0 deletions...ary/src/main/java/eu/europa/ec/edelivery/smp/SMPRole.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/ExtensionConverter.java 40 additions, 10 deletions...uropa/ec/edelivery/smp/conversion/ExtensionConverter.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/ServiceGroupConverter.java 45 additions, 20 deletions...pa/ec/edelivery/smp/conversion/ServiceGroupConverter.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/ServiceMetadataConverter.java 25 additions, 14 deletions...ec/edelivery/smp/conversion/ServiceMetadataConverter.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java 253 additions, 10 deletions...ain/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java 53 additions, 2 deletions...n/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/OwnershipDao.java 0 additions, 33 deletions...ava/eu/europa/ec/edelivery/smp/data/dao/OwnershipDao.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceGroupDao.java 65 additions, 1 deletion.../eu/europa/ec/edelivery/smp/data/dao/ServiceGroupDao.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceMetadataDao.java 41 additions, 7 deletions.../europa/ec/edelivery/smp/data/dao/ServiceMetadataDao.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/UserDao.java 106 additions, 1 deletion...ain/java/eu/europa/ec/edelivery/smp/data/dao/UserDao.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ui/UiDaoService.java 0 additions, 230 deletions.../eu/europa/ec/edelivery/smp/data/dao/ui/UiDaoService.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialect.java 27 additions, 0 deletions.../edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialect.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGenerator.java 154 additions, 0 deletions...a/ec/edelivery/smp/data/dao/utils/SMPSchemaGenerator.java
- smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/BaseEntity.java 56 additions, 2 deletions...ava/eu/europa/ec/edelivery/smp/data/model/BaseEntity.java
Loading
Please register or sign in to comment