[midPoint-git] midPoint branch gensync updated. v2.3devel-415-g7b97711

Radovan Semancik git at evolveum.com
Wed Dec 18 11:14:58 CET 2013


Project "midPoint" branch gensync has been updated
       via  7b97711cc369429538301d56fe7f8717e19c5db4 (commit) v2.3devel-415-g7b97711
       via  6dd29126b1c75a285e759baff979676c4ce88c15 (commit) v2.3devel-391-g6dd2912
       via  8e6e36cc7b7b3d9da575c5b2264fda227bb4fd43 (commit) v2.3devel-390-g8e6e36c
       via  4ea424cbcff8039bb13a5d904298b0e8e6f6670b (commit) v2.3devel-389-g4ea424c
       via  57b961c9066c6ee5926fdb078d2d0881b13e5c60 (commit) v2.3devel-384-g57b961c
       via  a9b356934b3d5aab4a2ba30cc0a7957d3cd4f3a1 (commit) v2.3devel-406-ga9b3569
       via  45bcf5daef1b1adf8c57fe4b93e5e8a5ea02a10a (commit) v2.3devel-387-g45bcf5d
       via  bbd013c427657fb8fa4e89c8bc2c426b6b630a1d (commit) v2.3devel-386-gbbd013c
       via  c699bf9809ad9d2dd4f2b6a674bbaeffc814f061 (commit) v2.3devel-385-gc699bf9
       via  31e530f932774538644b70e65a89e7691feafa6f (commit) v2.3devel-380-g31e530f
      from  90180dddd7e0954888f1a6fe8e1ddb14c4390dd4 (commit) v2.3devel-405-g90180dd

- Log -----------------------------------------------------------------
commit 7b97711cc369429538301d56fe7f8717e19c5db4
Merge: a9b3569 6dd2912
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Dec 18 11:02:13 2013 +0100

    Merge branch 'master' into gensync

commit a9b356934b3d5aab4a2ba30cc0a7957d3cd4f3a1
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Dec 17 16:53:51 2013 +0100

    Reconciliation and test fixes.

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

(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:
 config/eclipse/codetemplates.xml                   |   45 +
 config/eclipse/formatter-profile-midpoint.xml      |  291 +++
 .../sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql  |   24 +-
 .../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql         |   25 +
 .../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql       |   23 +
 .../postgresql/postgresql-upgrade-2.2-to-2.3.sql   |   24 +
 .../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql |   23 +
 config/sql/midpoint/2.3/h2/h2-2.3.sql              | 1858 ++++++++---------
 config/sql/midpoint/2.3/mysql/mysql-2.3.sql        | 2134 ++++++++++----------
 config/sql/midpoint/2.3/oracle/oracle-2.3.sql      | 1857 ++++++++---------
 .../sql/midpoint/2.3/postgresql/postgresql-2.3.sql | 1858 ++++++++---------
 .../sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql   | 1864 ++++++++---------
 .../resources/xml/ns/public/common/common-2a.xsd   |   81 +-
 .../src/main/schemadoc/resources/gif/titlebar.gif  |  Bin 0 -> 5713 bytes
 .../main/schemadoc/resources/gif/titlebar_end.gif  |  Bin 0 -> 1312 bytes
 .../schema/src/main/schemadoc/resources/style.css  |  325 ++-
 .../schemadoc/templates/complex-type-definition.vm |   42 +-
 .../src/main/schemadoc/templates/items-inc.vm      |  120 +-
 .../main/schemadoc/templates/object-definition.vm  |   29 +-
 .../src/main/schemadoc/templates/schema-index.vm   |   53 +-
 .../schema/src/main/schemadoc/templates/schema.vm  |  100 +-
 .../midpoint/model/api/ModelDiagnosticService.java |    9 +-
 .../model/controller/ModelDiagController.java      |   14 +
 .../lens/projector/ReconciliationProcessor.java    |    2 +-
 .../midpoint/model/lens/TestProjector.java         |    1 +
 .../model/intest/TestModelServiceContract.java     |    4 +-
 .../midpoint/report/ReportCreateTaskHandler.java   |   36 +-
 .../midpoint/report/ReportManagerImpl.java         |   58 +-
 .../evolveum/midpoint/report/BasicReportTest.java  |  351 +---
 .../provisioning/api/ProvisioningService.java      |    6 +
 .../provisioning/impl/ConnectorManager.java        |    5 +
 .../provisioning/impl/ProvisioningServiceImpl.java |   23 +-
 .../provisioning/ucf/api/ConnectorFactory.java     |    5 +
 .../ucf/impl/ConnectorFactoryIcfImpl.java          |   83 +
 .../provisioning/test/ucf/TestUcfDummy.java        |   18 +-
 repo/repo-sql-impl-test/sql-procedures/mysql.sql   |    1 +
 .../sql-procedures/postgresql.sql                  |    1 +
 .../sql-procedures/sqlserver.sql                   |    1 +
 .../src/test/resources/basic/objects.xml           |   10 +-
 .../midpoint/repo/sql/data/common/RReport.java     |   26 +-
 .../repo/sql/data/common/RReportOutput.java        |  133 ++
 41 files changed, 6323 insertions(+), 5240 deletions(-)
 create mode 100644 config/eclipse/codetemplates.xml
 create mode 100644 config/eclipse/formatter-profile-midpoint.xml
 create mode 100644 infra/schema/src/main/schemadoc/resources/gif/titlebar.gif
 create mode 100644 infra/schema/src/main/schemadoc/resources/gif/titlebar_end.gif
 create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java


hooks/post-receive
-- 
midPoint


More information about the midPoint-svn mailing list