You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2014/11/21 09:27:40 UTC
[1/3] syncope git commit: [SYNCOPE-607] Fix SpinnerFieldPanel for
long type
Repository: syncope
Updated Branches:
refs/heads/1_2_X 9a86fe0d6 -> a0db589e9
[SYNCOPE-607] Fix SpinnerFieldPanel for long type
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cd2d6398
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cd2d6398
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cd2d6398
Branch: refs/heads/1_2_X
Commit: cd2d63984e6825427730babbee1e6d6b65a3835a
Parents: 633c3d9
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Wed Nov 19 10:12:11 2014 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Wed Nov 19 10:12:11 2014 +0100
----------------------------------------------------------------------
.../console/wicket/markup/html/form/SpinnerFieldPanel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/cd2d6398/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SpinnerFieldPanel.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SpinnerFieldPanel.java b/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SpinnerFieldPanel.java
index c738c45..789e517 100644
--- a/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SpinnerFieldPanel.java
+++ b/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SpinnerFieldPanel.java
@@ -152,9 +152,9 @@ public class SpinnerFieldPanel<T extends Number> extends FieldPanel<T> {
number = reference.equals(Integer.class)
? reference.cast(Integer.valueOf((String) obj))
: reference.equals(Long.class)
- ? reference.cast(Short.valueOf((String) obj))
- : reference.equals(Short.class)
? reference.cast(Long.valueOf((String) obj))
+ : reference.equals(Short.class)
+ ? reference.cast(Short.valueOf((String) obj))
: reference.equals(Float.class)
? reference.cast(Float.valueOf((String) obj))
: reference.equals(byte.class)
[2/3] syncope git commit: [SYNCOPE-608] Add authentication event to
LoggerController
Posted by md...@apache.org.
[SYNCOPE-608] Add authentication event to LoggerController
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/577f98e4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/577f98e4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/577f98e4
Branch: refs/heads/1_2_X
Commit: 577f98e498a21fcaa355b65754ce5428d5e3db21
Parents: cd2d639
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Wed Nov 19 12:04:02 2014 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Wed Nov 19 12:04:02 2014 +0100
----------------------------------------------------------------------
.../apache/syncope/core/rest/controller/LoggerController.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/577f98e4/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
index 10447c8..a4e53b8 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/LoggerController.java
@@ -239,6 +239,12 @@ public class LoggerController extends AbstractTransactionalController<LoggerTO>
}
}
}
+
+ //SYNCOPE-608
+ final EventCategoryTO authenticationControllerEvents = new EventCategoryTO();
+ authenticationControllerEvents.setCategory("AuthenticationController");
+ authenticationControllerEvents.getEvents().add("login");
+ events.add(authenticationControllerEvents);
events.add(new EventCategoryTO(EventCategoryType.PROPAGATION));
events.add(new EventCategoryTO(EventCategoryType.SYNCHRONIZATION));
[3/3] syncope git commit: Merge branch '1_2_X' of
https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Posted by md...@apache.org.
Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a0db589e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a0db589e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a0db589e
Branch: refs/heads/1_2_X
Commit: a0db589e922124c6a5e2916c4e02649a2943eaad
Parents: 577f98e 9a86fe0
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Fri Nov 21 09:26:46 2014 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Fri Nov 21 09:26:46 2014 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
src/site/xdoc/release-process.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------