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/03/17 15:19:41 UTC
[1/2] syncope git commit: Upgrading Jackson
Repository: syncope
Updated Branches:
refs/heads/master d72befc59 -> 96fd9f55c
Upgrading Jackson
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2191f29b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2191f29b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2191f29b
Branch: refs/heads/master
Commit: 2191f29b4131da096bdc2ee714940c8f61732792
Parents: d72befc
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 17 15:19:20 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 17 15:19:20 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/2191f29b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8fb974b..728eaf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,7 +331,7 @@ under the License.
<camel.version>2.16.2</camel.version>
- <jackson.version>2.7.2</jackson.version>
+ <jackson.version>2.7.3</jackson.version>
<spring.version>4.2.5.RELEASE</spring.version>
<spring-security.version>4.0.4.RELEASE</spring-security.version>
[2/2] syncope git commit: Various small fixes and improvements
Posted by il...@apache.org.
Various small fixes and improvements
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/96fd9f55
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/96fd9f55
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/96fd9f55
Branch: refs/heads/master
Commit: 96fd9f55c3ecb04d6727bae018b821f08bc2459d
Parents: 2191f29
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 17 15:19:30 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 17 15:19:30 2016 +0100
----------------------------------------------------------------------
.../syncope/client/console/pages/MustChangePassword.java | 9 +++++++--
.../client/console/widgets/ReconciliationWidget.java | 3 ++-
.../org/apache/syncope/client/console/pages/Login.html | 1 -
.../syncope/client/console/pages/MustChangePassword.html | 2 +-
.../src/main/resources/META-INF/resources/app/index.html | 5 ++---
.../syncope/common/lib/report/AbstractReportletConf.java | 4 +++-
.../org/apache/syncope/common/lib/to/MappingItemTO.java | 6 ++++++
fit/core-reference/src/main/resources/log4j2.xml | 3 +++
installer/src/main/resources/izpack/html/prerequisites.html | 2 +-
installer/src/main/resources/izpack/userInputLang.xml_eng | 4 ++--
installer/src/main/resources/izpack/userInputLang.xml_ita | 4 ++--
11 files changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
index a25636b..455326a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
@@ -20,6 +20,8 @@ package org.apache.syncope.client.console.pages;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.panels.NotificationPanel;
import org.apache.syncope.client.console.rest.UserSelfRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -54,6 +56,9 @@ public class MustChangePassword extends WebPage {
public MustChangePassword(final PageParameters parameters) {
super(parameters);
+ final NotificationPanel notificationPanel = new NotificationPanel(Constants.FEEDBACK);
+ add(notificationPanel);
+
form = new StatelessForm<>("changePassword");
form.setOutputMarkupId(true);
@@ -94,13 +99,13 @@ public class MustChangePassword extends WebPage {
LOG.error("While changing password for {}",
SyncopeConsoleSession.get().getSelfTO().getUsername(), e);
error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.getMessage());
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ notificationPanel.refresh(target);
}
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ notificationPanel.refresh(target);
}
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
index 8693f39..1e7a4bd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
@@ -25,6 +25,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -189,7 +190,7 @@ public class ReconciliationWidget extends BaseWidget {
execResult = parseReconciliationReportExec();
} catch (Exception e) {
LOG.error("Could not parse the reconciliation report result", e);
- execResult = Pair.of(Collections.<ProgressBean>emptyList(), null);
+ execResult = Pair.of(Collections.<ProgressBean>emptyList(), new ReconciliationReport(new Date()));
}
final List<ProgressBean> progressBeans = execResult.getLeft();
final ReconciliationReport report = execResult.getRight();
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
index 0f53a8a..df0c685 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html
@@ -38,7 +38,6 @@ under the License.
<img class="login-logo" src="img/logo-green.png" />
<span wicket:id="feedback" role="alert"/>
-
<form class="form-signin" wicket:id="login">
<fieldset class="form-group input-group">
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
index 13dd34f..e7122f6 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html
@@ -41,7 +41,7 @@ under the License.
<div class="card card-container">
<img class="login-logo" src="img/logo-green.png" />
- <div wicket:id="feedback" role="alert"/>
+ <span wicket:id="feedback"></span>
<div class="alert alert-success"><wicket:message key="passwordNeedsToBeUpdated"/></div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/client/enduser/src/main/resources/META-INF/resources/app/index.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/index.html b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 225d1c6..326482c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<!DOCTYPE html>
<!--[if lt IE 7]> <html lang="en" ng-app="myApp" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html lang="en" ng-app="myApp" class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html lang="en" ng-app="myApp" class="no-js lt-ie9"> <![endif]-->
@@ -25,7 +24,7 @@ under the License.
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>SyncopeEnduserApp</title>
+ <title>Apache Syncope - EndUser</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/app.css">
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
index 8fe5e24..f590067 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/AbstractReportletConf.java
@@ -24,7 +24,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.AbstractBaseBean;
@XmlType
-@XmlSeeAlso({ StaticReportletConf.class, UserReportletConf.class, GroupReportletConf.class })
+@XmlSeeAlso({
+ StaticReportletConf.class, UserReportletConf.class, GroupReportletConf.class,
+ AuditReportletConf.class, ReconciliationReportletConf.class })
public abstract class AbstractReportletConf extends AbstractBaseBean implements ReportletConf {
private static final long serialVersionUID = -6130008602014516608L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
index a3409ca..62e38ed 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/MappingItemTO.java
@@ -18,8 +18,11 @@
*/
package org.apache.syncope.common.lib.to;
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.AbstractBaseBean;
@@ -138,6 +141,9 @@ public class MappingItemTO extends AbstractBaseBean implements EntityTO<Long> {
this.purpose = purpose;
}
+ @XmlElementWrapper(name = "mappingItemTransformerClassNames")
+ @XmlElement(name = "className")
+ @JsonProperty("mappingItemTransformerClassNames")
public List<String> getMappingItemTransformerClassNames() {
return mappingItemTransformerClassNames;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/fit/core-reference/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/log4j2.xml b/fit/core-reference/src/main/resources/log4j2.xml
index 7ef0997..02bb591 100644
--- a/fit/core-reference/src/main/resources/log4j2.xml
+++ b/fit/core-reference/src/main/resources/log4j2.xml
@@ -124,6 +124,9 @@ under the License.
<asyncLogger name="org.apache.camel" additivity="false" level="ERROR">
<appender-ref ref="main"/>
</asyncLogger>
+ <asyncLogger name="io.swagger" additivity="false" level="ERROR">
+ <appender-ref ref="main"/>
+ </asyncLogger>
<root level="INFO">
<appender-ref ref="main"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/installer/src/main/resources/izpack/html/prerequisites.html
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/html/prerequisites.html b/installer/src/main/resources/izpack/html/prerequisites.html
index 6b3e42c..2ff8e1a 100644
--- a/installer/src/main/resources/izpack/html/prerequisites.html
+++ b/installer/src/main/resources/izpack/html/prerequisites.html
@@ -36,7 +36,7 @@ under the License.
<div>
Hence you need:
<ol>
- <li class="prerequisite">Java SE Development Kit 6 (version 1.6.0-23 or higher) installed;</li>
+ <li class="prerequisite">Java SE Development Kit 7 or higher installed;</li>
<li class="prerequisite"><a href="http://maven.apache.org/">Apache Maven (version 3.0.3 or higher) installed;</a></li>
<li class="prerequisite">Some basic knowledge about Maven;</li>
<li class="prerequisite">Some basic knowledge about <a href="http://maven.apache.org/plugins/maven-war-plugin/overlays.html">Maven WAR overlays;</a></li>
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/installer/src/main/resources/izpack/userInputLang.xml_eng
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/userInputLang.xml_eng b/installer/src/main/resources/izpack/userInputLang.xml_eng
index 3e9ee88..a655c15 100644
--- a/installer/src/main/resources/izpack/userInputLang.xml_eng
+++ b/installer/src/main/resources/izpack/userInputLang.xml_eng
@@ -39,7 +39,7 @@ under the License.
<str id="options.swagger.id" txt="Swagger"/>
<str id="options.activiti.workflow.adapter.id" txt="Activiti workflow adapter"/>
- <str id="options.camel.id" txt="Camel"/>
+ <str id="options.camel.id" txt="Apache Camel provisioning manager"/>
<str id="persistence.jdbc.url" txt="Database JDBC url:"/>
<str id="persistence.db.user" txt="Username:"/>
@@ -67,4 +67,4 @@ under the License.
<str id="jboss.container.user.id" txt="Jboss admin username:"/>
<str id="jboss.container.pwd.id" txt="Jboss admin password:"/>
<str id='jboss.container.management.port.id' txt="Jboss management port"/>
-</langpack>
\ No newline at end of file
+</langpack>
http://git-wip-us.apache.org/repos/asf/syncope/blob/96fd9f55/installer/src/main/resources/izpack/userInputLang.xml_ita
----------------------------------------------------------------------
diff --git a/installer/src/main/resources/izpack/userInputLang.xml_ita b/installer/src/main/resources/izpack/userInputLang.xml_ita
index 580a17d..5020feb 100644
--- a/installer/src/main/resources/izpack/userInputLang.xml_ita
+++ b/installer/src/main/resources/izpack/userInputLang.xml_ita
@@ -39,7 +39,7 @@ under the License.
<str id="options.swagger.id" txt="Swagger"/>
<str id="options.activiti.workflow.adapter.id" txt="Activiti workflow adapter"/>
- <str id="options.camel.id" txt="Camel"/>
+ <str id="options.camel.id" txt="Apache Camel provisioning manager"/>
<str id="persistence.jdbc.url" txt="Database JDBC url:"/>
<str id="persistence.db.user" txt="Username:"/>
@@ -67,4 +67,4 @@ under the License.
<str id="jboss.container.user.id" txt="Jboss admin username:"/>
<str id="jboss.container.pwd.id" txt="Jboss admin password:"/>
<str id='jboss.container.management.port.id' txt="Jbos management port"/>
-</langpack>
\ No newline at end of file
+</langpack>