[midPoint-git] midPoint branch master updated. v2.3devel-468-g46ab6a1

[Gabriela Polcova]

Project "midPoint" branch master has been updated
       via  46ab6a1a4682226e9c4a9f01cdd69b34148b0ded (commit) v2.3devel-468-g46ab6a1
       via  0da14f1c74d9983bfe6ce4dc9492d68dde70a3f9 (commit) v2.3devel-466-g0da14f1
       via  6666b32755201ffa71749457fb55ba069ea812bd (commit) v2.3devel-463-g6666b32
      from  43d32ec0451db2eb4574c7469a47db271ed02b1a (commit) v2.3devel-465-g43d32ec

- Log -----------------------------------------------------------------
commit 46ab6a1a4682226e9c4a9f01cdd69b34148b0ded
Merge: 0da14f1 43d32ec
Author: Gabriela Polcova <gabriela.polcova at evolveum.com>
Date:   Fri Jan 3 16:43:49 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

commit 0da14f1c74d9983bfe6ce4dc9492d68dde70a3f9
Merge: 6666b32 2fbcca0
Author: Gabriela Polcova <gabriela.polcova at evolveum.com>
Date:   Fri Jan 3 16:34:23 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

commit 6666b32755201ffa71749457fb55ba069ea812bd
Author: Gabriela Polcova <gabriela.polcova at evolveum.com>
Date:   Fri Jan 3 16:29:02 2014 +0100

    new class ReportUtils, clean project reports

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../midpoint/schema/constants/ObjectTypes.java     |    4 +-
 .../midpoint/schema/constants/SchemaConstants.java |    2 -
 .../resources/xml/ns/public/common/common-2a.xsd   |   13 +-
 .../evolveum/midpoint/report/DataSourceReport.java |    8 +-
 .../midpoint/report/ReportCreateTaskHandler.java   |    4 +-
 .../evolveum/midpoint/report/ReportManager.java    |    5 -
 .../midpoint/report/ReportManagerImpl.java         |  463 +-------------------
 .../{ReportManagerImpl.java => ReportUtils.java}   |  201 +--------
 .../evolveum/midpoint/report/BasicReportTest.java  |    4 +-
 9 files changed, 47 insertions(+), 657 deletions(-)
 copy model/report-impl/src/main/java/com/evolveum/midpoint/report/{ReportManagerImpl.java => ReportUtils.java} (68%)


hooks/post-receive
-- 
midPoint