[midPoint-git] midPoint branch bootstrap updated. v2.3devel-649-gb72b410

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  b72b4100835c8ff2cdd9e02bc9ab04ae87f9a4cf (commit) v2.3devel-649-gb72b410
       via  4cb67b8e8986be01391b2c4091aa049d4d953e6a (commit) v2.3devel-642-g4cb67b8
       via  004d395b6c114e656ff781b9329b1a111042a466 (commit) v2.3devel-376-g004d395
       via  a40aeb8e52b3e6e6c1b2b5e54b4e16b4c5cff16a (commit) v2.3devel-641-ga40aeb8
       via  e83373cb344027859176cfb4ce8d3ee82c640ad3 (commit) v2.3devel-375-ge83373c
       via  e55868870cff1a057748895dfdf801b0a14cae68 (commit) v2.3devel-374-ge558688
       via  d7b661f3064d0bce67f4a233358506dbd83252d1 (commit) v2.3devel-369-gd7b661f
       via  121e02106206ca85214c654123662e6ceb160e38 (commit) v2.3devel-640-g121e021
       via  9f371cd13acfce709f26be583b816f2e393c8691 (commit) v2.3devel-639-g9f371cd
       via  4c9d0999822bfff467d8ca6c59fb417fb5b2ad70 (commit) v2.3devel-370-g4c9d099
       via  dfd1a5dd4a60f431367218d5a4c94c71e3e2aace (commit) v2.3devel-368-gdfd1a5d
       via  c7cefd4e14b326856877dddc434ce2b9bd70ea4f (commit) v2.3devel-350-gc7cefd4
      from  44e0272a8b11af27931d409cf0a0e9771bf11485 (commit) v2.3devel-637-g44e0272

- Log -----------------------------------------------------------------
commit b72b4100835c8ff2cdd9e02bc9ab04ae87f9a4cf
Merge: 4cb67b8 004d395
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 12 16:01:47 2013 +0100

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

commit 4cb67b8e8986be01391b2c4091aa049d4d953e6a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 12 16:01:25 2013 +0100

    passwords page, styles

commit a40aeb8e52b3e6e6c1b2b5e54b4e16b4c5cff16a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 12 15:09:28 2013 +0100

    workitems, styles, work in progress.

commit 121e02106206ca85214c654123662e6ceb160e38
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 12 14:09:27 2013 +0100

    add task page.

commit 9f371cd13acfce709f26be583b816f2e393c8691
Merge: 44e0272 4c9d099
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 12 13:01:39 2013 +0100

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

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

(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:
 .../web/component/menu/top/UserMenuPanel.html      |    4 +-
 .../web/component/menu/top/UserMenuPanel.java      |    9 +-
 .../web/page/admin/home/PageMyPasswords.html       |   36 +-
 .../web/page/admin/home/PageMyPasswords.java       |    9 +-
 .../web/page/admin/server/PageTaskAdd.html         |   78 ++---
 .../web/page/admin/server/PageTaskAdd.properties   |    3 +
 .../page/admin/workflow/PageProcessInstance.html   |    6 +-
 .../page/admin/workflow/PageProcessInstance.java   |   59 ++--
 .../page/admin/workflow/PageProcessInstances.html  |   15 +-
 .../page/admin/workflow/PageProcessInstances.java  |    8 +-
 .../web/page/admin/workflow/PageWorkItem.html      |   32 +-
 .../web/page/admin/workflow/PageWorkItem.java      |   13 +-
 .../page/admin/workflow/PageWorkItem.properties    |    1 +
 .../web/page/admin/workflow/PageWorkItems.html     |   19 +-
 .../web/page/admin/workflow/PageWorkItems.java     |    6 +-
 .../page/admin/workflow/PageWorkItems.properties   |    1 -
 .../page/admin/workflow/ProcessInstancePanel.html  |    2 +-
 infra/common/.gitignore                            |    1 +
 .../midpoint/common/crypto/AESProtector.java       |   17 +-
 .../evolveum/midpoint/common/crypto/Protector.java |    3 +
 infra/prism/.gitignore                             |    1 +
 .../com/evolveum/midpoint/prism/Definition.java    |   11 +-
 .../midpoint/prism/PrismContainerDefinition.java   |   11 +
 .../prism/schema/DomToSchemaProcessor.java         |    4 +
 infra/schema/.gitignore                            |    1 +
 .../resources/xml/ns/public/common/common-2a.xsd   |  161 +++++----
 .../schemadoc/templates/complex-type-definition.vm |   11 +
 .../main/schemadoc/templates/object-definition.vm  |    5 +
 .../schema/src/main/schemadoc/templates/schema.vm  |    2 +-
 model/model-impl/.gitignore                        |    1 +
 .../evolveum/midpoint/report/DataSourceReport.java |    2 +-
 .../midpoint/report/ReportCreateTaskHandler.java   |    2 +-
 .../midpoint/report/ReportManagerImpl.java         |   23 +-
 .../evolveum/midpoint/report/BasicReportTest.java  |  351 +++++++++-----------
 .../src/test/resources/reports/report-test.xml     |  253 ++++++++++++++
 provisioning/provisioning-impl/.gitignore          |    1 +
 .../provisioning/impl/ResourceManager.java         |    3 +
 .../src/test/resources/basic/objects.xml           |    8 +-
 .../midpoint/repo/sql/data/common/RReport.java     |    8 +-
 .../midpoint/tools/ninja/KeyStoreDumper.java       |  110 ++++++
 .../com/evolveum/midpoint/tools/ninja/Main.java    |    9 +
 41 files changed, 865 insertions(+), 435 deletions(-)
 create mode 100644 model/report-impl/src/test/resources/reports/report-test.xml
 create mode 100644 tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java


hooks/post-receive
-- 
midPoint