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 2017/04/11 14:41:27 UTC
[1/4] syncope git commit: [SYNCOPE-1055] Adding ref to Flowable in
the docs
Repository: syncope
Updated Branches:
refs/heads/2_0_X 610345ad6 -> dcc1266d8
refs/heads/master 11026de06 -> 7a08dc65a
[SYNCOPE-1055] Adding ref to Flowable in the docs
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/10d53d2b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/10d53d2b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/10d53d2b
Branch: refs/heads/2_0_X
Commit: 10d53d2bda9bab857f08a04aa9dc0e8991ee2ee9
Parents: 610345a
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Apr 11 15:53:18 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Apr 11 15:53:18 2017 +0200
----------------------------------------------------------------------
src/main/asciidoc/getting-started/introduction.adoc | 5 +++--
src/main/asciidoc/getting-started/obtain.adoc | 2 +-
.../asciidoc/reference-guide/concepts/workflow.adoc | 12 ++++++++++--
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/10d53d2b/src/main/asciidoc/getting-started/introduction.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/introduction.adoc b/src/main/asciidoc/getting-started/introduction.adoc
index 8fafc8f..a9f3c66 100644
--- a/src/main/asciidoc/getting-started/introduction.adoc
+++ b/src/main/asciidoc/getting-started/introduction.adoc
@@ -116,8 +116,9 @@ point for defining and enforcing the consistency and transformations between int
all-Java implementation can be extended for this purpose. In addition, an http://camel.apache.org/[Apache Camel^]-based
implementation is also available as an extension, which brings all the power of runtime changes and adaptation.
* *_Workflow_* is one of the pluggable aspects of Apache Syncope: this lets every deployment choose the preferred engine
-from a provided list - including the one based on http://www.activiti.org/[Activiti BPM^], the reference open source
-http://www.bpmn.org/[BPMN 2.0^] implementation - or define new, custom ones.
+from a provided list - including one based on http://www.activiti.org/[Activiti BPM^] and another based on
+http://www.flowable.org/[Flowable^], the reference open source http://www.bpmn.org/[BPMN 2.0^] implementations - or
+define new, custom ones.
* *_Persistence_* manages all data (users, groups, attributes, resources, ...) at a high level
using a standard https://en.wikipedia.org/wiki/Java_Persistence_API[JPA 2.0^] approach. The data is persisted to an underlying
database, referred to as *_Internal Storage_*. Consistency is ensured via the comprehensive
http://git-wip-us.apache.org/repos/asf/syncope/blob/10d53d2b/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index 60f7235..2f76821 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -407,7 +407,7 @@ mvn -P all clean install
then, from the `enduser` subdirectory, execute:
[source,bash]
-mvn -P embedded
+mvn -P embedded,all
===== Paths and Components
http://git-wip-us.apache.org/repos/asf/syncope/blob/10d53d2b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/concepts/workflow.adoc b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
index 712b59e..ea0e28d 100644
--- a/src/main/asciidoc/reference-guide/concepts/workflow.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
@@ -77,8 +77,8 @@ https://camunda.org/[Camunda^] or http://jbpm.jboss.org/[jBPM^].
==== Activiti User Workflow Adapter
-An advanced adapter is provided for Users, based on http://www.activiti.org/[Activiti BPM^], the reference open source
-http://www.bpmn.org/[BPMN 2.0^] implementation.
+An advanced adapter is provided for Users, based on http://www.activiti.org/[Activiti BPM^], one of reference open
+source http://www.bpmn.org/[BPMN 2.0^] implementations.
The
ifeval::["{snapshotOrRelease}" == "release"]
@@ -229,3 +229,11 @@ The delegated administrator for approving recertifications can be configured by
activiti:candidateUser="${user.lastRecertificator}">
----
====
+
+==== Flowable User Workflow Adapter
+
+Starting with Apache Syncope 2.0.3, another advanced adapter is provided for Users, based on
+http://www.flowable.org/[Flowable^], one of reference open source http://www.bpmn.org/[BPMN 2.0^] implementations.
+
+Since Flowable was http://www.flowable.org/blog/2016/10/12/flowable-and-activiti.html[forked from Activiti BPM^],
+everything stated <<activiti-user-workflow-adapter,above>> about Activiti BPM can be applied.
[4/4] syncope git commit: Maven-compliant site generation + fix
javadocs
Posted by il...@apache.org.
Maven-compliant site generation + fix javadocs
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7a08dc65
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7a08dc65
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7a08dc65
Branch: refs/heads/master
Commit: 7a08dc65ac9eb22708fab32c30ba9a36e6b81b7b
Parents: cd8b72d
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Apr 11 16:20:01 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Apr 11 16:41:18 2017 +0200
----------------------------------------------------------------------
.../resources/WorkflowDefGETResource.java | 2 +-
.../resources/WorkflowDefPUTResource.java | 2 +-
.../common/lib/search/SyncopeProperty.java | 37 ++++-
.../core/spring/security/AuthDataAccessor.java | 5 +-
pom.xml | 149 +++++++++++--------
5 files changed, 126 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
index 18cbb6a..5b1bece 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
@@ -28,7 +28,7 @@ import org.apache.wicket.util.io.IOUtils;
/**
* Mirror REST resource for obtaining user workflow definition in JSON (used by Activiti Modeler).
*
- * @see org.apache.syncope.common.rest.api.service.WorkflowService#exportDefinition
+ * @see org.apache.syncope.common.rest.api.service.WorkflowService#get
*/
public class WorkflowDefGETResource extends AbstractWorkflowResource {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
index 5223dc0..efef6d1 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
@@ -29,7 +29,7 @@ import org.apache.wicket.util.io.IOUtils;
/**
* Mirror REST resource for putting user workflow definition in JSON (used by Activiti Modeler).
*
- * @see org.apache.syncope.common.rest.api.service.WorkflowService#importDefinition
+ * @see org.apache.syncope.common.rest.api.service.WorkflowService#set
*/
public class WorkflowDefPUTResource extends AbstractWorkflowResource {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
index 2f560c1..0d06c5b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
@@ -27,22 +27,47 @@ import org.apache.cxf.jaxrs.ext.search.client.Property;
*/
public interface SyncopeProperty extends Property {
- /** Is textual property equal to (ignoring case) given literal or matching given pattern? */
+ /** Is textual property equal to (ignoring case) given literal or matching given pattern?
+ *
+ * @param value first value
+ * @param moreValues more values
+ * @return updated condition
+ */
CompleteCondition equalToIgnoreCase(String value, String... moreValues);
- /** Is textual property different (ignoring case) than given literal or not matching given pattern? */
+ /** Is textual property different (ignoring case) than given literal or not matching given pattern?
+ *
+ * @param literalOrPattern
+ * @return updated condition
+ */
CompleteCondition notEqualTolIgnoreCase(String literalOrPattern);
- /** Is property null? */
+ /** Is property null?
+ *
+ * @return updated condition
+ */
CompleteCondition nullValue();
- /** Is property not null? */
+ /** Is property not null?
+ *
+ * @return updated condition
+ */
CompleteCondition notNullValue();
- /** Is user, group or any object owning given resource(s)? */
+ /** Is user, group or any object owning given resource(s)?
+ *
+ * @param resource first resource
+ * @param moreResources more resources
+ * @return updated condition
+ */
CompleteCondition hasResources(String resource, String... moreResources);
- /** Is user, group or any object not owning given resource(s)? */
+ /** Is user, group or any object not owning given resource(s)?
+ *
+ * @param resource first resource
+ * @param moreResources more resources
+ * @return updated condition
+ */
CompleteCondition hasNotResources(String resource, String... moreResources);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
index 616f3e7..b54d756 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
@@ -74,9 +74,10 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.transaction.annotation.Transactional;
/**
- * Domain-sensible (via {@code @Transactional} access to authentication / authorization data.
+ * Domain-sensible (via {@code @Transactional}) access to authentication / authorization data.
*
- * @see SyncopeAuthenticationProvider
+ * @see JWTAuthenticationProvider
+ * @see UsernamePasswordAuthenticationProvider
* @see SyncopeAuthenticationDetails
*/
public class AuthDataAccessor {
http://git-wip-us.apache.org/repos/asf/syncope/blob/7a08dc65/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 678a035..91360cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,10 +342,6 @@ under the License.
</contributor>
</contributors>
- <prerequisites>
- <maven>[3.0.3,)</maven>
- </prerequisites>
-
<properties>
<syncope.version>${project.version}</syncope.version>
@@ -381,7 +377,7 @@ under the License.
<camel.version>2.18.3</camel.version>
<slf4j.version>1.7.25</slf4j.version>
- <opensaml.version>3.2.0</opensaml.version>
+ <opensaml.version>3.3.0</opensaml.version>
<log4j.version>2.8.2</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
@@ -1712,7 +1708,28 @@ under the License.
</plugins>
</pluginManagement>
- <plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
@@ -1916,6 +1933,73 @@ under the License.
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>project-team</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <configuration>
+ <destDir>apidocs/2.0</destDir>
+ <isOffline>false</isOffline>
+ <detectLinks>true</detectLinks>
+ <detectJavaApiLink>true</detectJavaApiLink>
+ <links>
+ <link>http://docs.oracle.com/javaee/7/api/</link>
+ <link>http://www.slf4j.org/api/</link>
+ <link>http://connid.tirasa.net/apidocs/1.4/</link>
+ <link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
+ <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.8/</link>
+ <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.18.3/</link>
+ <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.18.3/</link>
+ <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
+ <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
+ <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.5/</link>
+ <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
+ <link>https://commons.apache.org/proper/commons-collections/javadocs/api-release/</link>
+ <link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
+ <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
+ <link>http://activiti.org/javadocs/</link>
+ <link>http://www.flowable.org/docs/javadocs/</link>
+ <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
+ <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
+ </links>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
@@ -2095,59 +2179,6 @@ under the License.
<configuration>
<locales>en</locales>
<generateProjectInfo>false</generateProjectInfo>
- <reportPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- <reports>
- <report>index</report>
- <report>project-team</report>
- <report>issue-tracking</report>
- <report>license</report>
- </reports>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <destDir>apidocs/2.0</destDir>
- <isOffline>false</isOffline>
- <detectLinks>true</detectLinks>
- <detectJavaApiLink>true</detectJavaApiLink>
- <links>
- <link>http://docs.oracle.com/javaee/7/api/</link>
- <link>http://www.slf4j.org/api/</link>
- <link>http://connid.tirasa.net/apidocs/1.4/</link>
- <link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
- <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.8/</link>
- <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.17.5</link>
- <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.17.5</link>
- <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
- <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
- <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.5/</link>
- <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
- <link>https://commons.apache.org/proper/commons-collections/javadocs/</link>
- <link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
- <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
- <link>http://activiti.org/javadocs/</link>
- </links>
- </configuration>
- <reports>
- <report>aggregate</report>
- </reports>
- </plugin>
- </reportPlugins>
</configuration>
</plugin>
[2/4] syncope git commit: [SYNCOPE-1055] Adding ref to Flowable in
the docs
Posted by il...@apache.org.
[SYNCOPE-1055] Adding ref to Flowable in the docs
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cd8b72de
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cd8b72de
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cd8b72de
Branch: refs/heads/master
Commit: cd8b72deac696e62bcad042179b9366ec191eba2
Parents: 11026de
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Apr 11 15:53:18 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Apr 11 15:53:38 2017 +0200
----------------------------------------------------------------------
src/main/asciidoc/getting-started/introduction.adoc | 5 +++--
src/main/asciidoc/getting-started/obtain.adoc | 2 +-
.../asciidoc/reference-guide/concepts/workflow.adoc | 12 ++++++++++--
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cd8b72de/src/main/asciidoc/getting-started/introduction.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/introduction.adoc b/src/main/asciidoc/getting-started/introduction.adoc
index 8fafc8f..a9f3c66 100644
--- a/src/main/asciidoc/getting-started/introduction.adoc
+++ b/src/main/asciidoc/getting-started/introduction.adoc
@@ -116,8 +116,9 @@ point for defining and enforcing the consistency and transformations between int
all-Java implementation can be extended for this purpose. In addition, an http://camel.apache.org/[Apache Camel^]-based
implementation is also available as an extension, which brings all the power of runtime changes and adaptation.
* *_Workflow_* is one of the pluggable aspects of Apache Syncope: this lets every deployment choose the preferred engine
-from a provided list - including the one based on http://www.activiti.org/[Activiti BPM^], the reference open source
-http://www.bpmn.org/[BPMN 2.0^] implementation - or define new, custom ones.
+from a provided list - including one based on http://www.activiti.org/[Activiti BPM^] and another based on
+http://www.flowable.org/[Flowable^], the reference open source http://www.bpmn.org/[BPMN 2.0^] implementations - or
+define new, custom ones.
* *_Persistence_* manages all data (users, groups, attributes, resources, ...) at a high level
using a standard https://en.wikipedia.org/wiki/Java_Persistence_API[JPA 2.0^] approach. The data is persisted to an underlying
database, referred to as *_Internal Storage_*. Consistency is ensured via the comprehensive
http://git-wip-us.apache.org/repos/asf/syncope/blob/cd8b72de/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index 3dd1d62..e879e95 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -406,7 +406,7 @@ mvn -P all clean install
then, from the `enduser` subdirectory, execute:
[source,bash]
-mvn -P embedded
+mvn -P embedded,all
===== Paths and Components
http://git-wip-us.apache.org/repos/asf/syncope/blob/cd8b72de/src/main/asciidoc/reference-guide/concepts/workflow.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/concepts/workflow.adoc b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
index b88ac7f..d1e98c2 100644
--- a/src/main/asciidoc/reference-guide/concepts/workflow.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
@@ -77,8 +77,8 @@ https://camunda.org/[Camunda^] or http://jbpm.jboss.org/[jBPM^].
==== Activiti User Workflow Adapter
-An advanced adapter is provided for Users, based on http://www.activiti.org/[Activiti BPM^], the reference open source
-http://www.bpmn.org/[BPMN 2.0^] implementation.
+An advanced adapter is provided for Users, based on http://www.activiti.org/[Activiti BPM^], one of reference open
+source http://www.bpmn.org/[BPMN 2.0^] implementations.
The
ifeval::["{snapshotOrRelease}" == "release"]
@@ -229,3 +229,11 @@ The delegated administrator for approving recertifications can be configured by
activiti:candidateUser="${user.lastRecertificator}">
----
====
+
+==== Flowable User Workflow Adapter
+
+Starting with Apache Syncope 2.0.3, another advanced adapter is provided for Users, based on
+http://www.flowable.org/[Flowable^], one of reference open source http://www.bpmn.org/[BPMN 2.0^] implementations.
+
+Since Flowable was http://www.flowable.org/blog/2016/10/12/flowable-and-activiti.html[forked from Activiti BPM^],
+everything stated <<activiti-user-workflow-adapter,above>> about Activiti BPM can be applied.
[3/4] syncope git commit: Maven-compliant site generation + fix
javadocs
Posted by il...@apache.org.
Maven-compliant site generation + fix javadocs
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dcc1266d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dcc1266d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dcc1266d
Branch: refs/heads/2_0_X
Commit: dcc1266d8837762b31d6007121a152adaa213fa1
Parents: 10d53d2
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Apr 11 16:20:01 2017 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Apr 11 16:39:30 2017 +0200
----------------------------------------------------------------------
.../resources/WorkflowDefGETResource.java | 2 +-
.../resources/WorkflowDefPUTResource.java | 2 +-
.../common/lib/search/SyncopeProperty.java | 37 ++++-
.../core/spring/security/AuthDataAccessor.java | 5 +-
pom.xml | 149 +++++++++++--------
5 files changed, 126 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/dcc1266d/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
index 2c14d35..6d1ac41 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
@@ -28,7 +28,7 @@ import org.apache.wicket.util.io.IOUtils;
/**
* Mirror REST resource for obtaining user workflow definition in JSON (used by Activiti / Flowable Modeler).
*
- * @see org.apache.syncope.common.rest.api.service.WorkflowService#exportDefinition
+ * @see org.apache.syncope.common.rest.api.service.WorkflowService#get
*/
public class WorkflowDefGETResource extends AbstractWorkflowResource {
http://git-wip-us.apache.org/repos/asf/syncope/blob/dcc1266d/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
index bd34711..ca1debf 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefPUTResource.java
@@ -29,7 +29,7 @@ import org.apache.wicket.util.io.IOUtils;
/**
* Mirror REST resource for putting user workflow definition in JSON (used by Activiti / Flowable Modeler).
*
- * @see org.apache.syncope.common.rest.api.service.WorkflowService#importDefinition
+ * @see org.apache.syncope.common.rest.api.service.WorkflowService#set
*/
public class WorkflowDefPUTResource extends AbstractWorkflowResource {
http://git-wip-us.apache.org/repos/asf/syncope/blob/dcc1266d/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
index 2f560c1..0d06c5b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SyncopeProperty.java
@@ -27,22 +27,47 @@ import org.apache.cxf.jaxrs.ext.search.client.Property;
*/
public interface SyncopeProperty extends Property {
- /** Is textual property equal to (ignoring case) given literal or matching given pattern? */
+ /** Is textual property equal to (ignoring case) given literal or matching given pattern?
+ *
+ * @param value first value
+ * @param moreValues more values
+ * @return updated condition
+ */
CompleteCondition equalToIgnoreCase(String value, String... moreValues);
- /** Is textual property different (ignoring case) than given literal or not matching given pattern? */
+ /** Is textual property different (ignoring case) than given literal or not matching given pattern?
+ *
+ * @param literalOrPattern
+ * @return updated condition
+ */
CompleteCondition notEqualTolIgnoreCase(String literalOrPattern);
- /** Is property null? */
+ /** Is property null?
+ *
+ * @return updated condition
+ */
CompleteCondition nullValue();
- /** Is property not null? */
+ /** Is property not null?
+ *
+ * @return updated condition
+ */
CompleteCondition notNullValue();
- /** Is user, group or any object owning given resource(s)? */
+ /** Is user, group or any object owning given resource(s)?
+ *
+ * @param resource first resource
+ * @param moreResources more resources
+ * @return updated condition
+ */
CompleteCondition hasResources(String resource, String... moreResources);
- /** Is user, group or any object not owning given resource(s)? */
+ /** Is user, group or any object not owning given resource(s)?
+ *
+ * @param resource first resource
+ * @param moreResources more resources
+ * @return updated condition
+ */
CompleteCondition hasNotResources(String resource, String... moreResources);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/dcc1266d/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
----------------------------------------------------------------------
diff --git a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
index 616f3e7..b54d756 100644
--- a/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
+++ b/core/spring/src/main/java/org/apache/syncope/core/spring/security/AuthDataAccessor.java
@@ -74,9 +74,10 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.transaction.annotation.Transactional;
/**
- * Domain-sensible (via {@code @Transactional} access to authentication / authorization data.
+ * Domain-sensible (via {@code @Transactional}) access to authentication / authorization data.
*
- * @see SyncopeAuthenticationProvider
+ * @see JWTAuthenticationProvider
+ * @see UsernamePasswordAuthenticationProvider
* @see SyncopeAuthenticationDetails
*/
public class AuthDataAccessor {
http://git-wip-us.apache.org/repos/asf/syncope/blob/dcc1266d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index acf3e14..9b63a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,10 +342,6 @@ under the License.
</contributor>
</contributors>
- <prerequisites>
- <maven>[3.0.3,)</maven>
- </prerequisites>
-
<properties>
<syncope.version>${project.version}</syncope.version>
@@ -382,7 +378,7 @@ under the License.
<camel.version>2.17.6</camel.version>
<slf4j.version>1.7.25</slf4j.version>
- <opensaml.version>3.2.0</opensaml.version>
+ <opensaml.version>3.3.0</opensaml.version>
<log4j.version>2.8.2</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
@@ -1767,7 +1763,28 @@ under the License.
</plugins>
</pluginManagement>
- <plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
@@ -1971,6 +1988,73 @@ under the License.
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>project-team</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <configuration>
+ <destDir>apidocs/2.0</destDir>
+ <isOffline>false</isOffline>
+ <detectLinks>true</detectLinks>
+ <detectJavaApiLink>true</detectJavaApiLink>
+ <links>
+ <link>http://docs.oracle.com/javaee/7/api/</link>
+ <link>http://www.slf4j.org/api/</link>
+ <link>http://connid.tirasa.net/apidocs/1.4/</link>
+ <link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
+ <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.8/</link>
+ <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.8/</link>
+ <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.17.6/</link>
+ <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.17.6/</link>
+ <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
+ <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
+ <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.5/</link>
+ <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
+ <link>https://commons.apache.org/proper/commons-collections/javadocs/api-release/</link>
+ <link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
+ <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
+ <link>http://activiti.org/javadocs/</link>
+ <link>http://www.flowable.org/docs/javadocs/</link>
+ <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-saml-api/3.3.0/opensaml-saml-api-3.3.0-javadoc.jar/!/index.html</link>
+ <link>https://build.shibboleth.net/nexus/service/local/repositories/releases/archive/org/opensaml/opensaml-core/3.3.0/opensaml-core-3.3.0-javadoc.jar/!/index.html</link>
+ </links>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
@@ -2150,59 +2234,6 @@ under the License.
<configuration>
<locales>en</locales>
<generateProjectInfo>false</generateProjectInfo>
- <reportPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- <reports>
- <report>index</report>
- <report>project-team</report>
- <report>issue-tracking</report>
- <report>license</report>
- </reports>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <destDir>apidocs/2.0</destDir>
- <isOffline>false</isOffline>
- <detectLinks>true</detectLinks>
- <detectJavaApiLink>true</detectJavaApiLink>
- <links>
- <link>http://docs.oracle.com/javaee/7/api/</link>
- <link>http://www.slf4j.org/api/</link>
- <link>http://connid.tirasa.net/apidocs/1.4/</link>
- <link>http://cxf.apache.org/javadoc/latest-3.1.x/</link>
- <link>http://fasterxml.github.io/jackson-core/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-databind/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-annotations/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-dataformat-yaml/javadoc/2.8/</link>
- <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.8/</link>
- <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.17.5</link>
- <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.17.5</link>
- <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
- <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
- <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.5/</link>
- <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
- <link>https://commons.apache.org/proper/commons-collections/javadocs/</link>
- <link>http://docs.spring.io/spring/docs/4.3.x/javadoc-api/</link>
- <link>http://docs.spring.io/spring-security/site/docs/4.2.x/apidocs/</link>
- <link>http://activiti.org/javadocs/</link>
- </links>
- </configuration>
- <reports>
- <report>aggregate</report>
- </reports>
- </plugin>
- </reportPlugins>
</configuration>
</plugin>