Merge from 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/69754419 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69754419 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69754419 Branch: refs/heads/master Commit: 69754419891a5f36619c9a02bc0133286cab897e Parents: 3f4c758 424148a Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon Feb 2 14:54:29 2015 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon Feb 2 14:54:29 2015 +0100 ---------------------------------------------------------------------- CHANGES | 23 +++ NOTICE | 2 +- build-tools/NOTICE | 8 +- console/NOTICE | 12 +- core/NOTICE | 12 +- core/pom.xml | 38 ++++ .../rest/utils/QueryResourceInfoComparator.java | 114 ++++++++++ .../main/resources/quartz/tables_mariadb.sql | 206 +++++++++++++++++++ core/src/main/resources/restContext.xml | 3 + .../core/rest/ConfigurationTestITCase.java | 8 +- .../resources/mariadb/persistence.properties | 28 +++ pom.xml | 5 +- src/site/xdoc/building.xml | 5 + src/site/xdoc/downloads.xml | 88 ++++---- standalone/NOTICE | 14 +- 15 files changed, 492 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/69754419/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/69754419/pom.xml ----------------------------------------------------------------------
