[midPoint-git] [Evolveum/midpoint] 2a3375: MID-2533
Viliam Repan
vilo.repan at evolveum.com
Tue Sep 8 21:35:13 CEST 2015
Branch: refs/heads/feature/user-search
Home: https://github.com/Evolveum/midpoint
Commit: 2a33754802364e6b65b926934110b2cb2c45c8a2
https://github.com/Evolveum/midpoint/commit/2a33754802364e6b65b926934110b2cb2c45c8a2
Author: honchar <honchar at evolveum.com>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
Log Message:
-----------
MID-2533
Commit: ce418b08af24b454b298bcaf835f151891194b9f
https://github.com/Evolveum/midpoint/commit/ce418b08af24b454b298bcaf835f151891194b9f
Author: honchar <honchar at evolveum.com>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
Log Message:
-----------
MID-2533 not fixed yet
Commit: f17891580588df58966b75ed12b6134add7708f8
https://github.com/Evolveum/midpoint/commit/f17891580588df58966b75ed12b6134add7708f8
Author: honchar <honchar at evolveum.com>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
A testing/selenidetest/complex-test-suite.xml
M testing/selenidetest/testng.xml
Log Message:
-----------
new test suite
Commit: 8c846fa2fdce04ebc2c8913c7351b9d5221fbb21
https://github.com/Evolveum/midpoint/commit/8c846fa2fdce04ebc2c8913c7351b9d5221fbb21
Author: honchar <honchar at evolveum.com>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
A samples/resources/389ds/389ds-legacy-connector.xml
M samples/resources/389ds/389ds-localhost-medium.xml
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
M testing/conntest/src/test/resources/389ds/resource-bacchus.xml
M testing/conntest/src/test/resources/389ds/resource-localhost.xml
M testing/conntest/src/test/resources/openldap/resource.xml
Log Message:
-----------
Merge branch 'mid2533' of https://github.com/Evolveum/midpoint into mid2533
Commit: cc47dbc203954137f6d591b3c1297153f15a2ef1
https://github.com/Evolveum/midpoint/commit/cc47dbc203954137f6d591b3c1297153f15a2ef1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2015-09-02 (Wed, 02 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/TreeStateSet.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
Log Message:
-----------
MID-2533 storing tree state, not finished yet
Commit: 5756dcd7ed4191e088d396326cadf234e8f6a5f0
https://github.com/Evolveum/midpoint/commit/5756dcd7ed4191e088d396326cadf234e8f6a5f0
Author: honchar <honchar at evolveum.com>
Date: 2015-09-06 (Sun, 06 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
Log Message:
-----------
mid-2533 fixed
Commit: b508a48b009a288610337ebce6ac940d216f68bc
https://github.com/Evolveum/midpoint/commit/b508a48b009a288610337ebce6ac940d216f68bc
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-06 (Sun, 06 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusShadowDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UserAccountDto.java
Log Message:
-----------
adding support for references in generated gui form
Commit: b8e91a44fa1a43126f2906a2a10cb2c77a54c4ce
https://github.com/Evolveum/midpoint/commit/b8e91a44fa1a43126f2906a2a10cb2c77a54c4ce
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-06 (Sun, 06 Sep 2015)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
Log Message:
-----------
improving operations(add, delete, replace) on references in form
Commit: 37ddab07cc0e11dc56d845580c2f164de4972515
https://github.com/Evolveum/midpoint/commit/37ddab07cc0e11dc56d845580c2f164de4972515
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Support for name in object references
Commit: d1603fc788fd0302894c1804e2b5f899771ddbfc
https://github.com/Evolveum/midpoint/commit/d1603fc788fd0302894c1804e2b5f899771ddbfc
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
R testing/consistency-mechanism/src/test/resources/repo/user-bob-no-family-name.xml
A testing/consistency-mechanism/src/test/resources/repo/user-bob-no-given-name.xml
Log Message:
-----------
Merge branch 'master' into feature/gui-form-references
Commit: 95f571d56cd08359ebe03cbc4297e98e8db70794
https://github.com/Evolveum/midpoint/commit/95f571d56cd08359ebe03cbc4297e98e8db70794
Author: honchar <honchar at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/TreeStateSet.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
A testing/selenidetest/complex-test-suite.xml
M testing/selenidetest/testng.xml
Log Message:
-----------
fixing MID-2533
some changes for selenide module
Commit: 4a21f824ab681d41f8462b3b7cbfed9caaf5110a
https://github.com/Evolveum/midpoint/commit/4a21f824ab681d41f8462b3b7cbfed9caaf5110a
Author: honchar <honchar at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 08859b7e14de25bc2cbd685365ce602aa78690b2
https://github.com/Evolveum/midpoint/commit/08859b7e14de25bc2cbd685365ce602aa78690b2
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Merge branch 'master' into feature/gui-form-references
Commit: d0bb504186bb2c7a0d04fed8c9084eedebf824c2
https://github.com/Evolveum/midpoint/commit/d0bb504186bb2c7a0d04fed8c9084eedebf824c2
Author: honchar <honchar at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
Log Message:
-----------
fixing MID-2533, some changes
Commit: 960e27c4f3e905d63537f564c3e7c1a963667bd2
https://github.com/Evolveum/midpoint/commit/960e27c4f3e905d63537f564c3e7c1a963667bd2
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
Log Message:
-----------
Fixing marking shadow as dead.
Commit: d2236cacc102bcf03b837b878e4d64616bedcc12
https://github.com/Evolveum/midpoint/commit/d2236cacc102bcf03b837b878e4d64616bedcc12
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
Log Message:
-----------
reslve names (repo support)
Commit: 241b1df007eeeee505a0c5835a16c3f609861e2a
https://github.com/Evolveum/midpoint/commit/241b1df007eeeee505a0c5835a16c3f609861e2a
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
Log Message:
-----------
showing name instead of oid in valueChoosePanel
Commit: c9e20d41e12b2a65453277151db29831165d52d0
https://github.com/Evolveum/midpoint/commit/c9e20d41e12b2a65453277151db29831165d52d0
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
Log Message:
-----------
Fixing several stupid bugs in projector and ChangeExecutor ... but consistency test still fails.
Commit: c6b41b0325ceed415cf5f8ef62b2f7fc1cdd5d1d
https://github.com/Evolveum/midpoint/commit/c6b41b0325ceed415cf5f8ef62b2f7fc1cdd5d1d
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
Log Message:
-----------
displayName for prismReferenceDefinition - updating schema + parsing, small clean up in text formatting...
Commit: a2d61a7502ee30653aaf245196017665ad47c969
https://github.com/Evolveum/midpoint/commit/a2d61a7502ee30653aaf245196017665ad47c969
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/TreeStateSet.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
A testing/selenidetest/complex-test-suite.xml
M testing/selenidetest/testng.xml
Log Message:
-----------
Merge branch 'master' into feature/gui-form-references
Commit: c4d67d6bcee9211038c93f40a5635713dd210145
https://github.com/Evolveum/midpoint/commit/c4d67d6bcee9211038c93f40a5635713dd210145
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java
Log Message:
-----------
fixing GUI tests
Commit: 101de4b97e79205459b238b42113814be0025561
https://github.com/Evolveum/midpoint/commit/101de4b97e79205459b238b42113814be0025561
Author: Ivan Noris <ivan.noris at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
Log Message:
-----------
Attempt to fix could not extract ResultSet error, unsuccessfull yet
Commit: b8910a2f166a223705bfd7dfb0f1dcadbbb56d3e
https://github.com/Evolveum/midpoint/commit/b8910a2f166a223705bfd7dfb0f1dcadbbb56d3e
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
Log Message:
-----------
fixing resolve name function
Commit: ce64a297a47d431d7a419cd848f9f18990dba6c4
https://github.com/Evolveum/midpoint/commit/ce64a297a47d431d7a419cd848f9f18990dba6c4
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-07 (Mon, 07 Sep 2015)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 39a82451c198f9c02381436322be168007046370
https://github.com/Evolveum/midpoint/commit/39a82451c198f9c02381436322be168007046370
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertQueryHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
Log Message:
-----------
improving handling resolveNames options
Commit: efe73ba6601929b915f8c8abe1672e65168e0351
https://github.com/Evolveum/midpoint/commit/efe73ba6601929b915f8c8abe1672e65168e0351
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
Log Message:
-----------
fixing GUI user/org creation
Commit: 2d0211cffeca5aa12b768a8ef6faeb7cffccaefd
https://github.com/Evolveum/midpoint/commit/2d0211cffeca5aa12b768a8ef6faeb7cffccaefd
Author: honchar <honchar at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M testing/selenidetest/testng.xml
Log Message:
-----------
basic test suite is uncommented
Commit: 08fb5818bb9ff521d050a1880bd9cb952be6344f
https://github.com/Evolveum/midpoint/commit/08fb5818bb9ff521d050a1880bd9cb952be6344f
Author: honchar <honchar at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 5ed4203b8b40b3767a078bff8d3096a340649d8e
https://github.com/Evolveum/midpoint/commit/5ed4203b8b40b3767a078bff8d3096a340649d8e
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
Log Message:
-----------
Generalized resolveNames implementation to cover references in any depth.
Commit: 674c541784ea56c2f55ec0a5171b71f07574b1eb
https://github.com/Evolveum/midpoint/commit/674c541784ea56c2f55ec0a5171b71f07574b1eb
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
M testing/selenidetest/testng.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 8399ecdd89b7bc5b0836542ff272a0bc14a21f35
https://github.com/Evolveum/midpoint/commit/8399ecdd89b7bc5b0836542ff272a0bc14a21f35
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsNsUniqueIdTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsBacchus.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsDnBacchus.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsDnLocalhost.java
R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsNsUniqueIdBacchus.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsNsUniqueIdLocalhost.java
R testing/conntest/src/test/resources/389ds/resource-bacchus.xml
A testing/conntest/src/test/resources/389ds/resource-dn-bacchus.xml
A testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
R testing/conntest/src/test/resources/389ds/resource-localhost.xml
A testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml
A testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml
M testing/conntest/testng.xml
Log Message:
-----------
Support for a single identifier (e.g. in case ConnId UID and NAME are the same). Fixing normalization of side-effect changes.
Commit: 4a62589b8cf4b8049886771c313047402807ac0a
https://github.com/Evolveum/midpoint/commit/4a62589b8cf4b8049886771c313047402807ac0a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2015-09-08 (Tue, 08 Sep 2015)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/SimpleErrorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusShadowDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/TreeStateSet.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UserAccountDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertQueryHelper.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsNsUniqueIdTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsBacchus.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsDnBacchus.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsDnLocalhost.java
R testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsNsUniqueIdBacchus.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsNsUniqueIdLocalhost.java
R testing/conntest/src/test/resources/389ds/resource-bacchus.xml
A testing/conntest/src/test/resources/389ds/resource-dn-bacchus.xml
A testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
R testing/conntest/src/test/resources/389ds/resource-localhost.xml
A testing/conntest/src/test/resources/389ds/resource-nsuniqueid-bacchus.xml
A testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml
M testing/conntest/testng.xml
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
A testing/selenidetest/complex-test-suite.xml
M testing/selenidetest/testng.xml
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/user-search
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
Compare: https://github.com/Evolveum/midpoint/compare/3d53e9e15bc3...4a62589b8cf4
More information about the midPoint-svn
mailing list