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 2015/01/05 14:34:15 UTC

[10/53] [abbrv] syncope git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: de130b7fcbcb763d5578dbc4ae2aa9788aa53b1f
Parents: 43c9462 4de7c70
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Dec 18 11:17:39 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Dec 18 11:17:39 2014 +0100

----------------------------------------------------------------------
 .../syncope/console/pages/ConfModalPage.java    |   1 +
 .../wicket/markup/html/form/DateFieldPanel.java |   6 +-
 .../wicket/markup/html/form/FieldPanel.java     |   4 +-
 .../syncope/console/ConnInstanceTestITCase.java |  58 ++---
 .../files/JBossDeploymentStructureXml.java      |   9 +-
 .../apache/syncope/installer/files/OrmXml.java  |  98 ++++++---
 .../syncope/installer/files/ParentPom.java      | 212 ++++++++++++++-----
 .../files/PersistenceContextEMFactoryXml.java   |  14 +-
 pom.xml                                         |   6 +-
 9 files changed, 280 insertions(+), 128 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/de130b7f/pom.xml
----------------------------------------------------------------------