[midPoint-git] midPoint branch master updated. v2.3devel-834-g5ccc711
Katka Valalikova
git at evolveum.com
Tue Jan 7 21:13:17 CET 2014
Project "midPoint" branch master has been updated
via 5ccc7115db216575f65dd49d4b3079b582220e23 (commit) v2.3devel-834-g5ccc711
via d27f07e89f9845c10558cbec9cce4d8b531341a3 (commit) v2.3devel-832-gd27f07e
via 9c5a7c1ffa04caadd88e48e0118d0c20e1a4a22c (commit) v2.3devel-831-g9c5a7c1
via 64575bbc83712ff86d4406b7da8f9aef90da267d (commit) v2.3devel-490-g64575bb
via d02e3e5cb829dfc99671668cb276e4c6fe9f5672 (commit) v2.3devel-489-gd02e3e5
via 4288f055da4eb5c7bb1710bfec9efc74454dc91e (commit) v2.3devel-486-g4288f05
via 7e3e9e1dbdf052df2ac1640c263123c2b59a15c4 (commit) v2.3devel-485-g7e3e9e1
via ad1c4253603088865365ec1015d512b9367439c8 (commit) v2.3devel-484-gad1c425
via fb183f7c01ba2c16db3ab48b15d98315aa6661ef (commit) v2.3devel-483-gfb183f7
via eba3095cba1a5919e3949fb6fab712406bd3ba0c (commit) v2.3devel-354-geba3095
via 6a198653efb9f0dae4cd6dbf60cc29a68c04fd71 (commit) v2.3devel-353-g6a19865
via 859d8b9ca7f1073d216365834458f6b4818c9435 (commit) v2.3devel-352-g859d8b9
via a403fd88800f5dae9bec2de5817b48a5cb238b74 (commit) v2.3devel-351-ga403fd8
via aea52b1d6d3b4d89bd73b0bf5befe8acaf2ee1fa (commit) v2.3devel-350-gaea52b1
from 49c046076490a5553861a4f6c9f100111cbfc572 (commit) v2.3devel-820-g49c0460
- Log -----------------------------------------------------------------
commit 5ccc7115db216575f65dd49d4b3079b582220e23
Merge: d27f07e 49c0460
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Jan 7 21:03:08 2014 +0100
Merge branch 'master' into queryApi
commit d27f07e89f9845c10558cbec9cce4d8b531341a3
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Jan 7 21:02:06 2014 +0100
fixing build after merge..
commit 9c5a7c1ffa04caadd88e48e0118d0c20e1a4a22c
Merge: 64575bb e64a4e5
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Jan 7 20:08:54 2014 +0100
Merge branch 'master' into queryApi
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.java
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
commit 64575bbc83712ff86d4406b7da8f9aef90da267d
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Jan 7 20:01:31 2014 +0100
fixing tests after query api refactoring..
commit d02e3e5cb829dfc99671668cb276e4c6fe9f5672
Merge: 4288f05 6682992
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Jan 6 23:30:12 2014 +0100
Merge branch 'master' into queryApi
commit 4288f055da4eb5c7bb1710bfec9efc74454dc91e
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Jan 6 23:29:15 2014 +0100
fixing report tests compilation..
commit 7e3e9e1dbdf052df2ac1640c263123c2b59a15c4
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Jan 6 21:17:42 2014 +0100
fixing build after merge
commit ad1c4253603088865365ec1015d512b9367439c8
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Jan 6 19:57:46 2014 +0100
fixing compilation failures after merge of master.
commit fb183f7c01ba2c16db3ab48b15d98315aa6661ef
Merge: eba3095 3c553a8e
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Jan 6 19:42:26 2014 +0100
Merge branch 'master' into queryApi
Conflicts:
infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
commit eba3095cba1a5919e3949fb6fab712406bd3ba0c
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Jan 6 19:36:33 2014 +0100
refactoring query api
commit 6a198653efb9f0dae4cd6dbf60cc29a68c04fd71
Author: katkav <k.valalikova at evolveum.com>
Date: Fri Dec 13 12:04:57 2013 +0100
query api refactoring (factory method clean up, work in progress)
commit 859d8b9ca7f1073d216365834458f6b4818c9435
Author: katkav <k.valalikova at evolveum.com>
Date: Fri Dec 13 01:44:12 2013 +0100
query api refanctoring (work in progress)
commit a403fd88800f5dae9bec2de5817b48a5cb238b74
Author: katkav <k.valalikova at evolveum.com>
Date: Wed Dec 11 11:48:09 2013 +0100
query api clean up (work in progress, model done)
commit aea52b1d6d3b4d89bd73b0bf5befe8acaf2ee1fa
Author: katkav <k.valalikova at evolveum.com>
Date: Wed Dec 11 02:27:33 2013 +0100
query api clean up...work in progress (infra, repo, provisioning done)
-----------------------------------------------------------------------
(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:
.../web/component/dialog/UserBrowserDialog.java | 34 +--
.../web/page/admin/configuration/PageAccounts.java | 12 +-
.../page/admin/configuration/PageDebugList.java | 4 +-
.../resources/content/PageContentAccounts.java | 2 +-
.../midpoint/web/page/admin/server/PageTasks.java | 4 +-
.../server/dto/TaskDtoExecutionStatusFilter.java | 14 +-
.../midpoint/web/page/admin/users/PageUser.java | 6 +-
.../midpoint/web/page/admin/users/PageUsers.java | 16 +-
.../midpoint/common/crypto/TestProtector.java | 26 ++
.../common/mapping/MappingTestEvaluator.java | 13 -
.../midpoint/prism/query/ComparativeFilter.java | 70 +++--
.../midpoint/prism/query/EqualsFilter.java | 217 ++++++++++-----
.../midpoint/prism/query/GreaterFilter.java | 73 ++++--
.../evolveum/midpoint/prism/query/LessFilter.java | 85 ++++--
.../midpoint/prism/query/ObjectFilter.java | 14 +
.../midpoint/prism/query/PropertyValueFilter.java | 277 +++++++++++++-------
.../evolveum/midpoint/prism/query/RefFilter.java | 140 +++++++---
.../midpoint/prism/query/StringValueFilter.java | 4 +-
.../midpoint/prism/query/SubstringFilter.java | 148 +++++++++--
.../evolveum/midpoint/prism/query/ValueFilter.java | 87 ++++--
.../evolveum/midpoint/prism/TestObjectQuery.java | 32 +--
.../evolveum/midpoint/schema/QueryConvertor.java | 213 +++++++++------
.../midpoint/schema/util/ObjectQueryUtil.java | 10 +-
.../midpoint/schema/TestQueryConvertor.java | 2 +
.../model/controller/ModelDiagController.java | 6 +-
.../midpoint/model/expr/MidpointFunctionsImpl.java | 19 +-
.../model/lens/ShadowConstraintsChecker.java | 16 +-
.../model/security/UserDetailsServiceImpl.java | 6 +-
.../sync/FocusValidityScannerTaskHandler.java | 24 +-
.../model/sync/ReconciliationTaskHandler.java | 14 +-
.../model/trigger/TriggerScannerTaskHandler.java | 12 +-
.../model/intest/TestModelServiceContract.java | 4 +-
.../evolveum/midpoint/model/intest/TestRbac.java | 4 +-
.../midpoint/model/intest/TestStrangeCases.java | 8 +-
.../model/intest/importer/ImportRefTest.java | 6 +-
.../midpoint/model/intest/importer/ImportTest.java | 6 +-
.../model/test/AbstractModelIntegrationTest.java | 15 +-
.../midpoint/report/ReportManagerImpl.java | 4 +-
.../evolveum/midpoint/report/BasicReportTest.java | 2 +-
.../midpoint/wf/TestUserChangeApproval.java | 5 +-
.../impl/ObjectAlreadyExistHandler.java | 11 +-
.../provisioning/impl/ConnectorManager.java | 4 +-
.../provisioning/impl/EntitlementConverter.java | 15 +-
.../provisioning/impl/ResourceObjectConverter.java | 6 +-
.../midpoint/provisioning/impl/ShadowManager.java | 31 +--
.../provisioning/ucf/query/LogicalOperation.java | 2 +-
.../midpoint/provisioning/ucf/query/Operation.java | 2 +-
.../provisioning/ucf/query/ValueOperation.java | 15 +-
.../provisioning/test/impl/AbstractDummyTest.java | 5 +-
.../test/impl/TestConnectorDiscovery.java | 4 +-
.../midpoint/provisioning/test/impl/TestDummy.java | 2 +-
.../test/impl/TestDummyUuidNonUniqueName.java | 10 +-
.../midpoint/repo/sql/AddOverwriteTest.java | 2 +-
.../midpoint/repo/sql/ConcurrencyTest.java | 3 +-
.../evolveum/midpoint/repo/sql/EncodingTest.java | 4 +-
.../com/evolveum/midpoint/repo/sql/ModifyTest.java | 2 +-
.../evolveum/midpoint/repo/sql/OrgStructTest.java | 4 +-
.../midpoint/repo/sql/PartialLoadingTest.java | 28 +-
.../midpoint/repo/sql/QueryInterpreterTest.java | 91 +++----
.../com/evolveum/midpoint/repo/sql/SearchTest.java | 12 +-
.../midpoint/repo/sql/query/QueryInterpreter.java | 3 +-
.../query/restriction/AnyPropertyRestriction.java | 5 +-
.../query/restriction/CollectionRestriction.java | 8 +-
.../sql/query/restriction/ItemRestriction.java | 10 +-
.../sql/query/restriction/PropertyRestriction.java | 8 +-
.../query/restriction/ReferenceRestriction.java | 3 +-
.../com/evolveum/midpoint/repo/sql/util/RUtil.java | 2 +-
.../midpoint/test/AbstractIntegrationTest.java | 24 +-
.../midpoint/test/IntegrationTestTools.java | 35 +--
.../task/quartzimpl/TaskManagerQuartzImpl.java | 28 +-
.../midpoint/task/quartzimpl/TaskQuartzImpl.java | 20 +-
.../task/quartzimpl/cluster/NodeRegistrar.java | 5 +-
.../quartzimpl/TestQuartzTaskManagerContract.java | 4 +-
.../midpoint/samples/test/TestSampleImport.java | 6 +-
.../midpoint/testing/sanity/TestSanity.java | 3 +-
75 files changed, 1323 insertions(+), 748 deletions(-)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list