[midPoint-git] midPoint branch rest updated. v2.3devel-87-gdc1b025
Katka Valalikova
git at evolveum.com
Wed Oct 23 08:31:36 CEST 2013
Project "midPoint" branch rest has been updated
via dc1b02550006619c52b827ecf729b3f16b146d57 (commit) v2.3devel-87-gdc1b025
via 7039d8d87c413cfcd15c602a0c186e85af91933a (commit) v2.3devel-86-g7039d8d
via ce81d1acc6eec4fc7156f9af0961643ef5f879ba (commit) v2.3devel-85-gce81d1a
via 57556afbf0eafb4e89485b6f27af231bde82452e (commit) v2.3devel-84-g57556af
via 12b8edc52793acb95c2fdcf2810f6255d80f5dde (commit) v2.3devel-83-g12b8edc
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 5d31735b5c03e42dc7c31d0cc845fe6f0df71f62 (commit) v2.3devel-41-g5d31735
via ae1963fcf65583e7b520320b5dfcca8ff1992576 (commit) v2.3devel-39-gae1963f
via b0754d353cd43faea2cde1c28a966cda40bccd11 (commit) v2.3devel-39-gb0754d3
via de2275d863366c2195a2678acf1d77a7e007dd6c (commit) v2.3devel-38-gde2275d
via dd8622e184cd4af56cd0292556bd557e27b5571f (commit) v2.3devel-37-gdd8622e
via c09b19b9a42fbd1ba3faffe16f299ce521547e57 (commit) v2.3devel-26-gc09b19b
via 18d28437c6731d8f62db0a93feeb6b46c4b45847 (commit) v2.3devel-25-g18d2843
via 40f05f6e8ef626a05315b68075a3bdd6fe90e4af (commit) v2.3devel-34-g40f05f6
via b4ecdda51275a13fa1f4e3bf48f4c53c01222812 (commit) v2.3devel-33-gb4ecdda
via 6f493698848c96d453f1f2949e337df2abe28780 (commit) v2.3devel-32-g6f49369
via 68098f683094fa1c32108ef19968c30d9933962e (commit) v2.3devel-31-g68098f6
via accb57c7a0dd35d340ca83e5ecf6aa94fda681f2 (commit) v2.3devel-30-gaccb57c
via eef5511dcf7408d6bd002064c99b2d9eef2ed1fe (commit) v2.3devel-29-geef5511
via 5d702b9972d6bacdaa96fcb1264e721550dad248 (commit) v2.3devel-28-g5d702b9
via 5e6ac58485a90c92fa49894db8b9a562c2ada2dd (commit) v2.3devel-27-g5e6ac58
via ede203d47452dfd2c6407cf30da0a9d0333b811a (commit) v2.3devel-22-gede203d
via e68f023380ebe786fbd352737061c1f882efd996 (commit) v2.3devel-25-ge68f023
via efe50d17ba7fb49245c9c6f1320bc4923b8b7812 (commit) v2.3devel-24-gefe50d1
via f80449d716d4d59f247be008d08d1f727277dd7b (commit) v2.3devel-23-gf80449d
via 3e3a413dc5a126110d8ba46e662562ee6a8e2083 (commit) v2.3devel-22-g3e3a413
via 947d00fc3386400a450acadbd215e1ba068f6e59 (commit) v2.3devel-21-g947d00f
from d026074501cc70686c24ae7291b25401ea6ee013 (commit) v2.3devel-24-gd026074
- Log -----------------------------------------------------------------
commit dc1b02550006619c52b827ecf729b3f16b146d57
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Oct 22 15:30:02 2013 +0200
improve mapping for list shadow owner method..
commit 7039d8d87c413cfcd15c602a0c186e85af91933a
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Oct 22 12:15:24 2013 +0200
PATCH for modifyObject..
commit ce81d1acc6eec4fc7156f9af0961643ef5f879ba
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Oct 22 10:51:00 2013 +0200
some improvements to the rest api (changes URL, improved exception handling, etc..)
commit 57556afbf0eafb4e89485b6f27af231bde82452e
Author: katkav <k.valalikova at evolveum.com>
Date: Thu Oct 10 15:08:55 2013 +0200
build fix.
commit 12b8edc52793acb95c2fdcf2810f6255d80f5dde
Merge: d026074 7138de7
Author: katkav <k.valalikova at evolveum.com>
Date: Thu Oct 10 14:55:10 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:
.gitignore | 1 +
.../PageLogging_en_US.utf8.properties | 13 +
.../PageLogging_sk_SK.utf8.properties | 13 +
.../web/component/data/ObjectDataProvider.java | 2 +-
.../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 | 1 +
.../midpoint/web/page/admin/users/PageUser.java | 11 +-
.../web/page/admin/users/dto/OrgStructDto.java | 18 +-
.../web/util/MidPointProfilingServletFilter.java | 41 ++-
gui/admin-gui/src/main/resources/DejaVuSans.ttf | Bin 0 -> 622020 bytes
gui/admin-gui/src/main/resources/logback.xml | 4 +-
gui/admin-gui/src/main/resources/objects.xml | 7 +-
.../{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
.../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 +-
.../common/LoggingConfigurationManager.java | 2 +-
.../common/ProfilingConfigurationManager.java | 64 ++--
.../midpoint/prism/ComplexTypeDefinition.java | 10 +
.../java/com/evolveum/midpoint/prism/Item.java | 2 +-
.../midpoint/prism/PrismPropertyDefinition.java | 2 +-
.../midpoint/prism/PrismPropertyValue.java | 3 +-
.../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 +-
.../midpoint/prism/query/LogicalFilter.java | 9 +
.../evolveum/midpoint/prism/query/NotFilter.java | 5 +-
.../midpoint/prism/query/ObjectFilter.java | 7 +-
.../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 | 44 ++-
.../evolveum/midpoint/prism/query/RefFilter.java | 12 +-
.../midpoint/prism/query/SubstringFilter.java | 33 +-
.../evolveum/midpoint/prism/query/ValueFilter.java | 26 ++
.../query/{OrderDirection.java => Visitor.java} | 47 ++-
.../midpoint/prism/schema/SchemaRegistry.java | 49 +--
.../evolveum/midpoint/prism/util/PrismAsserts.java | 8 +-
.../evolveum/midpoint/prism/TestExtraSchema.java | 16 +-
.../evolveum/midpoint/prism/TestObjectQuery.java | 21 +-
.../resources/schema-extra/extension/user2.xsd | 16 +-
.../midpoint/schema/constants/ObjectTypes.java | 4 +-
.../midpoint/schema/constants/SchemaConstants.java | 1 +
.../schema/util/SynchronizationSituationUtil.java | 22 +-
.../resources/xml/ns/public/common/common-2a.xsd | 2 +
.../public/connector/icf-1/resource-schema-2.xsd | 61 ++--
.../midpoint/test/ldap/OpenDJController.java | 23 ++
.../util/aspect/AspectProfilingFilters.java | 304 -----------------
.../util/aspect/MethodUsageStatistics.java | 192 +++++++++++
.../midpoint/util/aspect/MidpointAspect.java | 200 ++++++++++--
.../util/aspect/PerformanceStatistics.java | 162 ++++++++++
.../midpoint/util/aspect/ProfilingDataLog.java | 136 +++++++-
.../midpoint/util/aspect/ProfilingDataManager.java | 325 +++++++++++++++++--
.../util/logging/ProfilingLogbackFilter.java | 4 +-
.../com/evolveum/midpoint/util/ProfilingTest.java | 199 ++++++++++++
.../midpoint/model/api/ModelExecuteOptions.java | 9 +
.../evolveum/midpoint/model/ModelCrudService.java | 9 +-
.../midpoint/model/ModelObjectResolver.java | 5 +-
.../evolveum/midpoint/model/ModelRestService.java | 254 ++++++++++++---
.../evolveum/midpoint/model/ModelWebService.java | 2 +-
.../midpoint/model/controller/ModelController.java | 4 +-
.../controller/SystemConfigurationHandler.java | 3 +-
.../midpoint/model/lens/ChangeExecutor.java | 31 +-
.../evolveum/midpoint/model/lens/LensContext.java | 10 +
.../com/evolveum/midpoint/model/lens/LensUtil.java | 8 +-
.../model/lens/ShadowConstraintsChecker.java | 34 +-
.../lens/projector/AccountValuesProcessor.java | 130 ++++++--
.../model/lens/projector/ActivationProcessor.java | 5 +
.../model/lens/projector/ContextLoader.java | 15 +-
.../model/lens/projector/InboundProcessor.java | 2 +
.../model/lens/projector/OutboundProcessor.java | 1 +
.../midpoint/model/lens/projector/Projector.java | 28 +-
.../lens/projector/ReconciliationProcessor.java | 4 +-
.../model/{ => rest}/MidpointXmlProvider.java | 10 +-
.../com/evolveum/midpoint/model/rest/PATCH.java | 15 +
.../MidpointRestAuthenticationHandler.java | 2 +-
.../sync/CorrelationConfirmationEvaluator.java | 11 +-
.../model/sync/ReconciliationTaskHandler.java | 10 +-
.../model/sync/SynchronizationService.java | 39 +--
.../com/evolveum/midpoint/model/util/Utils.java | 27 ++
model/model-impl/src/main/resources/ctx-model.xml | 4 +-
.../midpoint/model/lens/TestProjectorAddUser.java | 4 +-
.../midpoint/model/lens/TestReconScript.java | 142 +++++++-
.../sync/TestCorrelationConfiramtionEvaluator.java | 137 +++++++-
.../src/test/resources/common/resource-dummy.xml | 27 +-
.../test/resources/lens/account-before-script.xml} | 11 +-
...filter.xml => correlation-case-insensitive.xml} | 5 +-
...> correlation-case-insensitive_empl_number.xml} | 7 +-
.../midpoint/model/intest/TestIteration.java | 75 ++++-
.../midpoint/model/intest/TestMapping.java | 2 +
.../midpoint/model/intest/TestPreviewChanges.java | 2 +-
.../test/resources/common/resource-dummy-red.xml | 5 +
.../resources/iteration/resource-dummy-pink.xml | 3 +
.../model/test/AbstractModelIntegrationTest.java | 9 +
.../provisioning/api/ProvisioningService.java | 6 +-
.../impl/ObjectAlreadyExistHandler.java | 2 +-
.../consistency/impl/ObjectNotFoundHandler.java | 4 +
.../provisioning/impl/ProvisioningServiceImpl.java | 85 +++--
.../midpoint/provisioning/impl/ShadowCache.java | 86 ++++-
.../midpoint/provisioning/impl/ShadowManager.java | 68 ++++
.../ucf/impl/ConnectorFactoryIcfImpl.java | 8 +-
.../ucf/impl/ConnectorInstanceIcfImpl.java | 141 ++------
.../provisioning/ucf/impl/IcfNameMapper.java | 199 ++++++++++++
.../ucf/impl/SecretIcfOperationalAttributes.java | 37 +--
.../provisioning/ucf/query/FilterInterpreter.java | 5 +-
.../provisioning/ucf/query/LogicalOperation.java | 9 +-
.../midpoint/provisioning/ucf/query/Operation.java | 5 +-
.../provisioning/ucf/query/ValueOperation.java | 13 +-
.../midpoint/provisioning/ucf/util/UcfUtil.java | 25 --
.../test/impl/TestConnectorDiscovery.java | 2 +-
.../midpoint/provisioning/test/impl/TestDummy.java | 105 ++++--
.../test/impl/TestDummyCaseIgnore.java | 23 ++
.../provisioning/test/impl/TestDummyHacks.java | 18 +-
.../provisioning/test/impl/TestDummySecurity.java | 2 +-
.../provisioning/test/impl/TestOpenDJ.java | 8 +-
.../provisioning/test/impl/TestOpenDJNegative.java | 13 +-
.../test/resources/impl/dummy/account-morgan.xml | 2 +
.../midpoint/repo/api/RepositoryService.java | 113 ++++---
.../midpoint/repo/cache/RepositoryCache.java | 9 +
.../evolveum/midpoint/repo/sql/EncodingTest.java | 2 +-
.../midpoint/repo/sql/SearchShadowOwnerTest.java | 96 ++++++
.../src/test/resources/basic/objects.xml | 19 +-
repo/repo-sql-impl-test/testng.xml | 1 +
.../repo/sql/SqlRepositoryServiceImpl.java | 135 ++++++--
.../midpoint/repo/sql/util/ClassMapper.java | 1 +
.../task/quartzimpl/cluster/ClusterManager.java | 2 -
.../account-jack.xml => rest/account-jack-csv.xml} | 4 +-
.../account-jack-opendj.xml} | 4 +-
samples/rest/default-user-template.xml | 37 +++
samples/rest/default-user-template2.xml | 36 +++
.../modification-assign-account.xml | 0
samples/{samples => rest}/query-all-accounts.xml | 0
.../testing/consistency/ConsistencyTest.java | 275 ++++++++++++++--
.../repo/{user-jack.xml => user-abom.xml} | 17 +-
.../repo/{user-jack.xml => user-abomba.xml} | 17 +-
.../repo/{user-herman.xml => user-discovery.xml} | 72 ++---
.../src/test/resources/request/discovery.ldif} | 12 +-
.../src/test/resources/request/modify-rename.ldif | 7 +
.../resource-modify-resource-schema.xml} | 341 +++++---------------
.../request/resource-modify-synchronization.xml | 92 ++++++
...ls.xml => user-modify-add-account-directly.xml} | 82 +++--
.../midpoint/testing/longtest/TestLdap.java | 15 +-
.../midpoint/testing/sanity/TestSanity.java | 2 +-
153 files changed, 4535 insertions(+), 1943 deletions(-)
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
copy infra/prism/src/main/java/com/evolveum/midpoint/prism/query/{OrderDirection.java => Visitor.java} (84%)
copy samples/samples-test/src/test/resources/schema/extension-piracy.xsd => infra/prism/src/test/resources/schema-extra/extension/user2.xsd (73%)
delete mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/AspectProfilingFilters.java
create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java
create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/PerformanceStatistics.java
create mode 100644 infra/util/src/test/java/com/evolveum/midpoint/util/ProfilingTest.java
rename model/model-impl/src/main/java/com/evolveum/midpoint/model/{ => rest}/MidpointXmlProvider.java (95%)
create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/rest/PATCH.java
rename model/model-impl/src/main/java/com/evolveum/midpoint/model/{ => security}/MidpointRestAuthenticationHandler.java (99%)
copy model/{model-intest/src/test/resources/common/account-jack-dummy.xml => model-impl/src/test/resources/lens/account-before-script.xml} (86%)
copy model/model-impl/src/test/resources/sync/{correlation-first-filter.xml => correlation-case-insensitive.xml} (85%)
copy model/model-impl/src/test/resources/sync/{correlation-first-filter.xml => correlation-case-insensitive_empl_number.xml} (83%)
create mode 100644 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddResourcesDto.java => provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/SecretIcfOperationalAttributes.java (56%)
create mode 100644 repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchShadowOwnerTest.java
copy samples/{objects/account-jack.xml => rest/account-jack-csv.xml} (92%)
copy samples/{objects/account-jack.xml => rest/account-jack-opendj.xml} (92%)
create mode 100644 samples/rest/default-user-template.xml
create mode 100644 samples/rest/default-user-template2.xml
rename samples/{samples => rest}/modification-assign-account.xml (100%)
rename samples/{samples => rest}/query-all-accounts.xml (100%)
copy testing/consistency-mechanism/src/test/resources/repo/{user-jack.xml => user-abom.xml} (78%)
copy testing/consistency-mechanism/src/test/resources/repo/{user-jack.xml => user-abomba.xml} (78%)
copy testing/consistency-mechanism/src/test/resources/repo/{user-herman.xml => user-discovery.xml} (78%)
copy testing/{sanity/src/test/resources/request/elaine.ldif => consistency-mechanism/src/test/resources/request/discovery.ldif} (56%)
create mode 100644 testing/consistency-mechanism/src/test/resources/request/modify-rename.ldif
copy testing/consistency-mechanism/src/test/resources/{repo/resource-opendj.xml => request/resource-modify-resource-schema.xml} (56%)
create mode 100644 testing/consistency-mechanism/src/test/resources/request/resource-modify-synchronization.xml
copy testing/consistency-mechanism/src/test/resources/request/{user-modify-add-account-deniels.xml => user-modify-add-account-directly.xml} (85%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list