You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2016/01/14 11:50:16 UTC
[1/2] syncope git commit: [SYNCOPE-735] Deleting unused
ACT_GE_BYTEARRAY entries
Repository: syncope
Updated Branches:
refs/heads/master a30719c78 -> c5b47d50c
[SYNCOPE-735] Deleting unused ACT_GE_BYTEARRAY entries
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/614695f9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/614695f9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/614695f9
Branch: refs/heads/master
Commit: 614695f9a8558068f37374f25fc8149243b50cca
Parents: c486bc1
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Thu Jan 14 11:48:57 2016 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Thu Jan 14 11:48:57 2016 +0100
----------------------------------------------------------------------
.../core/workflow/activiti/ActivitiUserWorkflowAdapter.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/614695f9/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
index 7cf3967..c664f22 100644
--- a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
@@ -222,6 +222,15 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
update.append("AND TASK_ID_<>'").append(taskId).append("' ");
}
jdbcTemplate.execute(update.toString());
+
+ List<String> byteArrayIds = jdbcTemplate.queryForList(
+ "SELECT BYTEARRAY_ID_ FROM ACT_HI_VARINST WHERE BYTEARRAY_ID_ IS NOT NULL", String.class);
+ update.setLength(0);
+ update.append("DELETE FROM ACT_GE_BYTEARRAY WHERE NAME_ LIKE 'hist.%' ");
+ for (String byteArrayId : byteArrayIds) {
+ update.append("AND ID_<>'").append(byteArrayId).append("' ");
+ }
+ jdbcTemplate.execute(update.toString());
}
/**
[2/2] syncope git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/syncope
Posted by md...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c5b47d50
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c5b47d50
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c5b47d50
Branch: refs/heads/master
Commit: c5b47d50cdf3d73c4931a7cb91b7b3365e9615aa
Parents: 614695f a30719c
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Thu Jan 14 11:49:37 2016 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Thu Jan 14 11:49:37 2016 +0100
----------------------------------------------------------------------
.../commons/NotificationAwareComponent.java | 1 +
.../client/console/pages/AbstractBasePage.java | 74 --------------------
.../syncope/client/console/pages/BasePage.java | 39 +++++++++--
.../client/console/pages/BasePopupPage.java | 2 +-
.../client/console/pages/SecurityQuestions.java | 2 +-
.../console/pages/XMLEditorPopupPage.java | 6 +-
.../console/panels/AbstractLogsPanel.java | 4 +-
.../panels/AbstractSearchResultPanel.java | 6 +-
.../console/panels/AjaxDataTablePanel.java | 3 +-
.../console/panels/AnyTypeClassesPanel.java | 4 +-
.../client/console/panels/AnyTypePanel.java | 6 +-
.../console/panels/GroupSearchResultPanel.java | 8 +--
.../console/panels/RoleSearchResultPanel.java | 8 +--
.../client/console/panels/SchemaTypePanel.java | 4 +-
.../console/panels/SecurityQuestionsPanel.java | 10 +--
.../console/panels/UserSearchResultPanel.java | 23 +++---
.../console/topology/TopologyNodePanel.java | 5 +-
.../console/pages/XMLEditorPopupPage.html | 8 +--
.../console/pages/CamelRouteModalPage.java | 5 +-
.../console/rest/CamelRouteRestClient.java | 9 +--
20 files changed, 86 insertions(+), 141 deletions(-)
----------------------------------------------------------------------