[midPoint-git] midPoint branch master updated. v2.3devel-246-gf7be75b

[Gabriela Polcova]

Project "midPoint" branch master has been updated
       via  f7be75b108c1a91105c5331e81956b5fb231ebbe (commit) v2.3devel-246-gf7be75b
       via  63250ce90c8fc886fa8932f6b31ff73d1f99c443 (commit) v2.3devel-241-g63250ce
      from  57da8cc92f37553fc48951ef6758e3f7d00ab2db (commit) v2.3devel-244-g57da8cc

- Log -----------------------------------------------------------------
commit f7be75b108c1a91105c5331e81956b5fb231ebbe
Merge: 63250ce 57da8cc
Author: Gabriela Polcova <gabriela.polcova at evolveum.com>
Date:   Wed Nov 27 14:22:50 2013 +0100

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

commit 63250ce90c8fc886fa8932f6b31ff73d1f99c443
Author: Gabriela Polcova <gabriela.polcova at evolveum.com>
Date:   Wed Nov 27 14:21:57 2013 +0100

    report model

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

(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     |    5 +-
 .../midpoint/schema/constants/SchemaConstants.java |    3 +
 .../resources/xml/ns/public/common/common-2a.xsd   |  256 +++++-
 model/report-impl/pom.xml                          |   12 +
 .../evolveum/midpoint/report/DataSourceReport.java |  129 +++
 .../evolveum/midpoint/report/BasicReportTest.java  |  943 +++++++++++++++++++-
 .../src/test/resources}/reports/logo.jpg           |  Bin 22159 -> 22159 bytes
 .../resources/reports/reportDataSourceTest.jrxml   |  152 ++++
 .../resources/styles/midpoint_base_styles.jrtx     |   28 +
 .../src/test/resources/basic/objects.xml           |   35 +
 .../midpoint/repo/sql/data/common/RReport.java     |  272 ++++++
 .../repo/sql/data/common/enums/RExportType.java    |   53 ++
 .../sql/data/common/enums/ROrientationType.java    |   24 +
 .../repo/sql/data/common/other/RContainerType.java |    1 +
 .../midpoint/repo/sql/util/ClassMapper.java        |    1 +
 15 files changed, 1905 insertions(+), 9 deletions(-)
 create mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
 copy {gui/admin-gui/src/main/webapp => model/report-impl/src/test/resources}/reports/logo.jpg (100%)
 create mode 100644 model/report-impl/src/test/resources/reports/reportDataSourceTest.jrxml
 create mode 100644 model/report-impl/src/test/resources/styles/midpoint_base_styles.jrtx
 create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
 create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExportType.java
 create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/ROrientationType.java


hooks/post-receive
-- 
midPoint