From 9c81906906c5ed205b710d9406c6ec152f71b572 Mon Sep 17 00:00:00 2001 From: bsinou Date: Mon, 13 Mar 2017 11:51:09 +0100 Subject: [PATCH 01/16] Next development cycle --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 184de8d..2cd5033 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ sdk - 0.1.6 + 0.1.7-SNAPSHOT 0.1 2.1.69 2.1.9 -- 2.30.2 From 205cbeaee8009400ac24fb1d143b887198c3e037 Mon Sep 17 00:00:00 2001 From: bsinou Date: Tue, 14 Mar 2017 19:42:08 +0100 Subject: [PATCH 02/16] Prepare Argeo Suite 0.1.7 release --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2cd5033..06b37c4 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ sdk - 0.1.7-SNAPSHOT + 0.1.7 0.1 - 2.1.69 + 2.1.70 2.1.9 -- 2.30.2 From 5f88ceea72430121345bf09c50660023e827ba8c Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Tue, 14 Mar 2017 18:43:00 +0000 Subject: [PATCH 03/16] [maven-release-plugin] prepare release argeo-suite-0.1.7 --- org.argeo.suite.apps.web/pom.xml | 4 ++-- org.argeo.suite.apps/pom.xml | 6 +++--- org.argeo.suite.core/pom.xml | 2 +- org.argeo.suite.web/pom.xml | 4 ++-- org.argeo.suite.workbench.rap/pom.xml | 4 ++-- pom.xml | 4 ++-- sdk/org.argeo.suite.platform/pom.xml | 6 +++--- sdk/pom.xml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/org.argeo.suite.apps.web/pom.xml b/org.argeo.suite.apps.web/pom.xml index bf119b7..e7d9107 100644 --- a/org.argeo.suite.apps.web/pom.xml +++ b/org.argeo.suite.apps.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7-SNAPSHOT + 0.1.7 .. org.argeo.suite.apps.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.web - 0.1.7-SNAPSHOT + 0.1.7 diff --git a/org.argeo.suite.apps/pom.xml b/org.argeo.suite.apps/pom.xml index 3421c77..f7d380c 100644 --- a/org.argeo.suite.apps/pom.xml +++ b/org.argeo.suite.apps/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7-SNAPSHOT + 0.1.7 .. org.argeo.suite.apps @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.7-SNAPSHOT + 0.1.7 org.argeo.suite org.argeo.suite.web - 0.1.7-SNAPSHOT + 0.1.7 diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.suite.core/pom.xml index a6e9317..2b31081 100644 --- a/org.argeo.suite.core/pom.xml +++ b/org.argeo.suite.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7-SNAPSHOT + 0.1.7 .. org.argeo.suite.core diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml index 1078cc1..147c4a6 100644 --- a/org.argeo.suite.web/pom.xml +++ b/org.argeo.suite.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7-SNAPSHOT + 0.1.7 .. org.argeo.suite.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.7-SNAPSHOT + 0.1.7 org.argeo.connect diff --git a/org.argeo.suite.workbench.rap/pom.xml b/org.argeo.suite.workbench.rap/pom.xml index b0cf86f..ce0f714 100644 --- a/org.argeo.suite.workbench.rap/pom.xml +++ b/org.argeo.suite.workbench.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7-SNAPSHOT + 0.1.7 .. org.argeo.suite.workbench.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.7-SNAPSHOT + 0.1.7 org.argeo.connect diff --git a/pom.xml b/pom.xml index 06b37c4..d6db437 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom Argeo Suite - 0.1.7-SNAPSHOT + 0.1.7 org.argeo.suite.core org.argeo.suite.web @@ -30,7 +30,7 @@ scm:git:http://git.argeo.org/gpl/argeo-suite.git http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary scm:git:https://code.argeo.org/git/gpl/argeo-suite.git - HEAD + argeo-suite-0.1.7 2014 diff --git a/sdk/org.argeo.suite.platform/pom.xml b/sdk/org.argeo.suite.platform/pom.xml index 99c4833..a6f5019 100644 --- a/sdk/org.argeo.suite.platform/pom.xml +++ b/sdk/org.argeo.suite.platform/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite sdk - 0.1.7-SNAPSHOT + 0.1.7 .. org.argeo.suite.platform @@ -17,14 +17,14 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.7-SNAPSHOT + 0.1.7 org.argeo.suite org.argeo.suite.web - 0.1.7-SNAPSHOT + 0.1.7 diff --git a/sdk/pom.xml b/sdk/pom.xml index 87ed493..eb27519 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7-SNAPSHOT + 0.1.7 .. sdk -- 2.30.2 From 3d7f2f665440a3645c10d673f1613e641fa0f99d Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Tue, 14 Mar 2017 18:43:01 +0000 Subject: [PATCH 04/16] [maven-release-plugin] prepare for next development iteration --- org.argeo.suite.apps.web/pom.xml | 4 ++-- org.argeo.suite.apps/pom.xml | 6 +++--- org.argeo.suite.core/pom.xml | 2 +- org.argeo.suite.web/pom.xml | 4 ++-- org.argeo.suite.workbench.rap/pom.xml | 4 ++-- pom.xml | 4 ++-- sdk/org.argeo.suite.platform/pom.xml | 6 +++--- sdk/pom.xml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/org.argeo.suite.apps.web/pom.xml b/org.argeo.suite.apps.web/pom.xml index e7d9107..f8450d4 100644 --- a/org.argeo.suite.apps.web/pom.xml +++ b/org.argeo.suite.apps.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7 + 0.1.8-SNAPSHOT .. org.argeo.suite.apps.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.web - 0.1.7 + 0.1.8-SNAPSHOT diff --git a/org.argeo.suite.apps/pom.xml b/org.argeo.suite.apps/pom.xml index f7d380c..3bcbc06 100644 --- a/org.argeo.suite.apps/pom.xml +++ b/org.argeo.suite.apps/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7 + 0.1.8-SNAPSHOT .. org.argeo.suite.apps @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.7 + 0.1.8-SNAPSHOT org.argeo.suite org.argeo.suite.web - 0.1.7 + 0.1.8-SNAPSHOT diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.suite.core/pom.xml index 2b31081..c6ef409 100644 --- a/org.argeo.suite.core/pom.xml +++ b/org.argeo.suite.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7 + 0.1.8-SNAPSHOT .. org.argeo.suite.core diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml index 147c4a6..a0c2253 100644 --- a/org.argeo.suite.web/pom.xml +++ b/org.argeo.suite.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7 + 0.1.8-SNAPSHOT .. org.argeo.suite.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.7 + 0.1.8-SNAPSHOT org.argeo.connect diff --git a/org.argeo.suite.workbench.rap/pom.xml b/org.argeo.suite.workbench.rap/pom.xml index ce0f714..aac7177 100644 --- a/org.argeo.suite.workbench.rap/pom.xml +++ b/org.argeo.suite.workbench.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7 + 0.1.8-SNAPSHOT .. org.argeo.suite.workbench.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.7 + 0.1.8-SNAPSHOT org.argeo.connect diff --git a/pom.xml b/pom.xml index d6db437..74d450a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom Argeo Suite - 0.1.7 + 0.1.8-SNAPSHOT org.argeo.suite.core org.argeo.suite.web @@ -30,7 +30,7 @@ scm:git:http://git.argeo.org/gpl/argeo-suite.git http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary scm:git:https://code.argeo.org/git/gpl/argeo-suite.git - argeo-suite-0.1.7 + HEAD 2014 diff --git a/sdk/org.argeo.suite.platform/pom.xml b/sdk/org.argeo.suite.platform/pom.xml index a6f5019..3d84839 100644 --- a/sdk/org.argeo.suite.platform/pom.xml +++ b/sdk/org.argeo.suite.platform/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite sdk - 0.1.7 + 0.1.8-SNAPSHOT .. org.argeo.suite.platform @@ -17,14 +17,14 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.7 + 0.1.8-SNAPSHOT org.argeo.suite org.argeo.suite.web - 0.1.7 + 0.1.8-SNAPSHOT diff --git a/sdk/pom.xml b/sdk/pom.xml index eb27519..68c308a 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.7 + 0.1.8-SNAPSHOT .. sdk -- 2.30.2 From 47af2cfa8ffee70a7b5958079e241293169b092e Mon Sep 17 00:00:00 2001 From: bsinou Date: Tue, 14 Mar 2017 19:44:32 +0100 Subject: [PATCH 05/16] Next development cycle --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 74d450a..b08e423 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ sdk - 0.1.7 + 0.1.8-SNAPSHOT 0.1 - 2.1.70 + 2.1.71-SNAPSHOT 2.1.9 -- 2.30.2 From 3434807d747081548e80b464b5e1432be3933d3b Mon Sep 17 00:00:00 2001 From: bsinou Date: Thu, 16 Mar 2017 11:29:30 +0100 Subject: [PATCH 06/16] Use latest Commons snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b08e423..b37e1e4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.64 + 2.1.65-SNAPSHOT org.argeo.suite argeo-suite -- 2.30.2 From dcca03cc76c3ca46c05513acc59f1bdf608a8357 Mon Sep 17 00:00:00 2001 From: bsinou Date: Thu, 16 Mar 2017 14:21:22 +0100 Subject: [PATCH 07/16] Prepare Argeo Suite 0.1.8 release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b37e1e4..2640186 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.65-SNAPSHOT + 2.1.65 org.argeo.suite argeo-suite @@ -20,9 +20,9 @@ sdk - 0.1.8-SNAPSHOT + 0.1.8 0.1 - 2.1.71-SNAPSHOT + 2.1.71 2.1.9 -- 2.30.2 From 93c55b320e506dfa4b68984d9b6d66744db33cff Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Thu, 16 Mar 2017 13:22:22 +0000 Subject: [PATCH 08/16] [maven-release-plugin] prepare release argeo-suite-0.1.8 --- org.argeo.suite.apps.web/pom.xml | 4 ++-- org.argeo.suite.apps/pom.xml | 6 +++--- org.argeo.suite.core/pom.xml | 2 +- org.argeo.suite.web/pom.xml | 4 ++-- org.argeo.suite.workbench.rap/pom.xml | 4 ++-- pom.xml | 4 ++-- sdk/org.argeo.suite.platform/pom.xml | 6 +++--- sdk/pom.xml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/org.argeo.suite.apps.web/pom.xml b/org.argeo.suite.apps.web/pom.xml index f8450d4..2959ae9 100644 --- a/org.argeo.suite.apps.web/pom.xml +++ b/org.argeo.suite.apps.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8-SNAPSHOT + 0.1.8 .. org.argeo.suite.apps.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.web - 0.1.8-SNAPSHOT + 0.1.8 diff --git a/org.argeo.suite.apps/pom.xml b/org.argeo.suite.apps/pom.xml index 3bcbc06..7c5f7ae 100644 --- a/org.argeo.suite.apps/pom.xml +++ b/org.argeo.suite.apps/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8-SNAPSHOT + 0.1.8 .. org.argeo.suite.apps @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.8-SNAPSHOT + 0.1.8 org.argeo.suite org.argeo.suite.web - 0.1.8-SNAPSHOT + 0.1.8 diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.suite.core/pom.xml index c6ef409..3c1665e 100644 --- a/org.argeo.suite.core/pom.xml +++ b/org.argeo.suite.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8-SNAPSHOT + 0.1.8 .. org.argeo.suite.core diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml index a0c2253..92fa911 100644 --- a/org.argeo.suite.web/pom.xml +++ b/org.argeo.suite.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8-SNAPSHOT + 0.1.8 .. org.argeo.suite.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.8-SNAPSHOT + 0.1.8 org.argeo.connect diff --git a/org.argeo.suite.workbench.rap/pom.xml b/org.argeo.suite.workbench.rap/pom.xml index aac7177..5f99cfb 100644 --- a/org.argeo.suite.workbench.rap/pom.xml +++ b/org.argeo.suite.workbench.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8-SNAPSHOT + 0.1.8 .. org.argeo.suite.workbench.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.8-SNAPSHOT + 0.1.8 org.argeo.connect diff --git a/pom.xml b/pom.xml index 2640186..bf7c37c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom Argeo Suite - 0.1.8-SNAPSHOT + 0.1.8 org.argeo.suite.core org.argeo.suite.web @@ -30,7 +30,7 @@ scm:git:http://git.argeo.org/gpl/argeo-suite.git http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary scm:git:https://code.argeo.org/git/gpl/argeo-suite.git - HEAD + argeo-suite-0.1.8 2014 diff --git a/sdk/org.argeo.suite.platform/pom.xml b/sdk/org.argeo.suite.platform/pom.xml index 3d84839..7756ba0 100644 --- a/sdk/org.argeo.suite.platform/pom.xml +++ b/sdk/org.argeo.suite.platform/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite sdk - 0.1.8-SNAPSHOT + 0.1.8 .. org.argeo.suite.platform @@ -17,14 +17,14 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.8-SNAPSHOT + 0.1.8 org.argeo.suite org.argeo.suite.web - 0.1.8-SNAPSHOT + 0.1.8 diff --git a/sdk/pom.xml b/sdk/pom.xml index 68c308a..cab175a 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8-SNAPSHOT + 0.1.8 .. sdk -- 2.30.2 From 7d622b62058b328b1b6ebecbe5f14d40460c4f24 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Thu, 16 Mar 2017 13:22:22 +0000 Subject: [PATCH 09/16] [maven-release-plugin] prepare for next development iteration --- org.argeo.suite.apps.web/pom.xml | 4 ++-- org.argeo.suite.apps/pom.xml | 6 +++--- org.argeo.suite.core/pom.xml | 2 +- org.argeo.suite.web/pom.xml | 4 ++-- org.argeo.suite.workbench.rap/pom.xml | 4 ++-- pom.xml | 4 ++-- sdk/org.argeo.suite.platform/pom.xml | 6 +++--- sdk/pom.xml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/org.argeo.suite.apps.web/pom.xml b/org.argeo.suite.apps.web/pom.xml index 2959ae9..49d4d4d 100644 --- a/org.argeo.suite.apps.web/pom.xml +++ b/org.argeo.suite.apps.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8 + 0.1.9-SNAPSHOT .. org.argeo.suite.apps.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.web - 0.1.8 + 0.1.9-SNAPSHOT diff --git a/org.argeo.suite.apps/pom.xml b/org.argeo.suite.apps/pom.xml index 7c5f7ae..1d57705 100644 --- a/org.argeo.suite.apps/pom.xml +++ b/org.argeo.suite.apps/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8 + 0.1.9-SNAPSHOT .. org.argeo.suite.apps @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.8 + 0.1.9-SNAPSHOT org.argeo.suite org.argeo.suite.web - 0.1.8 + 0.1.9-SNAPSHOT diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.suite.core/pom.xml index 3c1665e..4ada8a2 100644 --- a/org.argeo.suite.core/pom.xml +++ b/org.argeo.suite.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8 + 0.1.9-SNAPSHOT .. org.argeo.suite.core diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml index 92fa911..41894df 100644 --- a/org.argeo.suite.web/pom.xml +++ b/org.argeo.suite.web/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8 + 0.1.9-SNAPSHOT .. org.argeo.suite.web @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.8 + 0.1.9-SNAPSHOT org.argeo.connect diff --git a/org.argeo.suite.workbench.rap/pom.xml b/org.argeo.suite.workbench.rap/pom.xml index 5f99cfb..9ea39a7 100644 --- a/org.argeo.suite.workbench.rap/pom.xml +++ b/org.argeo.suite.workbench.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8 + 0.1.9-SNAPSHOT .. org.argeo.suite.workbench.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 0.1.8 + 0.1.9-SNAPSHOT org.argeo.connect diff --git a/pom.xml b/pom.xml index bf7c37c..558b6c5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom Argeo Suite - 0.1.8 + 0.1.9-SNAPSHOT org.argeo.suite.core org.argeo.suite.web @@ -30,7 +30,7 @@ scm:git:http://git.argeo.org/gpl/argeo-suite.git http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary scm:git:https://code.argeo.org/git/gpl/argeo-suite.git - argeo-suite-0.1.8 + HEAD 2014 diff --git a/sdk/org.argeo.suite.platform/pom.xml b/sdk/org.argeo.suite.platform/pom.xml index 7756ba0..0ddf818 100644 --- a/sdk/org.argeo.suite.platform/pom.xml +++ b/sdk/org.argeo.suite.platform/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite sdk - 0.1.8 + 0.1.9-SNAPSHOT .. org.argeo.suite.platform @@ -17,14 +17,14 @@ org.argeo.suite org.argeo.suite.workbench.rap - 0.1.8 + 0.1.9-SNAPSHOT org.argeo.suite org.argeo.suite.web - 0.1.8 + 0.1.9-SNAPSHOT diff --git a/sdk/pom.xml b/sdk/pom.xml index cab175a..e6002be 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 0.1.8 + 0.1.9-SNAPSHOT .. sdk -- 2.30.2 From 077fef092478239ebde50a6041121f202e312c80 Mon Sep 17 00:00:00 2001 From: bsinou Date: Thu, 16 Mar 2017 14:23:48 +0100 Subject: [PATCH 10/16] Next development cycle --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 558b6c5..6b61e23 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ sdk - 0.1.8 + 0.1.9-SNAPSHOT 0.1 2.1.71 2.1.9 -- 2.30.2 From bf461fcc24c3025d0c234966262c9e61bf15f143 Mon Sep 17 00:00:00 2001 From: bsinou Date: Wed, 22 Mar 2017 20:53:56 +0100 Subject: [PATCH 11/16] Use correct default command, use latest snapshots --- pom.xml | 4 ++-- sdk/argeo_suite_web.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6b61e23..a5418c5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.65 + 2.1.66-SNAPSHOT org.argeo.suite argeo-suite @@ -22,7 +22,7 @@ 0.1.9-SNAPSHOT 0.1 - 2.1.71 + 2.1.72-SNAPSHOT 2.1.9 diff --git a/sdk/argeo_suite_web.properties b/sdk/argeo_suite_web.properties index e26ee6e..29d2e1a 100644 --- a/sdk/argeo_suite_web.properties +++ b/sdk/argeo_suite_web.properties @@ -14,8 +14,8 @@ org.argeo.suite.workbench.rap ## Rap Workbench configuration ## Open the user admin page by default when opening the workbench org.argeo.security.ui.initialPerspective=org.argeo.cms.ui.workbench.adminSecurityPerspective -# Default home page for the Specific People RAP workbench perspective -org.argeo.ui.openHomeCommandId=org.argeo.suite.workbench.rap.openDashboardEditor +# Use the WorkbenchAppService to open a default home page +org.argeo.ui.openHomeCommandId=org.argeo.connect.ui.openDefaultEditor ## JCR BACKEND argeo.node.repo.type=h2 -- 2.30.2 From d33954323cdc2ac54034d8d3a83471c8af705afb Mon Sep 17 00:00:00 2001 From: bsinou Date: Thu, 23 Mar 2017 19:03:40 +0100 Subject: [PATCH 12/16] Remove problematic Jetty log configuration --- sdk/argeo_suite_web.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/argeo_suite_web.properties b/sdk/argeo_suite_web.properties index 29d2e1a..b72388e 100644 --- a/sdk/argeo_suite_web.properties +++ b/sdk/argeo_suite_web.properties @@ -22,7 +22,7 @@ argeo.node.repo.type=h2 ### Jetty - test URL: http://localhost:7070 org.osgi.service.http.port=7070 -org.eclipse.equinox.http.jetty.log.stderr.threshold=info + log4j.configuration=file:../../log4j.properties -- 2.30.2 From 65a8aa7ab3bc0243c0fbd4fb765364d0c9ad7565 Mon Sep 17 00:00:00 2001 From: bsinou Date: Mon, 27 Mar 2017 21:34:09 +0200 Subject: [PATCH 13/16] Adapt after connect refactoring --- .../src/org/argeo/suite/core/DefaultSuiteAppService.java | 9 +++++---- .../argeo/suite/workbench/commands/ImportEntities.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java index ea5dc23..24cf37d 100644 --- a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java +++ b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java @@ -4,6 +4,7 @@ import java.util.List; import javax.jcr.Node; import javax.jcr.RepositoryException; +import javax.jcr.Session; import org.argeo.connect.AppService; import org.argeo.connect.SystemAppService; @@ -17,11 +18,11 @@ public class DefaultSuiteAppService implements SystemAppService { private List knownAppServices; @Override - public Node createEntity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode) + public Node publishEntity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode) throws RepositoryException { for (AppService appService : knownAppServices) { if (appService.isKnownType(nodeType)) - return appService.createEntity(parent, nodeType, srcNode, removeSrcNode); + return appService.publishEntity(parent, nodeType, srcNode, removeSrcNode); } return null; } @@ -51,10 +52,10 @@ public class DefaultSuiteAppService implements SystemAppService { } @Override - public String getDefaultRelPath(String nodetype, String id) { + public String getDefaultRelPath(Session session, String nodetype, String id) { for (AppService appService : knownAppServices) { if (appService.isKnownType(nodetype)) - return appService.getDefaultRelPath(nodetype, id); + return appService.getDefaultRelPath(session, nodetype, id); } return null; } diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java index 640e90e..769e807 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/commands/ImportEntities.java @@ -345,7 +345,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames { tmpPerson.setProperty(PEOPLE_FIRST_NAME, firstName); if (EclipseUiUtils.notEmpty(lastName)) tmpPerson.setProperty(PEOPLE_LAST_NAME, lastName); - Node newPersonNode = peopleService.createEntity(targetParent, PeopleTypes.PEOPLE_PERSON, tmpPerson); + Node newPersonNode = peopleService.publishEntity(targetParent, PeopleTypes.PEOPLE_PERSON, tmpPerson); // if (EclipseUiUtils.notEmpty(position)) PersonJcrUtils.addJob(resourcesService, peopleService, newPersonNode, newOrgNode, position, true); // Save the newly created entity without creating a base version @@ -458,7 +458,7 @@ public class ImportEntities extends AbstractHandler implements PeopleNames { if (notEmpty(tagsStr)) tmpOrg.setProperty(ResourcesNames.CONNECT_TAGS, ConnectJcrUtils.parseAndClean(tagsStr, ",", true)); - Node newOrgNode = peopleService.createEntity(targetParent, PeopleTypes.PEOPLE_ORG, tmpOrg); + Node newOrgNode = peopleService.publishEntity(targetParent, PeopleTypes.PEOPLE_ORG, tmpOrg); // Save the newly created entity without creating a base version newOrgNode = peopleService.saveEntity(newOrgNode, false); -- 2.30.2 From ce27112f9bc01fc37b1121496f3ad1eb7593d7eb Mon Sep 17 00:00:00 2001 From: bsinou Date: Fri, 31 Mar 2017 21:13:39 +0200 Subject: [PATCH 14/16] Enhance non-IT projects support --- .../META-INF/spring/parts.xml | 8 +- .../DefaultSuiteWorkbenchService.java | 6 + .../parts/AbstractSuiteDashboard.java | 44 ++--- .../parts/DefaultDashboardEditor.java | 161 ++++++++++++------ 4 files changed, 129 insertions(+), 90 deletions(-) diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml index 5019156..01f6a51 100644 --- a/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml +++ b/org.argeo.suite.workbench.rap/META-INF/spring/parts.xml @@ -14,15 +14,15 @@ - + - + - - + + diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java index 480af06..ea909bf 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DefaultSuiteWorkbenchService.java @@ -21,6 +21,12 @@ public class DefaultSuiteWorkbenchService implements SystemWorkbenchService { @Override public String getDefaultEditorId() { + String result = null; + for (AppWorkbenchService appWbService : knownAppWbServices) { + result = appWbService.getDefaultEditorId(); + if (EclipseUiUtils.notEmpty(result)) + return result; + } return defaultEditorId; } diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java index cdb802f..6ca460e 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java @@ -7,19 +7,18 @@ import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.Session; -import org.argeo.activities.ActivitiesService; import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.cms.util.CmsUtils; +import org.argeo.connect.SystemAppService; import org.argeo.connect.resources.ResourcesService; import org.argeo.connect.ui.ConnectUiStyles; import org.argeo.connect.util.ConnectJcrUtils; import org.argeo.connect.workbench.AppWorkbenchService; import org.argeo.connect.workbench.SystemWorkbenchService; +import org.argeo.connect.workbench.commands.OpenEntityEditor; import org.argeo.connect.workbench.util.EntityEditorInput; -import org.argeo.documents.DocumentsService; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; -import org.argeo.people.PeopleService; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -42,9 +41,7 @@ public abstract class AbstractSuiteDashboard extends EditorPart { // DEPENDENCY INJECTION private Repository repository; private ResourcesService resourcesService; - private ActivitiesService activitiesService; - private PeopleService peopleService; - private DocumentsService documentsService; + private SystemAppService systemAppService; private SystemWorkbenchService systemWorkbenchService; private Session session; @@ -142,15 +139,14 @@ public abstract class AbstractSuiteDashboard extends EditorPart { @Override public void widgetSelected(final SelectionEvent event) { Map params = new HashMap(); - // FIXME - params.put("param.jcrId", ConnectJcrUtils.getIdentifier(entity)); + params.put(OpenEntityEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity)); CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params); } }); return link; } - // LIFE CYCLE + // Life cycle @Override public void dispose() { JcrUtils.logoutQuietly(session); @@ -187,30 +183,18 @@ public abstract class AbstractSuiteDashboard extends EditorPart { return session; } - public ResourcesService getResourceService() { + public ResourcesService getResourcesService() { return resourcesService; } - protected ActivitiesService getActivityService() { - return activitiesService; - } - - protected PeopleService getPeopleService() { - return peopleService; - } - - protected DocumentsService getDocumentsService() { - return documentsService; + protected SystemAppService getSystemAppService() { + return systemAppService; } protected SystemWorkbenchService getSystemWorkbenchService() { return systemWorkbenchService; } - protected Image getLogoImg() { - return logoImg; - } - protected FormToolkit getFormToolkit() { return toolkit; } @@ -224,16 +208,8 @@ public abstract class AbstractSuiteDashboard extends EditorPart { this.resourcesService = resourcesService; } - public void setActivitiesService(ActivitiesService activitiesService) { - this.activitiesService = activitiesService; - } - - public void setDocumentsService(DocumentsService documentsService) { - this.documentsService = documentsService; - } - - public void setPeopleService(PeopleService peopleService) { - this.peopleService = peopleService; + public void setSystemAppService(SystemAppService systemAppService) { + this.systemAppService = systemAppService; } public void setSystemWorkbenchService(SystemWorkbenchService systemWorkbenchService) { diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java index 99bc560..7751d6b 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java @@ -1,95 +1,152 @@ package org.argeo.suite.workbench.parts; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.List; + import javax.jcr.Node; import javax.jcr.NodeIterator; +import javax.jcr.RepositoryException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.activities.ActivitiesTypes; -import org.argeo.connect.resources.ResourcesTypes; -import org.argeo.connect.util.ConnectJcrUtils; -import org.argeo.connect.workbench.ConnectWorkbenchUtils; +import org.argeo.activities.ActivitiesNames; +import org.argeo.activities.ActivitiesService; +import org.argeo.cms.auth.CurrentUser; +import org.argeo.cms.util.CmsUtils; import org.argeo.connect.workbench.Refreshable; import org.argeo.eclipse.ui.EclipseUiUtils; -import org.argeo.people.PeopleTypes; +import org.argeo.jcr.JcrUtils; +import org.argeo.node.NodeUtils; import org.argeo.suite.workbench.AsUiPlugin; +import org.argeo.tracker.TrackerNames; +import org.argeo.tracker.TrackerService; +import org.argeo.tracker.ui.TaskListLabelProvider; +import org.argeo.tracker.ui.TaskVirtualListComposite; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; /** Argeo Suite Default Dashboard */ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Refreshable { final static Log log = LogFactory.getLog(DefaultDashboardEditor.class); public final static String ID = AsUiPlugin.PLUGIN_ID + ".defaultDashboardEditor"; - // Default gadget dimensions - private int wh = 300; - private int hh = 350; + private ActivitiesService activitiesService; + private TrackerService trackerService; - private Composite lastUpdatedDocsGadget; + private Composite headerCmp; + private Composite taskListCmp; + private TaskVirtualListComposite tvlc; @Override public void createPartControl(Composite parent) { super.createPartControl(parent); + parent.setLayout(EclipseUiUtils.noSpaceGridLayout()); + Composite bodyCmp = new Composite(parent, SWT.NO_FOCUS); + bodyCmp.setLayoutData(EclipseUiUtils.fillAll()); + bodyCmp.setLayout(new GridLayout()); + + // Header + try { + // Control overviewCmp = + createUi(bodyCmp, NodeUtils.getUserHome(getSession())); + } catch (RepositoryException e) { + e.printStackTrace(); + } - parent.setLayout(new GridLayout()); - // Main Layout - Composite body = getFormToolkit().createComposite(parent); - body.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true)); + taskListCmp = new Composite(bodyCmp, SWT.NO_FOCUS); + taskListCmp.setLayoutData(EclipseUiUtils.fillAll()); - GridLayout bodyLayout = new GridLayout(2, true); - bodyLayout.horizontalSpacing = 20; - bodyLayout.verticalSpacing = 20; - body.setLayout(bodyLayout); + populateTaskListCmp(); + } - // Contacts - Composite contactGadget = createGadgetCmp(body, wh, hh); - populateContactsGadget(contactGadget); + private void populateTaskListCmp() { + CmsUtils.clear(taskListCmp); + taskListCmp.setLayout(EclipseUiUtils.noSpaceGridLayout()); + // Composite innerCmp = new Composite(taskListCmp, SWT.NO_FOCUS); + // innerCmp.setLayoutData(EclipseUiUtils.fillAll()); - // Last updated doc List - lastUpdatedDocsGadget = createGadgetCmp(body, wh, hh); + TaskListLabelProvider labelProvider = new TaskListLabelProvider(trackerService); + tvlc = new TaskVirtualListComposite(taskListCmp, SWT.NO_FOCUS, labelProvider, 54); + tvlc.setLayoutData(EclipseUiUtils.fillAll()); + forceRefresh(null); } @Override public void forceRefresh(Object object) { - refreshDocListGadget(); + NodeIterator nit = activitiesService.getMyTasks(getSession(), true); + tvlc.getTableViewer().setInput(JcrUtils.nodeIteratorToList(nit).toArray()); + } + + private Control createUi(Composite parent, Node context) throws RepositoryException { + Composite bodyCmp = new Composite(parent, SWT.NO_FOCUS); + bodyCmp.setLayout(new GridLayout()); + + // Title + Label titleLbl = new Label(bodyCmp, SWT.WRAP | SWT.LEAD); + CmsUtils.markup(titleLbl); + String titleStr = " Hello " + CurrentUser.getDisplayName() + " "; + titleLbl.setText(titleStr); + GridData gd = new GridData(SWT.CENTER, SWT.BOTTOM, false, false); + gd.verticalIndent = 5; + gd.horizontalIndent = 10; + titleLbl.setLayoutData(gd); + + Calendar now = GregorianCalendar.getInstance(); + + NodeIterator nit = activitiesService.getMyTasks(getSession(), true); + if (nit.hasNext()) { + List overdueTasks = new ArrayList<>(); + while (nit.hasNext()) { + Node currNode = nit.nextNode(); + if (currNode.hasProperty(ActivitiesNames.ACTIVITIES_DUE_DATE) + && currNode.getProperty(ActivitiesNames.ACTIVITIES_DUE_DATE).getDate().before(now)) + overdueTasks.add(currNode); + } + if (!overdueTasks.isEmpty()) { + Label overdueLbl = new Label(bodyCmp, SWT.WRAP | SWT.LEAD); + CmsUtils.markup(overdueLbl); + long size = overdueTasks.size(); + String overdueStr = "You have " + size + " overdue task" + (size > 1 ? "s" : "") + "."; + overdueLbl.setText(overdueStr); + } + } + + nit = trackerService.getMyMilestones(getSession(), true); + if (nit.hasNext()) { + List overdueMilestones = new ArrayList<>(); + while (nit.hasNext()) { + Node currNode = nit.nextNode(); + if (currNode.hasProperty(TrackerNames.TRACKER_TARGET_DATE) + && currNode.getProperty(TrackerNames.TRACKER_TARGET_DATE).getDate().before(now)) + overdueMilestones.add(currNode); + } + if (!overdueMilestones.isEmpty()) { + Label overdueLbl = new Label(bodyCmp, SWT.WRAP | SWT.LEAD); + CmsUtils.markup(overdueLbl); + long size = overdueMilestones.size(); + String overdueStr = "You have " + size + " overdue milestone" + (size > 1 ? "s" : "") + "."; + overdueLbl.setText(overdueStr); + } + } + return bodyCmp; } @Override public void setFocus() { - refreshDocListGadget(); + // refreshDocListGadget(); } - /** Links to the various last updated docs */ - private void refreshDocListGadget() { - EclipseUiUtils.clear(lastUpdatedDocsGadget); - lastUpdatedDocsGadget.setLayout(EclipseUiUtils.noSpaceGridLayout()); - createGadgetTitleCmp(lastUpdatedDocsGadget, "Last updated documents"); - Composite bodyCmp = createGadgetBodyCmp(lastUpdatedDocsGadget); - - NodeIterator nit = getDocumentsService().getLastUpdatedDocuments(getSession()); - while (nit.hasNext()) { - Node file = nit.nextNode(); - createOpenEntityEditorLink(getSystemWorkbenchService(), bodyCmp, ConnectJcrUtils.getName(file), file); - } - lastUpdatedDocsGadget.layout(true, true); + public void setActivitiesService(ActivitiesService activitiesService) { + this.activitiesService = activitiesService; } - /** Links to the various contact search pages */ - private void populateContactsGadget(Composite parent) { - parent.setLayout(EclipseUiUtils.noSpaceGridLayout()); - createGadgetTitleCmp(parent, "Contacts"); - Composite bodyCmp = createGadgetBodyCmp(parent); - ConnectWorkbenchUtils.createOpenSearchEditorLink(getSystemWorkbenchService(), bodyCmp, "Persons", - PeopleTypes.PEOPLE_PERSON); - ConnectWorkbenchUtils.createOpenSearchEditorLink(getSystemWorkbenchService(), bodyCmp, "Organisations", - PeopleTypes.PEOPLE_ORG); - ConnectWorkbenchUtils.createOpenSearchEditorLink(getSystemWorkbenchService(), bodyCmp, "Mailing lists", - PeopleTypes.PEOPLE_MAILING_LIST); - ConnectWorkbenchUtils.createOpenSearchEditorLink(getSystemWorkbenchService(), bodyCmp, "Tasks", - ActivitiesTypes.ACTIVITIES_TASK); - ConnectWorkbenchUtils.createOpenSearchEditorLink(getSystemWorkbenchService(), bodyCmp, "Tags", - ResourcesTypes.RESOURCES_TAG); + public void setTrackerService(TrackerService trackerService) { + this.trackerService = trackerService; } } -- 2.30.2 From 63bb1036480ff177c433584e91f946ab3686bf86 Mon Sep 17 00:00:00 2001 From: bsinou Date: Sat, 1 Apr 2017 08:12:56 +0200 Subject: [PATCH 15/16] Fix spring bindings --- .../META-INF/spring/backend-services.xml | 2 +- .../META-INF/spring/workbench-services.xml | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/org.argeo.suite.apps/META-INF/spring/backend-services.xml b/org.argeo.suite.apps/META-INF/spring/backend-services.xml index bae1034..3a6aad6 100644 --- a/org.argeo.suite.apps/META-INF/spring/backend-services.xml +++ b/org.argeo.suite.apps/META-INF/spring/backend-services.xml @@ -30,8 +30,8 @@ - + diff --git a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml index ea46634..86b71a2 100644 --- a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml +++ b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml @@ -8,16 +8,25 @@ class="org.argeo.connect.resources.workbench.ResourcesWorkbenchService" /> + class="org.argeo.activities.workbench.ActivitiesWorkbenchService"> + + + + - + + + + + + - + + -- 2.30.2 From b2507a9b93aadb669ee9f65c048c7609b78b4d92 Mon Sep 17 00:00:00 2001 From: bsinou Date: Mon, 3 Apr 2017 10:57:16 +0200 Subject: [PATCH 16/16] Cosmetic enhancements --- .../src/org/argeo/suite/workbench/DashboardPerspective.java | 3 +-- .../src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java index 11335ce..e75bccb 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java @@ -1,6 +1,5 @@ package org.argeo.suite.workbench; -import org.argeo.activities.workbench.parts.MyTodoListView; import org.argeo.documents.workbench.parts.MyFilesView; import org.argeo.people.workbench.rap.parts.QuickSearchView; import org.eclipse.ui.IFolderLayout; @@ -17,6 +16,6 @@ public class DashboardPerspective implements IPerspectiveFactory { IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT, 0.25f, editorArea); left.addView(MyFilesView.ID); left.addView(QuickSearchView.ID); - left.addView(MyTodoListView.ID); + // left.addView(MyTodoListView.ID); } } diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java index 50f33c3..e24663a 100644 --- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java +++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsSecureEntryPoint.java @@ -50,7 +50,7 @@ public class AsSecureEntryPoint extends RapWorkbenchLogin { String titleStr = " Please sign in to your personal dashboard"; titleLbl.setText(titleStr); gd = new GridData(SWT.CENTER, SWT.BOTTOM, false, false); - // gd.verticalIndent = 40; + gd.verticalIndent = 15; titleLbl.setLayoutData(gd); // Login composite -- 2.30.2