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 2016/02/16 17:16:43 UTC
[1/5] syncope git commit: [SYNCOPE-156] Small clean-up
Repository: syncope
Updated Branches:
refs/heads/master 0d9358373 -> 411b7cf2e
[SYNCOPE-156] Small clean-up
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/356655e5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/356655e5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/356655e5
Branch: refs/heads/master
Commit: 356655e55dd20fe9b5cf4ed84046186762fdf0a8
Parents: 0d93583
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 16 12:23:35 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 16 12:23:35 2016 +0100
----------------------------------------------------------------------
.../apache/syncope/client/console/annotations/ExtPage.java | 2 +-
.../org/apache/syncope/client/console/commons/Constants.java | 8 ++++----
.../java/org/apache/syncope/client/console/pages/Logs.java | 3 ---
.../org/apache/syncope/client/console/pages/Parameters.java | 3 ---
.../java/org/apache/syncope/client/console/pages/Roles.java | 4 ----
.../syncope/client/console/pages/SecurityQuestions.java | 3 ---
.../java/org/apache/syncope/client/console/pages/Types.java | 3 ---
.../org/apache/syncope/client/console/pages/Dashboard.html | 2 +-
.../org/apache/syncope/client/console/pages/Layouts.html | 4 ++--
.../org/apache/syncope/client/console/pages/Logs.html | 2 +-
.../org/apache/syncope/client/console/pages/Logs.properties | 1 -
.../apache/syncope/client/console/pages/Logs_it.properties | 1 -
.../syncope/client/console/pages/Logs_pt_BR.properties | 1 -
.../apache/syncope/client/console/pages/Notifications.html | 2 +-
.../org/apache/syncope/client/console/pages/Parameters.html | 2 +-
.../syncope/client/console/pages/Parameters.properties | 1 -
.../syncope/client/console/pages/Parameters_it.properties | 1 -
.../syncope/client/console/pages/Parameters_pt_BR.properties | 1 -
.../org/apache/syncope/client/console/pages/Policies.html | 2 +-
.../org/apache/syncope/client/console/pages/Realms.html | 6 ++++++
.../org/apache/syncope/client/console/pages/Roles.html | 2 +-
.../org/apache/syncope/client/console/pages/Roles.properties | 1 -
.../apache/syncope/client/console/pages/Roles_it.properties | 1 -
.../syncope/client/console/pages/Roles_pt_BR.properties | 1 -
.../syncope/client/console/pages/SecurityQuestions.html | 2 +-
.../client/console/pages/SecurityQuestions.properties | 1 -
.../client/console/pages/SecurityQuestions_it.properties | 1 -
.../client/console/pages/SecurityQuestions_pt_BR.properties | 1 -
.../org/apache/syncope/client/console/pages/Types.html | 2 +-
.../org/apache/syncope/client/console/pages/Workflow.html | 5 +++++
.../org/apache/syncope/client/console/pages/CamelRoutes.java | 3 ---
.../org/apache/syncope/client/console/pages/CamelRoutes.html | 2 +-
.../syncope/client/console/pages/CamelRoutes.properties | 2 +-
.../syncope/client/console/pages/CamelRoutes_it.properties | 2 +-
.../client/console/pages/CamelRoutes_pt_BR.properties | 2 +-
35 files changed, 30 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java b/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java
index 32587c9..18ce9f5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java
@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
public @interface ExtPage {
/**
- * @return the label shown under the "Extensions" menu item, on the left pane
+ * @return the i18n key for the label shown under the "Extensions" menu item, on the left pane
*/
String label();
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index 978a860..8381f67 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -20,13 +20,13 @@ package org.apache.syncope.client.console.commons;
public final class Constants {
- public static final String ON_CLICK = "onclick";
+ public static final String ON_CLICK = "click";
- public static final String ON_CHANGE = "onchange";
+ public static final String ON_CHANGE = "change";
- public static final String ON_KEYUP = "onkeyup";
+ public static final String ON_KEYUP = "keyup";
- public static final String ON_BLUR = "onblur";
+ public static final String ON_BLUR = "blur";
public static final String PNG_EXT = ".png";
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/java/org/apache/syncope/client/console/pages/Logs.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Logs.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Logs.java
index ff880c5..b0e4538 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Logs.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Logs.java
@@ -26,7 +26,6 @@ import org.apache.syncope.client.console.panels.CoreLogPanel;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -38,8 +37,6 @@ public class Logs extends BasePage {
public Logs(final PageParameters parameters) {
super(parameters);
- body.add(new Label("header", getString("header_title")));
-
WebMarkupContainer content = new WebMarkupContainer("content");
content.setOutputMarkupId(true);
AjaxBootstrapTabbedPanel<ITab> tabbedPanel = new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList());
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/java/org/apache/syncope/client/console/pages/Parameters.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Parameters.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Parameters.java
index d1b1a97..997c1a8 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Parameters.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Parameters.java
@@ -20,7 +20,6 @@ package org.apache.syncope.client.console.pages;
import org.apache.syncope.client.console.panels.ParametersPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class Parameters extends BasePage {
@@ -32,8 +31,6 @@ public class Parameters extends BasePage {
public Parameters(final PageParameters parameters) {
super(parameters);
- body.add(new Label("header", getString("header_title")));
-
WebMarkupContainer content = new WebMarkupContainer("content");
content.setOutputMarkupId(true);
body.add(content);
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
index 797dee2..96ff81c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
@@ -25,8 +25,6 @@ import org.apache.syncope.client.console.wizards.role.RoleHandler;
import org.apache.syncope.client.console.wizards.role.RoleWizardBuilder;
import org.apache.syncope.common.lib.to.RoleTO;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class Roles extends BasePage {
@@ -36,8 +34,6 @@ public class Roles extends BasePage {
public Roles(final PageParameters parameters) {
super(parameters);
- body.add(new Label("header", getString("header_title", new Model<>(), "Roles")));
-
WebMarkupContainer content = new WebMarkupContainer("content");
content.setOutputMarkupId(true);
body.add(content);
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
index da1f3aa..28ee332 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/SecurityQuestions.java
@@ -20,7 +20,6 @@ package org.apache.syncope.client.console.pages;
import org.apache.syncope.client.console.panels.SecurityQuestionsPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class SecurityQuestions extends BasePage {
@@ -30,8 +29,6 @@ public class SecurityQuestions extends BasePage {
public SecurityQuestions(final PageParameters parameters) {
super(parameters);
- body.add(new Label("header", getString("header_title")));
-
WebMarkupContainer content = new WebMarkupContainer("content");
content.setOutputMarkupId(true);
body.add(content);
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/java/org/apache/syncope/client/console/pages/Types.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Types.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Types.java
index 637b020..e4f8877 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Types.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Types.java
@@ -28,7 +28,6 @@ import org.apache.syncope.client.console.panels.SchemasPanel;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -50,8 +49,6 @@ public class Types extends BasePage {
public Types(final PageParameters parameters) {
super(parameters);
- body.add(new Label("header", "Types"));
-
WebMarkupContainer content = new WebMarkupContainer("content");
content.setOutputMarkupId(true);
tabbedPanel = new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList());
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
index 4030f60..446a873 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
@@ -21,7 +21,7 @@ under the License.
<wicket:extend>
<section class="content-header">
<h1>
- Dashboard
+ <wicket:message key="dashboard"/>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Layouts.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Layouts.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Layouts.html
index a513ab3..0ca52d7 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Layouts.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Layouts.html
@@ -17,12 +17,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<html xmlns="http://www.w3.org/1999/xhtml" >
<wicket:extend>
<section class="content-header">
<h1>
- Layouts
+ <wicket:message key="layouts"/>
<small>Work in progress</small>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
index d50dd84..d7f479d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.html
@@ -21,7 +21,7 @@ under the License.
<wicket:extend>
<section class="content-header">
<h1>
- <span wicket:id="header"></span>
+ <wicket:message key="logs"/>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.properties
index 20b2c4f..e37b4bc 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Logs
logLevel=Log Level
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_it.properties
index 20b2c4f..e37b4bc 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_it.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Logs
logLevel=Log Level
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_pt_BR.properties
index 20b2c4f..e37b4bc 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_pt_BR.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Logs
logLevel=Log Level
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.html
index 3305367..d79c959 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications.html
@@ -22,7 +22,7 @@ under the License.
<section class="content-header">
<h1>
- Notifications
+ <wicket:message key="notifications"/>
<small>Work in progress</small>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.html
index 90f1c01..ff920b2 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.html
@@ -21,7 +21,7 @@ under the License.
<wicket:extend>
<section class="content-header">
<h1>
- <span wicket:id="header"></span>
+ <wicket:message key="parameters"/>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.properties
index f9a68f1..3b8ec56 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters.properties
@@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Parameters
createParameter=Create new Parameter
content=Content
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_it.properties
index 12fc219..bad4c57 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_it.properties
@@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Parametri di configurazione
createParameter=Crea un nuovo parametro
content=Contenuto
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_pt_BR.properties
index 682871d..6b1d433 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_pt_BR.properties
@@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Par\u00e2metros
createParameter=Cria um novo par\u00e2metros
content=Conte\u00fado
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Policies.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Policies.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Policies.html
index 0e0e177..cb7c548 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Policies.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Policies.html
@@ -22,7 +22,7 @@ under the License.
<section class="content-header">
<h1>
- Policies
+ <wicket:message key="policies"/>
<small>Work in progress</small>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms.html
index 4d70dbc..de6e4ab 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Realms.html
@@ -20,6 +20,12 @@ under the License.
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://xmlns.jcp.org/jsf/composite">
<head><title>Realms</title></head>
<wicket:extend>
+ <section class="content-header">
+ <h1>
+ <wicket:message key="realms"/>
+ </h1>
+ </section>
+
<div class="wrapper">
<div class="admin-content-page content-margin-layout" wicket:id="content">
<div class="box box-solid box-primary">
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
index c3e4d86..3c2593f 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
@@ -21,7 +21,7 @@ under the License.
<wicket:extend>
<section class="content-header">
<h1>
- <span wicket:id="header"></span>
+ <wicket:message key="roles"/>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
index f03583a..6a40284 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Roles
add=Create new Role
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
index c9797dd..ba0237a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_it.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Ruoli
add=Crea un nuovo Ruolo
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
index e9ebe1c..c150538 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles_pt_BR.properties
@@ -14,5 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Fun\u00e7\u00e3os
add=Cria um novo fun\u00e7\u00e3o
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html
index 1679cbc..2eae244 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.html
@@ -21,7 +21,7 @@ under the License.
<wicket:extend>
<section class="content-header">
<h1>
- <span wicket:id="header"></span>
+ <wicket:message key="securityQuestions"/>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties
index bb64381..8e55776 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions.properties
@@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Security Questions
createSecurityQuestion=Create new Secutiry Questions
content=Content
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties
index 5943987..57f0f99 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_it.properties
@@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Security Questions
createSecurityQuestion=Crea una nuova domanda di sicurezza
content=Contenuto
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties
index 770e81d..ddf033a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/SecurityQuestions_pt_BR.properties
@@ -14,6 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Security Questions
createSecurityQuestion=Cria um novo Security Question
content=Conte\u00fado
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Types.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Types.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Types.html
index d50dd84..b116624 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Types.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Types.html
@@ -21,7 +21,7 @@ under the License.
<wicket:extend>
<section class="content-header">
<h1>
- <span wicket:id="header"></span>
+ <wicket:message key="types"/>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
index 97ce580..c91440e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Workflow.html
@@ -19,6 +19,11 @@ under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
+ <section class="content-header">
+ <h1>
+ <wicket:message key="workflow"/>
+ </h1>
+ </section>
<section class="content">
<div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
index fd0bd39..e8f5e26 100644
--- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
+++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutes.java
@@ -30,7 +30,6 @@ import org.apache.syncope.client.console.annotations.ExtPage;
import org.apache.syncope.client.console.panels.CamelRoutesPanel;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -47,8 +46,6 @@ public class CamelRoutes extends AbstractExtPage {
public CamelRoutes(final PageParameters parameters) {
super(parameters);
- body.add(new Label("header", getString("header_title")));
-
WebMarkupContainer content = new WebMarkupContainer("content");
content.setOutputMarkupId(true);
AjaxBootstrapTabbedPanel<ITab> tabbedPanel = new AjaxBootstrapTabbedPanel<>("tabbedPanel", buildTabList());
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.html
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.html b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.html
index d50dd84..33e8411 100644
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.html
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.html
@@ -21,7 +21,7 @@ under the License.
<wicket:extend>
<section class="content-header">
<h1>
- <span wicket:id="header"></span>
+ <wicket:message key="camelRoutes"/>
</h1>
</section>
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.properties
index f8c2fd1..bd959d5 100644
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.properties
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Camel Routes
+camelRoutes=Camel Routes
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_it.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_it.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_it.properties
index f8c2fd1..5e5b7c0 100644
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_it.properties
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_it.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Camel Routes
+camelRoutes=Rotte Camel
http://git-wip-us.apache.org/repos/asf/syncope/blob/356655e5/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_pt_BR.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_pt_BR.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_pt_BR.properties
index f8c2fd1..46ecbfd 100644
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_pt_BR.properties
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutes_pt_BR.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-header_title=Camel Routes
+camelRoutes=Rotas Camel
[2/5] syncope git commit: [SYNCOPE-156] Clean-up again
Posted by il...@apache.org.
[SYNCOPE-156] Clean-up again
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3e6c308d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3e6c308d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3e6c308d
Branch: refs/heads/master
Commit: 3e6c308d70bc59f05bb517239b3ecc3ba57253aa
Parents: 356655e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 16 12:40:02 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 16 12:40:02 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/syncope/client/console/pages/Roles.java | 6 +++---
.../org/apache/syncope/client/console/pages/Roles.html | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3e6c308d/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
index 96ff81c..f37d5fd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Roles.java
@@ -38,15 +38,15 @@ public class Roles extends BasePage {
content.setOutputMarkupId(true);
body.add(content);
- WizardMgtPanel<RoleHandler> roleSearchResultPanel =
+ WizardMgtPanel<RoleHandler> rolesPanel =
new RoleSearchResultPanel.Builder(getPageReference()) {
private static final long serialVersionUID = -5960765294082359003L;
}.disableCheckBoxes().addNewItemPanelBuilder(
new RoleWizardBuilder(BaseModal.CONTENT_ID, new RoleTO(), getPageReference()), true).
- build("roles");
+ build("rolesPanel");
- content.add(roleSearchResultPanel);
+ content.add(rolesPanel);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3e6c308d/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
index 3c2593f..0782e38 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Roles.html
@@ -27,7 +27,7 @@ under the License.
<section class="content" wicket:id="content">
<div class="box">
- <div class="box-body" wicket:id="roles"/>
+ <div class="box-body" wicket:id="rolesPanel"/>
</div>
</section>
</wicket:extend>
[3/5] syncope git commit: [SYNCOPE-744] More widgets
Posted by il...@apache.org.
[SYNCOPE-744] More widgets
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0e6e8717
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0e6e8717
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0e6e8717
Branch: refs/heads/master
Commit: 0e6e87171cb105dd580a859d78f74a2af1fca847
Parents: 3e6c308
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 16 16:53:09 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 16 16:53:09 2016 +0100
----------------------------------------------------------------------
client/console/pom.xml | 4 +
.../syncope/client/console/pages/Dashboard.java | 15 +++
.../client/console/widgets/AbstractWidget.java | 4 +
.../console/widgets/AnyByRealmWidget.java | 102 +++++++++++++++++++
.../console/widgets/LabeledBarDataSet.java | 42 ++++++++
.../widgets/LabeledDoughnutChartData.java | 46 +++++++++
.../client/console/widgets/LoadWidget.java | 71 +++++++++++++
.../console/widgets/UsersByStatusWidget.java | 46 +++++++++
.../syncope/client/console/pages/Dashboard.html | 9 ++
.../console/widgets/AnyByRealmWidget.html | 33 ++++++
.../console/widgets/AnyByRealmWidget.properties | 17 ++++
.../widgets/AnyByRealmWidget_it.properties | 17 ++++
.../widgets/AnyByRealmWidget_pt_BR.properties | 17 ++++
.../client/console/widgets/LoadWidget.html | 33 ++++++
.../console/widgets/LoadWidget.properties | 17 ++++
.../console/widgets/LoadWidget_it.properties | 17 ++++
.../console/widgets/LoadWidget_pt_BR.properties | 17 ++++
.../client/console/widgets/NumberWidget.html | 1 -
.../console/widgets/UsersByStatusWidget.html | 33 ++++++
.../widgets/UsersByStatusWidget.properties | 17 ++++
.../widgets/UsersByStatusWidget_it.properties | 17 ++++
.../UsersByStatusWidget_pt_BR.properties | 17 ++++
.../syncope/common/lib/info/SystemInfo.java | 10 ++
.../apache/syncope/core/logic/SyncopeLogic.java | 1 +
pom.xml | 26 ++++-
25 files changed, 623 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/pom.xml
----------------------------------------------------------------------
diff --git a/client/console/pom.xml b/client/console/pom.xml
index a78d5c4..52bee43 100644
--- a/client/console/pom.xml
+++ b/client/console/pom.xml
@@ -90,6 +90,10 @@ under the License.
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.pingunaut</groupId>
+ <artifactId>wicket-chartjs</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/java/org/apache/syncope/client/console/pages/Dashboard.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Dashboard.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Dashboard.java
index 25001c0..6300d0a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Dashboard.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Dashboard.java
@@ -20,6 +20,9 @@ package org.apache.syncope.client.console.pages;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.widgets.NumberWidget;
+import org.apache.syncope.client.console.widgets.AnyByRealmWidget;
+import org.apache.syncope.client.console.widgets.LoadWidget;
+import org.apache.syncope.client.console.widgets.UsersByStatusWidget;
import org.apache.syncope.common.lib.info.NumbersInfo;
import org.apache.syncope.common.rest.api.service.SyncopeService;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -62,5 +65,17 @@ public class Dashboard extends BasePage {
icon = "ion ion-gear-a";
}
body.add(new NumberWidget("totalAny1OrResources", "bg-aqua", number, label, icon));
+
+ body.add(new UsersByStatusWidget("usersByStatus", numbers.getUsersByStatus()));
+ body.add(new AnyByRealmWidget(
+ "anyByRealm",
+ numbers.getUsersByRealm(),
+ numbers.getGroupsByRealm(),
+ numbers.getAnyType1(),
+ numbers.getAny1ByRealm(),
+ numbers.getAnyType2(),
+ numbers.getAny2ByRealm()));
+
+ body.add(new LoadWidget("load", SyncopeConsoleSession.get().getService(SyncopeService.class).system()));
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/java/org/apache/syncope/client/console/widgets/AbstractWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/AbstractWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AbstractWidget.java
index a31acca..efe363b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/AbstractWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AbstractWidget.java
@@ -24,6 +24,10 @@ public abstract class AbstractWidget extends Panel {
private static final long serialVersionUID = -4186604985011430091L;
+ protected static final int MEDIUM_WIDTH = 451;
+
+ protected static final int MEDIUM_HEIGHT = 227;
+
public AbstractWidget(final String id) {
super(id);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java
new file mode 100644
index 0000000..c4ddf51
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/AnyByRealmWidget.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.widgets;
+
+import com.pingunaut.wicket.chartjs.chart.impl.Bar;
+import com.pingunaut.wicket.chartjs.core.panel.BarChartPanel;
+import com.pingunaut.wicket.chartjs.data.sets.BarDataSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.common.lib.to.RealmTO;
+import org.apache.syncope.common.rest.api.service.RealmService;
+import org.apache.wicket.model.Model;
+
+public class AnyByRealmWidget extends AbstractWidget {
+
+ private static final long serialVersionUID = -816175678514035085L;
+
+ private static final int MAX_REALMS = 9;
+
+ public AnyByRealmWidget(
+ final String id,
+ final Map<String, Integer> usersByRealm,
+ final Map<String, Integer> groupsByRealm,
+ final String anyType1,
+ final Map<String, Integer> any1ByRealm,
+ final String anyType2,
+ final Map<String, Integer> any2ByRealm) {
+
+ super(id);
+
+ List<String> labels = new ArrayList<>();
+
+ List<Integer> userValues = new ArrayList<>();
+ List<Integer> groupValues = new ArrayList<>();
+ List<Integer> any1Values = new ArrayList<>();
+ List<Integer> any2Values = new ArrayList<>();
+
+ List<RealmTO> realms = SyncopeConsoleSession.get().getService(RealmService.class).list();
+ for (int i = 0; i < realms.size() && i < MAX_REALMS; i++) {
+ RealmTO realm = realms.get(i);
+
+ labels.add(realm.getName());
+
+ userValues.add(usersByRealm.get(realm.getFullPath()));
+ groupValues.add(groupsByRealm.get(realm.getFullPath()));
+ if (any1ByRealm != null) {
+ any1Values.add(any1ByRealm.get(realm.getFullPath()));
+ }
+ if (any2ByRealm != null) {
+ any2Values.add(any2ByRealm.get(realm.getFullPath()));
+ }
+ }
+
+ Bar bar = new Bar();
+ bar.getData().setLabels(labels);
+ bar.getOptions().setMultiTooltipTemplate("<%= datasetLabel %> - <%= value %>");
+
+ List<BarDataSet> datasets = new ArrayList<>();
+ LabeledBarDataSet userDataSet = new LabeledBarDataSet(userValues);
+ userDataSet.setFillColor("orange");
+ userDataSet.setLabel(getString("users"));
+ datasets.add(userDataSet);
+ LabeledBarDataSet groupDataSet = new LabeledBarDataSet(groupValues);
+ groupDataSet.setFillColor("red");
+ groupDataSet.setLabel(getString("groups"));
+ datasets.add(groupDataSet);
+ if (anyType1 != null) {
+ LabeledBarDataSet any1DataSet = new LabeledBarDataSet(any1Values);
+ any1DataSet.setFillColor("green");
+ any1DataSet.setLabel(anyType1);
+ datasets.add(any1DataSet);
+ }
+ if (anyType2 != null) {
+ LabeledBarDataSet any2DataSet = new LabeledBarDataSet(any2Values);
+ any2DataSet.setFillColor("aqua");
+ any2DataSet.setLabel(anyType2);
+ datasets.add(any2DataSet);
+ }
+ bar.getData().setDatasets(datasets);
+
+ add(new BarChartPanel("chart", Model.of(bar), MEDIUM_WIDTH, MEDIUM_HEIGHT));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledBarDataSet.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledBarDataSet.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledBarDataSet.java
new file mode 100644
index 0000000..a1bf3c9
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledBarDataSet.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.widgets;
+
+import com.pingunaut.wicket.chartjs.data.sets.BarDataSet;
+import java.util.List;
+
+public class LabeledBarDataSet extends BarDataSet {
+
+ private static final long serialVersionUID = -6571823370630502272L;
+
+ private String label;
+
+ public LabeledBarDataSet(final List<? extends Number> values) {
+ super(values);
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(final String label) {
+ this.label = label;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledDoughnutChartData.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledDoughnutChartData.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledDoughnutChartData.java
new file mode 100644
index 0000000..52ece37
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LabeledDoughnutChartData.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.widgets;
+
+import com.pingunaut.wicket.chartjs.data.DoughnutChartData;
+
+public class LabeledDoughnutChartData extends DoughnutChartData {
+
+ private static final long serialVersionUID = -660949108690472467L;
+
+ private String label;
+
+ public LabeledDoughnutChartData(final Integer value, final String color) {
+ super(value, color);
+ }
+
+ public LabeledDoughnutChartData(final Integer value, final String color, final String label) {
+ super(value, color);
+ this.label = label;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(final String label) {
+ this.label = label;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
new file mode 100644
index 0000000..f565a25
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.widgets;
+
+import com.pingunaut.wicket.chartjs.chart.impl.Line;
+import com.pingunaut.wicket.chartjs.core.panel.LineChartPanel;
+import com.pingunaut.wicket.chartjs.data.sets.LineDataSet;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.syncope.common.lib.info.SystemInfo;
+import org.apache.wicket.model.Model;
+
+public class LoadWidget extends AbstractWidget {
+
+ private static final long serialVersionUID = -816175678514035085L;
+
+ public LoadWidget(final String id, final SystemInfo systeminfo) {
+ super(id);
+
+ List<String> labels = new ArrayList<>();
+
+ List<Double> cpuValues = new ArrayList<>();
+ List<Long> memValues = new ArrayList<>();
+
+ for (SystemInfo.PlatformLoad instant : systeminfo.getLoad()) {
+ labels.add(DateFormatUtils.ISO_DATETIME_FORMAT.format(systeminfo.getStartTime() + instant.getUptime()));
+
+ cpuValues.add(instant.getSystemLoadAverage() * 1000);
+ memValues.add(instant.getTotalMemory());
+ }
+
+ Line line = new Line();
+ line.getData().setLabels(labels);
+ line.getOptions().setDatasetFill(false);
+ line.getOptions().setShowScale(false);
+ line.getOptions().setMultiTooltipTemplate("<%= datasetLabel %>");
+
+ List<LineDataSet> datasets = new ArrayList<>();
+ LineDataSet cpuDataSet = new LineDataSet(cpuValues);
+ cpuDataSet.setLabel("CPU");
+ cpuDataSet.setPointColor("purple");
+ cpuDataSet.setStrokeColor("purple");
+ datasets.add(cpuDataSet);
+ LineDataSet memDataSet = new LineDataSet(memValues);
+ memDataSet.setLabel("MEM");
+ memDataSet.setPointColor("grey");
+ memDataSet.setStrokeColor("grey");
+ datasets.add(memDataSet);
+ line.getData().setDatasets(datasets);
+
+ add(new LineChartPanel("chart", Model.of(line), MEDIUM_WIDTH, MEDIUM_HEIGHT));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java
new file mode 100644
index 0000000..d395bfa
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.widgets;
+
+import com.pingunaut.wicket.chartjs.chart.impl.Doughnut;
+import com.pingunaut.wicket.chartjs.core.panel.DoughnutChartPanel;
+import java.util.Map;
+import org.apache.wicket.model.Model;
+
+public class UsersByStatusWidget extends AbstractWidget {
+
+ private static final long serialVersionUID = -816175678514035085L;
+
+ private static final String[] COLORS = { "green", "orange", "aqua", "red", "gray" };
+
+ public UsersByStatusWidget(final String id, final Map<String, Integer> usersByStatus) {
+ super(id);
+
+ Doughnut doughnut = new Doughnut();
+
+ int i = 0;
+ for (Map.Entry<String, Integer> entry : usersByStatus.entrySet()) {
+ doughnut.getData().add(new LabeledDoughnutChartData(entry.getValue(), COLORS[i % 5], entry.getKey()));
+ i++;
+ }
+
+ add(new DoughnutChartPanel("chart", Model.of(doughnut), MEDIUM_WIDTH, MEDIUM_HEIGHT));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
index 446a873..9a694cb 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard.html
@@ -32,6 +32,15 @@ under the License.
<span wicket:id="totalAny1OrRoles"/>
<span wicket:id="totalAny1OrResources"/>
</div>
+
+ <div class="row">
+ <span wicket:id="usersByStatus"/>
+ <span wicket:id="anyByRealm"/>
+ </div>
+
+ <div class="row">
+ <span wicket:id="load"/>
+ </div>
</section>
</wicket:extend>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.html
new file mode 100644
index 0000000..a3631df
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.html
@@ -0,0 +1,33 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <div class="col-md-6">
+ <div class="box">
+ <div class="box-header with-border">
+ <h3 class="box-title"><wicket:message key="usersGroupsAndAnyObjectsDistribution"/></h3>
+ <div class="box-tools pull-right">
+ <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+ </div>
+ </div>
+ <div class="box-body" wicket:id="chart"/>
+ </div>
+ </div>
+ </wicket:panel>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.properties
new file mode 100644
index 0000000..dbeec7e
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+usersGroupsAndAnyObjectsDistribution=Users, Groups and Any Objects Distribution
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_it.properties
new file mode 100644
index 0000000..5918d52
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_it.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+usersGroupsAndAnyObjectsDistribution=Distribuzione di Utenti, Gruppi ed Any Object
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_pt_BR.properties
new file mode 100644
index 0000000..38489be
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/AnyByRealmWidget_pt_BR.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+usersGroupsAndAnyObjectsDistribution=Usu\u00e1rios, grupos e Any Objects Distribui\u00e7\u00e3o
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.html
new file mode 100644
index 0000000..6f89e7a
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.html
@@ -0,0 +1,33 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <div class="col-md-6">
+ <div class="box">
+ <div class="box-header with-border">
+ <h3 class="box-title"><wicket:message key="systemLoad"/></h3>
+ <div class="box-tools pull-right">
+ <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+ </div>
+ </div>
+ <div class="box-body" wicket:id="chart"/>
+ </div>
+ </div>
+ </wicket:panel>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.properties
new file mode 100644
index 0000000..d4f2143
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+systemLoad=System Load
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_it.properties
new file mode 100644
index 0000000..cb213b7
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_it.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+systemLoad=Carico di Sistema
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_pt_BR.properties
new file mode 100644
index 0000000..394a3c1
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/LoadWidget_pt_BR.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+systemLoad=Carga do Sistema
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
index 8a752b6..12fcb11 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/NumberWidget.html
@@ -27,7 +27,6 @@ under the License.
<div class="icon">
<i wicket:id="icon"></i>
</div>
- <a class="small-box-footer" href="#"> </a>
</div>
</div>
</wicket:panel>
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.html b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.html
new file mode 100644
index 0000000..db93105
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.html
@@ -0,0 +1,33 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <div class="col-md-6">
+ <div class="box">
+ <div class="box-header with-border">
+ <h3 class="box-title"><wicket:message key="userStatus"/></h3>
+ <div class="box-tools pull-right">
+ <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+ </div>
+ </div>
+ <div class="box-body" wicket:id="chart"/>
+ </div>
+ </div>
+ </wicket:panel>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.properties
new file mode 100644
index 0000000..0187351
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+userStatus=Users Status
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_it.properties
new file mode 100644
index 0000000..af367d8
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_it.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+userStatus=Stato Utenti
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_pt_BR.properties
new file mode 100644
index 0000000..2b1ee3f
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/widgets/UsersByStatusWidget_pt_BR.properties
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+userStatus=Status de usu\u00e1rios
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
index eb806ed..2f25320 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/SystemInfo.java
@@ -38,6 +38,8 @@ public class SystemInfo extends AbstractBaseBean {
private int availableProcessors;
+ private long startTime;
+
private final CircularFifoQueue<PlatformLoad> load = new CircularFifoQueue<>(10);
public String getOs() {
@@ -64,6 +66,14 @@ public class SystemInfo extends AbstractBaseBean {
this.availableProcessors = availableProcessors;
}
+ public long getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(final long startTime) {
+ this.startTime = startTime;
+ }
+
@XmlElementWrapper(name = "load")
@XmlElement(name = "instant")
@JsonProperty("load")
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java
index 9d55e62..ad2f3b5 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java
@@ -196,6 +196,7 @@ public class SyncopeLogic extends AbstractLogic<AbstractBaseBean> {
runtimeMXBean.getVmName()
+ " " + System.getProperty("java.version")
+ " " + runtimeMXBean.getVmVendor());
+ SYSTEM_INFO.setStartTime(runtimeMXBean.getStartTime());
}
SystemInfo.PlatformLoad instant = new SystemInfo.PlatformLoad();
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e6e8717/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d7b12c2..462467f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,16 +372,15 @@ under the License.
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
<swagger-core.version>1.5.7</swagger-core.version>
- <swagger-ui.version>2.1.4</swagger-ui.version>
+ <swagger-ui.version>2.1.4</swagger-ui.version>
+
<jquery.version>2.2.0</jquery.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
+
<bootstrap.version>3.3.6</bootstrap.version>
<bootstrap-select.version>1.7.3</bootstrap-select.version>
-
- <wicket-bootstrap.version>0.10.6</wicket-bootstrap.version>
<bootbox.version>4.4.0</bootbox.version>
-
<font-awesome.version>4.5.0</font-awesome.version>
<ionicons.version>2.0.1</ionicons.version>
<highlightjs.version>8.7</highlightjs.version>
@@ -390,7 +389,9 @@ under the License.
<wicket.version>7.2.0</wicket.version>
<wicket-jqueryui.version>7.2.0</wicket-jqueryui.version>
-
+ <wicket-bootstrap.version>0.10.6</wicket-bootstrap.version>
+ <wicket-chartjs.version>7.0.1</wicket-chartjs.version>
+
<angular.version>1.5.0</angular.version>
<angular-ui-router.version>0.2.17</angular-ui-router.version>
<angular-ui-bootstrap.version>1.1.1-1</angular-ui-bootstrap.version>
@@ -921,6 +922,21 @@ under the License.
<artifactId>wicket-bootstrap-extensions</artifactId>
<version>${wicket-bootstrap.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.pingunaut</groupId>
+ <artifactId>wicket-chartjs</artifactId>
+ <version>${wicket-chartjs.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- /Wicket -->
<dependency>
[4/5] syncope git commit: Fixing ASF license headers
Posted by il...@apache.org.
Fixing ASF license headers
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/188f5d31
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/188f5d31
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/188f5d31
Branch: refs/heads/master
Commit: 188f5d3160f41094d5830ccd697e1c9a8cea0924
Parents: 0e6e871
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 16 16:58:51 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 16 16:58:51 2016 +0100
----------------------------------------------------------------------
.../console/tasks/SchedTaskWizardBuilder.java | 25 +++++++++++---------
.../wizards/AbstractModalPanelBuilder.java | 25 +++++++++++---------
.../console/wizards/AjaxWizardBuilder.java | 25 +++++++++++---------
.../console/wizards/AjaxWizardButton.java | 25 +++++++++++---------
.../wizards/any/AnyObjectWizardBuilder.java | 25 +++++++++++---------
.../console/wizards/any/AnyWizardBuilder.java | 25 +++++++++++---------
.../console/wizards/any/GroupWizardBuilder.java | 25 +++++++++++---------
.../console/wizards/any/UserWizardBuilder.java | 25 +++++++++++---------
.../provision/ProvisionWizardBuilder.java | 25 +++++++++++---------
.../console/wizards/role/RoleWizardBuilder.java | 25 +++++++++++---------
10 files changed, 140 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java
index 809d403..07e98b7 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.tasks;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java
index a9926cc..8acea1d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractModalPanelBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
index d1dc756..c183910 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardButton.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardButton.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardButton.java
index b9f1325..886115e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardButton.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardButton.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
index 7ba0deb..ebe2d14 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyObjectWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards.any;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
index c502670..47f255d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards.any;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
index 4503df5..7314fa2 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/GroupWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards.any;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
index 21e430a..6c9b1a3 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards.any;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
index 0df8a7c..7c763fb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards.provision;
http://git-wip-us.apache.org/repos/asf/syncope/blob/188f5d31/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
index 0dc3cde..4d55084 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/role/RoleWizardBuilder.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.client.console.wizards.role;
[5/5] syncope git commit: It's 2016
Posted by il...@apache.org.
It's 2016
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/411b7cf2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/411b7cf2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/411b7cf2
Branch: refs/heads/master
Commit: 411b7cf2eeb16deb2015b32ecdb7fe1a2f23363c
Parents: 188f5d3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 16 17:00:19 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 16 17:00:19 2016 +0100
----------------------------------------------------------------------
NOTICE | 2 +-
client/cli/NOTICE | 2 +-
deb/console/NOTICE | 2 +-
deb/core/NOTICE | 2 +-
deb/enduser/NOTICE | 2 +-
installer/NOTICE | 2 +-
standalone/NOTICE | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/411b7cf2/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 6bb20e8..4394b91 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/syncope/blob/411b7cf2/client/cli/NOTICE
----------------------------------------------------------------------
diff --git a/client/cli/NOTICE b/client/cli/NOTICE
index b31c6d8..c190492 100644
--- a/client/cli/NOTICE
+++ b/client/cli/NOTICE
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/syncope/blob/411b7cf2/deb/console/NOTICE
----------------------------------------------------------------------
diff --git a/deb/console/NOTICE b/deb/console/NOTICE
index 7b559f7..e422d63 100644
--- a/deb/console/NOTICE
+++ b/deb/console/NOTICE
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/syncope/blob/411b7cf2/deb/core/NOTICE
----------------------------------------------------------------------
diff --git a/deb/core/NOTICE b/deb/core/NOTICE
index 6147e9a..98f8128 100644
--- a/deb/core/NOTICE
+++ b/deb/core/NOTICE
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/syncope/blob/411b7cf2/deb/enduser/NOTICE
----------------------------------------------------------------------
diff --git a/deb/enduser/NOTICE b/deb/enduser/NOTICE
index a8ca9cc..ae2c876 100644
--- a/deb/enduser/NOTICE
+++ b/deb/enduser/NOTICE
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/syncope/blob/411b7cf2/installer/NOTICE
----------------------------------------------------------------------
diff --git a/installer/NOTICE b/installer/NOTICE
index 77405cc..f636012 100644
--- a/installer/NOTICE
+++ b/installer/NOTICE
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/syncope/blob/411b7cf2/standalone/NOTICE
----------------------------------------------------------------------
diff --git a/standalone/NOTICE b/standalone/NOTICE
index f2f661d..01a931b 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).