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 2019/01/16 07:12:06 UTC
[syncope] branch 2_0_X updated (fadb56a -> 731268b)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from fadb56a Upgrading spring-security
new abac865 Upgrading Bootstrap
new 731268b Fix docs after unwanted merge of commit 89c6df7e9c3970b955bc56a015a45193c9280ecc
The 2 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:
pom.xml | 2 +-
.../reference-guide/architecture/core.adoc | 11 +++--
.../workingwithapachesyncope/customization.adoc | 27 +++++-------
.../systemadministration/javaeecontainer.adoc | 48 ++++------------------
4 files changed, 23 insertions(+), 65 deletions(-)
[syncope] 01/02: Upgrading Bootstrap
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit abac8655cef0c9edce8060742ad9334a9546146b
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Jan 16 07:49:20 2019 +0100
Upgrading Bootstrap
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 22711af..3b3c88d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,7 +454,7 @@ under the License.
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
- <bootstrap.version>3.3.7</bootstrap.version>
+ <bootstrap.version>3.4.0</bootstrap.version>
<bootstrap-select.version>1.12.4</bootstrap-select.version>
<bootstrap-fileinput.version>4.4.8</bootstrap-fileinput.version>
<bootbox.version>4.4.0</bootbox.version>
[syncope] 02/02: Fix docs after unwanted merge of commit
89c6df7e9c3970b955bc56a015a45193c9280ecc
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 731268b67c32f5d9e76f2cd4b39f84211bfbf1c6
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Jan 16 08:01:46 2019 +0100
Fix docs after unwanted merge of commit 89c6df7e9c3970b955bc56a015a45193c9280ecc
---
.../reference-guide/architecture/core.adoc | 11 +++--
.../workingwithapachesyncope/customization.adoc | 27 +++++-------
.../systemadministration/javaeecontainer.adoc | 48 ++++------------------
3 files changed, 22 insertions(+), 64 deletions(-)
diff --git a/src/main/asciidoc/reference-guide/architecture/core.adoc b/src/main/asciidoc/reference-guide/architecture/core.adoc
index c1e32da..d7412df 100644
--- a/src/main/asciidoc/reference-guide/architecture/core.adoc
+++ b/src/main/asciidoc/reference-guide/architecture/core.adoc
@@ -36,7 +36,7 @@ An <<swagger,extension>> is also available, providing full http://swagger.io/[Sw
which enables in-browser access to all the REST endpoints defined.
At a technical level, the RESTful interface is a fully-compliant
-https://en.wikipedia.org/wiki/Java_API_for_RESTful_Web_Services[JAX-RS 2.1^] implementation based on
+https://en.wikipedia.org/wiki/Java_API_for_RESTful_Web_Services[JAX-RS 2.0^] implementation based on
http://cxf.apache.org[Apache CXF^], natively dealing either with JSON, YAML and XML payloads.
More details are available in the dedicated <<restful-services,usage>> section.
@@ -73,15 +73,14 @@ In addition, an http://camel.apache.org/[Apache Camel^]-based implementation is
The Workflow layer is responsible for managing the internal lifecycle of Users, Groups and Any Objects.
-Besides the default engine, another engine is available based on http://www.flowable.org/[Flowable^], the
+Besides the default engine, another engine is available based on http://www.activiti.org/[Activiti BPM^], the
reference open source http://www.bpmn.org/[BPMN 2.0^] implementation. It enables advanced features such
-as approval management and new statuses definitions; a web-based GUI editor, the
-http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^], is also available.
+as approval management and new statuses definitions; an optional web-based GUI editor is also available.
[.text-center]
-image::userWorkflow.png[title="Default Flowable user workflow",alt="Default Flowable user workflow"]
+image::userWorkflow.png[title="Default Activiti user workflow",alt="Default Activiti user workflow"]
-Besides Flowable, new workflow engines - possibly integrating with third-party tools as
+Besides Activiti, new workflow engines - possibly integrating with third-party tools as
https://camunda.org/[Camunda^] or http://jbpm.jboss.org/[jBPM^], can be written and plugged into specific deployments.
==== Persistence
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
index 0337e3d..2c281a6 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
@@ -197,7 +197,8 @@ Now, from the `enduser` subdirectory, execute:
[source,bash]
$ mvn -P embedded,debug
-At this point your favourite IDE can be attached to the port `8000`.
+At this point your favourite IDE can be attached to the port `8000`; please note that you might need to add
+`-XX:MaxPermSize=512m` to `<cargo.jvmargs>` in order to run with JDK 7.
====
[[customization-core]]
@@ -208,8 +209,8 @@ When providing custom Java classes implementing the defined interfaces or extend
implementations, their package *must* be rooted under `org.apache.syncope.core`, otherwise they will not be available
at runtime.
-Besides replacing existing classes as explained <<override-behavior,above>>, new <<implementations,implementations>> can
-be provided - under `core/src/main/java` if Java - for the following components:
+Besides replacing existing classes as explained <<override-behavior,above>>, new implementations can be provided under
+`core/src/main/java` for the following components:
* <<propagationactions,propagation>>, <<pushactions,push>>, <<pullactions,pull>> and <<logicactions,logic>> actions
* <<push-correlation-rules,push>> / <<pull-correlation-rules,pull>> correlation rules
@@ -311,32 +312,21 @@ becomes:
====
[discrete]
-===== Select the <<flowable-user-workflow-adapter>>
+===== Select the <<activiti-user-workflow-adapter>>
Add the following dependency to `core/pom.xml`:
[source,xml,subs="verbatim,attributes"]
----
<dependency>
- <groupId>org.apache.syncope.ext.flowable</groupId>
- <artifactId>syncope-ext-flowable-rest-cxf</artifactId>
+ <groupId>org.apache.syncope.core</groupId>
+ <artifactId>syncope-core-workflow-activiti</artifactId>
<version>${syncope.version}</version>
</dependency>
----
Copy `core/src/main/resources/all/workflow.properties` to `core/src/main/resources/workflow.properties`.
-Add the following dependency to `console/pom.xml`:
-
-[source,xml,subs="verbatim,attributes"]
-----
-<dependency>
- <groupId>org.apache.syncope.ext.flowable</groupId>
- <artifactId>syncope-ext-flowable-client-console</artifactId>
- <version>${syncope.version}</version>
-</dependency>
-----
-
[discrete]
===== Enable the <<apache-camel-provisioning-manager>>
@@ -423,6 +413,9 @@ Add the following dependencies to `core/pom.xml`:
[discrete]
===== Enable the <<elasticsearch>> extension
+[WARNING]
+This extension requires the latest JDK 8 that is available.
+
Add the following dependencies to `core/pom.xml`:
[source,xml,subs="verbatim,attributes"]
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
index 09335c0..5ad557d 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -18,23 +18,23 @@
//
==== JavaEE Container
-===== Apache Tomcat 9
+===== Apache Tomcat 8 and 8.5
On GNU / Linux - Mac OS X, create `$CATALINA_HOME/bin/setenv.sh` with similar content
(keep everything on a single line):
....
JAVA_OPTS="-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server \
--Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:+DisableExplicitGC \
--Djava.security.egd=file:/dev/./urandom"
+-Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m \
+-XX:MaxPermSize=256m -XX:+DisableExplicitGC -Djava.security.egd=file:/dev/./urandom"
....
On MS Windows, create `%CATALINA_HOME%\bin\setenv.bat` with similar content (keep everything on a single line):
....
set JAVA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server
--Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:+DisableExplicitGC
-....
+-Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
+-XX:MaxPermSize=256m -XX:+DisableExplicitGC....
It is recommended to define a separate datasource for each <<domains,domain>> (the following example is for the `Master`
domain and MySQL): please also check that the connection parameters are the same as configured for <<dbms>>:
@@ -58,41 +58,7 @@ domain and MySQL): please also check that the connection parameters are the same
[CAUTION]
Be sure to put the corresponding JDBC driver JAR file under `$CATALINA_HOME/lib` for each datasource defined.
-===== Glassfish 5 and Payara Server 5
-
-Replace
-
-[source,xml]
-....
- <dependency>
- <groupId>org.apache.syncope.core</groupId>
- <artifactId>syncope-core-persistence-jpa</artifactId>
- </dependency>
-....
-
-with
-
-[source,xml]
-....
- <dependency>
- <groupId>org.apache.syncope.core</groupId>
- <artifactId>syncope-core-persistence-jpa</artifactId>
- <version>${syncope.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>6.0.11.Final</version>
- </dependency>
-....
-
-in `core/pom.xml`.
+===== Glassfish 4.1 and Payara Server 4
When using a datasource for internal storage, be sure to add
@@ -116,7 +82,7 @@ For better performance under GNU / Linux, do not forget to include
among JVM options.
====
-===== Wildfly 14
+===== Wildfly 9 and 10
Add