[SYNCOPE-666] Integration tests can run, with 10 failures and 151 errors
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/79b1e80a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/79b1e80a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/79b1e80a Branch: refs/heads/master Commit: 79b1e80aa1f3b72fabb7427eecb1e9e967739b44 Parents: 705bfb8 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed May 27 16:40:51 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed May 27 16:40:51 2015 +0200 ---------------------------------------------------------------------- core/workflow-activiti/src/main/resources/workflow.properties | 1 + .../org/apache/syncope/core/logic/init/CamelRouteLoader.java | 2 +- .../src/main/resources/provisioning.properties | 1 + .../src/main/resources/all/provisioning.properties | 1 + fit/core-reference/src/main/resources/all/workflow.properties | 1 + fit/core-reference/src/main/resources/provisioning.properties | 1 + fit/core-reference/src/main/resources/workflow.properties | 1 + .../org/apache/syncope/fit/core/reference/ActivitiDetector.java | 4 ++++ .../org/apache/syncope/fit/core/reference/CamelDetector.java | 4 ++++ 9 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/core/workflow-activiti/src/main/resources/workflow.properties ---------------------------------------------------------------------- diff --git a/core/workflow-activiti/src/main/resources/workflow.properties b/core/workflow-activiti/src/main/resources/workflow.properties index 5a975cf..61f1a3e 100644 --- a/core/workflow-activiti/src/main/resources/workflow.properties +++ b/core/workflow-activiti/src/main/resources/workflow.properties @@ -18,3 +18,4 @@ wf.directory=${conf.directory} jobExecutorActivate=true uwfAdapter=org.apache.syncope.core.workflow.activiti.ActivitiUserWorkflowAdapter gwfAdapter=org.apache.syncope.core.workflow.java.DefaultGroupWorkflowAdapter +awfAdapter=org.apache.syncope.core.workflow.java.DefaultAnyObjectWorkflowAdapter http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java ---------------------------------------------------------------------- diff --git a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java index e2ddbc9..3520a4a 100644 --- a/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java +++ b/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java @@ -70,12 +70,12 @@ public class CamelRouteLoader implements SyncopeLoader { } @Transactional + @Override public void load() { synchronized (this) { if (!loaded) { loadRoutes(userRoutesLoader.getResource(), AnyTypeKind.USER); loadRoutes(groupRoutesLoader.getResource(), AnyTypeKind.GROUP); - loadRoutes(groupRoutesLoader.getResource(), AnyTypeKind.ANY_OBJECT); loaded = true; } } http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/ext/camel/provisioning-camel/src/main/resources/provisioning.properties ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/resources/provisioning.properties b/ext/camel/provisioning-camel/src/main/resources/provisioning.properties index 32fa5af..5061502 100644 --- a/ext/camel/provisioning-camel/src/main/resources/provisioning.properties +++ b/ext/camel/provisioning-camel/src/main/resources/provisioning.properties @@ -17,4 +17,5 @@ camel.directory=${conf.directory} userProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelUserProvisioningManager groupProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelGroupProvisioningManager +anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/fit/core-reference/src/main/resources/all/provisioning.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/all/provisioning.properties b/fit/core-reference/src/main/resources/all/provisioning.properties index 32fa5af..5061502 100644 --- a/fit/core-reference/src/main/resources/all/provisioning.properties +++ b/fit/core-reference/src/main/resources/all/provisioning.properties @@ -17,4 +17,5 @@ camel.directory=${conf.directory} userProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelUserProvisioningManager groupProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelGroupProvisioningManager +anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/fit/core-reference/src/main/resources/all/workflow.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/all/workflow.properties b/fit/core-reference/src/main/resources/all/workflow.properties index 5a975cf..61f1a3e 100644 --- a/fit/core-reference/src/main/resources/all/workflow.properties +++ b/fit/core-reference/src/main/resources/all/workflow.properties @@ -18,3 +18,4 @@ wf.directory=${conf.directory} jobExecutorActivate=true uwfAdapter=org.apache.syncope.core.workflow.activiti.ActivitiUserWorkflowAdapter gwfAdapter=org.apache.syncope.core.workflow.java.DefaultGroupWorkflowAdapter +awfAdapter=org.apache.syncope.core.workflow.java.DefaultAnyObjectWorkflowAdapter http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/fit/core-reference/src/main/resources/provisioning.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/provisioning.properties b/fit/core-reference/src/main/resources/provisioning.properties index 9c0abff..af1dd4b 100644 --- a/fit/core-reference/src/main/resources/provisioning.properties +++ b/fit/core-reference/src/main/resources/provisioning.properties @@ -16,4 +16,5 @@ # under the License. userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserProvisioningManager groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager +anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/fit/core-reference/src/main/resources/workflow.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/workflow.properties b/fit/core-reference/src/main/resources/workflow.properties index 7167164..f05a464 100644 --- a/fit/core-reference/src/main/resources/workflow.properties +++ b/fit/core-reference/src/main/resources/workflow.properties @@ -18,3 +18,4 @@ wf.directory=${conf.directory} jobExecutorActivate=false uwfAdapter=org.apache.syncope.core.workflow.java.DefaultUserWorkflowAdapter gwfAdapter=org.apache.syncope.core.workflow.java.DefaultGroupWorkflowAdapter +awfAdapter=org.apache.syncope.core.workflow.java.DefaultAnyObjectWorkflowAdapter http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ActivitiDetector.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ActivitiDetector.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ActivitiDetector.java index 798a313..6182e2a 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ActivitiDetector.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ActivitiDetector.java @@ -29,4 +29,8 @@ public class ActivitiDetector { public static boolean isActivitiEnabledForGroups(final SyncopeService syncopeService) { return syncopeService.info().getGroupWorkflowAdapter().indexOf("Activiti") != -1; } + + public static boolean isActivitiEnabledForAnyObjects(final SyncopeService syncopeService) { + return syncopeService.info().getAnyObjectWorkflowAdapter().indexOf("Activiti") != -1; + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/79b1e80a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CamelDetector.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CamelDetector.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CamelDetector.java index a061005..0021922 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CamelDetector.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CamelDetector.java @@ -29,4 +29,8 @@ public class CamelDetector { public static boolean isCamelEnabledForGroups(final SyncopeService syncopeService) { return syncopeService.info().getGroupProvisioningManager().indexOf("Camel") != -1; } + + public static boolean isCamelEnabledForAnyObjects(final SyncopeService syncopeService) { + return syncopeService.info().getAnyObjectProvisioningManager().indexOf("Camel") != -1; + } }
