Upgrading Flowable
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c193001d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c193001d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c193001d Branch: refs/heads/2_1_X Commit: c193001d8336e8eb7d1e78072af458a39668bebd Parents: 6f6d915 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Tue Oct 2 16:19:04 2018 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Oct 2 16:19:04 2018 +0200 ---------------------------------------------------------------------- ext/flowable/flowable-bpmn/pom.xml | 4 + .../flowable/impl/FlowableRuntimeUtils.java | 1 + .../flowable/impl/SyncopeTaskQueryImpl.java | 49 - .../flowable/support/SyncopeTaskQueryImpl.java | 49 + .../org/apache/syncope/ext/flowable/Task.xml | 1415 +++++++++--------- pom.xml | 7 +- 6 files changed, 769 insertions(+), 756 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c193001d/ext/flowable/flowable-bpmn/pom.xml ---------------------------------------------------------------------- diff --git a/ext/flowable/flowable-bpmn/pom.xml b/ext/flowable/flowable-bpmn/pom.xml index a236d20..0cdbee6 100644 --- a/ext/flowable/flowable-bpmn/pom.xml +++ b/ext/flowable/flowable-bpmn/pom.xml @@ -61,6 +61,10 @@ under the License. </dependency> <dependency> <groupId>org.flowable</groupId> + <artifactId>flowable-idm-spring-configurator</artifactId> + </dependency> + <dependency> + <groupId>org.flowable</groupId> <artifactId>flowable-json-converter</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/syncope/blob/c193001d/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java ---------------------------------------------------------------------- diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java index cdf035d..15fd7a4 100644 --- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java +++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java @@ -18,6 +18,7 @@ */ package org.apache.syncope.core.flowable.impl; +import org.apache.syncope.core.flowable.support.SyncopeTaskQueryImpl; import java.util.Base64; import java.util.List; import java.util.Set; http://git-wip-us.apache.org/repos/asf/syncope/blob/c193001d/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/SyncopeTaskQueryImpl.java ---------------------------------------------------------------------- diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/SyncopeTaskQueryImpl.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/SyncopeTaskQueryImpl.java deleted file mode 100644 index eb36838..0000000 --- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/SyncopeTaskQueryImpl.java +++ /dev/null @@ -1,49 +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.core.flowable.impl; - -import org.flowable.common.engine.impl.interceptor.CommandExecutor; -import org.flowable.task.api.TaskQuery; -import org.flowable.task.service.impl.TaskQueryImpl; - -public class SyncopeTaskQueryImpl extends TaskQueryImpl { - - private static final long serialVersionUID = 734215641378485689L; - - protected boolean withFormKey; - - protected SyncopeTaskQueryImpl currentOrQueryObject; - - public SyncopeTaskQueryImpl(final CommandExecutor commandExecutor) { - super(commandExecutor); - } - - public TaskQuery taskWithFormKey() { - if (orActive) { - currentOrQueryObject.withFormKey = true; - } else { - this.withFormKey = true; - } - return this; - } - - public boolean isWithFormKey() { - return withFormKey; - } -} http://git-wip-us.apache.org/repos/asf/syncope/blob/c193001d/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeTaskQueryImpl.java ---------------------------------------------------------------------- diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeTaskQueryImpl.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeTaskQueryImpl.java new file mode 100644 index 0000000..833fe6b --- /dev/null +++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeTaskQueryImpl.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.core.flowable.support; + +import org.flowable.common.engine.impl.interceptor.CommandExecutor; +import org.flowable.task.api.TaskQuery; +import org.flowable.task.service.impl.TaskQueryImpl; + +public class SyncopeTaskQueryImpl extends TaskQueryImpl { + + private static final long serialVersionUID = 734215641378485689L; + + protected boolean withFormKey; + + protected SyncopeTaskQueryImpl currentOrQueryObject; + + public SyncopeTaskQueryImpl(final CommandExecutor commandExecutor) { + super(commandExecutor); + } + + public TaskQuery taskWithFormKey() { + if (orActive) { + currentOrQueryObject.withFormKey = true; + } else { + this.withFormKey = true; + } + return this; + } + + public boolean isWithFormKey() { + return withFormKey; + } +}
