You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/03/17 06:46:20 UTC
[syncope] branch SYNCOPE-1545 updated (5f292db -> 80b941e)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git.
discard 5f292db minor fixes to revert changes
discard 1303a7a Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545
discard 1a4a8a0 [SYNCOPE-1545] Using CAS BOM
discard 3d4e7c9 [SYNCOPE-1545] Archetype
discard 53a576e Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545
discard c7cdd08 fix build
discard f1a4c21 [SYNCOPE-1545] add AUP support; off by default
discard 13624ac [SYNCOPE-1545] Archetype
discard 89d4d36 [SYNCOPE-1545] add support for syncope authn and disable missing service param
discard f58aa14 [SYNCOPE-1545] move config to configuration class, add support for restful registry with entity-mapping and add support for config validation
discard d6bf46d [SYNCOPE-1545] Refactoring logging, adding Keymaster support + Docker image
discard b10501c [SYNCOPE-1545] fit/wa-reference + inclusion in standalone
discard f0f25d6 [SYNCOPE-1545] Basic white-labeling
discard 4e630e9 [SYNCOPE-1545] Initial
discard 1083f7b Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545
discard 264b270 [SYNCOPE-1545] Archetype
discard eba1928 [SYNCOPE-1545] add AUP support; off by default
discard 1c79728 [SYNCOPE-1545] add support for syncope authn and disable missing service param
discard 2a5f196 [SYNCOPE-1545] move config to configuration class, add support for restful registry with entity-mapping and add support for config validation
discard 37251ff [SYNCOPE-1545] Refactoring logging, adding Keymaster support + Docker image
discard dd5bed6 [SYNCOPE-1545] fit/wa-reference + inclusion in standalone
discard abfd62a [SYNCOPE-1545] Basic white-labeling
discard 596f679 [SYNCOPE-1545] Initial
discard 2dbd417 Merge branch 'master' into SYNCOPE-1545
discard b732d00 add AUP support; off by default
discard 51468cf wip: fix ci build
discard 03040c2 fix test
discard e4f8002 add support for syncope authn disable missing service param
discard 783482e fix copyright header
discard 9b7ff8f - move config to configuration class - add support for restful registry with entity-mapping - add support for config validation
discard 4eaac9d Exclusions
discard b58d877 Refactoring logging, adding Keymaster support + Docker image
discard b45da06 Fix checkstyle
discard 2000264 Upgrading Jackson and java-uuid-generator
discard b3d46e4 fit/wa-reference + inclusion in standalone
discard ce3dd6b Fixing checkstyle
discard c5453ca Basic white-labeling
discard 85c63a1 Restoring bootstrap
discard 730163e clean up module versions
discard 8ab5379 remove misc modules
discard 1ffb700 Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545
discard 52c22f3 minor fixes
discard 5fb7ef6 Now skipping maven-remote-resources-plugin by default
discard de75670 Skipping maven-remote-resources-plugin by default, keeping it enabled in the apache-release profile; for SNAPSHOT publishing we'll need to add -Dskip.maven-remote-resources-plugin=false
discard 19b3421 [SYNCOPE-1545] Initial
new 7725bf5 [SYNCOPE-1545] Initial
new 2351ca5 [SYNCOPE-1545] Skipping maven-remote-resources-plugin by default, keeping it enabled in the apache-release profile; for SNAPSHOT publishing we'll need to add -Dskip.maven-remote-resources-plugin=false
new 6381e9a [SYNCOPE-1545] Basic white-labeling
new 1295448 [SYNCOPE-1545] fit/wa-reference + inclusion in standalone
new 9218c90 [SYNCOPE-1545] move config to configuration class, add support for restful registry with entity-mapping, add support for config validation
new 43f5c9a [SYNCOPE-1545] add support for syncope authn, disable missing service param
new ca3a404 [SYNCOPE-1545] add AUP support; off by default
new 09d5ad9 [SYNCOPE-1545] Archetype
new 80b941e [SYNCOPE-1545] Using CAS BOM
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5f292db)
\
N -- N -- N refs/heads/SYNCOPE-1545 (80b941e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/idrepo/logic/pom.xml | 1 +
1 file changed, 1 insertion(+)
[syncope] 06/09: [SYNCOPE-1545] add support for syncope authn,
disable missing service param
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 43f5c9a35ea422943f697b427148a8ef0082cc8c
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Mar 12 16:57:17 2020 +0330
[SYNCOPE-1545] add support for syncope authn, disable missing service param
---
.travis.yml | 7 +++----
wa/pom.xml | 5 +++++
wa/src/main/resources/wa.properties | 4 ++++
wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java | 3 ++-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e2597fb..0ed30c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,9 @@ git:
env:
global:
- MAVEN_OPTS="-Xmx4096M -Xss128M -XX:+CMSClassUnloadingEnabled -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -noverify"
+ - JAVAEE_CONTAINER=Tomcat
+ - DBMS=H2
+ - jaxrsContentType=application/json
install: true
notifications:
email:
@@ -53,10 +56,6 @@ jobs:
######################################################
- stage: fit
name: "Full Integration Tests: Apache Tomcat / H2 / JSON Content-Type"
- env:
- - JAVAEE_CONTAINER=Tomcat
- - DBMS=H2
- - jaxrsContentType=application/json
script: travis_wait 55 mvn -f fit/core-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
after_failure:
- cat fit/core-reference/target/log/*
diff --git a/wa/pom.xml b/wa/pom.xml
index 09d2fa2..85cff67 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -132,6 +132,11 @@ under the License.
<artifactId>cas-server-support-reports</artifactId>
</dependency>
<dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-syncope-authentication</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apereo.cas</groupId>
<artifactId>cas-server-support-saml</artifactId>
</dependency>
diff --git a/wa/src/main/resources/wa.properties b/wa/src/main/resources/wa.properties
index a208075..14e07af 100644
--- a/wa/src/main/resources/wa.properties
+++ b/wa/src/main/resources/wa.properties
@@ -23,3 +23,7 @@ useGZIPCompression=true
conf.directory=${conf.directory}
cas.standalone.configurationDirectory=${conf.directory}
cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+
+# Disable access to the login endpoint
+# if no target application is specified.
+cas.sso.allow-missing-service-parameter=false
diff --git a/wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java b/wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java
index c4ed578..d504cc8 100644
--- a/wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java
+++ b/wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java
@@ -49,7 +49,8 @@ import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.test.context.ContextConfiguration;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
- "cas.authn.accept.users=mrossi::password"
+ "cas.authn.accept.users=mrossi::password",
+ "cas.sso.allow-missing-service-parameter=true"
})
@ContextConfiguration(initializers = ZookeeperTestingServer.class)
public class SyncopeWATest {
[syncope] 03/09: [SYNCOPE-1545] Basic white-labeling
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 6381e9a7dec270b587924dee070a4aebd26d5617
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 3 15:32:33 2020 +0100
[SYNCOPE-1545] Basic white-labeling
---
.../syncope/client/console/pages/BasePage.html | 6 +-
wa/pom.xml | 13 ++
wa/src/main/resources/static/images/logo.png | Bin 0 -> 8913 bytes
.../main/resources/templates/fragments/footer.html | 30 +++
.../main/resources/templates/fragments/header.html | 217 +++++++++++++++++++++
5 files changed, 261 insertions(+), 5 deletions(-)
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
index e18f828..7bf0e0a 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html
@@ -159,7 +159,7 @@ under the License.
</div>
<footer class="main-footer">
- <strong>Copyright © 2010-<span id="spanYear"></span>
+ <strong>Copyright © 2010-${year}
<a href="http://www.apache.org/" target="_blank" rel="noopener noreferrer">The Apache Software Foundation</a>.</strong>
All rights reserved.
</footer>
@@ -271,9 +271,5 @@ under the License.
</div>
<div id="veil">Loading...</div>
-
- <script type="text/javascript">
- $('#spanYear').html(new Date().getFullYear());
- </script>
</body>
</html>
diff --git a/wa/pom.xml b/wa/pom.xml
index 3850226..2bdb8b0 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -215,6 +215,13 @@ under the License.
<profile>
<id>debug</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<defaultGoal>clean package spring-boot:run</defaultGoal>
@@ -283,4 +290,10 @@ under the License.
</profile>
</profiles>
+ <repositories>
+ <repository>
+ <id>shibboleth</id>
+ <url>https://build.shibboleth.net/nexus/content/groups/public</url>
+ </repository>
+ </repositories>
</project>
diff --git a/wa/src/main/resources/static/images/logo.png b/wa/src/main/resources/static/images/logo.png
new file mode 100644
index 0000000..f05105e
Binary files /dev/null and b/wa/src/main/resources/static/images/logo.png differ
diff --git a/wa/src/main/resources/templates/fragments/footer.html b/wa/src/main/resources/templates/fragments/footer.html
new file mode 100644
index 0000000..d991bf5
--- /dev/null
+++ b/wa/src/main/resources/templates/fragments/footer.html
@@ -0,0 +1,30 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<footer class="py-4 d-flex flex-column justify-content-center cas-footer text-center">
+ <div class="pb-1 pt-1">
+ Copyright © 2010-${year}
+ <a href="http://www.apache.org/" target="_blank" rel="noopener noreferrer">The Apache Software Foundation</a>.</strong>
+ All rights reserved.
+ </div>
+ <div class="pb-1 pt-1">
+ <span id="copyright" th:utext="#{copyright}" class="mr-2 d-inline-block">Copyright Date Apereo, Inc</span>
+ <span class="mr-2 d-inline-block">Powered by <a href="https://github.com/apereo/cas">Apereo CAS</a></span>
+ <code class="version" th:text="${T(org.apereo.cas.util.CasVersion).getVersion() + ' ' + T(org.apereo.cas.util.CasVersion).getDateTime()}"></code>
+ </div>
+</footer>
diff --git a/wa/src/main/resources/templates/fragments/header.html b/wa/src/main/resources/templates/fragments/header.html
new file mode 100644
index 0000000..f128dc9
--- /dev/null
+++ b/wa/src/main/resources/templates/fragments/header.html
@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html lang="en">
+
+<head>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+
+ <title>Header Fragment</title>
+ <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
+</head>
+
+<body>
+ <div th:fragment="header">
+ <header id="app-bar" class="mdc-top-app-bar mdc-top-app-bar--fixed mdc-elevation--z4">
+ <nav class="mdc-top-app-bar__row">
+ <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-start">
+ <!--<button class="mdc-icon-button mdc-top-app-bar__navigation-icon">
+ <span class="mdi mdi-menu"></span>
+ <span class="sr-only">menu</span>
+ </button>-->
+ </section>
+ <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-center">
+ <span class="cas-brand mx-auto">
+ <span class="sr-only">Apache Syncope</span>
+ <img th:src="@{'/images/logo.png'}" />
+ </span>
+ </section>
+ <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-end">
+ <button id="cas-notifications-menu"
+ class="mdc-icon-button mdc-top-app-bar__action-item cas-notification-toggle"
+ aria-label="Bookmark this page">
+ <span class="mdi mdi-bell-alert"></span>
+ <span class="sr-only">notifications</span>
+ <i id="notifications-count" class="notifications-count count">2</i>
+ </button>
+ </section>
+ </nav>
+
+ </header>
+ <aside id="app-drawer" class="mdc-drawer mdc-drawer--dismissible mdc-drawer--modal">
+ <div class="mdc-drawer__header">
+ <h3 class="mdc-drawer__title">CAS</h3>
+ <h6 class="mdc-drawer__subtitle">Central Authentication Service</h6>
+ </div>
+ <div class="mdc-drawer__content">
+ <nav class="mdc-list">
+ <a th:href="@{/actuator}" class="mdc-list-item">
+ <i class="mdi mdi-cogs"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.endpoints}]]</span>
+ </a>
+ <hr class="mdc-list-divider" />
+ <a class="mdc-list-item" href="https://apereo.github.io/cas">
+ <i class="mdi mdi-file-code-outline"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.wiki}]]</span>
+ </a>
+ <a class="mdc-list-item" href="https://github.com/apereo/cas/pulls">
+ <i class="mdi mdi-call-merge"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.pulls}]]</span>
+ </a>
+ <a class="mdc-list-item" href="https://apereo.github.io/cas/developer/Contributor-Guidelines.html">
+ <i class="mdi mdi-information"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.contribguide}]]</span>
+ </a>
+ <a class="mdc-list-item" href="https://apereo.github.io/cas/Support.html">
+ <i class="mdi mdi-help-circle"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.support}]]</span>
+ </a>
+ <a class="mdc-list-item" href="https://apereo.github.io/cas/Mailing-Lists.html">
+ <i class="mdi mdi-email-newsletter"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.mailinglist}]]</span>
+ </a>
+ <a class="mdc-list-item" href="https://gitter.im/apereo/cas">
+ <i class="mdi mdi-message-text"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.chat}]]</span>
+ </a>
+ <a class="mdc-list-item" href="https://apereo.github.io/">
+ <i class="mdi mdi-post"></i>
+ <span class="mdc-list-item__text">[[#{cas.login.resources.blog}]]</span>
+ </a>
+ </nav>
+ </div>
+ </aside>
+
+ <script>var countMessages = 0;</script>
+ <div class="mdc-dialog cas-notification-dialog" id="cas-notification-dialog" role="alertdialog"
+ aria-modal="true" aria-labelledby="notif-dialog-title" aria-describedby="notif-dialog-content">
+ <div class="mdc-dialog__container">
+ <div class="mdc-dialog__surface">
+ <h2 class="mdc-dialog__title mt-2" id="notif-dialog-title">
+ Notifications
+ </h2>
+ <div class="mdc-dialog__content" id="notif-dialog-content">
+ <div class="cas-notification-message mdc-typography--body1" th:if="${staticAuthentication}">
+ <script>countMessages++;</script>
+ <h5 class="mdc-typography--headline6" th:utext="#{screen.defaultauthn.title}" />
+ <p class="text text-wrap small" th:utext="#{screen.defaultauthn.heading}">
+ Static AuthN is ONLY useful for demo purposes. It is recommended that you connect CAS to
+ LDAP,
+ JDBC, etc
+ instead.
+ </p>
+ </div>
+ <div class="cas-notification-message mdc-typography--body1"
+ th:if="${not #httpServletRequest.secure}">
+ <h5 class="mdc-typography--headline6" th:utext="#{screen.nonsecure.title}" />
+ <script>countMessages++;</script>
+ <p class="text-wrap small" th:utext="#{screen.nonsecure.message}">
+ Unsure Connection
+ </p>
+ </div>
+ </div>
+ <footer class="mdc-dialog__actions">
+ <button type="button" class="mdc-button mdc-dialog__button" data-mdc-dialog-action="accept"
+ data-mdc-dialog-button-default>
+ <span class="mdc-button__label">OK</span>
+ </button>
+ </footer>
+ </div>
+ </div>
+ <div class="mdc-dialog__scrim"></div>
+ </div>
+ <script type="text/javascript">
+
+ (function (material) {
+ var header = {
+ init: function () {
+ header.attachTopbar();
+ material.autoInit();
+ },
+ attachDrawer: function () {
+ var elm = document.getElementById('app-drawer');
+ var drawer = material.drawer.MDCDrawer.attachTo(elm);
+ var closeDrawer = function (evt) {
+ drawer.open = false;
+ };
+ drawer.foundation_.handleScrimClick = closeDrawer;
+ document.onkeydown = function (evt) {
+ evt = evt || window.event;
+ if (evt.keyCode == 27) {
+ closeDrawer();
+ }
+ };
+
+ header.drawer = drawer;
+
+ return drawer;
+ },
+ attachTopbar: function (drawer) {
+ var drawer = header.attachDrawer();
+ var dialog = header.attachNotificationDialog();
+ header.attachDrawerToggle(drawer);
+ header.attachNotificationToggle(dialog);
+ },
+ checkCaps: function (ev) {
+ var s = String.fromCharCode(ev.which);
+ if (s.toUpperCase() === s && s.toLowerCase() !== s && !ev.shiftKey) {
+ ev.target.parentElement.classList.add('caps-on');
+ } else {
+ ev.target.parentElement.classList.remove('caps-on');
+ }
+ },
+ attachDrawerToggle: function (drawer) {
+ var topAppBar = material.topAppBar.MDCTopAppBar.attachTo(document.getElementById('app-bar'));
+ topAppBar.setScrollTarget(document.getElementById('main-content'));
+ topAppBar.listen('MDCTopAppBar:nav', function () {
+ drawer.open = !drawer.open;
+ });
+ return topAppBar;
+ },
+ attachNotificationDialog: function () {
+ var element = document.getElementById('cas-notification-dialog');
+ var dialog = material.dialog.MDCDialog.attachTo(element);
+ return dialog;
+ },
+ attachNotificationToggle: function (dialog) {
+ var btn = document.getElementById('cas-notifications-menu');
+ btn.addEventListener('click', () => {
+ dialog.open();
+ });
+ }
+ }
+
+
+ document.addEventListener('DOMContentLoaded', function () {
+ header.init();
+
+ if (countMessages == 0) {
+ window.jQuery('#notifications-count').remove();
+ } else {
+ window.jQuery('#notifications-count').text("(" + countMessages + ")")
+ }
+ });
+ })(mdc);
+ </script>
+ </div>
+</body>
+
+</html>
[syncope] 01/09: [SYNCOPE-1545] Initial
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 7725bf5a448e7fc7a4b5399709b5cfa109b6d917
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 3 08:56:41 2020 +0100
[SYNCOPE-1545] Initial
---
pom.xml | 241 +++++++++++++++-
wa/LICENSE | 202 ++++++++++++++
wa/NOTICE | 5 +
wa/pom.xml | 303 +++++++++++++++++++++
.../apache/syncope/wa/SyncopeWAApplication.java | 88 ++++++
wa/src/main/resources/application.properties | 39 +++
wa/src/test/resources/application-debug.properties | 17 ++
7 files changed, 886 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b8a601..93a886e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -449,16 +449,13 @@ under the License.
<joda.version>2.10.5</joda.version>
+ <cas.version>6.2.0-SNAPSHOT</cas.version>
+
<h2.version>1.4.200</h2.version>
<junit.version>5.6.0</junit.version>
<mockito.version>3.3.3</mockito.version>
- <conf.directory>${project.build.directory}/test-classes</conf.directory>
- <bundles.directory>${project.build.directory}/bundles</bundles.directory>
- <connid.location>file:${bundles.directory}/</connid.location>
- <log.directory>${project.build.directory}/log</log.directory>
-
<swagger-core.version>2.1.1</swagger-core.version>
<swagger-ui.version>3.25.0</swagger-ui.version>
<guava.version>20.0</guava.version>
@@ -488,7 +485,7 @@ under the License.
<ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
- <netbeans.version>RELEASE111</netbeans.version>
+ <netbeans.version>RELEASE112</netbeans.version>
<antlr4.version>4.8-1</antlr4.version>
@@ -532,6 +529,11 @@ under the License.
<jdbc.mssql.version>8.2.0.jre</jdbc.mssql.version>
<jdbc.oracle.version>19.3.0.0</jdbc.oracle.version>
+ <conf.directory>${project.build.directory}/test-classes</conf.directory>
+ <bundles.directory>${project.build.directory}/bundles</bundles.directory>
+ <connid.location>file:${bundles.directory}/</connid.location>
+ <log.directory>${project.build.directory}/log</log.directory>
+
<adminUser>admin</adminUser>
<anonymousUser>anonymous</anonymousUser>
<adminPassword>DE088591C00CC98B36F5ADAAF7DA2B004CF7F2FE7BBB45B766B6409876E2F3DB13C7905C6AA59464</adminPassword>
@@ -1246,6 +1248,16 @@ under the License.
<artifactId>groovy-sql</artifactId>
<version>${groovy.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-groovysh</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -1418,6 +1430,181 @@ under the License.
</dependency>
<!-- /Flowable -->
+ <!-- CAS -->
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-api-configuration-model</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-audit</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-validation-api</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-authentication</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-configuration</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-configuration-metadata-repository</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-cookie</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-logout</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-logging</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-services</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-services-api</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-tickets</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-util</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-validation</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-web</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-webflow</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-events-configuration</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-thymeleaf</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-actions</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-ldap</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-jdbc</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-reports</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-saml</artifactId>
+ <version>${cas.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-storage-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-person-directory</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-themes</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-oidc</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-validation</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-pm-webflow</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-pac4j-webflow</artifactId>
+ <version>${cas.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-storage-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-consent-webflow</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-webapp-config</artifactId>
+ <version>${cas.version}</version>
+ </dependency>
+ <!-- /CAS -->
+
<!-- Wicket -->
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -1513,10 +1700,30 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jul</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j18-impl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>${disruptor.version}</version>
@@ -1532,7 +1739,12 @@ under the License.
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
@@ -1827,8 +2039,14 @@ under the License.
</snapshots>
</repository>
<repository>
- <id>jitpack.io</id>
- <url>https://jitpack.io</url>
+ <id>shibboleth-releases</id>
+ <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
@@ -2327,6 +2545,10 @@ under the License.
</goals>
<phase>none</phase>
</execution>
+ <execution>
+ <id>process-resource-bundles</id>
+ <phase>none</phase>
+ </execution>
</executions>
</plugin>
<!-- Put NOTICE and LICENSE files in all artifacts and javadocs -->
@@ -2704,6 +2926,7 @@ under the License.
<module>core</module>
<module>client</module>
<module>sra</module>
+ <module>wa</module>
<module>fit</module>
<module>ext</module>
<module>archetype</module>
diff --git a/wa/LICENSE b/wa/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/wa/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/wa/NOTICE b/wa/NOTICE
new file mode 100644
index 0000000..3db7985
--- /dev/null
+++ b/wa/NOTICE
@@ -0,0 +1,5 @@
+Apache Syncope
+Copyright 2012-2019 The Apache Software Foundation
+
+This product includes software developed by:
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/wa/pom.xml b/wa/pom.xml
new file mode 100644
index 0000000..9c4d4de
--- /dev/null
+++ b/wa/pom.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <name>Apache Syncope WA</name>
+ <description>Apache Syncope WA</description>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-wa</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <guava.version>28.2-jre</guava.version>
+ <opensaml.version>3.4.5</opensaml.version>
+ <bootstrap.version>4.4.1</bootstrap.version>
+ <slf4j.version>2.0.0-alpha1</slf4j.version>
+
+ <rootpom.basedir>${basedir}/..</rootpom.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-api-configuration-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-audit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-validation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-authentication</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-configuration-metadata-repository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-cookie</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-logout</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-services</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-services-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-tickets</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-webflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-core-events-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-thymeleaf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-actions</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-ldap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-reports</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-saml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-person-directory</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-themes</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-oidc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-pm-webflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-pac4j-webflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-consent-webflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-webapp-config</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+
+ <resource>
+ <directory>${basedir}/../src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>banner.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>debug</id>
+
+ <build>
+ <defaultGoal>clean package spring-boot:run</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.apache.syncope.wa.SyncopeWAApplication</mainClass>
+ <jvmArguments>
+ -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+ </jvmArguments>
+ <profiles>
+ <profile>debug</profile>
+ </profiles>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test/resources</directory>
+ <includes>
+ <include>application-debug.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ </profile>
+
+ <profile>
+ <id>site</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ <generateReports>false</generateReports>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-docs-to-site</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
new file mode 100644
index 0000000..40b87ae
--- /dev/null
+++ b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.wa;
+
+import org.apache.commons.lang.StringUtils;
+import org.apereo.cas.configuration.CasConfigurationProperties;
+import org.apereo.cas.util.AsciiArtUtils;
+import org.apereo.cas.util.DateTimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration;
+import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@SpringBootApplication(exclude = {
+ HibernateJpaAutoConfiguration.class,
+ JerseyAutoConfiguration.class,
+ GroovyTemplateAutoConfiguration.class,
+ GsonAutoConfiguration.class,
+ JmxAutoConfiguration.class,
+ DataSourceAutoConfiguration.class,
+ RedisAutoConfiguration.class,
+ MongoAutoConfiguration.class,
+ MongoDataAutoConfiguration.class,
+ CassandraAutoConfiguration.class,
+ DataSourceTransactionManagerAutoConfiguration.class,
+ RedisRepositoriesAutoConfiguration.class
+})
+@EnableConfigurationProperties(CasConfigurationProperties.class)
+@EnableAsync
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+@EnableTransactionManagement(proxyTargetClass = true)
+@EnableScheduling
+public class SyncopeWAApplication extends SpringBootServletInitializer {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SyncopeWAApplication.class);
+
+ public static void main(final String[] args) {
+ new SpringApplicationBuilder(SyncopeWAApplication.class).
+ run(args);
+ }
+
+ /**
+ * Handle application ready event.
+ *
+ * @param event the event
+ */
+ @EventListener
+ public void handleApplicationReadyEvent(final ApplicationReadyEvent event) {
+ AsciiArtUtils.printAsciiArtReady(LOG, StringUtils.EMPTY);
+ LOG.info("Ready to process requests @ [{}]", DateTimeUtils.zonedDateTimeOf(event.getTimestamp()));
+ }
+}
diff --git a/wa/src/main/resources/application.properties b/wa/src/main/resources/application.properties
new file mode 100644
index 0000000..8624c66
--- /dev/null
+++ b/wa/src/main/resources/application.properties
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+spring.application.name=Apache Syncope ${syncope.version} WA
+spring.groovy.template.check-template-location=false
+spring.main.banner-mode=log
+
+server.port=8080
+
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
+
+server.servlet.contextPath=/syncope-wa
+
+##
+# Allow configuration classes to override bean definitions from Spring Boot
+#
+spring.main.allow-bean-definition-overriding=true
+spring.main.lazy-initialization=false
+
+service.discovery.address=http://localhost:8080/syncope-wa/
+
+conf.directory=${conf.directory}
+
+cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
diff --git a/wa/src/test/resources/application-debug.properties b/wa/src/test/resources/application-debug.properties
new file mode 100644
index 0000000..5f956d3
--- /dev/null
+++ b/wa/src/test/resources/application-debug.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+cas.authn.accept.users=admin::password
[syncope] 05/09: [SYNCOPE-1545] move config to configuration class,
add support for restful registry with entity-mapping,
add support for config validation
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 9218c90f9153d536936c57051114b07347449821
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Mar 9 16:37:19 2020 +0330
[SYNCOPE-1545] move config to configuration class, add support for restful registry with entity-mapping, add support for config validation
---
wa/pom.xml | 4 ++
.../apache/syncope/wa/SyncopeWAApplication.java | 24 ++++-------
.../syncope/wa/config/SyncopeWAConfiguration.java | 49 ++++++++++++++++++++++
wa/src/main/resources/META-INF/spring.factories | 17 ++++++++
4 files changed, 79 insertions(+), 15 deletions(-)
diff --git a/wa/pom.xml b/wa/pom.xml
index 13d69aa..09d2fa2 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -165,6 +165,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-rest-service-registry</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-webapp-config</artifactId>
</dependency>
<dependency>
diff --git a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
index 16d985d..dac26bb 100644
--- a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
+++ b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
@@ -18,13 +18,12 @@
*/
package org.apache.syncope.wa;
-import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
-import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
-import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
import org.apereo.cas.configuration.CasConfigurationProperties;
+import org.apereo.cas.configuration.CasConfigurationPropertiesValidator;
import org.apereo.cas.util.AsciiArtUtils;
import org.apereo.cas.util.DateTimeUtils;
+
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -44,7 +43,6 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.event.EventListener;
@@ -88,17 +86,13 @@ public class SyncopeWAApplication extends SpringBootServletInitializer {
*/
@EventListener
public void handleApplicationReadyEvent(final ApplicationReadyEvent event) {
+ if (!Boolean.getBoolean("SKIP_CONFIG_VALIDATION")) {
+ CasConfigurationPropertiesValidator validator =
+ new CasConfigurationPropertiesValidator(event.getApplicationContext());
+ validator.validate();
+ }
+
AsciiArtUtils.printAsciiArtReady(LOG, StringUtils.EMPTY);
LOG.info("Ready to process requests @ [{}]", DateTimeUtils.zonedDateTimeOf(event.getTimestamp()));
}
-
- @Bean
- public KeymasterStart keymasterStart() {
- return new KeymasterStart(NetworkService.Type.WA);
- }
-
- @Bean
- public KeymasterStop keymasterStop() {
- return new KeymasterStop(NetworkService.Type.WA);
- }
}
diff --git a/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
new file mode 100644
index 0000000..2107f51
--- /dev/null
+++ b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.syncope.wa.config;
+
+import org.apereo.cas.services.DefaultRegisteredServiceEntityMapper;
+import org.apereo.cas.services.RegisteredServiceEntityMapper;
+
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration(proxyBeanMethods = false)
+public class SyncopeWAConfiguration {
+ @Bean
+ @ConditionalOnProperty(name = "cas.serviceRegistry.rest.url")
+ public RegisteredServiceEntityMapper registeredServiceEntityMapper() {
+ return new DefaultRegisteredServiceEntityMapper();
+ }
+
+ @Bean
+ public KeymasterStart keymasterStart() {
+ return new KeymasterStart(NetworkService.Type.WA);
+ }
+
+ @Bean
+ public KeymasterStop keymasterStop() {
+ return new KeymasterStop(NetworkService.Type.WA);
+ }
+}
diff --git a/wa/src/main/resources/META-INF/spring.factories b/wa/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..db54cd0
--- /dev/null
+++ b/wa/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.apache.syncope.wa.config.SyncopeWAConfiguration
[syncope] 02/09: [SYNCOPE-1545] Skipping
maven-remote-resources-plugin by default, keeping it enabled in the
apache-release profile; for SNAPSHOT publishing we'll need to add
-Dskip.maven-remote-resources-plugin=false
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 2351ca5d19fbb03c37999aa8424cd2a1b312d597
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 3 09:45:18 2020 +0100
[SYNCOPE-1545] Skipping maven-remote-resources-plugin by default, keeping it enabled in the apache-release profile; for SNAPSHOT publishing we'll need to add -Dskip.maven-remote-resources-plugin=false
---
.travis.yml | 2 +-
client/am/console/pom.xml | 2 +-
client/idm/console/pom.xml | 2 +-
client/idrepo/common-ui/pom.xml | 2 +-
client/idrepo/console/pom.xml | 2 +-
client/idrepo/enduser/pom.xml | 2 +-
pom.xml | 374 ++++++---------------
wa/pom.xml | 19 +-
.../apache/syncope/wa/SyncopeWAApplication.java | 3 +-
wa/src/main/resources/application.properties | 3 +-
10 files changed, 106 insertions(+), 305 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a1fa1b3..e2597fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ jobs:
######################################################
- stage: test
name: "Unit Tests"
- script: mvn -T 1C clean test -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dskip.sass=true
+ script: mvn -T 1C clean test -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
######################################################
- stage: fit
name: "Full Integration Tests: Apache Tomcat / H2 / JSON Content-Type"
diff --git a/client/am/console/pom.xml b/client/am/console/pom.xml
index bfddc84..f79ac21 100644
--- a/client/am/console/pom.xml
+++ b/client/am/console/pom.xml
@@ -85,7 +85,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idm/console/pom.xml b/client/idm/console/pom.xml
index adb6a4d..028d8c7 100644
--- a/client/idm/console/pom.xml
+++ b/client/idm/console/pom.xml
@@ -85,7 +85,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/common-ui/pom.xml b/client/idrepo/common-ui/pom.xml
index 3c49f74..d8be621 100644
--- a/client/idrepo/common-ui/pom.xml
+++ b/client/idrepo/common-ui/pom.xml
@@ -134,7 +134,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/ui-commons/css/accessibility</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml
index 86e69aa..e8447fd 100644
--- a/client/idrepo/console/pom.xml
+++ b/client/idrepo/console/pom.xml
@@ -177,7 +177,7 @@ under the License.
<destination>${project.build.outputDirectory}/META-INF/resources/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index 4291275..c80e81e 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -150,7 +150,7 @@ under the License.
<destination>${project.build.outputDirectory}/org/apache/syncope/client/enduser/assets/css</destination>
</resource>
</resources>
- <skip>${skip.sass}</skip>
+ <skip>${sass.skip}</skip>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 93a886e..11ed853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@ under the License.
<role>PMC member</role>
</roles>
<url>http://people.apache.org/~massi/</url>
- </developer>
+ </developer>
<developer>
<id>rene</id>
<name>René Mulder</name>
@@ -409,9 +409,9 @@ under the License.
<jackson.version>2.10.3</jackson.version>
<spring.version>5.2.4.RELEASE</spring.version>
- <spring-security.version>5.3.0.RELEASE</spring-security.version>
+ <spring-security.version>5.2.2.RELEASE</spring-security.version>
<spring-boot.version>2.2.5.RELEASE</spring-boot.version>
- <spring-cloud-gateway.version>2.2.2.RELEASE</spring-cloud-gateway.version>
+ <spring-cloud-gateway.version>2.2.1.RELEASE</spring-cloud-gateway.version>
<openjpa.version>3.1.1</openjpa.version>
<hikaricp.version>3.4.2</hikaricp.version>
@@ -423,7 +423,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>3.0.2</groovy.version>
+ <groovy.version>3.0.1</groovy.version>
<flowable.version>6.5.0</flowable.version>
@@ -432,21 +432,19 @@ under the License.
<slf4j.version>1.7.30</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
- <elasticsearch.version>7.6.1</elasticsearch.version>
+ <elasticsearch.version>7.6.0</elasticsearch.version>
<apacheds.version>2.0.0.AM25</apacheds.version>
<apachedirapi.version>2.0.0.AM2</apachedirapi.version>
<log4j.version>2.13.1</log4j.version>
<disruptor.version>3.4.2</disruptor.version>
-
+
<commons-jexl.version>3.1</commons-jexl.version>
<commons-lang.version>3.9</commons-lang.version>
<commons-text.version>1.8</commons-text.version>
<commons-logging.version>1.1.3</commons-logging.version>
- <tika.version>1.23</tika.version>
-
<joda.version>2.10.5</joda.version>
<cas.version>6.2.0-SNAPSHOT</cas.version>
@@ -454,9 +452,9 @@ under the License.
<h2.version>1.4.200</h2.version>
<junit.version>5.6.0</junit.version>
- <mockito.version>3.3.3</mockito.version>
+ <mockito.version>3.3.0</mockito.version>
- <swagger-core.version>2.1.1</swagger-core.version>
+ <swagger-core.version>2.1.1</swagger-core.version>
<swagger-ui.version>3.25.0</swagger-ui.version>
<guava.version>20.0</guava.version>
@@ -464,7 +462,7 @@ under the License.
<jquery-ui.version>1.12.1</jquery-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
-
+
<bootstrap.version>3.4.1</bootstrap.version>
<bootstrap-select.version>1.12.4</bootstrap-select.version>
<bootstrap-fileinput.version>4.4.8</bootstrap-fileinput.version>
@@ -477,12 +475,12 @@ under the License.
<googlediffmatchpath.version>895a9512bb</googlediffmatchpath.version>
<jsplumb.version>2.0.7</jsplumb.version>
<chartjs.version>1.0.2</chartjs.version>
-
+
<wicket.version>8.7.0</wicket.version>
<wicket-jqueryui.version>8.6.0</wicket-jqueryui.version>
<wicket-bootstrap.version>2.0.12</wicket-bootstrap.version>
<wicket-spring-boot.version>2.1.9</wicket-spring-boot.version>
-
+
<ianal-maven-plugin-version>1.0-alpha-1</ianal-maven-plugin-version>
<netbeans.version>RELEASE112</netbeans.version>
@@ -549,7 +547,8 @@ under the License.
<argLine>-Xms512m -Xmx1024m -Xss256k</argLine>
<ianal.skip>false</ianal.skip>
- <skip.sass>false</skip.sass>
+ <sass.skip>false</sass.skip>
+ <remote-resources.skip>true</remote-resources.skip>
<sonar.language>java</sonar.language>
<sonar.java.source>${targetJdk}</sonar.java.source>
@@ -591,9 +590,9 @@ under the License.
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<version>1.8.4</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
@@ -608,7 +607,7 @@ under the License.
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2.5</version>
</dependency>
-
+
<!-- CXF -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -672,7 +671,7 @@ under the License.
</dependency>
<!-- /CXF -->
- <!-- Swagger -->
+ <!-- Swagger -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
@@ -683,7 +682,7 @@ under the License.
<artifactId>jackson-dataformat-yaml</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
@@ -694,13 +693,13 @@ under the License.
<artifactId>swagger-ui</artifactId>
<version>${swagger-ui.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
- <!-- /Swagger -->
+ <!-- /Swagger -->
<!-- Camel -->
<dependency>
@@ -918,7 +917,7 @@ under the License.
<artifactId>javax.el</artifactId>
<version>3.0.1-b09</version>
</dependency>
-
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -989,7 +988,7 @@ under the License.
<artifactId>joda-time</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>joda-time</groupId>
@@ -1016,6 +1015,22 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
<version>${cxf.version}</version>
@@ -1157,13 +1172,13 @@ under the License.
<artifactId>spring-security-config</artifactId>
<version>${spring-security.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.5</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
@@ -1183,7 +1198,7 @@ under the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>${tika.version}</version>
+ <version>1.23</version>
</dependency>
<dependency>
@@ -1201,7 +1216,7 @@ under the License.
<artifactId>slf4j-logging</artifactId>
<version>${connid.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
@@ -1215,7 +1230,7 @@ under the License.
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1258,7 +1273,7 @@ under the License.
<artifactId>groovy-groovysh</artifactId>
<version>${groovy.version}</version>
</dependency>
-
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -1313,13 +1328,13 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
<version>${jasypt.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
@@ -1339,7 +1354,7 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.cocoon.sax</groupId>
<artifactId>cocoon-sax</artifactId>
@@ -1354,25 +1369,18 @@ under the License.
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<exclusions>
<exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-i18n</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-constants</artifactId>
- <version>1.10</version>
- </dependency>
-
<!-- Flowable -->
<dependency>
<groupId>org.flowable</groupId>
@@ -1430,181 +1438,6 @@ under the License.
</dependency>
<!-- /Flowable -->
- <!-- CAS -->
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-api-configuration-model</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-audit</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-validation-api</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-authentication</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-configuration</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-configuration-metadata-repository</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-cookie</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-logout</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-logging</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-services</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-services-api</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-tickets</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-util</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-validation</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-web</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-webflow</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-events-configuration</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-thymeleaf</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-actions</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-ldap</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-jdbc</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-reports</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-saml</artifactId>
- <version>${cas.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-person-directory</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-themes</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-oidc</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-validation</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-pm-webflow</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-pac4j-webflow</artifactId>
- <version>${cas.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-consent-webflow</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-webapp-config</artifactId>
- <version>${cas.version}</version>
- </dependency>
- <!-- /CAS -->
-
<!-- Wicket -->
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -1682,7 +1515,7 @@ under the License.
</exclusions>
</dependency>
<!-- /Wicket -->
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -1750,7 +1583,7 @@ under the License.
<artifactId>pdfbox</artifactId>
<version>2.0.18</version>
</dependency>
-
+
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
@@ -1795,7 +1628,7 @@ under the License.
<artifactId>bootstrap</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
@@ -2024,7 +1857,7 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
+
</dependencyManagement>
<repositories>
@@ -2038,16 +1871,6 @@ under the License.
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>shibboleth-releases</id>
- <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
@@ -2091,7 +1914,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.8.1</version>
<configuration>
<release>${targetJdk}</release>
<useIncrementalCompilation>false</useIncrementalCompilation>
@@ -2100,7 +1923,7 @@ under the License.
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -2112,11 +1935,11 @@ under the License.
</delimiters>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
@@ -2124,7 +1947,7 @@ under the License.
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
@@ -2134,7 +1957,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.1.1</version>
<configuration>
<outputDirectory>${bundles.directory}</outputDirectory>
<useBaseVersion>true</useBaseVersion>
@@ -2197,13 +2020,13 @@ under the License.
</artifactItems>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@@ -2221,13 +2044,13 @@ under the License.
</webResources>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
@@ -2240,17 +2063,17 @@ under the License.
</dependency>
</dependencies>
</plugin>
-
+
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.7.11</version>
+ <version>1.7.10</version>
<configuration>
<configuration>
<type>standalone</type>
@@ -2264,7 +2087,7 @@ under the License.
</configuration>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -2293,7 +2116,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -2328,7 +2151,7 @@ under the License.
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
@@ -2340,13 +2163,13 @@ under the License.
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
</plugin>
-
+
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${antlr4.version}</version>
</plugin>
-
+
<plugin>
<groupId>nl.geodienstencentrum.maven</groupId>
<artifactId>sass-maven-plugin</artifactId>
@@ -2386,7 +2209,7 @@ under the License.
<requireMavenVersion>
<version>3.5.0</version>
</requireMavenVersion>
- </rules>
+ </rules>
</configuration>
</execution>
</executions>
@@ -2476,11 +2299,11 @@ under the License.
<script><![CDATA[
import java.util.Date
import java.text.MessageFormat
- def year = MessageFormat.format("{0,date,yyyy}", new Date())
+ def year = MessageFormat.format("{0,date,yyyy}", new Date())
project.properties['year'] = year
project.properties['snapshotOrRelease'] = project.version.endsWith("SNAPSHOT") ? "snapshot" : "release"
project.properties['licenseUrl'] = project.parent.licenses[0].url
- project.properties['site.deploymentBaseDir'] =
+ project.properties['site.deploymentBaseDir'] =
project.properties['site.deploymentBaseUrl'] == null || !project.properties['site.deploymentBaseUrl'].startsWith('file:') ? project.properties['project.build.directory'] + "/generated-docs" : project.properties['site.deploymentBaseUrl'].substring(7)
if (!project.properties.containsKey('buildNumber'))
@@ -2491,7 +2314,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -2502,7 +2325,7 @@ under the License.
<exclude>**/nb-configuration.xml</exclude>
<exclude>**/META-INF/cxf/**</exclude>
<exclude>**/META-INF/services/**</exclude>
- <exclude>**/META-INF/MANIFEST.MF</exclude>
+ <exclude>**/META-INF/MANIFEST.MF</exclude>
<exclude>**/*.csv</exclude>
<exclude>**/archetype-resources/**</exclude>
<exclude>**/AdminLTE*/**</exclude>
@@ -2533,24 +2356,15 @@ under the License.
</execution>
</executions>
</plugin>
-
- <!-- Drop inherited behavior (i.e. don't put any more default LICENSE and NOTICE files in all artifacts) -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>none</phase>
- </execution>
- <execution>
- <id>process-resource-bundles</id>
- <phase>none</phase>
- </execution>
- </executions>
+ <configuration>
+ <skip>${remote-resources.skip}</skip>
+ </configuration>
</plugin>
+
<!-- Put NOTICE and LICENSE files in all artifacts and javadocs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2597,7 +2411,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
@@ -2685,7 +2499,7 @@ under the License.
<link>https://docs.spring.io/spring-security/site/docs/current/api/</link>
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/content/sites/site/java-opensaml/3.3.1/apidocs/</link>
- <link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/7.6.1/index.html</link>
+ <link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/7.6.0/index.html</link>
<link>http://docs.swagger.io/swagger-core/v2.1.1/apidocs/</link>
</links>
</configuration>
@@ -2710,6 +2524,10 @@ under the License.
<profile>
<id>apache-release</id>
+ <properties>
+ <remote-resources.skip>false</remote-resources.skip>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -2754,7 +2572,7 @@ under the License.
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
- <version>1.5.3</version>
+ <version>1.5.2</version>
</dependency>
</dependencies>
<configuration>
@@ -2849,13 +2667,13 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.9.0</version>
+ <version>3.8.2</version>
<configuration>
<locales>en</locales>
<generateProjectInfo>false</generateProjectInfo>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -2896,7 +2714,7 @@ under the License.
<build>
<defaultGoal>clean install</defaultGoal>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2920,7 +2738,7 @@ under the License.
</modules>
</profile>
</profiles>
-
+
<modules>
<module>common</module>
<module>core</module>
diff --git a/wa/pom.xml b/wa/pom.xml
index 9c4d4de..3850226 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -29,7 +29,6 @@ under the License.
<name>Apache Syncope WA</name>
<description>Apache Syncope WA</description>
- <groupId>org.apache.syncope</groupId>
<artifactId>syncope-wa</artifactId>
<packaging>jar</packaging>
@@ -47,11 +46,7 @@ under the License.
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-api-configuration-model</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core</artifactId>
@@ -62,10 +57,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-validation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core-authentication</artifactId>
</dependency>
<dependency>
@@ -74,10 +65,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-configuration-metadata-repository</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core-cookie</artifactId>
</dependency>
<dependency>
@@ -94,10 +81,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-core-services-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-core-tickets</artifactId>
</dependency>
<dependency>
diff --git a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
index 40b87ae..970d890 100644
--- a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
+++ b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
@@ -71,8 +71,7 @@ public class SyncopeWAApplication extends SpringBootServletInitializer {
private static final Logger LOG = LoggerFactory.getLogger(SyncopeWAApplication.class);
public static void main(final String[] args) {
- new SpringApplicationBuilder(SyncopeWAApplication.class).
- run(args);
+ new SpringApplicationBuilder(SyncopeWAApplication.class).run(args);
}
/**
diff --git a/wa/src/main/resources/application.properties b/wa/src/main/resources/application.properties
index 8624c66..487d11b 100644
--- a/wa/src/main/resources/application.properties
+++ b/wa/src/main/resources/application.properties
@@ -34,6 +34,7 @@ spring.main.lazy-initialization=false
service.discovery.address=http://localhost:8080/syncope-wa/
+# Conf directories
conf.directory=${conf.directory}
-
+cas.standalone.configurationDirectory=${conf.directory}
cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
[syncope] 04/09: [SYNCOPE-1545] fit/wa-reference + inclusion in
standalone
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 129544844e25b982e17290ab34ddc4992b304e4a
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Mar 3 17:28:49 2020 +0100
[SYNCOPE-1545] fit/wa-reference + inclusion in standalone
---
.../client/console/SyncopeConsoleApplication.java | 15 +-
.../client/console/SyncopeWebApplication.java | 20 --
.../client/enduser/SyncopeEnduserApplication.java | 13 ++
.../client/enduser/SyncopeWebApplication.java | 15 --
common/keymaster/client-api/pom.xml | 5 +
.../client/api/startstop/KeymasterStart.java | 11 +-
.../client/api/startstop/KeymasterStartStop.java | 12 +-
.../client/api/startstop/KeymasterStop.java | 14 +-
.../core/starter/SyncopeCoreApplication.java | 12 ++
...ncopeCoreStartup.java => SyncopeCoreStart.java} | 12 +-
docker/core/src/main/resources/log4j2.xml | 4 +
docker/pom.xml | 16 +-
.../docker-compose/docker-compose-all.yml | 18 +-
docker/wa/LICENSE | 202 +++++++++++++++++++++
docker/wa/NOTICE | 5 +
docker/wa/pom.xml | 177 ++++++++++++++++++
.../wa/src/main/resources/Dockerfile | 35 ++--
.../wa}/src/main/resources/application.properties | 2 +-
.../wa/src/main/resources/keymaster.properties | 27 +--
docker/wa/src/main/resources/log4j2.xml | 59 ++++++
.../wa/src/main/resources/startup.sh | 28 +--
.../wa/src/main/resources/wa.properties | 21 +--
.../syncope/core/logic/NetworkServiceLogic.java | 6 +-
fit/console-reference/pom.xml | 5 -
fit/enduser-reference/pom.xml | 5 -
fit/pom.xml | 1 +
fit/{console-reference => wa-reference}/pom.xml | 121 ++++++------
.../main/resources/application-embedded.properties | 26 +--
.../src/main/resources/keymaster.properties | 27 +--
fit/wa-reference/src/main/resources/log4j2.xml | 68 +++++++
.../wa-reference/src/main/resources/wa.properties | 21 +--
fit/wa-reference/src/main/webapp/WEB-INF/web.xml | 29 +++
.../src/test/resources/hotswap-agent.properties | 25 +--
sra/pom.xml | 6 +
.../apache/syncope/sra/SyncopeSRAApplication.java | 13 ++
.../org/apache/syncope/sra/SyncopeSRAShutdown.java | 33 ----
.../apache/syncope/sra/SyncopeSRAStartStop.java | 40 ----
standalone/pom.xml | 75 +++++---
wa/pom.xml | 133 +++++++++++++-
.../apache/syncope/wa/SyncopeWAApplication.java | 17 ++
wa/src/main/resources/application.properties | 8 +-
wa/src/main/resources/log4j2.xml | 68 +++++++
wa/src/main/resources/static/images/favicon.png | Bin 0 -> 641 bytes
wa/src/main/resources/templates/layout.html | 61 +++++++
.../{application.properties => wa.properties} | 21 +--
.../java/org/apache/syncope/wa/SyncopeWATest.java | 158 ++++++++++++++++
.../apache/syncope/wa/ZookeeperTestingServer.java | 80 ++++++++
.../resources/keymaster.properties} | 27 +--
48 files changed, 1323 insertions(+), 474 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index 0175fe7..8e922cc 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -19,6 +19,7 @@
package org.apache.syncope.client.console;
import com.giffing.wicket.spring.boot.starter.web.config.WicketWebInitializerAutoConfig.WebSocketWicketWebInitializerAutoConfiguration;
+import org.apache.syncope.client.console.commons.AnyDirectoryPanelAdditionalActionLinksProvider;
import org.apache.syncope.client.console.commons.AnyDirectoryPanelAdditionalActionsProvider;
import org.apache.syncope.client.console.commons.AnyWizardBuilderAdditionalSteps;
import org.apache.syncope.client.console.commons.ExternalResourceProvider;
@@ -36,6 +37,9 @@ import org.apache.syncope.client.console.commons.StatusProvider;
import org.apache.syncope.client.console.commons.VirSchemaDetailsPanelProvider;
import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
import org.apache.syncope.client.console.init.MIMETypesLoader;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -44,7 +48,6 @@ import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConf
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean;
-import org.apache.syncope.client.console.commons.AnyDirectoryPanelAdditionalActionLinksProvider;
@SpringBootApplication(exclude = {
ErrorMvcAutoConfiguration.class,
@@ -61,6 +64,16 @@ public class SyncopeConsoleApplication extends SpringBootServletInitializer {
return super.configure(builder);
}
+ @Bean
+ public KeymasterStart keymasterStart() {
+ return new KeymasterStart(NetworkService.Type.CONSOLE);
+ }
+
+ @Bean
+ public KeymasterStop keymasterStop() {
+ return new KeymasterStop(NetworkService.Type.CONSOLE);
+ }
+
@ConditionalOnMissingBean(name = "classPathScanImplementationLookup")
@Bean
public ClassPathScanImplementationLookup classPathScanImplementationLookup() {
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
index bc01e4d..e015d03 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
@@ -76,7 +76,6 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
@@ -100,9 +99,6 @@ public class SyncopeWebApplication extends WicketBootSecuredWebApplication {
@Autowired
private ServiceOps serviceOps;
- @Value("${service.discovery.address}")
- private String address;
-
private String anonymousUser;
private String anonymousKey;
@@ -179,13 +175,6 @@ public class SyncopeWebApplication extends WicketBootSecuredWebApplication {
}
}
- private NetworkService getNetworkService() {
- NetworkService ns = new NetworkService();
- ns.setType(NetworkService.Type.CONSOLE);
- ns.setAddress(address);
- return ns;
- }
-
@Override
protected void init() {
super.init();
@@ -311,15 +300,6 @@ public class SyncopeWebApplication extends WicketBootSecuredWebApplication {
if (getDebugSettings().isAjaxDebugModeEnabled()) {
getDebugSettings().setComponentPathAttributeName("syncope-path");
}
-
- serviceOps.register(getNetworkService());
- }
-
- @Override
- protected void onDestroy() {
- serviceOps.unregister(getNetworkService());
-
- super.onDestroy();
}
@Override
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
index 975a076..aaac232 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java
@@ -21,6 +21,9 @@ package org.apache.syncope.client.enduser;
import com.giffing.wicket.spring.boot.starter.web.config.WicketWebInitializerAutoConfig.WebSocketWicketWebInitializerAutoConfiguration;
import org.apache.syncope.client.enduser.init.ClassPathScanImplementationLookup;
import org.apache.syncope.client.enduser.init.MIMETypesLoader;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -45,6 +48,16 @@ public class SyncopeEnduserApplication extends SpringBootServletInitializer {
return super.configure(builder);
}
+ @Bean
+ public KeymasterStart keymasterStart() {
+ return new KeymasterStart(NetworkService.Type.ENDUSER);
+ }
+
+ @Bean
+ public KeymasterStop keymasterStop() {
+ return new KeymasterStop(NetworkService.Type.ENDUSER);
+ }
+
@ConditionalOnMissingBean(name = "classPathScanImplementationLookup")
@Bean
public ClassPathScanImplementationLookup classPathScanImplementationLookup() {
diff --git a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
index edc4ae4..176fa39 100644
--- a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
+++ b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
@@ -83,7 +83,6 @@ import org.apache.wicket.util.lang.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
@@ -110,9 +109,6 @@ public class SyncopeWebApplication extends WicketBootStandardWebApplication {
@Autowired
private ServiceOps serviceOps;
- @Value("${service.discovery.address}")
- private String address;
-
private boolean useGZIPCompression;
private String adminUser;
@@ -148,13 +144,6 @@ public class SyncopeWebApplication extends WicketBootStandardWebApplication {
}
}
- private NetworkService getNetworkService() {
- NetworkService ns = new NetworkService();
- ns.setType(NetworkService.Type.ENDUSER);
- ns.setAddress(address);
- return ns;
- }
-
@Override
protected void init() {
super.init();
@@ -355,14 +344,10 @@ public class SyncopeWebApplication extends WicketBootStandardWebApplication {
if (getDebugSettings().isAjaxDebugModeEnabled()) {
getDebugSettings().setComponentPathAttributeName("syncope-path");
}
-
- serviceOps.register(getNetworkService());
}
@Override
protected void onDestroy() {
- serviceOps.unregister(getNetworkService());
-
if (customFormAttributesMonitor != null) {
try {
customFormAttributesMonitor.stop(0);
diff --git a/common/keymaster/client-api/pom.xml b/common/keymaster/client-api/pom.xml
index 5dcf5ad..37fdb6b 100644
--- a/common/keymaster/client-api/pom.xml
+++ b/common/keymaster/client-api/pom.xml
@@ -43,6 +43,11 @@ under the License.
<artifactId>syncope-common-idrepo-lib</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAStartup.java b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStart.java
similarity index 78%
rename from sra/src/main/java/org/apache/syncope/sra/SyncopeSRAStartup.java
rename to common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStart.java
index cbc7b59..f164865 100644
--- a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAStartup.java
+++ b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStart.java
@@ -16,16 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.sra;
+package org.apache.syncope.common.keymaster.client.api.startstop;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.stereotype.Component;
-@Component
-public class SyncopeSRAStartup extends SyncopeSRAStartStop
+public class KeymasterStart extends KeymasterStartStop
implements ApplicationListener<ContextRefreshedEvent> {
+ public KeymasterStart(final NetworkService.Type networkServiceType) {
+ super(networkServiceType);
+ }
+
@Override
public void onApplicationEvent(final ContextRefreshedEvent event) {
serviceOps.register(getNetworkService());
diff --git a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStartStop.java b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStartStop.java
similarity index 79%
rename from core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStartStop.java
rename to common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStartStop.java
index 7f52923..29a161b 100644
--- a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStartStop.java
+++ b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStartStop.java
@@ -16,24 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.starter;
+package org.apache.syncope.common.keymaster.client.api.startstop;
import org.apache.syncope.common.keymaster.client.api.ServiceOps;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-abstract class SyncopeCoreStartStop {
+abstract class KeymasterStartStop {
@Autowired
protected ServiceOps serviceOps;
+ protected final NetworkService.Type networkServiceType;
+
+ protected KeymasterStartStop(final NetworkService.Type networkServiceType) {
+ this.networkServiceType = networkServiceType;
+ }
+
@Value("${service.discovery.address}")
private String address;
protected NetworkService getNetworkService() {
NetworkService ns = new NetworkService();
- ns.setType(NetworkService.Type.CORE);
+ ns.setType(networkServiceType);
ns.setAddress(address);
return ns;
}
diff --git a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreShutdown.java b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStop.java
similarity index 78%
rename from core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreShutdown.java
rename to common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStop.java
index 256607e..7851a39 100644
--- a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreShutdown.java
+++ b/common/keymaster/client-api/src/main/java/org/apache/syncope/common/keymaster/client/api/startstop/KeymasterStop.java
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.starter;
+package org.apache.syncope.common.keymaster.client.api.startstop;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextClosedEvent;
-import org.springframework.stereotype.Component;
-/**
- * Take care of cleanup actions needed by Syncope Core.
- */
-@Component
-public class SyncopeCoreShutdown extends SyncopeCoreStartStop
+public class KeymasterStop extends KeymasterStartStop
implements ApplicationListener<ContextClosedEvent> {
+ public KeymasterStop(final NetworkService.Type networkServiceType) {
+ super(networkServiceType);
+ }
+
@Override
public void onApplicationEvent(final ContextClosedEvent event) {
serviceOps.unregister(getNetworkService());
diff --git a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java b/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java
index 9c9aaf4..8902bec 100644
--- a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java
+++ b/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreApplication.java
@@ -20,6 +20,8 @@ package org.apache.syncope.core.starter;
import java.io.IOException;
import org.apache.cxf.spring.boot.autoconfigure.openapi.OpenApiAutoConfiguration;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -57,4 +59,14 @@ public class SyncopeCoreApplication extends SpringBootServletInitializer {
pspc.setIgnoreUnresolvablePlaceholders(true);
return pspc;
}
+
+ @Bean
+ public SyncopeCoreStart keymasterStart() {
+ return new SyncopeCoreStart();
+ }
+
+ @Bean
+ public KeymasterStop keymasterStop() {
+ return new KeymasterStop(NetworkService.Type.CORE);
+ }
}
diff --git a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStartup.java b/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStart.java
similarity index 89%
rename from core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStartup.java
rename to core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStart.java
index f93de92..515fa13 100644
--- a/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStartup.java
+++ b/core/starter/src/main/java/org/apache/syncope/core/starter/SyncopeCoreStart.java
@@ -19,6 +19,8 @@
package org.apache.syncope.core.starter;
import java.util.Comparator;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
import org.apache.syncope.core.persistence.api.DomainHolder;
import org.apache.syncope.core.persistence.api.SyncopeCoreLoader;
import org.slf4j.Logger;
@@ -28,20 +30,22 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.Ordered;
-import org.springframework.stereotype.Component;
/**
* Take care of all initializations needed by Syncope Core to run up and safe.
*/
-@Component
-public class SyncopeCoreStartup extends SyncopeCoreStartStop
+public class SyncopeCoreStart extends KeymasterStart
implements ApplicationListener<ContextRefreshedEvent>, Ordered {
- private static final Logger LOG = LoggerFactory.getLogger(SyncopeCoreStartup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SyncopeCoreStart.class);
@Autowired
private DomainHolder domainHolder;
+ public SyncopeCoreStart() {
+ super(NetworkService.Type.CORE);
+ }
+
@Override
public int getOrder() {
return 0;
diff --git a/docker/core/src/main/resources/log4j2.xml b/docker/core/src/main/resources/log4j2.xml
index 1941154..063d123 100644
--- a/docker/core/src/main/resources/log4j2.xml
+++ b/docker/core/src/main/resources/log4j2.xml
@@ -108,6 +108,10 @@ under the License.
<appender-ref ref="console"/>
<appender-ref ref="main"/>
</asyncLogger>
+ <asyncLogger name="liquibase" additivity="false" level="ERROR">
+ <appender-ref ref="console"/>
+ <appender-ref ref="main"/>
+ </asyncLogger>
<asyncLogger name="org.apache.cocoon" additivity="false" level="ERROR">
<appender-ref ref="console"/>
<appender-ref ref="main"/>
diff --git a/docker/pom.xml b/docker/pom.xml
index db2f0d5..dd17d08 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -42,13 +42,6 @@ under the License.
<rootpom.basedir>${basedir}/..</rootpom.basedir>
</properties>
- <modules>
- <module>core</module>
- <module>console</module>
- <module>enduser</module>
- <module>sra</module>
- </modules>
-
<build>
<resources>
<resource>
@@ -120,5 +113,12 @@ under the License.
</build>
</profile>
</profiles>
-
+
+ <modules>
+ <module>core</module>
+ <module>console</module>
+ <module>enduser</module>
+ <module>sra</module>
+ <module>wa</module>
+ </modules>
</project>
diff --git a/docker/src/main/resources/docker-compose/docker-compose-all.yml b/docker/src/main/resources/docker-compose/docker-compose-all.yml
index e3a9c25..29d6918 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-all.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-all.yml
@@ -24,7 +24,7 @@ version: '3.3'
services:
keymaster:
- image: zookeeper:3.4.14
+ image: zookeeper:3.5.6
restart: always
db:
@@ -84,13 +84,27 @@ services:
KEYMASTER_PASSWORD: ${KEYMASTER_PASSWORD:-}
SERVICE_DISCOVERY_ADDRESS: http://syncope-enduser:8080/syncope-enduser/
+ syncope-wa:
+ depends_on:
+ - syncope
+ - keymaster
+ image: apache/syncope-wa:${SYNCOPE_VERSION}
+ ports:
+ - "48080:8080"
+ restart: always
+ environment:
+ KEYMASTER_ADDRESS: keymaster:2181
+ KEYMASTER_USERNAME: ${KEYMASTER_USERNAME:-}
+ KEYMASTER_PASSWORD: ${KEYMASTER_PASSWORD:-}
+ SERVICE_DISCOVERY_ADDRESS: http://syncope-wa:8080/syncope-wa/
+
syncope-sra:
depends_on:
- syncope
- keymaster
image: apache/syncope-sra:${SYNCOPE_VERSION}
ports:
- - "48080:8080"
+ - "58080:8080"
restart: always
environment:
KEYMASTER_ADDRESS: keymaster:2181
diff --git a/docker/wa/LICENSE b/docker/wa/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/docker/wa/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/docker/wa/NOTICE b/docker/wa/NOTICE
new file mode 100644
index 0000000..3db7985
--- /dev/null
+++ b/docker/wa/NOTICE
@@ -0,0 +1,5 @@
+Apache Syncope
+Copyright 2012-2019 The Apache Software Foundation
+
+This product includes software developed by:
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/docker/wa/pom.xml b/docker/wa/pom.xml
new file mode 100644
index 0000000..13721b8
--- /dev/null
+++ b/docker/wa/pom.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-docker</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <name>Apache Syncope Docker WA</name>
+ <description>Apache Syncope Docker WA</description>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-docker-wa</artifactId>
+ <packaging>war</packaging>
+
+ <properties>
+ <guava.version>28.2-jre</guava.version>
+ <opensaml.version>3.4.5</opensaml.version>
+ <bootstrap.version>4.4.1</bootstrap.version>
+ <slf4j.version>2.0.0-alpha1</slf4j.version>
+
+ <rootpom.basedir>${basedir}/../..</rootpom.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-undertow</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-wa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope.ext.self-keymaster</groupId>
+ <artifactId>syncope-ext-self-keymaster-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.syncope.common.keymaster</groupId>
+ <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <webXml>${basedir}/../../fit/wa-reference/src/main/webapp/WEB-INF/web.xml</webXml>
+ <webResources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </webResources>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.apache.syncope.wa.SyncopeWAApplication</mainClass>
+ <layout>ZIP</layout>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>apache/syncope-wa:%v</name>
+ <build>
+ <dockerFileDir>${project.build.outputDirectory}</dockerFileDir>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>remove-syncope-wa</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>remove</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>build-syncope-wa</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <skipSource>true</skipSource>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/wa/src/main/resources/application.properties b/docker/wa/src/main/resources/Dockerfile
similarity index 53%
copy from wa/src/main/resources/application.properties
copy to docker/wa/src/main/resources/Dockerfile
index 487d11b..7edf8dc 100644
--- a/wa/src/main/resources/application.properties
+++ b/docker/wa/src/main/resources/Dockerfile
@@ -14,27 +14,26 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
-server.port=8080
+# Cannot FROM adoptopenjdk/openjdk11-openj9:alpine-slim because it's headless, and fonts might be required
+FROM openjdk:11
+MAINTAINER dev@syncope.apache.org
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
+RUN set -x
-server.servlet.contextPath=/syncope-wa
+RUN mkdir /opt/syncope
+RUN mkdir /opt/syncope/bin
+RUN mkdir /opt/syncope/conf
+RUN mkdir /opt/syncope/lib
+RUN mkdir /opt/syncope/log
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
+COPY *.properties /opt/syncope/conf/
+COPY log4j2.xml /opt/syncope/conf/
+
+COPY syncope-docker-wa-*war /opt/syncope/lib/syncope-wa.war
-service.discovery.address=http://localhost:8080/syncope-wa/
+COPY startup.sh /opt/syncope/bin
+RUN chmod 755 /opt/syncope/bin/startup.sh
+CMD ["/opt/syncope/bin/startup.sh"]
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+EXPOSE 8080
diff --git a/wa/src/main/resources/application.properties b/docker/wa/src/main/resources/application.properties
similarity index 95%
copy from wa/src/main/resources/application.properties
copy to docker/wa/src/main/resources/application.properties
index 487d11b..254b399 100644
--- a/wa/src/main/resources/application.properties
+++ b/docker/wa/src/main/resources/application.properties
@@ -32,7 +32,7 @@ server.servlet.contextPath=/syncope-wa
spring.main.allow-bean-definition-overriding=true
spring.main.lazy-initialization=false
-service.discovery.address=http://localhost:8080/syncope-wa/
+service.discovery.address=${SERVICE_DISCOVERY_ADDRESS}
# Conf directories
conf.directory=${conf.directory}
diff --git a/wa/src/main/resources/application.properties b/docker/wa/src/main/resources/keymaster.properties
similarity index 52%
copy from wa/src/main/resources/application.properties
copy to docker/wa/src/main/resources/keymaster.properties
index 487d11b..14e8ca6 100644
--- a/wa/src/main/resources/application.properties
+++ b/docker/wa/src/main/resources/keymaster.properties
@@ -14,27 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
-
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
-
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+keymaster.address=${KEYMASTER_ADDRESS}
+keymaster.username=${KEYMASTER_USERNAME}
+keymaster.password=${KEYMASTER_PASSWORD}
diff --git a/docker/wa/src/main/resources/log4j2.xml b/docker/wa/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..269180c
--- /dev/null
+++ b/docker/wa/src/main/resources/log4j2.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<configuration status="WARN">
+
+ <appenders>
+
+ <Console name="console" target="SYSTEM_OUT" follow="true">
+ <PatternLayout pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} [%11.11t] %style{%-60.60c{60}}{cyan} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+ </Console>
+
+ </appenders>
+
+ <loggers>
+
+ <asyncLogger name="org.apereo.cas" additivity="false" level="INFO">
+ <appender-ref ref="console"/>
+ </asyncLogger>
+ <asyncLogger name="org.apereo.inspektr.audit.support" additivity="false" level="INFO">
+ <appender-ref ref="console"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.springframework" additivity="false" level="INFO">
+ <appender-ref ref="console"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.apache.syncope.client.lib" additivity="false" level="OFF">
+ <appender-ref ref="console"/>
+ </asyncLogger>
+ <asyncLogger name="org.apache.syncope.wa" additivity="false" level="INFO">
+ <appender-ref ref="console"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
+ <appender-ref ref="console"/>
+ </asyncLogger>
+
+ <root level="INFO">
+ <appender-ref ref="console"/>
+ </root>
+
+ </loggers>
+</configuration>
diff --git a/wa/src/main/resources/application.properties b/docker/wa/src/main/resources/startup.sh
old mode 100644
new mode 100755
similarity index 52%
copy from wa/src/main/resources/application.properties
copy to docker/wa/src/main/resources/startup.sh
index 487d11b..68c70da
--- a/wa/src/main/resources/application.properties
+++ b/docker/wa/src/main/resources/startup.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -14,27 +16,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
-
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+export LOADER_PATH="/opt/syncope/conf,/opt/syncope/lib"
+java -Dfile.encoding=UTF-8 -server -Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m \
+ -XX:+DisableExplicitGC -Djava.security.egd=file:/dev/./urandom -jar /opt/syncope/lib/syncope-wa.war
diff --git a/wa/src/main/resources/application.properties b/docker/wa/src/main/resources/wa.properties
similarity index 64%
copy from wa/src/main/resources/application.properties
copy to docker/wa/src/main/resources/wa.properties
index 487d11b..a208075 100644
--- a/wa/src/main/resources/application.properties
+++ b/docker/wa/src/main/resources/wa.properties
@@ -14,25 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
+anonymousUser=${anonymousUser}
+anonymousKey=${anonymousKey}
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
+useGZIPCompression=true
# Conf directories
conf.directory=${conf.directory}
diff --git a/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/NetworkServiceLogic.java b/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/NetworkServiceLogic.java
index d97af30..554cb29 100644
--- a/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/NetworkServiceLogic.java
+++ b/ext/self-keymaster/logic/src/main/java/org/apache/syncope/core/logic/NetworkServiceLogic.java
@@ -43,8 +43,8 @@ public class NetworkServiceLogic extends AbstractTransactionalLogic<EntityTO> {
private SelfKeymasterEntityFactory entityFactory;
private static NetworkService toNetworkService(
- final NetworkService.Type serviceType,
- final NetworkServiceEntity service) {
+ final NetworkService.Type serviceType,
+ final NetworkServiceEntity service) {
NetworkService ns = new NetworkService();
ns.setType(serviceType);
@@ -84,7 +84,7 @@ public class NetworkServiceLogic extends AbstractTransactionalLogic<EntityTO> {
public void unregister(final NetworkService networkService) {
serviceDAO.findAll(networkService.getType()).stream().
filter(service -> service.getAddress().equals(networkService.getAddress())).
- findFirst().ifPresent(service -> serviceDAO.delete(service));
+ forEach(service -> serviceDAO.delete(service));
}
@Override
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index f80f55b..9e4fca4 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -56,11 +56,6 @@ under the License.
<artifactId>syncope-ext-self-keymaster-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.syncope.common.keymaster</groupId>
- <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.syncope.ext.flowable</groupId>
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index 812478d..29c34fd 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -51,11 +51,6 @@ under the License.
<artifactId>syncope-ext-self-keymaster-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.syncope.common.keymaster</groupId>
- <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.syncope.ext.flowable</groupId>
diff --git a/fit/pom.xml b/fit/pom.xml
index 5df60e1..30d9912 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -81,6 +81,7 @@ under the License.
<module>core-reference</module>
<module>console-reference</module>
<module>enduser-reference</module>
+ <module>wa-reference</module>
</modules>
</project>
diff --git a/fit/console-reference/pom.xml b/fit/wa-reference/pom.xml
similarity index 80%
copy from fit/console-reference/pom.xml
copy to fit/wa-reference/pom.xml
index f80f55b..e097196 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/wa-reference/pom.xml
@@ -27,13 +27,18 @@ under the License.
<version>3.0.0-SNAPSHOT</version>
</parent>
- <name>Apache Syncope FIT Console Reference</name>
- <description>Apache Syncope FIT Console Reference</description>
+ <name>Apache Syncope FIT WA Reference</name>
+ <description>Apache Syncope FIT WA Reference</description>
<groupId>org.apache.syncope.fit</groupId>
- <artifactId>syncope-fit-console-reference</artifactId>
+ <artifactId>syncope-fit-wa-reference</artifactId>
<packaging>war</packaging>
<properties>
+ <guava.version>28.2-jre</guava.version>
+ <opensaml.version>3.4.5</opensaml.version>
+ <bootstrap.version>4.4.1</bootstrap.version>
+ <slf4j.version>2.0.0-alpha1</slf4j.version>
+
<ianal.skip>true</ianal.skip>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
@@ -41,13 +46,8 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.syncope.client.idm</groupId>
- <artifactId>syncope-client-idm-console</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.syncope.client.am</groupId>
- <artifactId>syncope-client-am-console</artifactId>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-wa</artifactId>
<version>${project.version}</version>
</dependency>
@@ -56,62 +56,46 @@ under the License.
<artifactId>syncope-ext-self-keymaster-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.syncope.common.keymaster</groupId>
- <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- TEST -->
<dependency>
- <groupId>org.apache.syncope.ext.flowable</groupId>
- <artifactId>syncope-ext-flowable-client-console</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.syncope.ext.camel</groupId>
- <artifactId>syncope-ext-camel-client-console</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.syncope.ext.saml2sp</groupId>
- <artifactId>syncope-ext-saml2sp-client-console</artifactId>
- <version>${project.version}</version>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.syncope.ext.scimv2</groupId>
- <artifactId>syncope-ext-scimv2-client-console</artifactId>
+ <groupId>org.apache.syncope.fit</groupId>
+ <artifactId>syncope-fit-build-tools</artifactId>
<version>${project.version}</version>
+ <type>war</type>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.syncope.ext.oidcclient</groupId>
- <artifactId>syncope-ext-oidcclient-client-console</artifactId>
+ <groupId>org.apache.syncope.fit</groupId>
+ <artifactId>syncope-fit-core-reference</artifactId>
<version>${project.version}</version>
- </dependency>
-
- <!-- TEST -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
+ <type>war</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.syncope.fit</groupId>
- <artifactId>syncope-fit-build-tools</artifactId>
+ <artifactId>syncope-fit-console-reference</artifactId>
<version>${project.version}</version>
<type>war</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.syncope.fit</groupId>
- <artifactId>syncope-fit-core-reference</artifactId>
+ <artifactId>syncope-fit-enduser-reference</artifactId>
<version>${project.version}</version>
<type>war</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -128,7 +112,7 @@ under the License.
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
- <timeout>300000</timeout>
+ <timeout>600000</timeout>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
<dependencies>
@@ -163,11 +147,23 @@ under the License.
</properties>
</deployable>
<deployable>
- <location>${project.build.directory}/${project.build.finalName}</location>
+ <location>${basedir}/../console-reference/target/syncope-fit-console-reference-${project.version}</location>
<properties>
<context>syncope-console</context>
</properties>
</deployable>
+ <deployable>
+ <location>${basedir}/../enduser-reference/target/syncope-fit-enduser-reference-${project.version}</location>
+ <properties>
+ <context>syncope-enduser</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <location>${project.build.directory}/${project.build.finalName}</location>
+ <properties>
+ <context>syncope-wa</context>
+ </properties>
+ </deployable>
</deployables>
</configuration>
</plugin>
@@ -235,42 +231,29 @@ under the License.
<profile>
<id>hotswap</id>
- <dependencies>
- <!-- wicket-ioc depends on cglib, need to exclude it for hotswap to work -->
- <dependency>
- <groupId>org.apache.syncope.client.idm</groupId>
- <artifactId>syncope-client-idm-console</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
- </dependencies>
-
<build>
<defaultGoal>clean verify cargo:run</defaultGoal>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
- <id>enableHotSwapForCore</id>
+ <id>enableHotSwapForCoreAndConsoleAndEnduser</id>
<phase>package</phase>
<configuration>
<target>
<copy file="${basedir}/../core-reference/target/test-classes/hotswap-agent.properties"
tofile="${basedir}/../core-reference/target/syncope-fit-core-reference-${project.version}/WEB-INF/classes/hotswap-agent.properties"
overwrite="true"/>
+ <copy file="${basedir}/../console-reference/target/test-classes/hotswap-agent.properties"
+ tofile="${basedir}/../console-reference/target/syncope-fit-console-reference-${project.version}/WEB-INF/classes/hotswap-agent.properties"
+ overwrite="true"/>
+ <copy file="${basedir}/../enduser-reference/target/test-classes/hotswap-agent.properties"
+ tofile="${basedir}/../enduser-reference/target/syncope-fit-enduser-reference-${project.version}/WEB-INF/classes/hotswap-agent.properties"
+ overwrite="true"/>
</target>
</configuration>
<goals>
@@ -310,7 +293,7 @@ under the License.
</resources>
</build>
</profile>
-
+
<profile>
<id>apache-release</id>
@@ -330,7 +313,7 @@ under the License.
<configuration>
<skipSource>true</skipSource>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/wa/src/main/resources/application.properties b/fit/wa-reference/src/main/resources/application-embedded.properties
similarity index 52%
copy from wa/src/main/resources/application.properties
copy to fit/wa-reference/src/main/resources/application-embedded.properties
index 487d11b..464c8c8 100644
--- a/wa/src/main/resources/application.properties
+++ b/fit/wa-reference/src/main/resources/application-embedded.properties
@@ -14,27 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
-
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
-
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+spring.main.banner-mode=console
+service.discovery.address=http://localhost:9080/syncope-wa/
diff --git a/wa/src/main/resources/application.properties b/fit/wa-reference/src/main/resources/keymaster.properties
similarity index 52%
copy from wa/src/main/resources/application.properties
copy to fit/wa-reference/src/main/resources/keymaster.properties
index 487d11b..033fe3b 100644
--- a/wa/src/main/resources/application.properties
+++ b/fit/wa-reference/src/main/resources/keymaster.properties
@@ -14,27 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
-
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
-
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+keymaster.address=http://localhost:9080/syncope/rest/keymaster
+keymaster.username=${anonymousUser}
+keymaster.password=${anonymousKey}
diff --git a/fit/wa-reference/src/main/resources/log4j2.xml b/fit/wa-reference/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..e184c60
--- /dev/null
+++ b/fit/wa-reference/src/main/resources/log4j2.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<configuration status="WARN">
+
+ <appenders>
+
+ <RollingRandomAccessFile name="main" fileName="${log.directory}/wa.log"
+ filePattern="${log.directory}/wa-%d{yyyy-MM-dd}.log.gz"
+ immediateFlush="false" append="true">
+ <PatternLayout>
+ <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy/>
+ <SizeBasedTriggeringPolicy size="250 MB"/>
+ </Policies>
+ </RollingRandomAccessFile>
+
+ </appenders>
+
+ <loggers>
+
+ <asyncLogger name="org.apereo.cas" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+ <asyncLogger name="org.apereo.inspektr.audit.support" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.springframework" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.apache.syncope.client.lib" additivity="false" level="OFF">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+ <asyncLogger name="org.apache.syncope.wa" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <root level="INFO">
+ <appender-ref ref="main"/>
+ </root>
+
+ </loggers>
+
+</configuration>
diff --git a/wa/src/main/resources/application.properties b/fit/wa-reference/src/main/resources/wa.properties
similarity index 64%
copy from wa/src/main/resources/application.properties
copy to fit/wa-reference/src/main/resources/wa.properties
index 487d11b..a208075 100644
--- a/wa/src/main/resources/application.properties
+++ b/fit/wa-reference/src/main/resources/wa.properties
@@ -14,25 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
+anonymousUser=${anonymousUser}
+anonymousKey=${anonymousKey}
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
+useGZIPCompression=true
# Conf directories
conf.directory=${conf.directory}
diff --git a/fit/wa-reference/src/main/webapp/WEB-INF/web.xml b/fit/wa-reference/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..34b536e
--- /dev/null
+++ b/fit/wa-reference/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+ version="4.0"
+ metadata-complete="true">
+
+ <display-name>Apache Syncope ${syncope.version} WA</display-name>
+
+</web-app>
diff --git a/wa/src/main/resources/application.properties b/fit/wa-reference/src/test/resources/hotswap-agent.properties
similarity index 52%
copy from wa/src/main/resources/application.properties
copy to fit/wa-reference/src/test/resources/hotswap-agent.properties
index 487d11b..d0bf167 100644
--- a/wa/src/main/resources/application.properties
+++ b/fit/wa-reference/src/test/resources/hotswap-agent.properties
@@ -14,27 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
-server.port=8080
+LOGGER=error
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
+autoHotswap=true
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
-
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+extraClasspath=\
+${basedir}/../../wa/target/classes/org
diff --git a/sra/pom.xml b/sra/pom.xml
index 1139819..6644b0e 100644
--- a/sra/pom.xml
+++ b/sra/pom.xml
@@ -166,6 +166,7 @@ under the License.
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+
<resource>
<directory>${basedir}/../src/main/resources</directory>
<filtering>true</filtering>
@@ -208,6 +209,11 @@ under the License.
<artifactId>cxf-rt-transports-http-netty-server</artifactId>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAApplication.java b/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAApplication.java
index 5a2e05e..3f56eb4 100644
--- a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAApplication.java
+++ b/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAApplication.java
@@ -19,6 +19,9 @@
package org.apache.syncope.sra;
import java.util.Objects;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
import org.apache.syncope.common.lib.types.IdRepoEntitlement;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
@@ -62,6 +65,16 @@ public class SyncopeSRAApplication implements EnvironmentAware {
}
@Bean
+ public KeymasterStart keymasterStart() {
+ return new KeymasterStart(NetworkService.Type.SRA);
+ }
+
+ @Bean
+ public KeymasterStop keymasterStop() {
+ return new KeymasterStop(NetworkService.Type.SRA);
+ }
+
+ @Bean
public RouteLocator routes(final RouteLocatorBuilder builder) {
return () -> Flux.fromIterable(provider.fetch()).map(Route.AbstractBuilder::build);
}
diff --git a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAShutdown.java b/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAShutdown.java
deleted file mode 100644
index 4ed772c..0000000
--- a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAShutdown.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.sra;
-
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextClosedEvent;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SyncopeSRAShutdown extends SyncopeSRAStartStop
- implements ApplicationListener<ContextClosedEvent> {
-
- @Override
- public void onApplicationEvent(final ContextClosedEvent event) {
- serviceOps.unregister(getNetworkService());
- }
-}
diff --git a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAStartStop.java b/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAStartStop.java
deleted file mode 100644
index 926a608..0000000
--- a/sra/src/main/java/org/apache/syncope/sra/SyncopeSRAStartStop.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.sra;
-
-import org.apache.syncope.common.keymaster.client.api.ServiceOps;
-import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-
-abstract class SyncopeSRAStartStop {
-
- @Autowired
- protected ServiceOps serviceOps;
-
- @Value("${service.discovery.address}")
- private String address;
-
- protected NetworkService getNetworkService() {
- NetworkService ns = new NetworkService();
- ns.setType(NetworkService.Type.SRA);
- ns.setAddress(address);
- return ns;
- }
-}
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 1fee6ac..45d71fd 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -73,6 +73,13 @@ under the License.
<type>war</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.syncope.fit</groupId>
+ <artifactId>syncope-fit-wa-reference</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -116,68 +123,76 @@ under the License.
<phase>verify</phase>
<configuration>
<target>
- <mkdir dir="${work.dir}" />
+ <mkdir dir="${work.dir}"/>
<!-- legal stuff -->
- <copy file="${project.build.outputDirectory}/README" todir="${work.dir}" />
- <copy file="LICENSE" todir="${work.dir}" />
- <copy file="NOTICE" todir="${work.dir}" />
+ <copy file="${project.build.outputDirectory}/README" todir="${work.dir}"/>
+ <copy file="LICENSE" todir="${work.dir}"/>
+ <copy file="NOTICE" todir="${work.dir}"/>
<!-- Unzip Tomcat and remove docs and examples from webapps (space saving) -->
- <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/tomcat-${tomcat.version}.zip" dest="${work.dir}" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/docs" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/examples" />
+ <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/tomcat-${tomcat.version}.zip" dest="${work.dir}"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/docs"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/examples"/>
<!-- Syncope core -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope">
- <fileset dir="../fit/core-reference/target/syncope-fit-core-reference-${project.version}" includes="**/*" />
+ <fileset dir="../fit/core-reference/target/syncope-fit-core-reference-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/core" />
+ <fileset dir="${project.build.outputDirectory}/core"/>
</copy>
- <copy file="../fit/core-reference/target/test-classes/keystore" todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes" overwrite="true" />
+ <copy file="../fit/core-reference/target/test-classes/keystore" todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes" overwrite="true"/>
<!-- Syncope console -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console">
- <fileset dir="../fit/console-reference/target/syncope-fit-console-reference-${project.version}" includes="**/*" />
+ <fileset dir="../fit/console-reference/target/syncope-fit-console-reference-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/console" />
+ <fileset dir="${project.build.outputDirectory}/console"/>
</copy>
<!-- Syncope enduser -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-enduser">
- <fileset dir="../fit/enduser-reference/target/syncope-fit-enduser-reference-${project.version}" includes="**/*" />
+ <fileset dir="../fit/enduser-reference/target/syncope-fit-enduser-reference-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-enduser/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/enduser" />
+ <fileset dir="${project.build.outputDirectory}/enduser"/>
+ </copy>f
+
+ <!-- Syncope wa -->
+ <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-wa">
+ <fileset dir="../fit/wa-reference/target/syncope-fit-wa-reference-${project.version}" includes="**/*"/>
+ </copy>
+ <copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-wa/WEB-INF/classes" overwrite="true">
+ <fileset dir="${project.build.outputDirectory}/wa"/>
</copy>
- <mkdir dir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}" />
- <copy file="../fit/core-reference/src/test/resources/test.csv" todir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}" />
+ <mkdir dir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}"/>
+ <copy file="../fit/core-reference/src/test/resources/test.csv" todir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}"/>
<!-- Syncope build tools (provide H2, Apache DS and REST / SOAP resources + ConnId connector server) -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-fit-build-tools">
- <fileset dir="../fit/build-tools/target/syncope-fit-build-tools-${project.version}" includes="**/*" />
+ <fileset dir="../fit/build-tools/target/syncope-fit-build-tools-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-fit-build-tools/WEB-INF/lib">
- <fileset dir="../fit/core-reference/target/bundles/" includes="**/*" />
+ <fileset dir="../fit/core-reference/target/bundles/" includes="**/*"/>
</copy>
<!-- Tomcat shared libraries: H2, StAX2 API, Woodstox -->
- <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
+ <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/lib">
- <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="stax2-api-*.jar" />
- <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="woodstox-core-asl-*.jar" />
+ <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="stax2-api-*.jar"/>
+ <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="woodstox-core-asl-*.jar"/>
</copy>
<!-- Other custom Tomcat resources -->
- <copy file="${project.build.outputDirectory}/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true" />
- <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}" />
- <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8009" value="${cargo.tomcat.ajp.port}" />
- <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8005" value="${cargo.rmi.port}" />
+ <copy file="${project.build.outputDirectory}/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true"/>
+ <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}"/>
+ <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8009" value="${cargo.tomcat.ajp.port}"/>
+ <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8005" value="${cargo.rmi.port}"/>
</target>
</configuration>
</execution>
@@ -276,6 +291,12 @@ under the License.
</resource>
<resource>
+ <directory>../fit/wa-reference/src/main/resources</directory>
+ <targetPath>wa</targetPath>
+ <filtering>true</filtering>
+ </resource>
+
+ <resource>
<directory>src/main/resources</directory>
</resource>
<resource>
diff --git a/wa/pom.xml b/wa/pom.xml
index 2bdb8b0..13d69aa 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -43,6 +43,18 @@ under the License.
<dependencies>
<dependency>
+ <groupId>org.apache.syncope.common.keymaster</groupId>
+ <artifactId>syncope-common-keymaster-client-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope.client.am</groupId>
+ <artifactId>syncope-client-am-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
</dependency>
@@ -175,15 +187,30 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.syncope.common.keymaster</groupId>
+ <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -209,24 +236,105 @@ under the License.
</includes>
</resource>
</resources>
+
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
</build>
<profiles>
<profile>
<id>debug</id>
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-undertow</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope.common.keymaster</groupId>
+ <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>
</dependencies>
<build>
- <defaultGoal>clean package spring-boot:run</defaultGoal>
+ <defaultGoal>clean package io.fabric8:docker-maven-plugin:start spring-boot:run</defaultGoal>
<plugins>
<plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <images>
+ <image>
+ <name>zookeeper:${zookeeper.version}</name>
+ <run>
+ <ports>
+ <port>2181:2181</port>
+ </ports>
+ <volumes>
+ <bind>
+ <volume>${project.build.testOutputDirectory}/zoo.cfg:/conf/zoo.cfg</volume>
+ <volume>${project.build.testOutputDirectory}/java.env:/conf/java.env</volume>
+ <volume>${project.build.testOutputDirectory}/server-jaas.conf:/conf/server-jaas.conf</volume>
+ <volume>${project.build.testOutputDirectory}/client-jaas.conf:/conf/client-jaas.conf</volume>
+ </bind>
+ </volumes>
+ </run>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/src/test/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/org/apache/syncope/wa/**Test.java</exclude>
+ <exclude>**/org/apache/syncope/wa/**Zookeeper*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
@@ -244,11 +352,16 @@ under the License.
<resources>
<resource>
<directory>${basedir}/src/test/resources</directory>
- <includes>
- <include>application-debug.properties</include>
- </includes>
+ <filtering>true</filtering>
</resource>
</resources>
+
+ <testResources>
+ <testResource>
+ <directory>${basedir}/../common/keymaster/client-zookeeper/src/main/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
</build>
</profile>
diff --git a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
index 970d890..16d985d 100644
--- a/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
+++ b/wa/src/main/java/org/apache/syncope/wa/SyncopeWAApplication.java
@@ -19,6 +19,9 @@
package org.apache.syncope.wa;
import org.apache.commons.lang.StringUtils;
+import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
+import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
import org.apereo.cas.configuration.CasConfigurationProperties;
import org.apereo.cas.util.AsciiArtUtils;
import org.apereo.cas.util.DateTimeUtils;
@@ -41,12 +44,16 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.context.annotation.PropertySource;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
+@PropertySource("classpath:wa.properties")
+@PropertySource(value = "file:${conf.directory}/wa.properties", ignoreResourceNotFound = true)
@SpringBootApplication(exclude = {
HibernateJpaAutoConfiguration.class,
JerseyAutoConfiguration.class,
@@ -84,4 +91,14 @@ public class SyncopeWAApplication extends SpringBootServletInitializer {
AsciiArtUtils.printAsciiArtReady(LOG, StringUtils.EMPTY);
LOG.info("Ready to process requests @ [{}]", DateTimeUtils.zonedDateTimeOf(event.getTimestamp()));
}
+
+ @Bean
+ public KeymasterStart keymasterStart() {
+ return new KeymasterStart(NetworkService.Type.WA);
+ }
+
+ @Bean
+ public KeymasterStop keymasterStop() {
+ return new KeymasterStop(NetworkService.Type.WA);
+ }
}
diff --git a/wa/src/main/resources/application.properties b/wa/src/main/resources/application.properties
index 487d11b..53ae4b0 100644
--- a/wa/src/main/resources/application.properties
+++ b/wa/src/main/resources/application.properties
@@ -26,6 +26,9 @@ spring.http.encoding.force=true
server.servlet.contextPath=/syncope-wa
+management.endpoints.web.exposure.include=health,loggers
+management.endpoint.health.show-details=always
+
##
# Allow configuration classes to override bean definitions from Spring Boot
#
@@ -33,8 +36,3 @@ spring.main.allow-bean-definition-overriding=true
spring.main.lazy-initialization=false
service.discovery.address=http://localhost:8080/syncope-wa/
-
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
diff --git a/wa/src/main/resources/log4j2.xml b/wa/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..e184c60
--- /dev/null
+++ b/wa/src/main/resources/log4j2.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<configuration status="WARN">
+
+ <appenders>
+
+ <RollingRandomAccessFile name="main" fileName="${log.directory}/wa.log"
+ filePattern="${log.directory}/wa-%d{yyyy-MM-dd}.log.gz"
+ immediateFlush="false" append="true">
+ <PatternLayout>
+ <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy/>
+ <SizeBasedTriggeringPolicy size="250 MB"/>
+ </Policies>
+ </RollingRandomAccessFile>
+
+ </appenders>
+
+ <loggers>
+
+ <asyncLogger name="org.apereo.cas" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+ <asyncLogger name="org.apereo.inspektr.audit.support" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.springframework" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.apache.syncope.client.lib" additivity="false" level="OFF">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+ <asyncLogger name="org.apache.syncope.wa" additivity="false" level="INFO">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
+ <appender-ref ref="main"/>
+ </asyncLogger>
+
+ <root level="INFO">
+ <appender-ref ref="main"/>
+ </root>
+
+ </loggers>
+
+</configuration>
diff --git a/wa/src/main/resources/static/images/favicon.png b/wa/src/main/resources/static/images/favicon.png
new file mode 100644
index 0000000..aa2f3e2
Binary files /dev/null and b/wa/src/main/resources/static/images/favicon.png differ
diff --git a/wa/src/main/resources/templates/layout.html b/wa/src/main/resources/templates/layout.html
new file mode 100644
index 0000000..ad83fbc
--- /dev/null
+++ b/wa/src/main/resources/templates/layout.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+
+<head>
+ <meta charset="UTF-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+
+ <title layout:title-pattern="$LAYOUT_TITLE">Apache Syncope</title>
+
+ <!--/* Core CAS CSS */-->
+ <link rel="stylesheet" type="text/css" href="../static/css/normalize.css" th:href="@{#{webjars.normalize.css}}" />
+ <link rel="stylesheet" type="text/css" href="../static/css/bootstrap-grid.min.css" th:href="@{#{webjars.bootstrap-grid.css}}" />
+ <link rel="stylesheet" type="text/css" href="../static/css/material-components-web.min.css" th:href="@{#{webjars.material-components.css}}" />
+ <link rel="stylesheet" type="text/css" href="../static/css/mdi-font.css" th:href="@{#{webjars.mdi-font.css}}" />
+ <link rel="stylesheet" type="text/css" href="../static/css/cas.css" th:href="@{${#themes.code('cas.standard.css.file')}}"/>
+
+ <link rel="shortcut icon" th:href="@{'/images/favicon.png'}" type="image/png"/>
+</head>
+
+<body>
+<script th:replace="fragments/scripts" />
+
+<div th:replace="fragments/header :: header">
+ <a href="fragments/header.html">Header</a> fragment will go here
+</div>
+
+<div class="mdc-drawer-scrim"></div>
+
+<div class="mdc-drawer-app-content mdc-top-app-bar--fixed-adjust d-flex justify-content-center">
+ <main role="main" id="main-content" class="container-lg py-4">
+ <div layout:fragment="content" id="content">
+ CAS content will go here
+ </div>
+ </main>
+</div>
+
+<div th:replace="fragments/footer :: footer">
+ <a href="fragments/footer.html">Footer</a> fragment will go here
+</div>
+
+</body>
+</html>
diff --git a/wa/src/main/resources/application.properties b/wa/src/main/resources/wa.properties
similarity index 64%
copy from wa/src/main/resources/application.properties
copy to wa/src/main/resources/wa.properties
index 487d11b..a208075 100644
--- a/wa/src/main/resources/application.properties
+++ b/wa/src/main/resources/wa.properties
@@ -14,25 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
+anonymousUser=${anonymousUser}
+anonymousKey=${anonymousKey}
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
+useGZIPCompression=true
# Conf directories
conf.directory=${conf.directory}
diff --git a/wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java b/wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java
new file mode 100644
index 0000000..c4ed578
--- /dev/null
+++ b/wa/src/test/java/org/apache/syncope/wa/SyncopeWATest.java
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.wa;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+import javax.ws.rs.core.HttpHeaders;
+import org.apache.http.Consts;
+import org.apache.http.Header;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.test.context.ContextConfiguration;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
+ "cas.authn.accept.users=mrossi::password"
+})
+@ContextConfiguration(initializers = ZookeeperTestingServer.class)
+public class SyncopeWATest {
+
+ @LocalServerPort
+ private int port;
+
+ private String getLoginURL() {
+ return "http://localhost:" + port + "/syncope-wa/login";
+ }
+
+ @Test
+ public void loginLogout() throws IOException {
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+ HttpClientContext context = HttpClientContext.create();
+ context.setCookieStore(new BasicCookieStore());
+
+ // 1. first GET to fetch execution
+ HttpGet get = new HttpGet(getLoginURL());
+ get.addHeader(new BasicHeader(HttpHeaders.ACCEPT_LANGUAGE, "en-US,en;q=0.5"));
+ CloseableHttpResponse response = httpclient.execute(get, context);
+ assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
+
+ String responseBody = EntityUtils.toString(response.getEntity());
+ int begin = responseBody.indexOf("name=\"execution\" value=\"");
+ assertNotEquals(-1, begin);
+ int end = responseBody.indexOf("\"/><input type=\"hidden\" name=\"_eventId\"");
+ assertNotEquals(-1, end);
+
+ String execution = responseBody.substring(begin + 24, end);
+ assertNotNull(execution);
+
+ // 2. then POST to authenticate
+ List<NameValuePair> form = new ArrayList<>();
+ form.add(new BasicNameValuePair("_eventId", "submit"));
+ form.add(new BasicNameValuePair("execution", execution));
+ form.add(new BasicNameValuePair("username", "mrossi"));
+ form.add(new BasicNameValuePair("password", "password"));
+ form.add(new BasicNameValuePair("geolocation", ""));
+
+ HttpPost post = new HttpPost(getLoginURL());
+ post.addHeader(new BasicHeader(HttpHeaders.ACCEPT_LANGUAGE, "en-US,en;q=0.5"));
+ post.setEntity(new UrlEncodedFormEntity(form, Consts.UTF_8));
+ response = httpclient.execute(post, context);
+
+ // 3. check authentication results
+ assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
+
+ Header[] cookie = response.getHeaders("Set-Cookie");
+ assertNotNull(cookie);
+ assertTrue(cookie.length > 0);
+ assertEquals(1, Stream.of(cookie).filter(item -> item.getValue().startsWith("TGC")).count());
+
+ String body = EntityUtils.toString(response.getEntity());
+ assertTrue(body.contains("Log In Successful"));
+ assertTrue(body.contains("have successfully logged into the Central Authentication Service"));
+
+ // 4. logout
+ HttpGet logout = new HttpGet(getLoginURL().replace("login", "logout"));
+ logout.addHeader(new BasicHeader(HttpHeaders.ACCEPT_LANGUAGE, "en-US,en;q=0.5"));
+ response = httpclient.execute(logout, context);
+ assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
+
+ body = EntityUtils.toString(response.getEntity());
+ assertTrue(body.contains("Logout successful"));
+ assertTrue(body.contains("have successfully logged out of the Central Authentication Service"));
+ }
+
+ @Test
+ public void loginError() throws IOException {
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+ HttpClientContext context = HttpClientContext.create();
+ context.setCookieStore(new BasicCookieStore());
+
+ // 1. first GET to fetch execution
+ HttpGet get = new HttpGet(getLoginURL());
+ get.addHeader(new BasicHeader(HttpHeaders.ACCEPT_LANGUAGE, "en-US,en;q=0.5"));
+ CloseableHttpResponse response = httpclient.execute(get, context);
+ assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
+
+ String responseBody = EntityUtils.toString(response.getEntity());
+ int begin = responseBody.indexOf("name=\"execution\" value=\"");
+ assertNotEquals(-1, begin);
+ int end = responseBody.indexOf("\"/><input type=\"hidden\" name=\"_eventId\"");
+ assertNotEquals(-1, end);
+
+ String execution = responseBody.substring(begin + 24, end);
+ assertNotNull(execution);
+
+ // 2. then POST to authenticate
+ List<NameValuePair> form = new ArrayList<>();
+ form.add(new BasicNameValuePair("_eventId", "submit"));
+ form.add(new BasicNameValuePair("execution", execution));
+ form.add(new BasicNameValuePair("username", "mrossi"));
+ form.add(new BasicNameValuePair("password", "WRONG"));
+ form.add(new BasicNameValuePair("geolocation", ""));
+
+ HttpPost post = new HttpPost(getLoginURL());
+ post.addHeader(new BasicHeader(HttpHeaders.ACCEPT_LANGUAGE, "en-US,en;q=0.5"));
+ post.setEntity(new UrlEncodedFormEntity(form, Consts.UTF_8));
+ response = httpclient.execute(post, context);
+
+ // 3. check authentication results
+ assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getStatusLine().getStatusCode());
+ }
+}
diff --git a/wa/src/test/java/org/apache/syncope/wa/ZookeeperTestingServer.java b/wa/src/test/java/org/apache/syncope/wa/ZookeeperTestingServer.java
new file mode 100644
index 0000000..956e6f3
--- /dev/null
+++ b/wa/src/test/java/org/apache/syncope/wa/ZookeeperTestingServer.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.wa;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import org.apache.curator.test.InstanceSpec;
+import org.apache.curator.test.TestingServer;
+import org.apache.zookeeper.server.auth.DigestLoginModule;
+import org.apache.zookeeper.server.auth.SASLAuthenticationProvider;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+
+public class ZookeeperTestingServer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+ @Override
+ public void initialize(final ConfigurableApplicationContext ctx) {
+ AtomicReference<String> username = new AtomicReference<>();
+ AtomicReference<String> password = new AtomicReference<>();
+ try (InputStream propStream = getClass().getResourceAsStream("/keymaster.properties")) {
+ Properties props = new Properties();
+ props.load(propStream);
+
+ username.set(props.getProperty("keymaster.username"));
+ password.set(props.getProperty("keymaster.password"));
+ } catch (Exception e) {
+ throw new IllegalStateException("Could not load /keymaster.properties", e);
+ }
+
+ Configuration.setConfiguration(new Configuration() {
+
+ private final AppConfigurationEntry[] entries = {
+ new AppConfigurationEntry(
+ DigestLoginModule.class.getName(),
+ AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
+ Map.of(
+ "user_" + username.get(), password.get()
+ ))
+ };
+
+ @Override
+ public AppConfigurationEntry[] getAppConfigurationEntry(final String name) {
+ return entries;
+ }
+ });
+
+ Map<String, Object> customProperties = new HashMap<>();
+ customProperties.put("authProvider.1", SASLAuthenticationProvider.class.getName());
+ InstanceSpec spec = new InstanceSpec(null, 2181, -1, -1, true, 1, -1, -1, customProperties);
+
+ try {
+ new TestingServer(spec, true);
+ } catch (Exception e) {
+ fail(e);
+ }
+ }
+}
diff --git a/wa/src/main/resources/application.properties b/wa/src/test/resources/keymaster.properties
similarity index 52%
copy from wa/src/main/resources/application.properties
copy to wa/src/test/resources/keymaster.properties
index 487d11b..f374d8c 100644
--- a/wa/src/main/resources/application.properties
+++ b/wa/src/test/resources/keymaster.properties
@@ -14,27 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spring.application.name=Apache Syncope ${syncope.version} WA
-spring.groovy.template.check-template-location=false
-spring.main.banner-mode=log
-
-server.port=8080
-
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.enabled=true
-spring.http.encoding.force=true
-
-server.servlet.contextPath=/syncope-wa
-
-##
-# Allow configuration classes to override bean definitions from Spring Boot
-#
-spring.main.allow-bean-definition-overriding=true
-spring.main.lazy-initialization=false
-
-service.discovery.address=http://localhost:8080/syncope-wa/
-
-# Conf directories
-conf.directory=${conf.directory}
-cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+keymaster.address=127.0.0.1:2181
+keymaster.username=${anonymousUser}
+keymaster.password=${anonymousKey}
[syncope] 07/09: [SYNCOPE-1545] add AUP support; off by default
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit ca3a4040e6c88fca3c1017b9448e141fbb9df41a
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Fri Mar 13 15:53:56 2020 +0330
[SYNCOPE-1545] add AUP support; off by default
---
wa/pom.xml | 4 ++++
wa/src/main/resources/wa.properties | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/wa/pom.xml b/wa/pom.xml
index 85cff67..56c3193 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -170,6 +170,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-aup-webflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
<artifactId>cas-server-support-rest-service-registry</artifactId>
</dependency>
<dependency>
diff --git a/wa/src/main/resources/wa.properties b/wa/src/main/resources/wa.properties
index 14e07af..9a0d56e 100644
--- a/wa/src/main/resources/wa.properties
+++ b/wa/src/main/resources/wa.properties
@@ -26,4 +26,8 @@ cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
# Disable access to the login endpoint
# if no target application is specified.
-cas.sso.allow-missing-service-parameter=false
+cas.sso.allow-missing-service-parameter=true
+
+# Disable the acceptable usage policy
+# by default for now.
+cas.acceptableUsagePolicy.enabled=false
[syncope] 09/09: [SYNCOPE-1545] Using CAS BOM
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 80b941e0ace052034995b86315b95bdb482923c8
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Mar 16 14:05:06 2020 +0100
[SYNCOPE-1545] Using CAS BOM
---
wa/pom.xml | 17 ++++++++++++++---
.../syncope/wa/config/SyncopeWAConfiguration.java | 11 ++++++-----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/wa/pom.xml b/wa/pom.xml
index 1a5616d..8cb9d18 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -41,6 +41,18 @@ under the License.
<rootpom.basedir>${basedir}/..</rootpom.basedir>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-bom</artifactId>
+ <version>${cas.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.syncope.common.keymaster</groupId>
@@ -132,9 +144,8 @@ under the License.
<artifactId>cas-server-support-reports</artifactId>
</dependency>
<dependency>
- <groupId>org.apereo.cas</groupId>
- <artifactId>cas-server-support-syncope-authentication</artifactId>
- <scope>compile</scope>
+ <groupId>org.apereo.cas</groupId>
+ <artifactId>cas-server-support-syncope-authentication</artifactId>
</dependency>
<dependency>
<groupId>org.apereo.cas</groupId>
diff --git a/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
index 2107f51..701cb53 100644
--- a/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
+++ b/wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
@@ -6,7 +6,8 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -14,26 +15,26 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-
package org.apache.syncope.wa.config;
+import java.io.Serializable;
import org.apereo.cas.services.DefaultRegisteredServiceEntityMapper;
import org.apereo.cas.services.RegisteredServiceEntityMapper;
-
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStart;
import org.apache.syncope.common.keymaster.client.api.startstop.KeymasterStop;
+import org.apereo.cas.services.RegisteredService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
public class SyncopeWAConfiguration {
+
@Bean
@ConditionalOnProperty(name = "cas.serviceRegistry.rest.url")
- public RegisteredServiceEntityMapper registeredServiceEntityMapper() {
+ public RegisteredServiceEntityMapper<RegisteredService, Serializable> registeredServiceEntityMapper() {
return new DefaultRegisteredServiceEntityMapper();
}
[syncope] 08/09: [SYNCOPE-1545] Archetype
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 09d5ad9f052a8c1fd8529710c6375a9976e61c7e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Sun Mar 15 17:26:24 2020 +0100
[SYNCOPE-1545] Archetype
---
.travis.yml | 6 +-
archetype/pom.xml | 32 +++++
.../META-INF/maven/archetype-metadata.xml | 13 ++
.../main/resources/archetype-resources/fit/pom.xml | 12 +-
.../main/resources/archetype-resources/wa/pom.xml | 134 +++++++++++++++++++++
.../wa/src/test/resources/keymaster.properties | 19 +++
archetype/src/main/resources/meta-pom.xml | 7 ++
core/idrepo/logic/pom.xml | 8 --
.../org/apache/syncope/fit/core/ReportITCase.java | 7 +-
wa/pom.xml | 1 +
10 files changed, 222 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 0ed30c8..2a83c29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ cache:
bundler: false
cargo: false
directories:
- - $HOME/.m2
+ - '$HOME/.m2'
git:
depth: 2
env:
@@ -44,11 +44,11 @@ jobs:
include:
- stage: build
name: "Build"
- script: mvn -T 1C --quiet -P skipTests,all
+ script: mvn -T 1C -P skipTests,all
#######################################################
- stage: validate
name: "Checkstyle, Legal Files, Modernizer and Release Audit Tool (RAT) Analysis"
- script: mvn -T 1C checkstyle:check ianal:verify-legal-files modernizer:modernizer apache-rat:check --quiet
+ script: mvn -T 1C checkstyle:check ianal:verify-legal-files modernizer:modernizer apache-rat:check
######################################################
- stage: test
name: "Unit Tests"
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 54a749a..f500f59 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -354,6 +354,38 @@ under the License.
<include>keymaster.properties</include>
</includes>
</resource>
+
+ <resource>
+ <directory>../wa/src/main/resources</directory>
+ <targetPath>${project.build.outputDirectory}/archetype-resources/wa/src/main/resources</targetPath>
+ </resource>
+ <resource>
+ <directory>../wa/src/test/resources</directory>
+ <targetPath>${project.build.outputDirectory}/archetype-resources/wa/src/main/resources</targetPath>
+ <includes>
+ <include>keymaster.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../fit/wa-reference/src/main/resources</directory>
+ <targetPath>${project.build.outputDirectory}/archetype-resources/wa/src/main/resources</targetPath>
+ <includes>
+ <include>application-embedded.properties</include>
+ <include>log4j2.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../fit/wa-reference/src/main/resources</directory>
+ <targetPath>${project.build.outputDirectory}/archetype-resources/wa/src/test/resources</targetPath>
+ <includes>
+ <include>wa</include>
+ <include>keymaster.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../fit/wa-reference/src/main/webapp/WEB-INF</directory>
+ <targetPath>${project.build.outputDirectory}/archetype-resources/wa/src/main/webapp/WEB-INF</targetPath>
+ </resource>
</resources>
</build>
diff --git a/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index f22b5fb..9fa586c 100644
--- a/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -79,6 +79,19 @@ under the License.
</fileSet>
</fileSets>
</module>
+ <module id="syncope-wa" dir="wa" name="syncope-wa">
+ <fileSets>
+ <fileSet filtered="false" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ </fileSet>
+ <fileSet filtered="false" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ </fileSet>
+ <fileSet filtered="false" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ </fileSet>
+ </fileSets>
+ </module>
<module id="syncope-sra" dir="sra" name="syncope-sra">
<fileSets>
<fileSet filtered="false" encoding="UTF-8">
diff --git a/archetype/src/main/resources/archetype-resources/fit/pom.xml b/archetype/src/main/resources/archetype-resources/fit/pom.xml
index 53745a8..6be3d9d 100644
--- a/archetype/src/main/resources/archetype-resources/fit/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/fit/pom.xml
@@ -153,6 +153,10 @@ under the License.
<copy file="../enduser/target/test-classes/customTemplate.json"
todir="../enduser/target/syncope-enduser/WEB-INF/classes"
overwrite="true"/>
+
+ <copy file="../wa/target/test-classes/keymaster.properties"
+ todir="../wa/target/syncope-wa/WEB-INF/classes"
+ overwrite="true"/>
</target>
</configuration>
<goals>
@@ -181,7 +185,7 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${JAVA_HOME}/bin/java</executable>
<arguments>
<argument>-jar</argument>
<argument>${basedir}/../sra/target/syncope-sra.jar</argument>
@@ -253,6 +257,12 @@ under the License.
<context>syncope-enduser</context>
</properties>
</deployable>
+ <deployable>
+ <location>../wa/target/syncope-wa</location>
+ <properties>
+ <context>syncope-wa</context>
+ </properties>
+ </deployable>
</deployables>
</configuration>
</plugin>
diff --git a/archetype/src/main/resources/archetype-resources/wa/pom.xml b/archetype/src/main/resources/archetype-resources/wa/pom.xml
new file mode 100644
index 0000000..91b4a22
--- /dev/null
+++ b/archetype/src/main/resources/archetype-resources/wa/pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
+ </parent>
+
+ <name>Apache Syncope sample project - WA</name>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <packaging>war</packaging>
+
+ <properties>
+ <guava.version>28.2-jre</guava.version>
+ <opensaml.version>3.4.5</opensaml.version>
+ <bootstrap.version>4.4.1</bootstrap.version>
+ <slf4j.version>2.0.0-alpha1</slf4j.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>syncope-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-wa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope.ext.self-keymaster</groupId>
+ <artifactId>syncope-ext-self-keymaster-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.syncope.common.keymaster</groupId>
+ <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>syncope-wa</finalName>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+ <filtering>true</filtering>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>executable</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-undertow</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.apache.syncope.wa.SyncopeWAApplication</mainClass>
+ <layout>ZIP</layout>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
diff --git a/archetype/src/main/resources/archetype-resources/wa/src/test/resources/keymaster.properties b/archetype/src/main/resources/archetype-resources/wa/src/test/resources/keymaster.properties
new file mode 100644
index 0000000..033fe3b
--- /dev/null
+++ b/archetype/src/main/resources/archetype-resources/wa/src/test/resources/keymaster.properties
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+keymaster.address=http://localhost:9080/syncope/rest/keymaster
+keymaster.username=${anonymousUser}
+keymaster.password=${anonymousKey}
diff --git a/archetype/src/main/resources/meta-pom.xml b/archetype/src/main/resources/meta-pom.xml
index 8eb4a43..fe5f3e8 100644
--- a/archetype/src/main/resources/meta-pom.xml
+++ b/archetype/src/main/resources/meta-pom.xml
@@ -89,6 +89,12 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.syncope</groupId>
+ <artifactId>syncope-wa</artifactId>
+ <version>${syncope.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.syncope.ext.self-keymaster</groupId>
<artifactId>syncope-ext-self-keymaster-rest-cxf</artifactId>
<version>${syncope.version}</version>
@@ -135,6 +141,7 @@ under the License.
<module>console</module>
<module>enduser</module>
<module>sra</module>
+ <module>wa</module>
<module>fit</module>
</modules>
diff --git a/core/idrepo/logic/pom.xml b/core/idrepo/logic/pom.xml
index 67df68e..cfc1aac 100644
--- a/core/idrepo/logic/pom.xml
+++ b/core/idrepo/logic/pom.xml
@@ -70,14 +70,6 @@ under the License.
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-i18n</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-constants</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
index 918175c..ab9e35e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
@@ -238,8 +238,7 @@ public class ReportITCase extends AbstractITCase {
assertNotNull(response);
assertEquals(Response.Status.OK.getStatusCode(), response.getStatusInfo().getStatusCode());
assertNotNull(response.getHeaderString(HttpHeaders.CONTENT_DISPOSITION));
- assertTrue(response.getHeaderString(HttpHeaders.CONTENT_DISPOSITION).
- endsWith('.' + fmt.name().toLowerCase()));
+ assertTrue(response.getHeaderString(HttpHeaders.CONTENT_DISPOSITION).endsWith('.' + fmt.name().toLowerCase()));
Object entity = response.getEntity();
assertTrue(entity instanceof InputStream);
@@ -249,7 +248,6 @@ public class ReportITCase extends AbstractITCase {
@Test
public void executeAndExport() throws IOException {
ReportTO reportTO = reportService.read("0062ea9c-924d-4ecf-9961-4492a8cc6d1b");
- reportTO.setKey(null);
reportTO.setName("executeAndExport" + getUUIDString());
reportTO.setActive(false);
reportTO.getExecutions().clear();
@@ -282,10 +280,10 @@ public class ReportITCase extends AbstractITCase {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ // ignore
}
ReportTO reportTO = reportService.read("0062ea9c-924d-4ecf-9961-4492a8cc6d1b");
- reportTO.setKey(null);
reportTO.setName("deleteExecutions" + getUUIDString());
reportTO.getExecutions().clear();
reportTO = createReport(reportTO);
@@ -379,7 +377,6 @@ public class ReportITCase extends AbstractITCase {
public void issueSYNCOPE102() throws IOException {
// Create
ReportTO reportTO = reportService.read("0062ea9c-924d-4ecf-9961-4492a8cc6d1b");
- reportTO.setKey(null);
reportTO.setName("issueSYNCOPE102" + getUUIDString());
reportTO = createReport(reportTO);
assertNotNull(reportTO);
diff --git a/wa/pom.xml b/wa/pom.xml
index 56c3193..1a5616d 100644
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@ -180,6 +180,7 @@ under the License.
<groupId>org.apereo.cas</groupId>
<artifactId>cas-server-webapp-config</artifactId>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>