[midPoint-git] midPoint branch gensync updated. v2.3devel-442-g28b0720

[Radovan Semancik]

Project "midPoint" branch gensync has been updated
       via  28b072027f92dd6c371be7203a31fad4501da841 (commit) v2.3devel-442-g28b0720
       via  fb9271fae7f1c2e135dfd880b1def4d3df68e4e6 (commit) v2.3devel-404-gfb9271f
       via  736efd67d2c1dec98fe62aaa809a42a28ed90eac (commit) v2.3devel-403-g736efd6
       via  070aa7bf4d40dede046f7cbd628a8a579e55a30d (commit) v2.3devel-402-g070aa7b
       via  a95e01deffd5d60d6f55ae3b060810d0a38959e0 (commit) v2.3devel-401-ga95e01d
       via  c247672f9f550817598e31f0a608ab21dc7302d4 (commit) v2.3devel-400-gc247672
       via  845a96d9eec8676ed2c3f322201683448c6492af (commit) v2.3devel-399-g845a96d
       via  3fb828d805f7edf4362f050109b8008ce6701aa0 (commit) v2.3devel-398-g3fb828d
       via  c7621ea0d16efba6db913d910ff94e3eab8123ea (commit) v2.3devel-397-gc7621ea
       via  14d91a726c740045d67a98e75395ff10df6d93b8 (commit) v2.3devel-396-g14d91a7
       via  4325fc331a9d3097ac0055b7d4ea61b3fcfa82eb (commit) v2.3devel-395-g4325fc3
       via  d31277ad03b1926dee5035b7c058770522be6243 (commit) v2.3devel-394-gd31277a
       via  b07959a1081836a56dba7ed1be424c19b3231f5c (commit) v2.3devel-393-gb07959a
       via  3b988b2cba259efa5532be7f1235c53967473758 (commit) v2.3devel-392-g3b988b2
      from  42c792fd14707375c187a7b331ff1cd832927c4a (commit) v2.3devel-428-g42c792f

- Log -----------------------------------------------------------------
commit 28b072027f92dd6c371be7203a31fad4501da841
Merge: 42c792f fb9271f
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Mon Dec 30 09:49:02 2013 +0100

    Merge branch 'master' into gensync
    
    Conflicts:
    	config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    	config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    	config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    	config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    	config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql

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

(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:
 .../sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql  |   80 +-
 .../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql         |   91 +-
 .../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql       |   74 +-
 .../postgresql/postgresql-upgrade-2.2-to-2.3.sql   |   75 +-
 .../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql |   77 +-
 config/sql/midpoint/2.3/h2/h2-2.3.sql              |    4 +-
 config/sql/midpoint/2.3/mysql/mysql-2.3.sql        |    4 +-
 config/sql/midpoint/2.3/oracle/oracle-2.3.sql      |    4 +-
 .../sql/midpoint/2.3/postgresql/postgresql-2.3.sql |    4 +-
 .../sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql   |    4 +-
 .../midpoint/schema/constants/ObjectTypes.java     |    3 +
 .../midpoint/schema/constants/SchemaConstants.java |    2 +
 .../midpoint/schema/result/OperationConstants.java |    2 +
 .../resources/xml/ns/public/common/common-2a.xsd   |    4 +-
 .../src/main/schemadoc/resources/gif/titlebar.gif  |  Bin 5713 -> 6071 bytes
 .../main/schemadoc/resources/gif/titlebar_end.gif  |  Bin 1312 -> 1250 bytes
 .../AbstractConfiguredModelIntegrationTest.java    |   44 +
 .../model/intest/importer/BadImportTest.java       |   19 +-
 .../model/intest/importer/ImportRefTest.java       |   19 +-
 .../evolveum/midpoint/report/DataSourceReport.java |    9 +-
 .../midpoint/report/ReportCreateTaskHandler.java   |  419 ++++--
 .../evolveum/midpoint/report/ReportManager.java    |    7 +
 .../midpoint/report/ReportManagerImpl.java         |   83 +-
 .../evolveum/midpoint/report/BasicReportTest.java  | 1487 ++++++++------------
 .../test/resources/common/system-configuration.xml |    0
 .../test/resources/common/user-administrator.xml   |    0
 .../src/test/resources/reports/report-test.xml     |  434 +++---
 model/report-impl/testng.xml                       |    2 +-
 .../src/test/resources/basic/objects.xml           |   21 +-
 .../midpoint/repo/sql/SqlAuditServiceImpl.java     |   10 -
 .../midpoint/repo/sql/data/common/RReport.java     |   44 +-
 .../repo/sql/data/common/other/RContainerType.java |    1 +
 .../midpoint/repo/sql/util/ClassMapper.java        |    1 +
 .../evolveum/midpoint/task/api/TaskCategory.java   |    1 +
 34 files changed, 1444 insertions(+), 1585 deletions(-)
 copy model/{model-intest => report-impl}/src/test/resources/common/system-configuration.xml (100%)
 copy model/{model-intest => report-impl}/src/test/resources/common/user-administrator.xml (100%)


hooks/post-receive
-- 
midPoint