[midPoint-git] midPoint branch bootstrap updated. v2.3devel-220-gc19a8da

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  c19a8da9ab7ed20611207e7d997d2b3c55eed48d (commit) v2.3devel-220-gc19a8da
       via  e814a972ed5a2a3279fd1a760334a4bc6e538eec (commit) v2.3devel-122-ge814a97
      from  555f88e95582de597f88324fa956e8012adf7ed4 (commit) v2.3devel-218-g555f88e

- Log -----------------------------------------------------------------
commit c19a8da9ab7ed20611207e7d997d2b3c55eed48d
Merge: 555f88e e814a97
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Fri Oct 18 17:15:18 2013 +0200

    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:
 .../common/expression/script/ScriptExpression.java |    2 -
 .../script/jsr223/Jsr223ScriptEvaluator.java       |    3 +
 .../evolveum/midpoint/common/mapping/Mapping.java  |   59 ++++++
 .../midpoint/common/mapping/MappingFactory.java    |   10 +
 .../midpoint/common/monitor/InternalMonitor.java   |   42 +++--
 .../expression/script/TestScriptCaching.java       |  193 ++++++++++++++++++++
 .../common/mapping/MappingTestEvaluator.java       |    1 +
 infra/common/testng.xml                            |    1 +
 .../evolveum/midpoint/model/lens/Clockwork.java    |    6 +-
 .../evolveum/midpoint/model/lens/LensContext.java  |   13 ++
 .../midpoint/model/lens/LensDebugListener.java     |   10 +
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    3 +
 .../midpoint/model/lens/projector/Projector.java   |   10 +-
 .../model/util/mock/MockLensDebugListener.java     |   24 +++
 .../AbstractInitializedModelIntegrationTest.java   |   17 ++
 .../model/intest/TestModelServiceContract.java     |  138 ++++++++++++--
 .../intest/util/ProfilingLensDebugListener.java    |   59 ++++++
 .../src/test/resources/logback-test.xml            |    2 +-
 .../model/test/AbstractModelIntegrationTest.java   |    2 +-
 .../provisioning/impl/ConnectorManager.java        |    2 +-
 .../midpoint/provisioning/impl/ResourceCache.java  |   14 ++
 .../provisioning/impl/ResourceManager.java         |   12 +-
 .../provisioning/test/impl/AbstractDummyTest.java  |    2 +-
 .../midpoint/provisioning/test/impl/TestDummy.java |    4 +-
 .../impl/TestDummyResourceAndSchemaCaching.java    |   20 +-
 .../midpoint/test/AbstractIntegrationTest.java     |   52 +++++-
 26 files changed, 644 insertions(+), 57 deletions(-)
 create mode 100644 infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestScriptCaching.java
 create mode 100644 model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/ProfilingLensDebugListener.java


hooks/post-receive
-- 
midPoint