[2/3] syncope git commit: Upgrading Swagger UI

2018-07-11 Thread ilgrosso
Upgrading Swagger UI


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d90a2fe3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d90a2fe3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d90a2fe3

Branch: refs/heads/2_1_X
Commit: d90a2fe3805f120f846c342ea39a70938a80fbf2
Parents: ff93866
Author: Francesco Chicchiriccò 
Authored: Thu Jul 12 07:52:59 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Jul 12 07:52:59 2018 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/d90a2fe3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e8e41c3..9f34992 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,7 +442,7 @@ under the License.
 
${project.build.directory}/flowable-modeler

 
 2.0.2
-3.17.1
+3.17.2
 20.0
 
 2.2.4



[1/3] syncope git commit: Upgrading Swagger UI

2018-07-11 Thread ilgrosso
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 8a18a493d -> 041bcad6b
  refs/heads/2_1_X ff9386684 -> d90a2fe38
  refs/heads/master e03d47ef5 -> 47f792bd8


Upgrading Swagger UI


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/041bcad6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/041bcad6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/041bcad6

Branch: refs/heads/2_0_X
Commit: 041bcad6ba8d3356346ca6b93238e94135090968
Parents: 8a18a49
Author: Francesco Chicchiriccò 
Authored: Thu Jul 12 07:52:38 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Jul 12 07:52:38 2018 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/041bcad6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ea5859e..5de0b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -446,7 +446,7 @@ under the License.
 
${project.build.directory}/flowable-modeler
 
 1.5.17
-3.17.1
+3.17.2
 20.0
 
 2.2.4



[3/3] syncope git commit: Upgrading Swagger UI

2018-07-11 Thread ilgrosso
Upgrading Swagger UI


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/47f792bd
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/47f792bd
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/47f792bd

Branch: refs/heads/master
Commit: 47f792bd8cdb88489f0a33a11dad1f2d43ccce88
Parents: e03d47e
Author: Francesco Chicchiriccò 
Authored: Thu Jul 12 07:52:59 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Jul 12 07:53:07 2018 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/47f792bd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index dd2994b..14d0ea2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,7 +442,7 @@ under the License.
 
${project.build.directory}/flowable-modeler

 
 2.0.2
-3.17.1
+3.17.2
 20.0
 
 2.2.4



[2/2] syncope git commit: [SYNCOPE-1335] Missing statements added

2018-07-11 Thread ilgrosso
[SYNCOPE-1335] Missing statements added


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e03d47ef
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e03d47ef
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e03d47ef

Branch: refs/heads/master
Commit: e03d47ef56fbbaf2ff1e2f95b24a877ed040d52a
Parents: 6c104df
Author: Francesco Chicchiriccò 
Authored: Wed Jul 11 12:15:07 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Wed Jul 11 12:15:16 2018 +0200

--
 .../core/upgrade/GenerateUpgradeSQL.java| 76 +++-
 1 file changed, 74 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/e03d47ef/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
--
diff --git 
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
 
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
index 6f69d72..01554f3 100644
--- 
a/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
+++ 
b/core/upgrade/src/main/java/org/apache/syncope/core/upgrade/GenerateUpgradeSQL.java
@@ -91,10 +91,41 @@ public final class GenerateUpgradeSQL {
 schemaTool.run();
 
 // now proceed with manual update statements...
+Connection conn = jdbcConf.getDataSource2(null).getConnection();
+
+// User
+OUT.write("UPDATE SyncopeUser SET mustChangePassword=0 WHERE 
mustChangePassword IS NULL;\n");
+
+// VirSchema
+OUT.write("UPDATE VirSchema SET readonly=0 WHERE readonly IS 
NULL;\n");
+
+// ExternalResource
+OUT.write("UPDATE ExternalResource SET overrideCapabilities=0 
WHERE overrideCapabilities IS NULL;\n");
+
 // OrgUnit
 OUT.write("UPDATE OrgUnit SET ignoreCaseMatch=0;\n");
 
-Connection conn = jdbcConf.getDataSource2(null).getConnection();
+// OrgUnitItemTransformer
+try (Statement stmt = conn.createStatement();
+ResultSet rs = stmt.executeQuery(
+"SELECT orgUnitItem_id,transformerClassName FROM 
OrgUnitItem_Transformer")) {
+
+while (rs.next()) {
+String itemId = rs.getString(1);
+String transformerClassName = rs.getString(2);
+
+String implementationId = "OrgUnitItemTransformer_" + 
itemId;
+OUT.write("INSERT INTO Implementation(id,type,engine,body) 
VALUES("
++ "'" + implementationId + "',"
++ "'ITEM_TRANSFORMER',"
++ "'JAVA',"
++ "'" + transformerClassName + "');\n");
+OUT.write("INSERT INTO 
OrgUnitItemTransformer(item_id,implementation_id) VALUES("
++ "'" + itemId + "',"
++ "'" + implementationId + "');\n");
+}
+}
+OUT.write("DROP TABLE OrgUnitItem_Transformer;\n");
 
 // PlainSchema
 try (Statement stmt = conn.createStatement();
@@ -210,6 +241,7 @@ public final class GenerateUpgradeSQL {
 
 // Task
 OUT.write("UPDATE Task SET remediation=0;\n");
+OUT.write("UPDATE Task SET active=0 WHERE active IS NULL;\n");
 
 OUT.write("INSERT INTO Implementation(id,type,engine,body) VALUES("
 + "'PullJobDelegate',"
@@ -375,12 +407,52 @@ public final class GenerateUpgradeSQL {
 }
 }
 OUT.write("DROP TABLE ReportletConfInstance;\n");
+
+// MappingItemTransformer
+try (Statement stmt = conn.createStatement();
+ResultSet rs = stmt.executeQuery(
+"SELECT mappingItem_id,transformerClassName FROM 
MappingItem_Transformer")) {
+
+while (rs.next()) {
+String itemId = rs.getString(1);
+String transformerClassName = rs.getString(2);
+
+String implementationId = "MappingItemTransformer_" + 
itemId;
+OUT.write("INSERT INTO Implementation(id,type,engine,body) 
VALUES("
++ "'" + implementationId + "',"
++ "'ITEM_TRANSFORMER',"
++ "'JAVA',"
++ "'" + transformerClassName + "');\n");
+OUT.write("INSERT INTO 
MappingItemTransformer(item_id,implementation_id) VALUES("
++ "'" + itemId + "',"
++ "'" +