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/23 13:10:39 UTC
[syncope] 01/03: Merge branch 'master' 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 9a4ae21cdd7fe675f01826874d8b06183a37a75e
Merge: 4861251 f7a4fbf
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Mar 23 16:17:35 2020 +0430
Merge branch 'master' into SYNCOPE-163-1
# Conflicts:
# wa/pom.xml
# wa/starter/src/main/java/org/apache/syncope/wa/starter/SyncopeWAConfiguration.java
# wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/SyncopeServiceRegistry.java
# wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/WARestClient.java
.../main/resources/archetype-resources/wa/pom.xml | 2 +-
.../syncope/client/ui/commons/BaseSession.java | 2 +-
.../client/console/panels/ListViewPanel.java | 2 +-
.../console/panels/search/SearchClausePanel.java | 2 +-
.../syncope/client/console/AbstractAdminTest.java | 17 +-
.../syncope/client/console/AbstractTest.java | 48 +++
.../console/panels/search/UserSearchPanelTest.java | 60 ++++
.../search/AbstractFiqlSearchConditionBuilder.java | 112 ++++--
...operty.java => AnyObjectCompleteCondition.java} | 11 +-
.../AnyObjectFiqlSearchConditionBuilder.java | 37 +-
...roperty.java => AnyObjectPartialCondition.java} | 11 +-
.../common/lib/search/AnyObjectProperty.java | 19 +-
...rty.java => ConnObjectTOCompleteCondition.java} | 11 +-
.../ConnObjectTOFiqlSearchConditionBuilder.java | 33 +-
...erty.java => ConnObjectTOPartialCondition.java} | 11 +-
...roupProperty.java => ConnObjectTOProperty.java} | 10 +-
...upProperty.java => GroupCompleteCondition.java} | 10 +-
.../search/GroupFiqlSearchConditionBuilder.java | 21 +-
...oupProperty.java => GroupPartialCondition.java} | 10 +-
.../syncope/common/lib/search/GroupProperty.java | 10 +-
...Property.java => SyncopeCompleteCondition.java} | 15 +-
...tProperty.java => SyncopePartialCondition.java} | 25 +-
.../syncope/common/lib/search/SyncopeProperty.java | 22 +-
...oupProperty.java => UserCompleteCondition.java} | 10 +-
.../lib/search/UserFiqlSearchConditionBuilder.java | 49 +--
...roupProperty.java => UserPartialCondition.java} | 10 +-
.../syncope/common/lib/search/UserProperty.java | 25 +-
.../api/search/FilterConverterTest.java | 29 --
docker/wa/pom.xml | 6 +-
.../wa/src/main/resources/application.properties | 8 +-
.../FlowableLiquibaseEnvironmentPostProcessor.java | 2 +-
fit/build-tools/pom.xml | 40 +++
.../greenmail/util/InterruptableGreenMail.java | 54 ---
.../fit/buildtools/GreenMailStartStopListener.java | 8 +-
.../fit/buildtools}/InterruptableSmtpServer.java | 3 +-
.../fit/buildtools/cxf/GreenMailServiceImpl.java | 8 +-
.../webapp/WEB-INF/jboss-deployment-structure.xml | 1 +
fit/core-reference/pom.xml | 4 +-
.../main/resources/application-wildfly.properties | 2 +-
.../webapp/WEB-INF/jboss-deployment-structure.xml | 2 +
.../syncope/fit/core/NotificationITCase.java | 5 +-
.../apache/syncope/fit/enduser/EnduserITCase.java | 4 +-
fit/wa-reference/pom.xml | 4 +-
pom.xml | 198 +++++++++--
.../apache/syncope/sra/ZookeeperTestingServer.java | 9 +-
.../getting-started/systemRequirements.adoc | 2 +-
.../systemadministration/javaeecontainer.adoc | 4 +-
wa/LICENSE | 202 -----------
wa/NOTICE | 5 -
wa/bootstrap/pom.xml | 68 ++++
.../RestfulCloudConfigBootstrapConfiguration.java | 53 +++
.../src/main/resources/META-INF/spring.factories | 4 +-
wa/pom.xml | 379 +--------------------
wa/{ => starter}/pom.xml | 126 ++-----
.../syncope/wa/starter}/SyncopeWAApplication.java | 2 +-
.../wa/starter}/SyncopeWAConfiguration.java | 46 +--
.../wa/starter}/rest/SyncopeServiceRegistry.java | 0
.../syncope/wa/starter}/rest/WARestClient.java | 0
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/application.properties | 2 +
wa/{ => starter}/src/main/resources/log4j2.xml | 0
.../resources/thymeleaf}/static/images/favicon.png | Bin
.../resources/thymeleaf}/static/images/logo.png | Bin
.../thymeleaf}/templates/fragments/footer.html | 0
.../thymeleaf}/templates/fragments/header.html | 0
.../resources/thymeleaf}/templates/layout.html | 0
wa/{ => starter}/src/main/resources/wa.properties | 0
.../apache/syncope/wa/starter}/SyncopeWATest.java | 2 +-
.../wa/starter}/ZookeeperTestingServer.java | 11 +-
.../test/resources/application-debug.properties | 0
.../src/test/resources/keymaster.properties | 2 +-
71 files changed, 778 insertions(+), 1114 deletions(-)
diff --cc wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/SyncopeServiceRegistry.java
index adf4007,0000000..adf4007
mode 100644,000000..100644
--- a/wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/SyncopeServiceRegistry.java
+++ b/wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/SyncopeServiceRegistry.java
diff --cc wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/WARestClient.java
index 555de0c,0000000..555de0c
mode 100644,000000..100644
--- a/wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/WARestClient.java
+++ b/wa/starter/src/main/java/org/apache/syncope/wa/starter/rest/WARestClient.java