[midPoint-git] midPoint branch parser updated. v2.3devel-1221-g5633bc0

[Radovan Semancik]

Project "midPoint" branch parser has been updated
       via  5633bc0734b495d44c09087e820e52c2dd824667 (commit) v2.3devel-1221-g5633bc0
       via  afdef665b2ffe16bbdcda77b1b1731f75375c009 (commit) v2.3devel-1125-gafdef66
       via  94141dba48c8575d5b2d5bf4dc9f6288b483b66a (commit) v2.3devel-1124-g94141db
       via  73af2748808cd6117d332a814d299a068954d1bc (commit) v2.3devel-1123-g73af274
      from  40cff81a5c055aab209b3917f0cef946f86db38b (commit) v2.3devel-1217-g40cff81

- Log -----------------------------------------------------------------
commit 5633bc0734b495d44c09087e820e52c2dd824667
Merge: 40cff81 afdef66
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Fri Feb 14 16:45:27 2014 +0100

    Merge branch 'master' into parser
    
    Conflicts:
    	infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd

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

(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  |   36 +-
 .../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql         |   36 +-
 .../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql       |   36 +-
 .../postgresql/postgresql-upgrade-2.2-to-2.3.sql   |   36 +-
 .../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql |   36 +-
 config/sql/midpoint/2.3/h2/h2-2.3.sql              |   14 +-
 config/sql/midpoint/2.3/mysql/mysql-2.3.sql        |   14 +-
 config/sql/midpoint/2.3/oracle/oracle-2.3.sql      |   12 +-
 .../sql/midpoint/2.3/postgresql/postgresql-2.3.sql |   14 +-
 .../sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql   |   12 +-
 .../component/wizard/resource/CapabilityStep.html  |  391 ++++++++++++--------
 .../users/PageFindUsers.html => PageTest.html}     |    2 +-
 .../home/PageAdminHome.java => PageTest.java}      |   11 +-
 .../midpoint/web/util/SearchFormEnterBehavior.java |   17 +-
 .../src/main/webapp/WEB-INF/descriptor.xml         |    1 +
 .../main/webapp/less/midpoint/capabilities.less    |    4 +
 .../webapp/less/midpoint/operation-result.less     |    2 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |   16 +-
 model/report-impl/pom.xml                          |    5 -
 .../evolveum/midpoint/report/DataSourceReport.java |    4 +-
 .../report/HibernateQueryDataSourceReport.java     |    4 +-
 .../midpoint/report/ReportCreateTaskHandler.java   |   69 +++-
 .../midpoint/report/ReportManagerImpl.java         |   27 +-
 .../com/evolveum/midpoint/report/ReportUtils.java  |   40 +-
 .../evolveum/midpoint/report/BasicReportTest.java  |   83 +++--
 .../src/test/resources/reports/reportAuditLogs.xml |  112 +++---
 .../resources/reports/reportReconciliation.xml     |   56 +--
 .../test/resources/reports/reportUserAccounts.xml  |  132 +++++++
 .../src/test/resources/reports/reportUserList.xml  |  381 +++++++++++++++++++
 .../src/test/resources/reports/reportUserOrgs.xml  |  128 +++++++
 .../src/test/resources/reports/reportUserRoles.xml |  127 +++++++
 .../evolveum/midpoint/repo/sql/OrgStructTest.java  |    8 +-
 .../src/test/resources/basic/objects.xml           |   25 +-
 .../midpoint/repo/sql/data/common/RReport.java     |  124 +++----
 34 files changed, 1470 insertions(+), 545 deletions(-)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/{admin/users/PageFindUsers.html => PageTest.html} (94%)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/{admin/home/PageAdminHome.java => PageTest.java} (69%)
 create mode 100644 model/report-impl/src/test/resources/reports/reportUserAccounts.xml
 create mode 100644 model/report-impl/src/test/resources/reports/reportUserList.xml
 create mode 100644 model/report-impl/src/test/resources/reports/reportUserOrgs.xml
 create mode 100644 model/report-impl/src/test/resources/reports/reportUserRoles.xml


hooks/post-receive
-- 
midPoint