[midPoint-git] midPoint branch bootstrap updated. v2.3devel-557-gcc814a5

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  cc814a574c9a03095b67ced4996f7844d8f7ecb5 (commit) v2.3devel-557-gcc814a5
       via  e80b6b02e863384d3c75f9fd84c8544df80387f1 (commit) v2.3devel-318-ge80b6b0
       via  a3e99b8470d9a1491e32c47400ffc6a13dd45ecf (commit) v2.3devel-542-ga3e99b8
       via  ff858866bc0f096301601d03a1614101d64cddc1 (commit) v2.3devel-317-gff85886
       via  2813e023ae489c2204882de277b3df60e97b9b02 (commit) v2.3devel-316-g2813e02
       via  c06c5be549674d44d9cd7a60d6a35de7cf7c3509 (commit) v2.3devel-313-gc06c5be
       via  82291c1a23fffbd7064c52356e30c2d48951b02a (commit) v2.3devel-309-g82291c1
       via  1dcf87c34e023e43c6f249f392200d43c26428d7 (commit) v2.3devel-313-g1dcf87c
       via  8dbe9ae98189817e18d3eb79532fd0c481ad6cd8 (commit) v2.3devel-312-g8dbe9ae
       via  172d09a7f689d2a0b32bd035f444c863fe51ffba (commit) v2.3devel-311-g172d09a
       via  1b2565196d2900ae9674272e25088f6411235116 (commit) v2.3devel-310-g1b25651
       via  45f0f345e5e7c216c1205ce9e99e81edc23b5d82 (commit) v2.3devel-309-g45f0f34
       via  b48a8fe119445e5684125c2c8731f638250775ba (commit) v2.3devel-308-gb48a8fe
       via  d7ba35bd865ce49e1a29bd6e36b118306ca0f327 (commit) v2.3devel-307-gd7ba35b
       via  18d261fd38a70ffdbdba6dc8255ea34d98800204 (commit) v2.3devel-306-g18d261f
       via  54660c16041017d71ab985cc51bf3c42e8899cf1 (commit) v2.3devel-305-g54660c1
      from  7738476b347ec7033e53b5c72af89a2f56ce7904 (commit) v2.3devel-541-g7738476

- Log -----------------------------------------------------------------
commit cc814a574c9a03095b67ced4996f7844d8f7ecb5
Merge: a3e99b8 e80b6b0
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 5 15:52:58 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
    
    Conflicts:
    	gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageTasks_en_US.utf8.properties

commit a3e99b8470d9a1491e32c47400ffc6a13dd45ecf
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 5 13:34:38 2013 +0100

    not finished multivalue field editing, imodel support, just experiment.

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

(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:
 .../admin/server/PageTasks_en_US.utf8.properties   |   23 +-
 .../admin/server/PageTasks_sk_SK.utf8.properties   |    5 +-
 .../component/form/MultiValueTextFormGroup.java    |   15 +-
 .../web/component/util/PrismPropertyList.java      |  156 ++++
 .../web/component/util/PrismPropertyModel.java     |  131 +---
 .../midpoint/web/page/admin/server/PageTasks.java  |   11 +-
 .../web/page/admin/server/PageTasks.properties     |    3 +
 .../server/dto/TaskDtoExecutionStatusFilter.java   |    1 -
 .../com/evolveum/midpoint/common/QueryUtil.java    |  305 --------
 .../midpoint/common/expression/ExpressionUtil.java |    6 +-
 .../script/jsr223/Jsr223ScriptEvaluator.java       |    5 +
 .../script/xpath/XPathScriptEvaluator.java         |    5 +-
 .../midpoint/prism/PrismContainerValue.java        |    5 +
 .../midpoint/prism/PrismPropertyValue.java         |    9 +-
 .../midpoint/prism/delta/ContainerDelta.java       |   40 +-
 .../evolveum/midpoint/prism/delta/ObjectDelta.java |    8 +-
 .../midpoint/prism/dom/PrismDomProcessor.java      |    7 +-
 .../midpoint/prism/json/PrismJasonProcessor.java   |    8 +-
 .../midpoint/prism/query/PropertyValueFilter.java  |   12 +-
 .../evolveum/midpoint/prism/util/PrismUtil.java    |   27 +
 .../com/evolveum/midpoint/prism/TestDelta.java     |   20 +-
 .../schema/constants/ExpressionConstants.java      |    2 +
 .../midpoint/schema/util/MiscSchemaUtil.java       |   11 +
 .../midpoint/schema/util/ObjectQueryUtil.java      |   39 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |   32 +-
 .../evolveum/midpoint/model/api/ModelService.java  |  187 +++--
 .../midpoint/model/api/expr/MidpointFunctions.java |  764 ++++++++++++++++++++
 .../midpoint/model/api/hooks/ChangeHook.java       |   15 +
 .../midpoint/model/cleanup/CleanUpTaskHandler.java |    2 +-
 .../midpoint/model/controller/ModelController.java |    2 +-
 .../controller/SystemConfigurationHandler.java     |    5 +
 .../midpoint/model/expr/MidpointFunctionsImpl.java |  377 +++++++++-
 .../expr/ModelExpressionThreadLocalHolder.java     |   72 +-
 .../midpoint/model/importer/ObjectImporter.java    |    6 +-
 .../midpoint/model/lens/AccountConstruction.java   |   13 +-
 .../midpoint/model/lens/AssignmentEvaluator.java   |   38 +-
 .../evolveum/midpoint/model/lens/Clockwork.java    |   98 ++-
 .../evolveum/midpoint/model/lens/LensContext.java  |   14 +
 .../midpoint/model/lens/LensDebugListener.java     |    6 +
 .../midpoint/model/lens/LensElementContext.java    |   22 +-
 .../midpoint/model/lens/LensFocusContext.java      |   13 +
 .../com/evolveum/midpoint/model/lens/LensUtil.java |   60 +-
 .../model/lens/ShadowConstraintsChecker.java       |    1 -
 .../lens/projector/AccountValuesProcessor.java     |   13 +-
 .../model/lens/projector/ActivationProcessor.java  |   42 +-
 .../model/lens/projector/AssignmentProcessor.java  |   12 +-
 .../model/lens/projector/ContextLoader.java        |   11 +-
 .../model/lens/projector/CredentialsProcessor.java |   11 +-
 .../model/lens/projector/InboundProcessor.java     |   35 +-
 .../lens/projector/MappingEvaluationHelper.java    |    9 +-
 .../model/lens/projector/OutboundProcessor.java    |    5 +-
 .../midpoint/model/lens/projector/Projector.java   |   15 +-
 .../lens/projector/ReconciliationProcessor.java    |    2 +-
 .../model/lens/projector/UserPolicyProcessor.java  |   23 +-
 .../model/security/UserDetailsServiceImpl.java     |    4 +-
 .../model/lens/TestAssignmentEvaluator.java        |   11 +-
 .../model/lens/TestAssignmentProcessor.java        |   64 +-
 .../midpoint/model/lens/TestProjector.java         |   34 +-
 .../midpoint/model/lens/TestProjectorAddUser.java  |    2 +-
 .../model/util/mock/MockClockworkHook.java         |    5 +
 .../AbstractConfiguredModelIntegrationTest.java    |    8 +-
 .../model/intest/TestLoggingConfiguration.java     |   12 +-
 .../model/intest/TestModelServiceContract.java     |   73 +-
 .../midpoint/model/intest/TestScriptHooks.java     |  227 ++++++
 .../model/intest/importer/ImportRefTest.java       |    1 -
 .../midpoint/model/intest/importer/ImportTest.java |    1 -
 .../test/resources/common/system-configuration.xml |    7 +
 .../generic-blackpearl.xml}                        |   14 +-
 .../src/test/resources/scripthooks/org-top.xml     |   21 +-
 .../resource-dummy-hook.xml}                       |  139 ++--
 .../scripthooks/system-configuration-hooks.xml     |   57 ++
 model/model-intest/testng.xml                      |    1 +
 .../model/test/AbstractModelIntegrationTest.java   |   34 +-
 .../notifications/api/events/ModelEvent.java       |   21 +-
 .../notifications/NotificationChangeHook.java      |    5 +
 .../notifiers/SimpleUserNotifier.java              |   28 +-
 .../midpoint/report/ReportCreateTaskHandler.java   |   15 +-
 .../evolveum/midpoint/report/ReportManager.java    |   83 +--
 .../midpoint/report/ReportManagerImpl.java         |   77 +-
 .../main/java/com/evolveum/midpoint/wf/WfHook.java |    5 +
 .../consistency/impl/ObjectNotFoundHandler.java    |   17 -
 .../provisioning/impl/ResourceManager.java         |    4 +-
 .../provisioning/util/ProvisioningUtil.java        |    1 -
 .../provisioning/test/impl/TestCsvFile.java        |   99 ++-
 .../provisioning/test/impl/TestDummyHacks.java     |   84 +--
 .../midpoint/repo/sql/BaseSQLRepoTest.java         |    4 +-
 .../midpoint/repo/sql/ConcurrencyTest.java         |    1 -
 .../midpoint/repo/sql/QueryInterpreterTest.java    |    1 -
 .../evolveum/midpoint/task/api/TaskManager.java    |   10 +-
 .../task/quartzimpl/TaskManagerQuartzImpl.java     |   44 +-
 .../midpoint/task/quartzimpl/TaskQuartzImpl.java   |    6 +-
 .../quartzimpl/execution/ExecutionManager.java     |   46 +-
 .../task/quartzimpl/execution/JobExecutor.java     |   12 +-
 .../quartzimpl/execution/LocalNodeManager.java     |   37 +-
 .../midpoint/task/quartzimpl/CleanupTest.java      |    2 +-
 .../quartzimpl/TestQuartzTaskManagerContract.java  |   12 +-
 .../midpoint/samples/test/TestSampleImport.java    |    1 -
 97 files changed, 2926 insertions(+), 1163 deletions(-)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/PrismPropertyList.java
 delete mode 100644 infra/common/src/main/java/com/evolveum/midpoint/common/QueryUtil.java
 create mode 100644 model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestScriptHooks.java
 copy model/model-intest/src/test/resources/{common/user-three-headed-monkey.xml => scripthooks/generic-blackpearl.xml} (76%)
 copy infra/common/src/test/resources/mapping/mapping-time-deferred-delete.xml => model/model-intest/src/test/resources/scripthooks/org-top.xml (64%)
 copy model/model-intest/src/test/resources/{iteration/resource-dummy-magenta.xml => scripthooks/resource-dummy-hook.xml} (62%)
 copy testing/story/src/test/resources/common/system-configuration.xml => model/model-intest/src/test/resources/scripthooks/system-configuration-hooks.xml (70%)


hooks/post-receive
-- 
midPoint