[midPoint-git] midPoint branch bootstrap updated. v2.3devel-677-g5711176

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  5711176213e3a41d8d243448e521e503b0c29724 (commit) v2.3devel-677-g5711176
       via  d31277ad03b1926dee5035b7c058770522be6243 (commit) v2.3devel-394-gd31277a
       via  b07959a1081836a56dba7ed1be424c19b3231f5c (commit) v2.3devel-393-gb07959a
       via  3b988b2cba259efa5532be7f1235c53967473758 (commit) v2.3devel-392-g3b988b2
       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
      from  261480e0b9720014ed29e96682bd7a14af818954 (commit) v2.3devel-669-g261480e

- Log -----------------------------------------------------------------
commit 5711176213e3a41d8d243448e521e503b0c29724
Merge: 261480e d31277a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 18 20:31:39 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
    
    Conflicts:
    	infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java

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

(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  |    4 +-
 .../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql         |    4 +-
 .../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql       |    4 +-
 .../postgresql/postgresql-upgrade-2.2-to-2.3.sql   |    4 +-
 .../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql |    4 +-
 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     |    5 +-
 .../midpoint/schema/constants/SchemaConstants.java |    2 +
 .../resources/xml/ns/public/common/common-2a.xsd   |    4 +-
 .../src/main/schemadoc/resources/gif/titlebar.gif  |  Bin 0 -> 6071 bytes
 .../main/schemadoc/resources/gif/titlebar_end.gif  |  Bin 0 -> 1250 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 +
 .../midpoint/report/ReportManagerImpl.java         |    6 +-
 .../evolveum/midpoint/report/BasicReportTest.java  |    6 +-
 .../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 +-
 .../src/test/resources/basic/objects.xml           |   13 +-
 .../midpoint/repo/sql/data/common/RReport.java     |   44 +--
 .../repo/sql/data/common/other/RContainerType.java |    1 +
 .../midpoint/repo/sql/util/ClassMapper.java        |    1 +
 37 files changed, 1109 insertions(+), 181 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


hooks/post-receive
-- 
midPoint