This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 669715aa8a [SYNCOPE-1817] Fixing Standalone
669715aa8a is described below
commit 669715aa8a53ef1165b961eebf33eee1eaf8902b
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Apr 18 11:22:57 2024 +0200
[SYNCOPE-1817] Fixing Standalone
---
.../core/src/main/resources/core-saml2.properties | 22 ++++++++++++++++++++++
.../docker-compose/docker-compose-all.yml | 4 +---
.../resources/docker-compose/docker-compose-ha.yml | 4 +---
.../docker-compose/docker-compose-mariadb.yml | 4 +---
.../docker-compose/docker-compose-myjson.yml | 4 +---
.../docker-compose/docker-compose-mysql.yml | 4 +---
.../docker-compose/docker-compose-ojson.yml | 4 +---
.../docker-compose/docker-compose-oracle.yml | 4 +---
.../docker-compose/docker-compose-pgjsonb.yml | 4 +---
.../docker-compose/docker-compose-postgresql.yml | 4 +---
.../docker-compose/docker-compose-sqlserver.yml | 4 +---
src/main/asciidoc/getting-started/obtain.adoc | 15 ++++++++-------
standalone/pom.xml | 5 +++--
standalone/src/main/resources/setenv.bat | 2 +-
standalone/src/main/resources/setenv.sh | 2 +-
15 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/docker/core/src/main/resources/core-saml2.properties
b/docker/core/src/main/resources/core-saml2.properties
new file mode 100644
index 0000000000..ddc058a3ea
--- /dev/null
+++ b/docker/core/src/main/resources/core-saml2.properties
@@ -0,0 +1,22 @@
+# 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.
+saml2.sp4ui.keystore=file://${syncope.conf.dir}/saml.keystore.jks
+saml2.sp4ui.keystore.type=jks
+saml2.sp4ui.keystore.storepass=changeit
+saml2.sp4ui.keystore.keypass=changeit
+saml2.sp4ui.maximum-authentication-lifetime=3600
+saml2.sp4ui.accepted-skew=300
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 68e5304dd0..403c12fe3d 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-all.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-all.yml
@@ -20,8 +20,6 @@
# Zookeeper is configured without JAAS, hence empty KEYMASTER_USERNAME /
KEYMASTER_PASSWORD
# are passed to other containers
-version: '3.3'
-
services:
keymaster:
image: zookeeper:3.8.1
@@ -44,7 +42,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,postgresql
+ SPRING_PROFILES_ACTIVE: docker,postgresql,saml2
DB_URL: jdbc:postgresql://db:5432/syncope?stringtype=unspecified
DB_USER: syncope
DB_PASSWORD: syncope
diff --git a/docker/src/main/resources/docker-compose/docker-compose-ha.yml
b/docker/src/main/resources/docker-compose/docker-compose-ha.yml
index 0df7b71215..129b1c707a 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-ha.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-ha.yml
@@ -18,8 +18,6 @@
# Full deployment (Core, Console, Enduser) on PostgreSQL, with
high-availability set for Core
# https://syncope.apache.org/docs/reference-guide.html#high-availability
-version: '3.3'
-
services:
db:
image: postgres:16
@@ -37,7 +35,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,postgresql
+ SPRING_PROFILES_ACTIVE: docker,postgresql,saml2
DB_URL: jdbc:postgresql://db:5432/syncope?stringtype=unspecified
DB_USER: syncope
DB_PASSWORD: syncope
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
index a871517236..15cb1c5651 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on MariaDB
-version: '3.3'
-
services:
db:
image: mariadb:11
@@ -37,7 +35,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,mariadb
+ SPRING_PROFILES_ACTIVE: docker,mariadb,saml2
DB_URL:
jdbc:mariadb://db:3306/syncope?characterEncoding=UTF-8&relaxAutoCommit=true&useSSL=false
DB_USER: syncope
DB_PASSWORD: syncope
diff --git a/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
b/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
index 68fb23bf17..b7b597cc37 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-myjson.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on MySQL with JSON_TABLE support
-version: '3.3'
-
services:
db:
image: mysql/mysql-server:8.0
@@ -38,7 +36,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,myjson
+ SPRING_PROFILES_ACTIVE: docker,myjson,saml2
LOADER_PATH: "/opt/syncope/conf,/opt/syncope/lib,/opt/syncope/jpa-json"
DB_URL:
jdbc:mysql://db:3306/syncope?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
DB_USER: syncope
diff --git a/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
b/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
index 74a3e04b16..9eb68a9feb 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on MySQL
-version: '3.3'
-
services:
db:
image: mysql/mysql-server:8.0
@@ -38,7 +36,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,mysql
+ SPRING_PROFILES_ACTIVE: docker,mysql,saml2
DB_URL:
jdbc:mysql://db:3306/syncope?useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
DB_USER: syncope
DB_PASSWORD: syncope
diff --git a/docker/src/main/resources/docker-compose/docker-compose-ojson.yml
b/docker/src/main/resources/docker-compose/docker-compose-ojson.yml
index 10ee95ab4b..5175b6327c 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-ojson.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-ojson.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on Oracle with JSON support
-version: '3.3'
-
services:
db:
image: gvenzl/oracle-xe:21-slim
@@ -37,7 +35,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,ojson
+ SPRING_PROFILES_ACTIVE: docker,ojson,saml2
DB_URL: jdbc:oracle:thin:@db:1521/XEPDB1
DB_SCHEMA: SYNCOPE
DB_USER: syncope
diff --git a/docker/src/main/resources/docker-compose/docker-compose-oracle.yml
b/docker/src/main/resources/docker-compose/docker-compose-oracle.yml
index d88469569e..7cae51ac0f 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-oracle.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-oracle.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on Oracle
-version: '3.3'
-
services:
db:
image: gvenzl/oracle-xe:21-slim
@@ -37,7 +35,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,oracle
+ SPRING_PROFILES_ACTIVE: docker,oracle,saml2
DB_URL: jdbc:oracle:thin:@db:1521/XEPDB1
DB_SCHEMA: SYNCOPE
DB_USER: syncope
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
b/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
index 0d39042c70..e74f5e6c18 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on PostgreSQL with JSONB support
-version: '3.3'
-
services:
db:
image: postgres:16
@@ -36,7 +34,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,pgjsonb
+ SPRING_PROFILES_ACTIVE: docker,pgjsonb,saml2
LOADER_PATH: "/opt/syncope/conf,/opt/syncope/lib,/opt/syncope/jpa-json"
DB_URL: jdbc:postgresql://db:5432/syncope?stringtype=unspecified
DB_USER: syncope
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
index 8881840a10..50636da09b 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on PostgreSQL
-version: '3.3'
-
services:
db:
image: postgres:16
@@ -36,7 +34,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,postgresql
+ SPRING_PROFILES_ACTIVE: docker,postgresql,saml2
DB_URL: jdbc:postgresql://db:5432/syncope?stringtype=unspecified
DB_USER: syncope
DB_PASSWORD: syncope
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-sqlserver.yml
b/docker/src/main/resources/docker-compose/docker-compose-sqlserver.yml
index 82c37c73d9..2b3bac439e 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-sqlserver.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-sqlserver.yml
@@ -17,8 +17,6 @@
# Full deployment (Core, Console, Enduser) on MS SQL Server
-version: '3.3'
-
services:
db:
image: mcmoe/mssqldocker:latest
@@ -38,7 +36,7 @@ services:
- "18080:8080"
restart: always
environment:
- SPRING_PROFILES_ACTIVE: docker,sqlserver
+ SPRING_PROFILES_ACTIVE: docker,sqlserver,saml2
DB_URL: jdbc:sqlserver://db:1433;databaseName=syncope
DB_SCHEMA: dbo
DB_USER: syncope
diff --git a/src/main/asciidoc/getting-started/obtain.adoc
b/src/main/asciidoc/getting-started/obtain.adoc
index a941fb2fd0..ae0da7aaf9 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -190,8 +190,6 @@ are passed with same values as `ANONYMOUS_USER` /
`ANONYMOUS_KEY`.
[source,yaml,subs="verbatim,attributes"]
----
-version: '3.3'
-
services:
db: // <1>
image: postgres:latest
@@ -272,8 +270,6 @@ containers.
[source,yaml,subs="verbatim,attributes"]
----
-version: '3.3'
-
services:
keymaster: // <1>
image: zookeeper:3.7.0
@@ -393,9 +389,14 @@ services:
. Save the example file locally.
. Download and start the containers:
+
-[source,bash]
+[source,bash,subs="verbatim,attributes"]
----
-$ docker compose -f /path/to/docker-compose.yml up
+$ SYNCOPE_VERSION={docVersion} \
+ANONYMOUS_USER=anonymous \
+ANONYMOUS_KEY=anonymousKey \
+KEYMASTER_USERNAME=anonymous \
+KEYMASTER_PASSWORD=anonymousKey \
+docker compose -f /path/to/docker-compose.yml up
----
The following services will be available:
@@ -498,7 +499,7 @@ Provides access to the full capabilities of Apache Syncope,
and almost all exten
[[maven-prerequisites]]
==== Prerequisites
- . http://maven.apache.org/[Apache Maven^] (version 3.5.0 or higher) installed
+ . http://maven.apache.org/[Apache Maven^] (version 3.9.5 or higher) installed
. Some basic knowledge about Maven
. Some basic knowledge about
http://maven.apache.org/guides/introduction/introduction-to-archetypes.html[Maven
archetypes^].
diff --git a/standalone/pom.xml b/standalone/pom.xml
index f87ee8c2e3..e5804e1ae2 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -190,8 +190,9 @@ under the License.
<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="8443"
value="9443"/>
<replace
file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml">
- <replacetoken><![CDATA[redirectPort="9443"
/>]]></replacetoken>
- <replacevalue><![CDATA[redirectPort="9443" />
+ <replacetoken><![CDATA[<Service
name="Catalina">]]></replacetoken>
+ <replacevalue><![CDATA[<Service name="Catalina">
+
<Connector protocol="org.apache.coyote.http11.Http11NioProtocol" port="9443"
maxThreads="200"
scheme="https" secure="true" SSLEnabled="true"
keystoreFile="conf/keystore.jks" keystorePass="password"
keystoreType="JKS" clientAuth="false" sslProtocol="TLS"/>]]></replacevalue>
diff --git a/standalone/src/main/resources/setenv.bat
b/standalone/src/main/resources/setenv.bat
index c55f285f7e..e58be0879e 100644
--- a/standalone/src/main/resources/setenv.bat
+++ b/standalone/src/main/resources/setenv.bat
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
rem See the License for the specific language governing permissions and
rem limitations under the License.
-set JAVA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=%CATALINA_HOME%\conf\keystore.jks
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.conf.dir=%CATALINA_HOME%\webapps\syncope\WEB-INF\classes
-Dsyncope.log.dir=%CATALINA_HOME%\logs -Dspring.profiles.active=embedded
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=%CATALINA_HOME%
+set JAVA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=%CATALINA_HOME%\conf\keystore.jks
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.conf.dir=%CATALINA_HOME%\webapps\syncope\WEB-INF\classes
-Dsyncope.log.dir=%CATALINA_HOME%\logs -Dspring.profiles.active=embedded,all
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=%CATALINA_HOME%
diff --git a/standalone/src/main/resources/setenv.sh
b/standalone/src/main/resources/setenv.sh
index df66bfa9e1..fe44497a26 100755
--- a/standalone/src/main/resources/setenv.sh
+++ b/standalone/src/main/resources/setenv.sh
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JAVA_OPTS="-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=$CATALINA_HOME/conf/keystore.jks
-Djavax.net.ssl.trustStorePassword=password
-Dsyncope.conf.dir=$CATALINA_HOME/webapps/syncope/WEB-INF/classes
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.log.dir=$CATALINA_HOME/logs -Dspring.profiles.active=embedded
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=$CATALINA_HOME"
+JAVA_OPTS="-Djava.awt.headless=true -Dfile.encoding=UTF-8
-Djavax.net.ssl.trustStore=$CATALINA_HOME/conf/keystore.jks
-Djavax.net.ssl.trustStorePassword=password
-Dsyncope.conf.dir=$CATALINA_HOME/webapps/syncope/WEB-INF/classes
-Dsyncope.connid.location=connid://${testconnectorserver.key}@localhost:${testconnectorserver.port}
-Dsyncope.log.dir=$CATALINA_HOME/logs -Dspring.profiles.active=embedded,all
-server -Xms2048m -Xmx2048m -XX:NewSize=256m -XX:MaxNewSize=256m
-DCATALINA_HOME=$CATALI [...]
