[midPoint-git] midPoint branch bootstrap updated. v2.3devel-251-g68339ed

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  68339ed8001f3887d1b7697340a341ea65472cd6 (commit) v2.3devel-251-g68339ed
       via  1d44ae49f0cae3d0cb519971b2b5e8ce9fccc434 (commit) v2.3devel-240-g1d44ae4
       via  4e7186afe1aed2d46ddf4a53d82797e277070702 (commit) v2.3devel-135-g4e7186a
       via  e06b519ffe457c59db6a29634d1565665e75f237 (commit) v2.3devel-134-ge06b519
       via  744aa7a121474c97714c5a09d5b1c19bb4a4642f (commit) v2.3devel-239-g744aa7a
       via  965dc5e6d2e9b027d0aaebc9c0abd327bac998ff (commit) v2.3devel-131-g965dc5e
       via  dc0245cb2670042b054e2977b0f626fa4786daf1 (commit) v2.3devel-130-gdc0245c
       via  a497fd366c91f93ad0340e17d0b72f314263efe0 (commit) v2.3devel-126-ga497fd3
       via  f11010ff49e80730295d52cfeaa8a2ca7d47b989 (commit) v2.3devel-125-gf11010f
       via  a8dd700c9a1db06074f19191fb66f23634b82e78 (commit) v2.3devel-20-ga8dd700
       via  4425f29c775709b6962c5fdc1a0a17ae8f8699ea (commit) v2.3devel-19-g4425f29
       via  ac752b349682ae747f93cb90d3e074e5079ecb0f (commit) v2.3devel-18-gac752b3
       via  08ce9734b9b2593dc6cf8d951664da10984549cb (commit) v2.3devel-17-g08ce973
      from  7894ba2a84bbe32442e03fa9d21ad5c54efe2dd3 (commit) v2.3devel-238-g7894ba2

- Log -----------------------------------------------------------------
commit 68339ed8001f3887d1b7697340a341ea65472cd6
Merge: 1d44ae4 4e7186a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 22 12:14:21 2013 +0200

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
    
    Conflicts:
    	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties
    	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java

commit 1d44ae49f0cae3d0cb519971b2b5e8ce9fccc434
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Oct 22 12:00:49 2013 +0200

    proper striping on prism form, small hack through JS...

commit 744aa7a121474c97714c5a09d5b1c19bb4a4642f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Mon Oct 21 22:08:42 2013 +0200

    preparded fix for css problems in prism form.

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

(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:
 .../component/data/BaseSortableDataProvider.java   |    6 +
 .../web/component/menu/cog/InlineMenu.html         |    3 -
 .../web/component/prism/PrismContainerPanel.html   |    2 +-
 .../web/component/prism/PrismObjectPanel.java      |    6 +
 .../midpoint/web/page/admin/PageAdmin.properties   |    1 +
 .../web/page/admin/server/PageTaskAdd.java         |   17 +-
 .../web/page/admin/server/PageTaskEdit.java        |  125 +++---
 .../web/page/admin/server/dto/NodeDto.java         |   45 +-
 .../web/page/admin/server/dto/NodeDtoProvider.java |   33 +-
 .../web/page/admin/server/dto/TaskDto.java         |  474 +++++++++-----------
 .../admin/server/dto/TaskDtoExecutionStatus.java   |    4 +-
 .../web/page/admin/server/dto/TaskDtoProvider.java |   45 +-
 .../midpoint/web/security/MidPointApplication.java |    7 +
 .../evolveum/midpoint/web/util/WebMiscUtil.java    |    9 +-
 .../src/main/webapp/js/midpoint/midpoint.js        |   13 +
 .../main/webapp/less/midpoint/prism-container.less |    9 +-
 .../midpoint/prism/PrismReferenceValue.java        |    9 +
 .../midpoint/schema/GetOperationOptions.java       |   16 +-
 .../evolveum/midpoint/schema/SelectorOptions.java  |  177 ++++++--
 .../midpoint/schema/constants/ObjectTypes.java     |   74 ++-
 .../resources/xml/ns/public/common/common-2a.xsd   |  228 +++++++++-
 .../resources/xml/ns/public/model/model-1.wsdl     |  438 ++++++++++--------
 .../evolveum/midpoint/model/api/TaskService.java   |   12 +
 .../midpoint/model/ModelObjectResolver.java        |   45 +-
 .../evolveum/midpoint/model/ModelWebService.java   |   30 +-
 .../midpoint/model/controller/ModelController.java |  117 +++--
 .../midpoint/model/lens/ChangeExecutor.java        |   18 +-
 .../lens/projector/PasswordPolicyProcessor.java    |   25 +-
 .../midpoint/model/intest/TestStrangeCases.java    |   45 +-
 .../notifications/formatters/TextFormatter.java    |    4 +-
 .../midpoint/repo/sql/PartialLoadingTest.java      |   21 +-
 .../midpoint/repo/sql/util/SimpleTaskAdapter.java  |   36 +-
 .../midpoint/repo/sql/data/common/RFocus.java      |    5 +-
 .../midpoint/repo/sql/data/common/RObject.java     |   11 +-
 .../midpoint/repo/sql/data/common/RUser.java       |   10 +-
 .../midpoint/repo/sql/query/QueryInterpreter.java  |    2 +-
 .../com/evolveum/midpoint/repo/sql/util/RUtil.java |   81 ----
 .../java/com/evolveum/midpoint/task/api/Node.java  |  111 -----
 .../midpoint/task/api/NodeErrorStatus.java         |   58 ---
 .../midpoint/task/api/NodeExecutionStatus.java     |   53 ---
 .../java/com/evolveum/midpoint/task/api/Task.java  |   18 +-
 .../evolveum/midpoint/task/api/TaskManager.java    |  283 ++++++------
 .../midpoint/task/quartzimpl/Initializer.java      |    4 +-
 .../task/quartzimpl/TaskManagerQuartzImpl.java     |  228 ++++++----
 .../midpoint/task/quartzimpl/TaskQuartzImpl.java   |   24 +-
 .../task/quartzimpl/cluster/ClusterManager.java    |    8 +-
 .../cluster}/ClusterStatusInformation.java         |  264 +++++------
 .../task/quartzimpl/cluster/NodeRegistrar.java     |   52 ++-
 .../quartzimpl/execution/ExecutionManager.java     |   40 +-
 .../quartzimpl/execution/LocalNodeManager.java     |   14 +-
 .../quartzimpl/execution/RemoteNodesManager.java   |   81 ++--
 51 files changed, 1835 insertions(+), 1606 deletions(-)
 delete mode 100644 repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Node.java
 delete mode 100644 repo/task-api/src/main/java/com/evolveum/midpoint/task/api/NodeErrorStatus.java
 delete mode 100644 repo/task-api/src/main/java/com/evolveum/midpoint/task/api/NodeExecutionStatus.java
 rename repo/{task-api/src/main/java/com/evolveum/midpoint/task/api => task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster}/ClusterStatusInformation.java (74%)


hooks/post-receive
-- 
midPoint