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 a90a968ce0974733e430c83e3f386a57e7fe6110
Merge: 43f1433 1a38a80
Author: Misagh Moayyed <[email protected]>
AuthorDate: Wed Apr 1 11:47:54 2020 +0430

    Merge branch 'master' into SYNCOPE-163-1
    
    # Conflicts:
    #   .travis.yml

 appveyor.yml                                       |   2 +-
 .../main/resources/archetype-resources/wa/pom.xml  |   2 -
 .../ui/commons/StyledNotificationBehavior.java     |   4 +-
 .../commons/markup/html/form/AjaxPalettePanel.java |  49 +-
 .../ui/commons/panels/NotificationPanel.java       |   6 +-
 client/idrepo/console/pom.xml                      |   2 +-
 .../client/console/audit/AuditHistoryDetails.java  |   8 +-
 .../syncope/client/console/pages/Realms.java       |   7 +-
 .../console/tasks/ExecutionsDirectoryPanel.java    |   3 +
 .../console/wizards/any/AnnotatedBeanPanel.java    |  37 +-
 .../syncope/client/console/wizards/any/Groups.java |  27 +-
 .../console/SyncopeWebApplication.properties       |   1 +
 .../console/SyncopeWebApplication_fr_CA.properties |  66 ++-
 .../console/SyncopeWebApplication_it.properties    |   1 +
 .../console/SyncopeWebApplication_ja.properties    |   1 +
 .../console/SyncopeWebApplication_pt_BR.properties |   5 +-
 .../console/SyncopeWebApplication_ru.properties    |   1 +
 .../tasks/SchedTaskDirectoryPanel_it.properties    |   2 +-
 .../console/wizards/any/AnnotatedBeanPanel.html    |  28 +-
 .../wizards/any/AnnotatedBeanPanel.properties      |   6 +-
 .../any/AnnotatedBeanPanel_fr_CA.properties        |   8 +-
 .../wizards/any/AnnotatedBeanPanel_it.properties   |   2 +
 .../wizards/any/AnnotatedBeanPanel_ja.properties   |   2 +
 .../any/AnnotatedBeanPanel_pt_BR.properties        |   2 +
 .../wizards/any/AnnotatedBeanPanel_ru.properties   |  10 +-
 client/idrepo/enduser/pom.xml                      |   2 +-
 .../common/lib/jaxb/XmlEntityTOAdapter.java        |   1 -
 .../common/lib/to/AbstractAnnotatedBean.java       | 153 -----
 .../org/apache/syncope/common/lib/to/AnyTO.java    |  98 +++-
 core/idm/logic/pom.xml                             |   5 -
 .../syncope/core/logic/AbstractAnyLogic.java       |   2 +
 .../apache/syncope/core/logic/AnyObjectLogic.java  |  18 +-
 .../org/apache/syncope/core/logic/GroupLogic.java  |  20 +-
 .../org/apache/syncope/core/logic/TaskLogic.java   |   8 +-
 .../org/apache/syncope/core/logic/UserLogic.java   |  37 +-
 .../syncope/core/rest/cxf/AddETagFilter.java       |  12 +-
 .../syncope/core/rest/cxf/RESTCXFContext.java      |  12 +-
 .../syncope/core/persistence/api/entity/Any.java   |  27 +-
 .../api/entity/task/ProvisioningTask.java          |   1 -
 core/persistence-jpa/pom.xml                       |  16 +-
 .../jpa/content/XMLContentExporter.java            |   3 +-
 .../jpa/entity/AbstractAnnotatedEntity.java        | 112 ----
 .../core/persistence/jpa/entity/AbstractAny.java   | 101 +++-
 .../persistence/jpa/entity/AbstractPlainAttr.java  |   2 -
 .../jpa/entity/AbstractSysInfoListener.java        |  47 --
 .../jpa/entity/AnnotatedEntityListener.java        |  32 --
 .../persistence/jpa/entity/PlainAttrListener.java  |  35 --
 .../entity/EntityValidationListener.java           |   4 +-
 .../core/persistence/jpa/outer/UserTest.java       |  24 -
 .../api/AnyObjectProvisioningManager.java          |   9 +-
 .../provisioning/api/GroupProvisioningManager.java |   7 +-
 .../core/provisioning/api/ProvisioningManager.java |  20 +-
 .../provisioning/api/UserProvisioningManager.java  |  40 +-
 .../api/pushpull/ProvisioningProfile.java          |  10 +
 core/provisioning-java/pom.xml                     |   5 -
 .../java/DefaultAnyObjectProvisioningManager.java  |  76 ++-
 .../java/DefaultGroupProvisioningManager.java      |  78 ++-
 .../java/DefaultUserProvisioningManager.java       | 142 +++--
 .../java/data/AnyObjectDataBinderImpl.java         |  12 +-
 .../java/data/GroupDataBinderImpl.java             |   5 +-
 .../provisioning/java/data/UserDataBinderImpl.java |  23 +-
 .../java/job/AbstractSchedTaskJobDelegate.java     |  14 +-
 .../java/job/ExpiredAccessTokenCleanup.java        |   3 +-
 .../provisioning/java/job/ExpiredBatchCleanup.java |   2 +-
 .../job/GroupMemberProvisionTaskJobDelegate.java   |  20 +-
 .../provisioning/java/job/SetUMembershipsJob.java  |  13 +-
 .../java/job/notification/NotificationJob.java     |   8 +-
 .../provisioning/java/job/report/ReportJob.java    |  28 +-
 .../pushpull/AbstractProvisioningJobDelegate.java  |   9 +-
 .../java/pushpull/AbstractPullResultHandler.java   |   4 +-
 .../pushpull/AbstractSyncopeResultHandler.java     |   5 +
 .../DefaultAnyObjectPullResultHandler.java         |  14 +-
 .../DefaultAnyObjectPushResultHandler.java         |   2 +-
 .../pushpull/DefaultGroupPullResultHandler.java    |  13 +-
 .../pushpull/DefaultGroupPushResultHandler.java    |   2 +-
 .../pushpull/DefaultUserPullResultHandler.java     |  23 +-
 .../pushpull/DefaultUserPushResultHandler.java     |   3 +-
 .../java/pushpull/LDAPMembershipPullActions.java   |   5 +
 .../java/pushpull/PullJobDelegate.java             |   4 +-
 .../java/pushpull/PushJobDelegate.java             |   4 +-
 .../spring/security/JWTAuthenticationFilter.java   |  15 +-
 .../UsernamePasswordAuthenticationProvider.java    |   3 +-
 .../core/spring/security/WebSecurityContext.java   |   4 +-
 core/starter/pom.xml                               |   2 +-
 .../workflow/api/AnyObjectWorkflowAdapter.java     |   8 +-
 .../core/workflow/api/GroupWorkflowAdapter.java    |   8 +-
 .../core/workflow/api/UserWorkflowAdapter.java     |  38 +-
 .../java/AbstractAnyObjectWorkflowAdapter.java     |  19 +-
 .../java/AbstractGroupWorkflowAdapter.java         |  14 +-
 .../workflow/java/AbstractUserWorkflowAdapter.java |  64 ++-
 .../workflow/java/AbstractWorkflowAdapter.java}    |  29 +-
 .../java/DefaultAnyObjectWorkflowAdapter.java      |  12 +-
 .../workflow/java/DefaultGroupWorkflowAdapter.java |  10 +-
 .../workflow/java/DefaultUserWorkflowAdapter.java  |  31 +-
 docker/wa/pom.xml                                  |   2 -
 .../camel/CamelAnyObjectProvisioningManager.java   |  76 ++-
 .../camel/CamelGroupProvisioningManager.java       |  73 ++-
 .../camel/CamelUserProvisioningManager.java        | 116 +++-
 .../camel/component/PropagateComponent.java        |  25 +-
 .../camel/producer/CreateProducer.java             |  14 +-
 .../camel/producer/StatusProducer.java             |  10 +-
 .../src/main/resources/anyObjectRoutes.xml         |   8 +-
 .../src/main/resources/groupRoutes.xml             |  10 +-
 .../src/main/resources/userRoutes.xml              |  37 +-
 .../elasticsearch/client/ElasticsearchUtils.java   |   4 +-
 .../java/job/ElasticsearchReindex.java             |   2 +-
 .../flowable/impl/FlowableUserWorkflowAdapter.java |  31 +-
 .../syncope/core/logic/oidc/OIDCUserManager.java   |   8 +-
 .../syncope/core/logic/saml2/SAML2UserManager.java |   8 +-
 .../syncope/ext/scimv2/cxf/RESTSCIMCXFContext.java |   4 +-
 .../self/keymaster/cxf/SelfKeymasterContext.java   |   6 +-
 fit/build-tools/pom.xml                            |  21 +-
 .../normalization/NormalizationInterceptor.java    | 628 +++++++++++++++++++++
 .../fit/buildtools/ApacheDSStartStopListener.java  | 115 ++--
 .../WEB-INF/{glassfish-web.xml => payara-web.xml}  |   8 +-
 fit/core-reference/pom.xml                         |  15 +-
 .../fit/core/reference/TestSampleJobDelegate.java  |   3 +-
 fit/core-reference/src/main/resources/log4j2.xml   |   4 +
 .../WEB-INF/{glassfish-web.xml => payara-web.xml}  |  11 +-
 .../apache/syncope/fit/core/AnyObjectITCase.java   |   2 +
 .../apache/syncope/fit/core/PullTaskITCase.java    |  18 +-
 .../org/apache/syncope/fit/core/SearchITCase.java  |  20 +-
 fit/wa-reference/pom.xml                           |   2 -
 ide/netbeans/pom.xml                               |   4 -
 pom.xml                                            |  87 ++-
 sra/pom.xml                                        |   2 +-
 .../systemadministration/javaeecontainer.adoc      |  32 +-
 src/site/xdoc/building.xml                         |   5 -
 src/site/xdoc/downloads.xml                        | 126 ++---
 src/site/xdoc/release-process.xml                  |   2 +-
 wa/pom.xml                                         |   2 -
 131 files changed, 2209 insertions(+), 1246 deletions(-)


Reply via email to