[midPoint-git] midPoint branch gensync updated. v2.3devel-175-g75be9b1
Radovan Semancik
git at evolveum.com
Thu Oct 31 14:50:25 CET 2013
Project "midPoint" branch gensync has been updated
via 75be9b10d77b40eed39cd16d3f0531ba591c1c0f (commit) v2.3devel-175-g75be9b1
via 9cda3607048b573c1aefc3b058518b1d9d6bf007 (commit) v2.3devel-174-g9cda360
via 3374c1add530ad3ac62871f88f136c5a0f2c3f03 (commit) v2.3devel-161-g3374c1a
via cfed1fe430a3367b6d4d52d7b10b3a106b7ed868 (commit) v2.3devel-160-gcfed1fe
via daf426591ea811f56f1a9ffc062f715b3a027148 (commit) v2.3devel-159-gdaf4265
via 0b54a8d5df108a92cdc1bd02bf72ea8890765811 (commit) v2.3devel-158-g0b54a8d
via 8f2988c3a147172fcf90d9b8687ccd4b4fe32b0b (commit) v2.3devel-157-g8f2988c
via 27332d6b2a6e4d21ff346a55c48593380ff3d740 (commit) v2.3devel-155-g27332d6
via a8161e36662fe830a714f62c03e9fb32ca64cde6 (commit) v2.3devel-155-ga8161e3
via c189bc619ad45fc513021dc07cf822e9e1de02d1 (commit) v2.3devel-154-gc189bc6
via 13fdf0893560f86d3546a069dbafefb06d1ddf42 (commit) v2.3devel-153-g13fdf08
via 927863440d2ff3754ed6c0aa436f0d9c5931e212 (commit) v2.3devel-151-g9278634
via 12f24f58d993887376418fd7cbe4564a4ee54045 (commit) v2.3devel-149-g12f24f5
via c142e61011b0c4d8cb3b9360e2eaf23e15caf4e6 (commit) v2.3devel-150-gc142e61
via 2b104af1464d5cd8a57165f540825ed0cbe54e84 (commit) v2.3devel-146-g2b104af
via 8291788d79983bd48673157ab9030fb4df7af2f0 (commit) v2.3devel-148-g8291788
via 0b07982e5e2b0cb7a7424c334660599b01c7a4a6 (commit) v2.3devel-147-g0b07982
via 7d19d183a14e0d2180dfaba82ccf6e5d8691a36e (commit) v2.3devel-146-g7d19d18
via f30abe086a21643c0df5e5869e997ecb4244f415 (commit) v2.3devel-145-gf30abe0
via 47ffd0faf35859208f79981cdd80e6927ba20ded (commit) v2.3devel-144-g47ffd0f
via 9fb996bc60ef57fef506e00523eb67138599f009 (commit) v2.3devel-143-g9fb996b
via c75b7cf524fb0074bb33e012390a9a901b86b4f9 (commit) v2.3devel-142-gc75b7cf
via 0a7d35d9a98e3712d39ec1b85d56742775745fda (commit) v2.3devel-141-g0a7d35d
via b78b730cf291b0925c490205322da891a2201d25 (commit) v2.3devel-140-gb78b730
via b78191ef570bc94774f2d029a2dea60152b12da8 (commit) v2.3devel-139-gb78191e
via a79d49add33ebc0b8baf098caf31af1f0dc4f95c (commit) v2.3devel-138-ga79d49a
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 7138de72b88f989298985c7b4b8e208c69ff544b (commit) v2.3devel-78-g7138de7
via 81ac251f563cb7306067bc62dc1de94e8f7dadd2 (commit) v2.3devel-77-g81ac251
via 386001f552d520beafde5c24e65589cd9f65ab14 (commit) v2.3devel-76-g386001f
via 95f1994354f0541655aca247a9b9ad24a83cb32d (commit) v2.3devel-75-g95f1994
via 341ccd9a91ad12ea14c5568ad500f20cc062b1d8 (commit) v2.3devel-73-g341ccd9
via 777652b1e5f0cd4ea90160212c18fe5a679ebbc9 (commit) v2.3devel-72-g777652b
via cd586fa3cb5603155297b0fda38c4d7289f5a932 (commit) v2.3devel-72-gcd586fa
via 6a00664a9665225c961784658ca14bcc3e98ba5b (commit) v2.3devel-71-g6a00664
via 93e0242345ede46c57a77df4acdec27934558efb (commit) v2.3devel-70-g93e0242
via 753bc9b1f7624b723fc726c406a78dd3d6513905 (commit) v2.3devel-69-g753bc9b
via 7d92a298152bae4add064138a173ef03aaf0d053 (commit) v2.3devel-68-g7d92a29
via b43e3accd4687e9c8099adbd7e72d3d609963217 (commit) v2.3devel-67-gb43e3ac
via 2cbaada283a54d5dfd284926d6f031882432f1df (commit) v2.3devel-53-g2cbaada
via ec3d0ccae6faf3bbfe5dadc75707af25b4294305 (commit) v2.3devel-65-gec3d0cc
via ebc42616c59a03a276c7635f33386a8a4f93102c (commit) v2.3devel-64-gebc4261
via 3d19cb5e80bd3d73e2c6f0a7858ed384fe0b3dcf (commit) v2.3devel-54-g3d19cb5
via 8a359f15da4f446dcf4d571cac97f14a2e248523 (commit) v2.3devel-53-g8a359f1
via 85b303836aa0550b3667abad1d5f26a227f17ef4 (commit) v2.3devel-61-g85b3038
via 3689bafd332f4a55f529f3155cc89167f4ac47b8 (commit) v2.3devel-60-g3689baf
via db315191abfe41a5d129e30ea99683d2484da536 (commit) v2.3devel-59-gdb31519
via 93cefa786d9615dc5085c1d6a04f928bddb8d6a4 (commit) v2.3devel-58-g93cefa7
via a0ed38613071f721b61a9485c4d271fd08541464 (commit) v2.3devel-48-ga0ed386
via b8bc8a3d5a62cd7be63e239cf19095ea230d3675 (commit) v2.3devel-55-gb8bc8a3
via 124d66164cec197053c28777b2f86007fb215ad7 (commit) v2.3devel-54-g124d661
via 0994340fbbafb0694e113becec9d05df9753fa28 (commit) v2.3devel-53-g0994340
via ee810d7ab969d6bae773f6c1ee302aa7bbeedb3c (commit) v2.3devel-52-gee810d7
via d916df817799c5ad8e83b095e3acdffba21dd6a3 (commit) v2.3devel-51-gd916df8
via 4b9e32488422fec2ac7fae01f3dd6d1f523adf4e (commit) v2.3devel-50-g4b9e324
via 3c02f1b2cc00715bbc4a2857210a21d7cf706cc3 (commit) v2.3devel-48-g3c02f1b
via dbc9bd74fa357ff86bd4743199c45f983d018834 (commit) v2.3devel-48-gdbc9bd7
via 692799aef48a960f16c1333725ea2a3b2bec9936 (commit) v2.3devel-47-g692799a
via bc873e3fe3f18889ea458ffe869ef0558c47b35d (commit) v2.3devel-47-gbc873e3
via a89e97529afc43274ce4f701e2b81f35c3ad8714 (commit) v2.3devel-46-ga89e975
via 8a7e6f584328012dd7004b0c388e655636613c94 (commit) v2.3devel-45-g8a7e6f5
via 5c8ba417e494edd67181bef35ed3602e8d82b544 (commit) v2.3devel-44-g5c8ba41
via 2cbd824435811464b5ea2a8dbbae265ef27c4a42 (commit) v2.3devel-42-g2cbd824
via f41b8a778d620b03827b775706b9665f9a537623 (commit) v2.3devel-42-gf41b8a7
via 4425f29c775709b6962c5fdc1a0a17ae8f8699ea (commit) v2.3devel-19-g4425f29
via ac752b349682ae747f93cb90d3e074e5079ecb0f (commit) v2.3devel-18-gac752b3
via 08ce9734b9b2593dc6cf8d951664da10984549cb (commit) v2.3devel-17-g08ce973
from 401900a9d3c917c7823662e0ccde4d0478ac6192 (commit) v2.3devel-53-g401900a
- Log -----------------------------------------------------------------
commit 75be9b10d77b40eed39cd16d3f0531ba591c1c0f
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Thu Oct 31 14:43:45 2013 +0100
Post-merge compilation fixes.
commit 9cda3607048b573c1aefc3b058518b1d9d6bf007
Merge: 401900a 3374c1a
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Thu Oct 31 14:30:32 2013 +0100
Merge branch 'master' into gensync
Conflicts:
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AccountConstruction.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensContext.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensDebugListener.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/UserPolicyProcessor.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/action/AddUserAction.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/action/BaseAction.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/action/DeleteUserAction.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/action/SynchronizeAction.java
model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.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:
.gitignore | 2 +
NOTICE | 6 +
config/h2-schema.sql | 1779 +--
config/h2-upgrade-2.2-to-2.3.sql | 4 +
config/mysql-schema.sql | 2057 +--
config/mysql-upgrade-2.2-to-2.3.sql | 4 +
config/oracle-schema.sql | 1782 +--
config/oracle-upgrade-2.2-to-2.3.sql | 4 +
config/postgresql-schema.sql | 1779 +--
config/postgresql-upgrade-2.2-to-2.3.sql | 4 +
config/sqlserver-schema.sql | 1785 +--
config/sqlserver-upgrade-2.2-to-2.3.sql | 4 +
.../PageDebugList_en_US.utf8.properties | 7 +
.../PageLogging_en_US.utf8.properties | 13 +
.../PageContentAccounts_en_US.utf8.properties | 2 +
.../PageDebugList_sk_SK.utf8.properties | 7 +
.../PageLogging_sk_SK.utf8.properties | 13 +
.../PageContentAccounts_sk_SK.utf8.properties | 2 +
.../assignment/AssignmentEditorPanel.java | 3 +
.../component/data/BaseSortableDataProvider.java | 6 +
.../web/component/data/ObjectDataProvider.java | 2 +-
.../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/configuration/PageLogging.html | 85 +
.../web/page/admin/configuration/PageLogging.java | 84 +-
.../admin/configuration/PageLogging.properties | 15 +-
.../page/admin/configuration/dto/LoggingDto.java | 132 +-
.../web/page/admin/internal/PageAccounts.java | 60 +-
.../web/page/admin/resources/PageResource.java | 31 +-
.../web/page/admin/resources/PageResources.java | 30 +-
.../resources/content/PageContentAccounts.java | 31 +
.../content/PageContentAccounts.properties | 2 +
.../admin/resources/dto/ResourceDtoProvider.java | 15 +-
.../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 +
.../web/util/MidPointProfilingServletFilter.java | 2 +
.../evolveum/midpoint/web/util/WebMiscUtil.java | 10 +-
gui/admin-gui/src/main/resources/DejaVuSans.ttf | Bin 0 -> 622020 bytes
gui/admin-gui/src/main/resources/objects.xml | 5 +
.../{misc => src/main/webapp/img}/flag/en.png | Bin 599 -> 599 bytes
.../src/main/webapp/img/flag}/sk.png | Bin 562 -> 562 bytes
.../src/main/webapp/img/flag}/us.png | Bin 609 -> 609 bytes
gui/admin-gui/src/main/webapp/js/evolveum.js | 80 +-
.../src/main/webapp/reports/reportAuditLogs.jrxml | 92 +-
.../main/webapp/reports/reportReconciliation.jrxml | 94 +-
.../main/webapp/reports/reportUserAccounts.jrxml | 8 +-
.../webapp/reports/reportUserAccounts_old.jrxml | 263 -
.../src/main/webapp/reports/reportUserList.jrxml | 119 +-
.../src/main/webapp/reports/reportUserOrgs.jrxml | 6 +-
.../src/main/webapp/reports/reportUserRoles.jrxml | 6 +-
.../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 | 93 +-
.../common/refinery/TestRefinedSchema.java | 68 +-
.../resources/mapping/mapping-asis-password.xml | 25 +
...ng-script-system-variables-password-decrypt.xml | 32 +
.../mapping-script-system-variables-password.xml | 32 +
.../src/test/resources/mapping/user-jack.xml | 10 +-
infra/common/testng.xml | 1 +
.../midpoint/prism/ComplexTypeDefinition.java | 5 +-
.../java/com/evolveum/midpoint/prism/Item.java | 2 +-
.../evolveum/midpoint/prism/ItemDefinition.java | 10 +-
.../midpoint/prism/PrismContainerDefinition.java | 17 +-
.../midpoint/prism/PrismPropertyValue.java | 45 +-
.../midpoint/prism/PrismReferenceValue.java | 9 +
.../com/evolveum/midpoint/prism/Recomputable.java | 5 +
.../midpoint/prism/delta/DeltaSetTriple.java | 4 +
.../prism/delta/PrismValueDeltaSetTriple.java | 4 +-
.../midpoint/prism/dom/PrismDomProcessor.java | 8 +-
.../midpoint/prism/polystring/PolyString.java | 12 +-
.../evolveum/midpoint/prism/query/AndFilter.java | 5 +-
.../midpoint/prism/query/EqualsFilter.java | 70 +-
.../midpoint/prism/query/GreaterFilter.java | 3 +-
.../evolveum/midpoint/prism/query/LessFilter.java | 3 +-
.../evolveum/midpoint/prism/query/NotFilter.java | 5 +-
.../midpoint/prism/query/ObjectFilter.java | 3 +-
.../evolveum/midpoint/prism/query/ObjectQuery.java | 5 +-
.../evolveum/midpoint/prism/query/OrFilter.java | 5 +-
.../evolveum/midpoint/prism/query/OrgFilter.java | 3 +-
.../midpoint/prism/query/PropertyValueFilter.java | 37 +-
.../evolveum/midpoint/prism/query/RefFilter.java | 12 +-
.../midpoint/prism/query/SubstringFilter.java | 33 +-
.../evolveum/midpoint/prism/query/ValueFilter.java | 26 +
.../midpoint/prism/schema/SchemaRegistry.java | 1 +
.../evolveum/midpoint/prism/util/PrismAsserts.java | 6 +-
.../midpoint/prism/xml/XmlTypeConverter.java | 10 +
.../java/com/evolveum/midpoint/prism/TestDiff.java | 10 +-
.../evolveum/midpoint/prism/TestObjectQuery.java | 21 +-
.../evolveum/midpoint/schema/DeltaConvertor.java | 20 +-
.../midpoint/schema/GetOperationOptions.java | 16 +-
.../evolveum/midpoint/schema/SelectorOptions.java | 177 +-
.../midpoint/schema/constants/ObjectTypes.java | 74 +-
.../midpoint/schema/constants/SchemaConstants.java | 2 +
.../ResourceAttributeContainerDefinition.java | 13 +-
.../midpoint/schema/util/ConnectorTypeUtil.java | 10 +-
.../midpoint/schema/util/ResourceTypeUtil.java | 54 +
.../schema/util/SynchronizationSituationUtil.java | 45 +-
.../resources/xml/ns/public/common/common-2a.xsd | 238 +-
.../public/connector/icf-1/resource-schema-2.xsd | 61 +-
.../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 +
.../midpoint/test/ldap/OpenDJController.java | 23 +
.../util/aspect/MethodUsageStatistics.java | 39 +-
.../midpoint/util/aspect/MidpointAspect.java | 44 +-
.../util/aspect/PerformanceStatistics.java | 23 +-
.../midpoint/util/aspect/ProfilingDataLog.java | 23 +-
.../midpoint/util/aspect/ProfilingDataManager.java | 153 +-
.../midpoint/util/logging/LoggingUtils.java | 38 +
.../com/evolveum/midpoint/util/ProfilingTest.java | 201 +
infra/util/testng.xml | 5 +
.../midpoint/model/api/ModelExecuteOptions.java | 9 +
.../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 +-
.../controller/SystemConfigurationHandler.java | 3 +-
.../midpoint/model/expr/MidpointFunctionsImpl.java | 7 +
.../ImportAccountsFromResourceTaskHandler.java | 112 +-
.../midpoint/model/importer/ObjectImporter.java | 9 +
.../midpoint/model/lens/AccountConstruction.java | 5 +-
.../midpoint/model/lens/AssignmentEvaluator.java | 13 +-
.../midpoint/model/lens/ChangeExecutor.java | 68 +-
.../evolveum/midpoint/model/lens/Clockwork.java | 183 +-
.../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 | 57 +-
.../model/lens/projector/UserPolicyProcessor.java | 136 +-
.../model/security/UserDetailsServiceImpl.java | 4 +
.../sync/CorrelationConfirmationEvaluator.java | 35 +-
.../sync/FocusValidityScannerTaskHandler.java | 16 +-
.../midpoint/model/sync/RecomputeTaskHandler.java | 4 +-
.../model/sync/ReconciliationTaskHandler.java | 93 +-
.../model/sync/SynchronizationService.java | 101 +-
.../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/AbstractSearchIterativeResultHandler.java | 21 +-
.../util/AbstractSearchIterativeTaskHandler.java | 78 +-
.../com/evolveum/midpoint/model/util/Utils.java | 27 +
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 | 142 +-
.../sync/TestCorrelationConfiramtionEvaluator.java | 137 +-
.../model/sync/TestSynchronizationService.java | 219 +
.../model/util/mock/MockLensDebugListener.java | 24 +
.../common/account-shadow-calypso-dummy.xml | 33 +
.../src/test/resources/common/resource-dummy.xml | 27 +-
.../test/resources/lens/account-before-script.xml | 35 +
.../model-impl/src/test/resources/logback-test.xml | 1 +
.../sync/correlation-case-insensitive.xml | 33 +
.../correlation-case-insensitive_empl_number.xml | 33 +
.../AbstractConfiguredModelIntegrationTest.java | 2 +-
.../AbstractInitializedModelIntegrationTest.java | 19 +-
.../midpoint/model/intest/TestActivation.java | 6 +-
.../midpoint/model/intest/TestIteration.java | 2 +-
.../model/intest/TestLoggingConfiguration.java | 2 +-
.../midpoint/model/intest/TestMapping.java | 10 +-
.../model/intest/TestModelServiceContract.java | 430 +-
.../midpoint/model/intest/TestSecurity.java | 1 +
.../midpoint/model/intest/TestStrangeCases.java | 47 +-
.../midpoint/model/intest/TestUserTemplate.java | 44 +
.../model/intest/negative/TestBrokenCSV.java | 2 +-
.../model/intest/sync/AbstractInboundSyncTest.java | 12 +-
.../sync/AbstractSynchronizationStoryTest.java | 6 +-
.../model/intest/sync/TestImportRecon.java | 305 +-
.../intest/util/ProfilingLensDebugListener.java | 92 +
.../src/test/resources/common/resource-opendj.xml | 4 +
.../test/resources/common/task-reconcile-dummy.xml | 4 -
.../resources/common/user-template-complex.xml | 16 +
.../src/test/resources/logback-test.xml | 29 +-
.../src/test/resources/sync/account-stan-dummy.xml | 36 +
.../test/resources/sync/resource-dummy-lime.xml} | 281 +-
.../task-reconcile-dummy-long-freshness.xml} | 2 +-
.../model/test/AbstractModelIntegrationTest.java | 67 +-
.../notifications/formatters/TextFormatter.java | 4 +-
.../notifiers/SimpleAccountNotifier.java | 3 +-
.../impl/CommunicationExceptionHandler.java | 3 +-
.../consistency/impl/ObjectNotFoundHandler.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 | 120 +-
.../midpoint/provisioning/impl/ShadowManager.java | 115 +-
.../provisioning/ucf/api/ConnectorInstance.java | 5 +-
.../ucf/impl/ConnectorFactoryIcfImpl.java | 14 +-
.../ucf/impl/ConnectorInstanceIcfImpl.java | 275 +-
.../provisioning/ucf/impl/IcfNameMapper.java | 199 +
.../midpoint/provisioning/ucf/impl/IcfUtil.java | 2 +-
.../ucf/impl/SecretIcfOperationalAttributes.java | 41 +
.../provisioning/ucf/query/FilterInterpreter.java | 5 +-
.../provisioning/ucf/query/LogicalOperation.java | 9 +-
.../midpoint/provisioning/ucf/query/Operation.java | 5 +-
.../provisioning/ucf/query/ValueOperation.java | 5 +-
.../midpoint/provisioning/ucf/util/UcfUtil.java | 25 -
.../provisioning/util/ProvisioningUtil.java | 61 +-
.../provisioning/test/impl/AbstractDummyTest.java | 183 +-
.../midpoint/provisioning/test/impl/TestDummy.java | 385 +-
.../test/impl/TestDummyCaseIgnore.java | 2 +-
.../provisioning/test/impl/TestDummyHacks.java | 18 +-
.../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 +
.../provisioning/test/impl/TestOpenDJNegative.java | 5 +-
.../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 | 37 +
.../account-bill-fettucini.xml | 37 +
.../dummy-uuid-nonunique-name/resource-dummy.xml | 108 +
.../resources/impl/dummy-uuid/resource-dummy.xml | 107 +
.../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/api/RepositoryService.java | 113 +-
.../midpoint/repo/cache/RepositoryCache.java | 9 +
.../midpoint/repo/sql/BaseSQLRepoTest.java | 2 +
.../midpoint/repo/sql/ConcurrencyTest.java | 3 +-
.../com/evolveum/midpoint/repo/sql/DeleteTest.java | 32 +
.../evolveum/midpoint/repo/sql/EncodingTest.java | 2 +-
.../com/evolveum/midpoint/repo/sql/ModifyTest.java | 6 +-
.../midpoint/repo/sql/PartialLoadingTest.java | 21 +-
.../midpoint/repo/sql/SearchShadowOwnerTest.java | 96 +
.../midpoint/repo/sql/util/SimpleTaskAdapter.java | 36 +-
.../src/test/resources/basic/objects.xml | 31 +-
.../src/test/resources/delete/shadow.xml | 58 +
repo/repo-sql-impl-test/testng.xml | 1 +
.../repo/sql/SqlRepositoryServiceImpl.java | 169 +-
.../midpoint/repo/sql/data/common/RFocus.java | 5 +-
.../midpoint/repo/sql/data/common/RObject.java | 11 +-
.../midpoint/repo/sql/data/common/RShadow.java | 14 +
.../RSynchronizationSituationDescription.java | 22 +-
.../midpoint/repo/sql/data/common/RTask.java | 3 +-
.../midpoint/repo/sql/data/common/RUser.java | 10 +-
.../midpoint/repo/sql/query/QueryInterpreter.java | 2 +-
.../midpoint/repo/sql/util/ClassMapper.java | 1 +
.../com/evolveum/midpoint/repo/sql/util/RUtil.java | 81 -
.../midpoint/test/AbstractIntegrationTest.java | 166 +-
.../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 | 35 +-
.../task/quartzimpl/cluster/ClusterManager.java | 10 +-
.../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 +-
.../ModelClientSample/ModelClientSample.sln | 20 +
.../ModelClientSample/ModelClientSample.v11.suo | Bin 0 -> 78848 bytes
.../ModelClientSample/ModelClientSample/App.config | 22 +
.../ModelClientSample/ModelClientSample.csproj | 118 +
.../ModelClientSample/ModelClientSample/Program.cs | 85 +
.../ModelClientSample/Properties/AssemblyInfo.cs | 36 +
.../Properties/Settings.Designer.cs | 26 +
.../ModelClientSample/Properties/Settings.settings | 5 +
....midpointModelService.ObjectListType.datasource | 10 +
...mple.midpointModelService.ObjectType.datasource | 10 +
...ointModelService.OperationResultType.datasource | 10 +
...mple.midpointModelService.ShadowType.datasource | 10 +
...Sample.midpointModelService.TaskType.datasource | 10 +
...Sample.midpointModelService.UserType.datasource | 10 +
.../ModelWebServiceService.wsdl | 133 +
.../midpointModelService/Reference.cs |14634 ++++++++++++++++++++
.../midpointModelService/Reference.svcmap | 31 +
.../midpointModelService/configuration.svcinfo | 10 +
.../midpointModelService/configuration91.svcinfo | 201 +
.../midpointModelService/modelPortType.wsdl | 2867 ++++
.../ModelClientSample/WsSecurityHeaders.cs | 153 +
.../solaris/deimos-solaris-resource-redhat.xml | 17 +-
.../testing/consistency/ConsistencyTest.java | 85 +-
.../src/test/resources/request/modify-rename.ldif | 7 +
345 files changed, 33721 insertions(+), 8608 deletions(-)
create mode 100644 config/h2-upgrade-2.2-to-2.3.sql
create mode 100644 config/mysql-upgrade-2.2-to-2.3.sql
create mode 100644 config/oracle-upgrade-2.2-to-2.3.sql
create mode 100644 config/postgresql-upgrade-2.2-to-2.3.sql
create mode 100644 config/sqlserver-upgrade-2.2-to-2.3.sql
create mode 100644 gui/admin-gui/src/main/resources/DejaVuSans.ttf
copy gui/admin-gui/{misc => src/main/webapp/img}/flag/en.png (100%)
copy gui/{admin-gui-sk-SK/src/main/resources => admin-gui/src/main/webapp/img/flag}/sk.png (100%)
copy gui/{admin-gui-en-US/src/main/resources => admin-gui/src/main/webapp/img/flag}/us.png (100%)
mode change 100755 => 100644
delete mode 100644 gui/admin-gui/src/main/webapp/reports/reportUserAccounts_old.jrxml
create mode 100644 infra/common/src/test/java/com/evolveum/midpoint/common/expression/script/TestScriptCaching.java
create mode 100644 infra/common/src/test/resources/mapping/mapping-asis-password.xml
create mode 100644 infra/common/src/test/resources/mapping/mapping-script-system-variables-password-decrypt.xml
create mode 100644 infra/common/src/test/resources/mapping/mapping-script-system-variables-password.xml
create mode 100644 infra/util/src/test/java/com/evolveum/midpoint/util/ProfilingTest.java
create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractScannerResultHandler.java
create mode 100644 model/model-impl/src/test/resources/common/account-shadow-calypso-dummy.xml
create mode 100644 model/model-impl/src/test/resources/lens/account-before-script.xml
create mode 100644 model/model-impl/src/test/resources/sync/correlation-case-insensitive.xml
create mode 100644 model/model-impl/src/test/resources/sync/correlation-case-insensitive_empl_number.xml
create mode 100644 model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/ProfilingLensDebugListener.java
create mode 100644 model/model-intest/src/test/resources/sync/account-stan-dummy.xml
copy model/{model-impl/src/test/resources/common/resource-dummy.xml => model-intest/src/test/resources/sync/resource-dummy-lime.xml} (52%)
copy model/model-intest/src/test/resources/{common/task-reconcile-dummy.xml => sync/task-reconcile-dummy-long-freshness.xml} (96%)
create mode 100644 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
create mode 100644 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/SecretIcfOperationalAttributes.java
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
create mode 100644 provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/account-alfredo-fettucini.xml
create mode 100644 provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/account-bill-fettucini.xml
create mode 100644 provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid-nonunique-name/resource-dummy.xml
create mode 100644 provisioning/provisioning-impl/src/test/resources/impl/dummy-uuid/resource-dummy.xml
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/java/com/evolveum/midpoint/repo/sql/SearchShadowOwnerTest.java
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%)
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample.sln
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample.v11.suo
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/App.config
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/ModelClientSample.csproj
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Program.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Properties/AssemblyInfo.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Properties/Settings.Designer.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Properties/Settings.settings
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.ObjectListType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.ObjectType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.OperationResultType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.ShadowType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.TaskType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.UserType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelWebServiceService.wsdl
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/Reference.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/Reference.svcmap
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/configuration.svcinfo
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/configuration91.svcinfo
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/modelPortType.wsdl
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/WsSecurityHeaders.cs
create mode 100644 testing/consistency-mechanism/src/test/resources/request/modify-rename.ldif
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list