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/09/22 04:26:56 UTC
[1/4] syncope git commit: Upgrading Log4J
Repository: syncope
Updated Branches:
refs/heads/2_0_X 608d0daae -> 628ac7128
refs/heads/master db6cff32f -> d4e098a29
Upgrading Log4J
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/628ac712
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/628ac712
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/628ac712
Branch: refs/heads/2_0_X
Commit: 628ac71289b368789107851c7ef37aa9f3491cf4
Parents: e072712
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 22 06:25:05 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 22 06:25:22 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/628ac712/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a81f716..8311af1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,7 +394,7 @@ under the License.
<elasticsearch.version>5.6.0</elasticsearch.version>
- <log4j.version>2.9.0</log4j.version>
+ <log4j.version>2.9.1</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
<commons-io.version>2.5</commons-io.version>
[2/4] syncope git commit: [SYNCOPE-1211] When importing users,
cannot import more than 200 users.
Posted by il...@apache.org.
[SYNCOPE-1211] When importing users, cannot import more than 200 users.
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e0727125
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e0727125
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e0727125
Branch: refs/heads/2_0_X
Commit: e0727125cd48eb27a84b32bc25be96b690c5ed0b
Parents: 608d0da
Author: Frédéric Curvat <fc...@talend.com>
Authored: Wed Sep 20 14:50:43 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 22 06:25:22 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/scripted/SearchScript.groovy | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e0727125/core/migration/src/main/resources/scripted/SearchScript.groovy
----------------------------------------------------------------------
diff --git a/core/migration/src/main/resources/scripted/SearchScript.groovy b/core/migration/src/main/resources/scripted/SearchScript.groovy
index 5ff79d1..6e10651 100644
--- a/core/migration/src/main/resources/scripted/SearchScript.groovy
+++ b/core/migration/src/main/resources/scripted/SearchScript.groovy
@@ -122,10 +122,13 @@ case "__ACCOUNT__":
result.add(item)
});
-
+
if (result.size() == pageSize) {
- pagedResultsCookie = pagedResultsCookie + result.size();
- result.add([(OperationOptions.OP_PAGED_RESULTS_COOKIE): pagedResultsCookie]);
+ if (pagedResultsCookie == "") {
+ pagedResultsCookie = pagedResultsCookie + result.size();
+ } else {
+ pagedResultsCookie = Integer.toString(pagedResultsCookie.toInteger() + result.size());
+ }
}
break
[4/4] syncope git commit: [SYNCOPE-1211] When importing users,
cannot import more than 200 users. - This closes #63
Posted by il...@apache.org.
[SYNCOPE-1211] When importing users, cannot import more than 200 users. - This closes #63
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d4e098a2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d4e098a2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d4e098a2
Branch: refs/heads/master
Commit: d4e098a2916d37824174b026ee7ae9f3004ba833
Parents: 5779d31
Author: Frédéric Curvat <fc...@talend.com>
Authored: Wed Sep 20 14:50:43 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 22 06:26:37 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/scripted/SearchScript.groovy | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d4e098a2/core/migration/src/main/resources/scripted/SearchScript.groovy
----------------------------------------------------------------------
diff --git a/core/migration/src/main/resources/scripted/SearchScript.groovy b/core/migration/src/main/resources/scripted/SearchScript.groovy
index 5ff79d1..6e10651 100644
--- a/core/migration/src/main/resources/scripted/SearchScript.groovy
+++ b/core/migration/src/main/resources/scripted/SearchScript.groovy
@@ -122,10 +122,13 @@ case "__ACCOUNT__":
result.add(item)
});
-
+
if (result.size() == pageSize) {
- pagedResultsCookie = pagedResultsCookie + result.size();
- result.add([(OperationOptions.OP_PAGED_RESULTS_COOKIE): pagedResultsCookie]);
+ if (pagedResultsCookie == "") {
+ pagedResultsCookie = pagedResultsCookie + result.size();
+ } else {
+ pagedResultsCookie = Integer.toString(pagedResultsCookie.toInteger() + result.size());
+ }
}
break
[3/4] syncope git commit: Upgrading Log4J
Posted by il...@apache.org.
Upgrading Log4J
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5779d314
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5779d314
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5779d314
Branch: refs/heads/master
Commit: 5779d3145c122a76b251b5a4d28eadfe0ff1574b
Parents: db6cff3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 22 06:25:05 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 22 06:25:48 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/5779d314/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e1ec4f..6b5f492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@ under the License.
<elasticsearch.version>5.6.0</elasticsearch.version>
- <log4j.version>2.9.0</log4j.version>
+ <log4j.version>2.9.1</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
<commons-io.version>2.5</commons-io.version>