[midPoint-git] midPoint branch restNew updated. v2.3devel-148-gcacf8de

Katka Valalikova git at evolveum.com
Wed Oct 23 08:59:11 CEST 2013


Project "midPoint" branch restNew has been updated
       via  cacf8deb6a6664e1c99a5be486adea9934aad1cf (commit) v2.3devel-148-gcacf8de
       via  4f1f62a1dcda2053cca8770fab5a40d2079e6a70 (commit) v2.3devel-147-g4f1f62a
       via  614a28a10ce2372576ef5528a2f0af7859b3479e (commit) v2.3devel-137-g614a28a
       via  5cee30ed11f29e414a4eda0cd6c41b728064ea8f (commit) v2.3devel-136-g5cee30e
       via  4e7186afe1aed2d46ddf4a53d82797e277070702 (commit) v2.3devel-135-g4e7186a
       via  e06b519ffe457c59db6a29634d1565665e75f237 (commit) v2.3devel-134-ge06b519
       via  218286c375154da4df0808e52dd4cdb15aa27fdb (commit) v2.3devel-125-g218286c
       via  965dc5e6d2e9b027d0aaebc9c0abd327bac998ff (commit) v2.3devel-131-g965dc5e
       via  1410006bb36d99a53e720c6e825c077281e8d0cf (commit) v2.3devel-124-g1410006
       via  dc0245cb2670042b054e2977b0f626fa4786daf1 (commit) v2.3devel-130-gdc0245c
       via  d9e707b47b604d105dc454a37e6b027df03bd9cb (commit) v2.3devel-123-gd9e707b
       via  e814a972ed5a2a3279fd1a760334a4bc6e538eec (commit) v2.3devel-122-ge814a97
       via  f2d259c628a4397f5e02e3feecaa060dbcbdc993 (commit) v2.3devel-121-gf2d259c
       via  a497fd366c91f93ad0340e17d0b72f314263efe0 (commit) v2.3devel-126-ga497fd3
       via  f11010ff49e80730295d52cfeaa8a2ca7d47b989 (commit) v2.3devel-125-gf11010f
       via  a8dd700c9a1db06074f19191fb66f23634b82e78 (commit) v2.3devel-20-ga8dd700
       via  f70e1d7c72a8200e8f08dedcfb3878594b356674 (commit) v2.3devel-120-gf70e1d7
       via  f7aa17e28d399cdfe16d10731664050e1b8bbe21 (commit) v2.3devel-119-gf7aa17e
       via  6de9f471b76466360972eee87bfd48eb4fe053c2 (commit) v2.3devel-118-g6de9f47
       via  fe96c5b65ea6af33deeb670ae7d458d908e275ad (commit) v2.3devel-117-gfe96c5b
       via  1ca45133ce85a3e3b0399bf5cd7e70d5268abadb (commit) v2.3devel-116-g1ca4513
       via  d6c816d90c9de1fd90872514fda995a4e0c679a8 (commit) v2.3devel-115-gd6c816d
       via  0d2a1390074216a0cfb7dd71ed84b08a2f40bf0c (commit) v2.3devel-114-g0d2a139
       via  7026243a7d872ea4dac4164e91fa81a884f85ae5 (commit) v2.3devel-113-g7026243
       via  2f64a8f350c59d668ecd5f007583732f27807365 (commit) v2.3devel-112-g2f64a8f
       via  ec26725772839c51ad143881ff12dd838f7ec0e9 (commit) v2.3devel-111-gec26725
       via  0e8cb528833e6eb371f15c70dd01d01a097adc9f (commit) v2.3devel-110-g0e8cb52
       via  e64c2c174c34eecf2b6ccd1e2db66022ea0ba90c (commit) v2.3devel-108-ge64c2c1
       via  148749507c43e716d1bf67e33e56611a0c7f5ca2 (commit) v2.3devel-108-g1487495
       via  526137155897aefffa4b353673048810f0dbcc92 (commit) v2.3devel-107-g5261371
       via  e3cfab9c8461fc4ac95a71e2f97949dc327a1ead (commit) v2.3devel-103-ge3cfab9
       via  fe8c01c0f817beb39bb33932d2ade6740e6387d1 (commit) v2.3devel-105-gfe8c01c
       via  d55fa87c97b9fb0a7beefa7d9ac3f82b7cf0d4fd (commit) v2.3devel-104-gd55fa87
       via  59d889945a9edfb7d2150c0a9f34b983e73b845a (commit) v2.3devel-103-g59d8899
       via  0eeeffe59580f4d01e7da543d9209cb2a571fca5 (commit) v2.3devel-102-g0eeeffe
       via  690dfb0954d1f37039b64b90622c99c40283c161 (commit) v2.3devel-101-g690dfb0
       via  2d68ff276fad35aac1102d6f09816494f419beb1 (commit) v2.3devel-100-g2d68ff2
       via  bed928a2da1c9438d3d68d44476734fc74b67868 (commit) v2.3devel-99-gbed928a
       via  b78e39fa7971d350f6e5c842f7c46041ab4155c1 (commit) v2.3devel-98-gb78e39f
       via  b1d5dc8630739e9810154403a2baff3a305ee087 (commit) v2.3devel-93-gb1d5dc8
       via  b98eed916a225c84a59c977d8a05ee2bd4305301 (commit) v2.3devel-96-gb98eed9
       via  022d9c65f74f68001ac5c889523e674d8e641221 (commit) v2.3devel-95-g022d9c6
       via  d887542b30ec319f99bf65d093033afea38293b6 (commit) v2.3devel-94-gd887542
       via  1185b853da07ed1b3befe67b468041ea7daf3dc3 (commit) v2.3devel-93-g1185b85
       via  e13ec9e89c44addd03f01db0385288b0d556d707 (commit) v2.3devel-92-ge13ec9e
       via  a100161b89da50a9cd6bb63c76d3456709052245 (commit) v2.3devel-91-ga100161
       via  0347abf6d1a0ddd72f4426a183cefdc1f4eeda31 (commit) v2.3devel-90-g0347abf
       via  792710c91aa6b433ca540e29f67501a29a6ddeff (commit) v2.3devel-89-g792710c
       via  0caec14ef3e55722e1d4d6e559e0459cdaa885ad (commit) v2.3devel-88-g0caec14
       via  508adfcf34c67899a1f361715cdf4d7f73cefe5c (commit) v2.3devel-87-g508adfc
       via  0a58f2d47252f0f55e51aa84181bb3594cebf3b4 (commit) v2.3devel-86-g0a58f2d
       via  1887144291450170eb50d8b555596b051cecd0db (commit) v2.3devel-85-g1887144
       via  71a3ddff9185fcf4180fa69f9c104cabf1b9ea74 (commit) v2.3devel-84-g71a3ddf
       via  3ee47031399d64d13feef55ed8130288f54a4321 (commit) v2.3devel-83-g3ee4703
       via  0ab04a3be09985e996bac554ed51a61468f0f970 (commit) v2.3devel-82-g0ab04a3
       via  67ba6db108e62aeac9c1c0041669a51ff973fd57 (commit) v2.3devel-81-g67ba6db
       via  7b9e79574746a3d27c95ba435413b581694520e7 (commit) v2.3devel-80-g7b9e795
       via  3be40ca62dad98fab601781a51a79fb3faae685c (commit) v2.3devel-79-g3be40ca
       via  4425f29c775709b6962c5fdc1a0a17ae8f8699ea (commit) v2.3devel-19-g4425f29
       via  ac752b349682ae747f93cb90d3e074e5079ecb0f (commit) v2.3devel-18-gac752b3
       via  08ce9734b9b2593dc6cf8d951664da10984549cb (commit) v2.3devel-17-g08ce973
      from  dc1b02550006619c52b827ecf729b3f16b146d57 (commit) v2.3devel-87-gdc1b025

- Log -----------------------------------------------------------------
commit cacf8deb6a6664e1c99a5be486adea9934aad1cf
Author: katkav <k.valalikova at evolveum.com>
Date:   Wed Oct 23 08:53:28 2013 +0200

    fixing conflict on ObjectTypes..

commit 4f1f62a1dcda2053cca8770fab5a40d2079e6a70
Merge: dc1b025 614a28a
Author: katkav <k.valalikova at evolveum.com>
Date:   Wed Oct 23 08:42:47 2013 +0200

    Merge branch 'master' into restNew
    
    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:
 NOTICE                                             |    6 +
 config/h2-schema.sql                               |    2 +
 config/mysql-schema.sql                            |    2 +
 config/oracle-schema.sql                           |    2 +
 config/postgresql-schema.sql                       |    2 +
 config/sqlserver-schema.sql                        |    2 +
 .../PageDebugList_en_US.utf8.properties            |    7 +
 .../PageContentAccounts_en_US.utf8.properties      |    2 +
 .../PageDebugList_sk_SK.utf8.properties            |    7 +
 .../PageContentAccounts_sk_SK.utf8.properties      |    2 +
 .../assignment/AssignmentEditorPanel.java          |    3 +
 .../component/data/BaseSortableDataProvider.java   |    6 +
 .../web/component/dialog/ConfirmationDialog.java   |   10 +
 .../web/component/prism/ObjectWrapper.java         |    2 +-
 .../midpoint/web/page/admin/PageAdmin.properties   |    3 +-
 .../page/admin/configuration/PageDebugList.html    |    2 +
 .../page/admin/configuration/PageDebugList.java    |  211 ++++++++-
 .../admin/configuration/PageDebugList.properties   |    7 +
 .../web/page/admin/internal/PageAccounts.java      |   59 +--
 .../resources/content/PageContentAccounts.java     |   31 ++
 .../content/PageContentAccounts.properties         |    2 +
 .../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/page/admin/users/PageUser.java    |    3 +
 .../midpoint/web/security/MidPointApplication.java |    7 +
 .../web/security/MidPointApplication.properties    |    1 +
 .../evolveum/midpoint/web/util/WebMiscUtil.java    |   10 +-
 gui/admin-gui/src/main/webapp/js/evolveum.js       |   80 +++-
 .../icf/dummy/connector/DummyConfiguration.java    |   29 +-
 .../icf/dummy/connector/DummyConnector.java        |  155 ++++++-
 .../evolveum/icf/dummy/resource/DummyDelta.java    |   14 +-
 .../evolveum/icf/dummy/resource/DummyObject.java   |    9 +
 .../evolveum/icf/dummy/resource/DummyResource.java |  231 ++++++++--
 .../midpoint/common/ResourceObjectPattern.java     |   37 +-
 .../midpoint/common/expression/ExpressionUtil.java |   69 ++-
 .../evaluator/AsIsExpressionEvaluator.java         |    9 +-
 .../evaluator/AsIsExpressionEvaluatorFactory.java  |    8 +-
 .../evaluator/PathExpressionEvaluator.java         |    8 +-
 .../evaluator/PathExpressionEvaluatorFactory.java  |    8 +-
 .../functions/BasicExpressionFunctions.java        |   28 +-
 .../common/expression/script/ScriptExpression.java |    2 -
 .../script/ScriptExpressionEvaluatorFactory.java   |    2 +-
 .../expression/script/ScriptExpressionFactory.java |   10 +-
 .../script/jsr223/Jsr223ScriptEvaluator.java       |   40 +-
 .../evolveum/midpoint/common/mapping/Mapping.java  |   59 +++
 .../midpoint/common/mapping/MappingFactory.java    |   10 +
 .../midpoint/common/monitor/InternalMonitor.java   |  150 ++++++-
 .../refinery/LayerRefinedAttributeDefinition.java  |   21 +-
 .../LayerRefinedObjectClassDefinition.java         |   24 +-
 .../refinery/RefinedAttributeDefinition.java       |    3 +-
 .../refinery/RefinedObjectClassDefinition.java     |    5 +-
 .../common/expression/ExpressionTestUtil.java      |   10 +-
 .../expression/script/AbstractScriptTest.java      |   11 +-
 .../expression/script/TestExpressionFunctions.java |    5 +-
 .../expression/script/TestGroovyExpressions.java   |    5 +-
 .../script/TestJavaScriptExpressions.java          |    5 +-
 .../expression/script/TestScriptCaching.java       |  193 ++++++++
 .../expression/script/TestXPathExpressions.java    |    3 +-
 .../common/mapping/MappingTestEvaluator.java       |   95 +++-
 .../common/mapping/TestMappingDynamicSimple.java   |   67 ++-
 .../common/mapping/TestMappingDynamicSysVar.java   |   84 ++++
 .../common/refinery/TestRefinedSchema.java         |   68 ++-
 ...{mapping-asis.xml => mapping-asis-password.xml} |    2 +-
 ...g-script-system-variables-password-decrypt.xml} |    5 +-
 ...> mapping-script-system-variables-password.xml} |    5 +-
 .../src/test/resources/mapping/user-jack.xml       |   10 +-
 infra/common/testng.xml                            |    1 +
 .../midpoint/prism/ComplexTypeDefinition.java      |    5 +-
 .../evolveum/midpoint/prism/ItemDefinition.java    |   10 +-
 .../midpoint/prism/PrismContainerDefinition.java   |   17 +-
 .../midpoint/prism/PrismReferenceValue.java        |    9 +
 .../midpoint/prism/delta/DeltaSetTriple.java       |    4 +
 .../prism/delta/PrismValueDeltaSetTriple.java      |    4 +-
 .../midpoint/prism/schema/SchemaRegistry.java      |    1 +
 .../evolveum/midpoint/schema/DeltaConvertor.java   |   20 +-
 .../midpoint/schema/GetOperationOptions.java       |   16 +-
 .../evolveum/midpoint/schema/SelectorOptions.java  |  177 ++++++--
 .../midpoint/schema/constants/ObjectTypes.java     |   76 +++-
 .../midpoint/schema/constants/SchemaConstants.java |    1 +
 .../ResourceAttributeContainerDefinition.java      |   13 +-
 .../midpoint/schema/util/ConnectorTypeUtil.java    |   10 +-
 .../midpoint/schema/util/ResourceTypeUtil.java     |   54 +++
 .../resources/xml/ns/public/common/common-2a.xsd   |  228 +++++++++-
 .../ns/public/model/context/model-context-2.xsd    |   21 +
 .../resources/xml/ns/public/model/model-1.wsdl     |  438 ++++++++++--------
 .../xml/ns/public/resource/capabilities-2.xsd      |   58 +++
 .../midpoint/schema/TestDeltaConverter.java        |   86 ++++
 .../util/aspect/MethodUsageStatistics.java         |   42 +-
 .../midpoint/util/aspect/MidpointAspect.java       |    4 +-
 .../midpoint/util/aspect/ProfilingDataLog.java     |    4 +-
 .../midpoint/util/aspect/ProfilingDataManager.java |   69 ++-
 .../midpoint/util/logging/LoggingUtils.java        |   38 ++
 .../com/evolveum/midpoint/util/ProfilingTest.java  |   14 +-
 infra/util/testng.xml                              |    5 +
 .../evolveum/midpoint/model/api/ModelService.java  |   13 +-
 .../evolveum/midpoint/model/api/TaskService.java   |   12 +
 .../midpoint/model/ModelObjectResolver.java        |   45 +-
 .../evolveum/midpoint/model/ModelWebService.java   |   30 +-
 .../midpoint/model/controller/ModelController.java |  165 +++++--
 .../midpoint/model/expr/MidpointFunctionsImpl.java |    7 +
 .../ImportAccountsFromResourceTaskHandler.java     |  109 +++--
 .../midpoint/model/lens/AssignmentEvaluator.java   |   13 +-
 .../midpoint/model/lens/ChangeExecutor.java        |   52 ++-
 .../evolveum/midpoint/model/lens/Clockwork.java    |  176 +++++++-
 .../evolveum/midpoint/model/lens/LensContext.java  |   13 +
 .../midpoint/model/lens/LensDebugListener.java     |   10 +
 .../midpoint/model/lens/LensProjectionContext.java |   63 ++-
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    3 +
 .../lens/projector/ConsolidationProcessor.java     |   86 +++-
 .../lens/projector/PasswordPolicyProcessor.java    |   25 +-
 .../midpoint/model/lens/projector/Projector.java   |   58 ++-
 .../model/security/UserDetailsServiceImpl.java     |    4 +
 .../sync/FocusValidityScannerTaskHandler.java      |   16 +-
 .../midpoint/model/sync/RecomputeTaskHandler.java  |    4 +-
 .../model/sync/SynchronizationService.java         |   26 +-
 .../sync/SynchronizeAccountResultHandler.java      |   15 +-
 .../midpoint/model/sync/action/AddUserAction.java  |    2 +-
 .../midpoint/model/sync/action/BaseAction.java     |   12 +-
 .../model/sync/action/DeleteUserAction.java        |    2 +-
 .../model/sync/action/ModifyUserAction.java        |    2 +-
 .../model/sync/action/SynchronizeAction.java       |    2 +-
 .../model/trigger/TriggerScannerTaskHandler.java   |   37 +-
 .../model/util/AbstractScannerResultHandler.java   |   40 ++
 .../model/util/AbstractScannerTaskHandler.java     |   22 +-
 .../util/AbstractSearchIterativeTaskHandler.java   |   78 ++--
 model/model-impl/src/main/resources/ctx-model.xml  |    6 +
 .../AbstractInternalModelIntegrationTest.java      |    3 +
 .../midpoint/model/lens/TestClockwork.java         |   14 +
 .../midpoint/model/lens/TestProjector.java         |   15 +
 .../midpoint/model/lens/TestReconScript.java       |    2 +-
 .../model/sync/TestSynchronizationService.java     |  217 +++++++++
 .../model/util/mock/MockLensDebugListener.java     |   24 +
 ...-dummy.xml => account-shadow-calypso-dummy.xml} |   13 +-
 .../model-impl/src/test/resources/logback-test.xml |    1 +
 .../AbstractInitializedModelIntegrationTest.java   |   17 +
 .../midpoint/model/intest/TestMapping.java         |   10 +-
 .../model/intest/TestModelServiceContract.java     |  430 +++++++++++-------
 .../midpoint/model/intest/TestSecurity.java        |    1 +
 .../midpoint/model/intest/TestStrangeCases.java    |   47 +-
 .../model/intest/sync/AbstractInboundSyncTest.java |   10 +-
 .../sync/AbstractSynchronizationStoryTest.java     |    4 +-
 .../model/intest/sync/TestImportRecon.java         |  305 +++++++++++--
 .../intest/util/ProfilingLensDebugListener.java    |   59 +++
 .../src/test/resources/common/resource-opendj.xml  |    4 +
 .../src/test/resources/logback-test.xml            |   15 +-
 .../account-stan-dummy.xml}                        |   10 +-
 .../test/resources/sync/resource-dummy-lime.xml}   |   99 ++--
 .../sync/task-reconcile-dummy-long-freshness.xml}  |    2 +-
 .../model/test/AbstractModelIntegrationTest.java   |   35 +-
 .../notifications/formatters/TextFormatter.java    |    4 +-
 .../impl/ChangeNotificationDispatcherImpl.java     |   11 +-
 .../provisioning/impl/ConnectorManager.java        |   58 ++-
 .../provisioning/impl/EntitlementConverter.java    |   11 +-
 .../provisioning/impl/ProvisioningServiceImpl.java |   31 +-
 .../midpoint/provisioning/impl/ResourceCache.java  |   14 +
 .../provisioning/impl/ResourceManager.java         |   33 +-
 .../provisioning/impl/ResourceObjectConverter.java |  174 +++----
 .../midpoint/provisioning/impl/ShadowCache.java    |   76 ++--
 .../midpoint/provisioning/impl/ShadowManager.java  |  113 ++++-
 .../provisioning/ucf/api/ConnectorInstance.java    |    5 +-
 .../ucf/impl/ConnectorFactoryIcfImpl.java          |    6 +-
 .../ucf/impl/ConnectorInstanceIcfImpl.java         |  132 ++++--
 .../midpoint/provisioning/ucf/impl/IcfUtil.java    |    2 +-
 .../provisioning/util/ProvisioningUtil.java        |   56 +++
 .../provisioning/test/impl/AbstractDummyTest.java  |  183 ++++----
 .../midpoint/provisioning/test/impl/TestDummy.java |  385 +++++++++++-----
 .../test/impl/TestDummyCaseIgnore.java             |    2 +-
 .../impl/TestDummyResourceAndSchemaCaching.java    |   40 +-
 .../provisioning/test/impl/TestDummySecurity.java  |    8 +-
 ...TestDummyCaseIgnore.java => TestDummyUuid.java} |   35 +-
 .../test/impl/TestDummyUuidNonUniqueName.java      |  211 +++++++++
 .../provisioning/test/impl/TestOpenDJ.java         |  105 +++++
 .../test/impl/TestSynchronization.java             |  135 ++++--
 .../provisioning/test/ucf/TestUcfDummy.java        |    6 +-
 .../provisioning/test/ucf/TestUcfOpenDj.java       |    4 +-
 .../resource-dummy-schemaless-no-schema.xml        |    1 +
 .../resource-dummy-schemaless-static-schema.xml    |    4 +
 .../account-alfredo-fettucini.xml}                 |   11 +-
 .../account-bill-fettucini.xml}                    |   11 +-
 .../resource-dummy.xml                             |   10 +-
 .../resource-dummy.xml                             |    9 +-
 .../src/test/resources/impl/opendj/calypso.ldif    |   11 +
 .../object/resource-opendj-initialized.xml         |    8 +
 ...ce-opendj.xml => resource-opendj-no-create.xml} |    3 +
 ...ce-opendj.xml => resource-opendj-no-delete.xml} |    4 +
 ...urce-opendj.xml => resource-opendj-no-read.xml} |    3 +
 ...ce-opendj.xml => resource-opendj-no-update.xml} |    3 +
 .../src/test/resources/object/resource-opendj.xml  |    8 +
 provisioning/provisioning-impl/testng.xml          |    4 +-
 .../midpoint/repo/sql/BaseSQLRepoTest.java         |    2 +
 .../com/evolveum/midpoint/repo/sql/DeleteTest.java |   32 ++
 .../midpoint/repo/sql/PartialLoadingTest.java      |   21 +-
 .../midpoint/repo/sql/util/SimpleTaskAdapter.java  |   36 +-
 .../src/test/resources/delete/shadow.xml           |   58 +++
 .../midpoint/repo/sql/data/common/RFocus.java      |    5 +-
 .../midpoint/repo/sql/data/common/RObject.java     |   11 +-
 .../midpoint/repo/sql/data/common/RTask.java       |    3 +-
 .../midpoint/repo/sql/data/common/RUser.java       |   10 +-
 .../midpoint/repo/sql/query/QueryInterpreter.java  |    2 +-
 .../com/evolveum/midpoint/repo/sql/util/RUtil.java |   81 ----
 .../midpoint/test/AbstractIntegrationTest.java     |  151 ++++++-
 .../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 ++--
 .../solaris/deimos-solaris-resource-redhat.xml     |   17 +-
 .../testing/consistency/ConsistencyTest.java       |   20 +-
 222 files changed, 7339 insertions(+), 2901 deletions(-)
 create mode 100644 infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestScriptCaching.java
 copy infra/common/src/test/resources/mapping/{mapping-asis.xml => mapping-asis-password.xml} (95%)
 copy infra/common/src/test/resources/mapping/{mapping-script-system-variables-employee-type.xml => mapping-script-system-variables-password-decrypt.xml} (90%)
 copy infra/common/src/test/resources/mapping/{mapping-script-system-variables-employee-type.xml => mapping-script-system-variables-password.xml} (92%)
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractScannerResultHandler.java
 copy model/model-impl/src/test/resources/common/{account-shadow-jack-dummy.xml => account-shadow-calypso-dummy.xml} (88%)
 create mode 100644 model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/ProfilingLensDebugListener.java
 copy model/model-intest/src/test/resources/{common/account-jack-dummy.xml => sync/account-stan-dummy.xml} (84%)
 copy model/{workflow-impl/src/test/resources/common/resource-dummy.xml => model-intest/src/test/resources/sync/resource-dummy-lime.xml} (82%)
 copy model/{model-impl/src/test/resources/common/task-reconcile-dummy.xml => model-intest/src/test/resources/sync/task-reconcile-dummy-long-freshness.xml} (96%)
 copy provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/{TestDummyCaseIgnore.java => TestDummyUuid.java} (61%)
 create mode 100644 provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
 copy provisioning/provisioning-impl/src/test/resources/impl/{dummy/account-script.xml => dummy-uuid-nonunique-name/account-alfredo-fettucini.xml} (81%)
 copy provisioning/provisioning-impl/src/test/resources/impl/{dummy/account-script.xml => dummy-uuid-nonunique-name/account-bill-fettucini.xml} (81%)
 copy provisioning/provisioning-impl/src/test/resources/impl/{dummy-case-ignore => dummy-uuid-nonunique-name}/resource-dummy.xml (93%)
 copy provisioning/provisioning-impl/src/test/resources/impl/{dummy-case-ignore => dummy-uuid}/resource-dummy.xml (93%)
 create mode 100644 provisioning/provisioning-impl/src/test/resources/impl/opendj/calypso.ldif
 copy provisioning/provisioning-impl/src/test/resources/object/{resource-opendj.xml => resource-opendj-no-create.xml} (98%)
 copy provisioning/provisioning-impl/src/test/resources/object/{resource-opendj.xml => resource-opendj-no-delete.xml} (98%)
 copy provisioning/provisioning-impl/src/test/resources/object/{resource-opendj.xml => resource-opendj-no-read.xml} (98%)
 copy provisioning/provisioning-impl/src/test/resources/object/{resource-opendj.xml => resource-opendj-no-update.xml} (98%)
 create mode 100644 repo/repo-sql-impl-test/src/test/resources/delete/shadow.xml
 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


More information about the midPoint-svn mailing list