You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/07 15:49:48 UTC
[syncope] 04/06: Merge branches 'SYNCOPE-163-1' and 'SYNCOPE-163-1'
of github.com:apache/syncope into SYNCOPE-163-1
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit f3de025c1d810a4013db4afce4584442009995c5
Merge: 39d4c0c 20464c8
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Fri Mar 6 11:44:52 2020 +0330
Merge branches 'SYNCOPE-163-1' and 'SYNCOPE-163-1' of github.com:apache/syncope into SYNCOPE-163-1
# Conflicts:
# core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPolicyDAO.java
.../syncope/common/lib/to/client/ClientAppTO.java | 2 +-
.../lib/to/client/SAML2ServiceProviderTO.java | 23 ++++------
.../service/saml/SAML2ServiceProviderService.java | 4 +-
.../api/entity/resource/ExternalResource.java | 10 ----
.../src/test/resources/domains/MasterContent.xml | 2 +-
.../jpa/dao/JPAExternalResourceDAO.java | 6 ---
.../core/persistence/jpa/dao/JPAPolicyDAO.java | 53 ++++++++++++----------
.../entity/authentication/AbstractClientApp.java | 1 -
.../jpa/entity/resource/JPAExternalResource.java | 32 -------------
.../src/test/resources/domains/MasterContent.xml | 2 +-
.../java/data/PolicyDataBinderImpl.java | 12 +++--
.../java/data/ResourceDataBinderImpl.java | 18 --------
.../org/apache/syncope/fit/core/SAML2SPITCase.java | 31 +++++++++++++
13 files changed, 81 insertions(+), 115 deletions(-)
diff --cc common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
index f988f3f,d2ae687..1033781
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/ClientAppTO.java
@@@ -36,7 -35,7 +36,7 @@@ import javax.xml.bind.annotation.XmlTyp
@XmlType
@XmlSeeAlso({OIDCRelyingPartyTO.class, SAML2ServiceProviderTO.class})
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@class")
- @JsonPropertyOrder(value = {"@class", "key", "name", "description",
-@JsonPropertyOrder(value = {"@class", "key", "name", "description", "authenticationPolicy"})
++@JsonPropertyOrder(value = {"@class", "key", "name", "description", "authenticationPolicy", "accessPolicy"})
@Schema(subTypes = {OIDCRelyingPartyTO.class, SAML2ServiceProviderTO.class}, discriminatorProperty = "@class")
public abstract class ClientAppTO extends BaseBean implements EntityTO {