[midPoint-git] [Evolveum/midpoint] e1b7c8: updated report editor, not finished yet.
Viliam Repan
vilo.repan at evolveum.com
Mon Jul 14 10:43:44 CEST 2014
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: e1b7c873755642364d352a733c636125764680de
https://github.com/Evolveum/midpoint/commit/e1b7c873755642364d352a733c636125764680de
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
Log Message:
-----------
updated report editor, not finished yet.
Commit: 2e633a41fbd8011dcd9f91be2c7fb695b289786f
https://github.com/Evolveum/midpoint/commit/2e633a41fbd8011dcd9f91be2c7fb695b289786f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LocalePanel.java
M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
Log Message:
-----------
upgrade to wicket 6.15 web.xml to development mode.
Commit: 534e2242293a2e50c152b5b6ccd98b006bd085ef
https://github.com/Evolveum/midpoint/commit/534e2242293a2e50c152b5b6ccd98b006bd085ef
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
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/evaluator/GenerateExpressionEvaluator.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
A samples/demo-rs/object-template-org.xml
A samples/demo-rs/object-template-user.xml
A samples/demo-rs/org.xml
A samples/demo-rs/resource-csv-source.xml
A samples/demo-rs/resource-csv-target.xml
A samples/demo-rs/resource-csv-xxx.xml
A samples/demo-rs/resource-ldap-opendj.xml
A samples/demo-rs/role-basic.xml
A samples/demo-rs/role-boss.xml
A samples/demo-rs/role-gold.xml
A samples/demo-rs/role-meta-project.xml
A samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: b2a760815c0a096c321a94e3c7a0c7b6db727362
https://github.com/Evolveum/midpoint/commit/b2a760815c0a096c321a94e3c7a0c7b6db727362
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message2/FeedbackAlertMessage.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message2/FeedbackAlertMessage.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message2/FeedbackAlertMessage.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message2/FeedbackAlerts.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message2/FeedbackAlerts.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message2/FeedbackListView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
Log Message:
-----------
new feedback messages, without details.
Commit: 6f6ed2dc7724518e1b10d8530c4cbd3e192b64ba
https://github.com/Evolveum/midpoint/commit/6f6ed2dc7724518e1b10d8530c4cbd3e192b64ba
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/OidUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
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/LensFocusContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUuid.java
A testing/story/src/test/resources/uuid/object-template-user.xml
A testing/story/src/test/resources/uuid/ou-clients.ldif
A testing/story/src/test/resources/uuid/resource-opendj.xml
A testing/story/src/test/resources/uuid/role-client.xml
A testing/story/src/test/resources/uuid/system-configuration.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 83e528857233ccd32b9894bd2ee607f5eab6dc4a
https://github.com/Evolveum/midpoint/commit/83e528857233ccd32b9894bd2ee607f5eab6dc4a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M samples/demo-rs/resource-ldap-opendj.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUuid.java
M testing/story/src/test/resources/uuid/resource-opendj.xml
M testing/story/src/test/resources/uuid/role-client.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 86a8e0100bd57598b07f3aab0153d5b987afef4e
https://github.com/Evolveum/midpoint/commit/86a8e0100bd57598b07f3aab0153d5b987afef4e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-06 (Fri, 06 Jun 2014)
Changed paths:
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/AbstractModelWebService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
A samples/resources/edirectory/example.ldif
A samples/resources/edirectory/resource-ldap-edirectory.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 7041d6627c9cceeea8fb366f7b96a2f05c235067
https://github.com/Evolveum/midpoint/commit/7041d6627c9cceeea8fb366f7b96a2f05c235067
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentSearchDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.properties
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/PropertyWrapper.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
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/SimpleUserResourceProvider.java
M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
M infra/pom.xml
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
A infra/ws-util/pom.xml
A infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java
A infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/ClientPasswordHandler.java
A infra/ws-util/src/test/java/com/evolveum/midpoint/infra/wsutil/DummyClient.java
A infra/ws-util/src/test/java/com/evolveum/midpoint/infra/wsutil/DummyMain.java
A infra/ws-util/src/test/java/com/evolveum/midpoint/infra/wsutil/DummyPort.java
A infra/ws-util/src/test/java/com/evolveum/midpoint/infra/wsutil/DummyService.java
A infra/ws-util/src/test/resources/logback-test.xml
A infra/ws-util/testng.xml
M model/model-intest/src/test/resources/security/role-prop-read-some-modify-some.xml
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/IcfUtil.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
M samples/resources/edirectory/resource-ldap-edirectory.xml
A samples/tasks/bulk-actions/discover-rebind.xml
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 23c47a42bc45ba4650ebd8d3992d4b99653a2783
https://github.com/Evolveum/midpoint/commit/23c47a42bc45ba4650ebd8d3992d4b99653a2783
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
Log Message:
-----------
Just a cosmetic fix to get rid of scroll-bar in popups.
Commit: 6eb37e1ba7280b93935ede2461cf8c8031bf96ff
https://github.com/Evolveum/midpoint/commit/6eb37e1ba7280b93935ede2461cf8c8031bf96ff
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
Log Message:
-----------
Fixis on report page - model is updated and validated when working with various tabs.
Commit: 1e35fa714b5b4b98b604670e7792651a7ef98ea9
https://github.com/Evolveum/midpoint/commit/1e35fa714b5b4b98b604670e7792651a7ef98ea9
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
M infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: d766475469edc9d92de279763675752e81c36d7a
https://github.com/Evolveum/midpoint/commit/d766475469edc9d92de279763675752e81c36d7a
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-16 (Mon, 16 Jun 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ContactDataProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ContactOrgUnitPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ContactOrgUnitPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ContactUserPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ContactUserPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/ContactOrgUnitDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/ContactTreeDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/ContactUserDto.java
Log Message:
-----------
contacts page, work started.
Commit: 6aa62cd2671bcaa9f093b4c753572ed0bf55ae15
https://github.com/Evolveum/midpoint/commit/6aa62cd2671bcaa9f093b4c753572ed0bf55ae15
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgUnitStorage.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourceContentStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
Log Message:
-----------
Fixing reports (more logical behavior in error cases) + small search storage objects refactoring
Commit: 238f4b126fb645e36140b78c5f88133bf95c447d
https://github.com/Evolveum/midpoint/commit/238f4b126fb645e36140b78c5f88133bf95c447d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgUnitStorage.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourceContentStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
Log Message:
-----------
Merge branch 'gui-devel' of github.com:Evolveum/midpoint into gui-devel
Commit: 1dcedf86e357745351aa832c47528c0b08c430da
https://github.com/Evolveum/midpoint/commit/1dcedf86e357745351aa832c47528c0b08c430da
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
Log Message:
-----------
report configuration improved.
Commit: fa6d84cce593f60369f25434d56428d67255a356
https://github.com/Evolveum/midpoint/commit/fa6d84cce593f60369f25434d56428d67255a356
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties
Log Message:
-----------
Fixed one more issue and improved error handling when working with reports.
Commit: ac0df5750625dc1739a728b3057a1539b7bfa462
https://github.com/Evolveum/midpoint/commit/ac0df5750625dc1739a728b3057a1539b7bfa462
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths:
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
M gui/admin-gui/src/main/webapp/WEB-INF/wro.properties
M gui/admin-gui/src/main/webapp/WEB-INF/wro.xml
M infra/util/pom.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/ClassPathUtil.java
A weblogic-build/pom.xml
A weblogic-build/src/main/app/META-INF/weblogic-application.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 4888cc8fa362c919f091aa151d1f7544614c8f76
https://github.com/Evolveum/midpoint/commit/4888cc8fa362c919f091aa151d1f7544614c8f76
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths:
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: a06435ae9a3e1aca879a2346bec17accb8e63c31
https://github.com/Evolveum/midpoint/commit/a06435ae9a3e1aca879a2346bec17accb8e63c31
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.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/SessionStorage.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
Log Message:
-----------
MID-1931 working initial implementation. Not fully completed yet.
Commit: 911de0858a7a86b3522779a249ed56a0c7a2057c
https://github.com/Evolveum/midpoint/commit/911de0858a7a86b3522779a249ed56a0c7a2057c
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 5a698cdfbc9b868a7e015992c210617e1c60362f
https://github.com/Evolveum/midpoint/commit/5a698cdfbc9b868a7e015992c210617e1c60362f
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
Log Message:
-----------
MID-1931 - adding and showing paging size selectors to some places in GUI.
Commit: c398723c1bdf2c92ffcb02eeb40514b87a308def
https://github.com/Evolveum/midpoint/commit/c398723c1bdf2c92ffcb02eeb40514b87a308def
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.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/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
Log Message:
-----------
Merge branch 'gui-devel' of github.com:Evolveum/midpoint into gui-devel
Commit: 0793bc01a5418041f06e890715db6cbc85c8ece7
https://github.com/Evolveum/midpoint/commit/0793bc01a5418041f06e890715db6cbc85c8ece7
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M build-system/pom.xml
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/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.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/security/MidPointApplication.java
M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/ObjectWrapperTest.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
M model/model-intest/src/test/resources/security/role-self-accounts-partial-control.xml
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/ObjectSecurityConstraintsImpl.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
gui/admin-gui/src/main/webapp/WEB-INF/web.xml
Commit: d1472563fe2533230768c554baa6fb9d980fbca8
https://github.com/Evolveum/midpoint/commit/d1472563fe2533230768c554baa6fb9d980fbca8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
Log Message:
-----------
paging change popover JS sample.
Commit: f2d9f2cf2a78d92a7cb103c7a4b5d73f200369fe
https://github.com/Evolveum/midpoint/commit/f2d9f2cf2a78d92a7cb103c7a4b5d73f200369fe
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
Log Message:
-----------
Commenting out unused JS popover window.
Commit: ade4da5b79b335e1e17db9010d194d4098749908
https://github.com/Evolveum/midpoint/commit/ade4da5b79b335e1e17db9010d194d4098749908
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/schema/src/test/resources/common/resource-opendj.xml
A samples/resources/ad/ad-resource-groups.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 4010a7ae94347022c04877b4257cbd2a980db349
https://github.com/Evolveum/midpoint/commit/4010a7ae94347022c04877b4257cbd2a980db349
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/webapp/js/midpoint/midpoint.js
Log Message:
-----------
paging change popover with custom JS, minor code improvements in table page size handling.
Commit: 104a30dc9e4f173da793ae472afe2a9d7a643e02
https://github.com/Evolveum/midpoint/commit/104a30dc9e4f173da793ae472afe2a9d7a643e02
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.java
Log Message:
-----------
contacts hml template sample.
Commit: 6f91a2ce59bd6e83bdafd5c9ae7f38c57d2b8ee2
https://github.com/Evolveum/midpoint/commit/6f91a2ce59bd6e83bdafd5c9ae7f38c57d2b8ee2
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
M gui/admin-gui/src/main/webapp/js/midpoint/midpoint.js
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/schema/src/test/resources/common/resource-opendj.xml
A samples/resources/ad/ad-resource-groups.xml
Log Message:
-----------
Merge branch 'gui-devel' of https://github.com/Evolveum/midpoint into gui-devel
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
Commit: c0e1bd34d33bb3a3b30bc95f90603497ecce04b6
https://github.com/Evolveum/midpoint/commit/c0e1bd34d33bb3a3b30bc95f90603497ecce04b6
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.java
Log Message:
-----------
Merge branch 'gui-devel' of https://github.com/Evolveum/midpoint into gui-devel
Commit: c20f638b282f9f99a9542425d7c7a09a385f9ba7
https://github.com/Evolveum/midpoint/commit/c20f638b282f9f99a9542425d7c7a09a385f9ba7
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.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/workflow/PageWorkItems.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
Log Message:
-----------
MID-1931 more small code improvements and cleanup.
Commit: 86fda4dabd72458d41da48be052de13c536c967c
https://github.com/Evolveum/midpoint/commit/86fda4dabd72458d41da48be052de13c536c967c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
Log Message:
-----------
minor code cleanup
Commit: b65129af2e3d64a07368f689ad155c5ac63ef8d1
https://github.com/Evolveum/midpoint/commit/b65129af2e3d64a07368f689ad155c5ac63ef8d1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskResult.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/sync/account-andre-dummy.xml
A model/model-intest/src/test/resources/sync/account-augustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-cruff-dummy.xml
A model/model-intest/src/test/resources/sync/account-kenny-dummy.xml
A model/model-intest/src/test/resources/sync/account-lechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tandre-dummy.xml
A model/model-intest/src/test/resources/sync/account-taugustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlafoot-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tpalido-dummy.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
A samples/resources/ad/ad-resource-groups-advanced.xml
A samples/resources/ad/ad-resource-groups-basic.xml
R samples/resources/ad/ad-resource-groups.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: d4c41c1e7d59152725725015adb55bc5ce6db87b
https://github.com/Evolveum/midpoint/commit/d4c41c1e7d59152725725015adb55bc5ce6db87b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
M samples/resources/ad/ad-resource-groups-advanced.xml
M samples/resources/ad/ad-resource-groups-basic.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 903728c915e37852275c600f4aacc4dd0e75a939
https://github.com/Evolveum/midpoint/commit/903728c915e37852275c600f4aacc4dd0e75a939
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
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/util/ObjectWrapperUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.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/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
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/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AddExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/BaseActionExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DeleteExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/OperationsHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskResult.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/sync/account-andre-dummy.xml
A model/model-intest/src/test/resources/sync/account-augustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-cruff-dummy.xml
A model/model-intest/src/test/resources/sync/account-kenny-dummy.xml
A model/model-intest/src/test/resources/sync/account-lechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tandre-dummy.xml
A model/model-intest/src/test/resources/sync/account-taugustus-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlafoot-dummy.xml
A model/model-intest/src/test/resources/sync/account-tlechimp-dummy.xml
A model/model-intest/src/test/resources/sync/account-tpalido-dummy.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
A samples/resources/ad/ad-resource-groups-advanced.xml
A samples/resources/ad/ad-resource-groups-basic.xml
R samples/resources/ad/ad-resource-groups.xml
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 2dcc9d257351777dc12b6320ffde3fc7d6a2e370
https://github.com/Evolveum/midpoint/commit/2dcc9d257351777dc12b6320ffde3fc7d6a2e370
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 76efe1535206cbf6f893d9fb249a902719452c23
https://github.com/Evolveum/midpoint/commit/76efe1535206cbf6f893d9fb249a902719452c23
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
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/util/ObjectWrapperUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.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/AssignablePopupContent.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
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/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
M samples/resources/ad/ad-resource-groups-advanced.xml
M samples/resources/ad/ad-resource-groups-basic.xml
Log Message:
-----------
Merge branch 'gui-devel' of github.com:Evolveum/midpoint into gui-devel
Commit: 381032052539e7c369f522cf439a8bd0e55edd08
https://github.com/Evolveum/midpoint/commit/381032052539e7c369f522cf439a8bd0e55edd08
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 29b15070d50938ed5f41ea325379466d19388ce8
https://github.com/Evolveum/midpoint/commit/29b15070d50938ed5f41ea325379466d19388ce8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M build-system/pom.xml
Log Message:
-----------
updated wicket to version 6.16.0
Commit: d9c090e3936131a26791b7386d31302bfca3d8c4
https://github.com/Evolveum/midpoint/commit/d9c090e3936131a26791b7386d31302bfca3d8c4
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessageFilter.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
Log Message:
-----------
removed atmosphere dependencies and apache lang3 package dependencies.
Commit: 1da8102001d3e3d98fc05d663056c61cb782e25b
https://github.com/Evolveum/midpoint/commit/1da8102001d3e3d98fc05d663056c61cb782e25b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M gui/admin-gui/pom.xml
Log Message:
-----------
removed 30MB of unused dependencies from admin gui, hopefully not breaking web app.
Commit: 10ec2ac162a7a0df5278af55c4f1803ef1ea4232
https://github.com/Evolveum/midpoint/commit/10ec2ac162a7a0df5278af55c4f1803ef1ea4232
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 0f86516212a0ae76403888d828dfeced29d8e1a4
https://github.com/Evolveum/midpoint/commit/0f86516212a0ae76403888d828dfeced29d8e1a4
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 83aa94fb7016d2b41b0335c799ff32955ba1c7cc
https://github.com/Evolveum/midpoint/commit/83aa94fb7016d2b41b0335c799ff32955ba1c7cc
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-01 (Tue, 01 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: c2882c9e1cef65a914eaf0023794d90f90e31cf1
https://github.com/Evolveum/midpoint/commit/c2882c9e1cef65a914eaf0023794d90f90e31cf1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
M infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java
A infra/ws-util/src/main/resources/META-INF/cxf/org.apache.cxf.Logger
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
M model/model-impl/src/main/resources/ctx-model.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Commit: 54c51b9c447e52740cfd5477574de73530cc6904
https://github.com/Evolveum/midpoint/commit/54c51b9c447e52740cfd5477574de73530cc6904
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityListRepeater.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityListRepeater.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityListRepeater.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.java
Log Message:
-----------
MID-1730 Capability Editor implementation. Not finished yet.
Commit: 23a3bc292bdfc34ddf7edca5a96060cc1e76d4ee
https://github.com/Evolveum/midpoint/commit/23a3bc292bdfc34ddf7edca5a96060cc1e76d4ee
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
Log Message:
-----------
create template page (super class of page base) without spring beans - just pure template + util methods.
Commit: c5831c45e54df210768b7089dc689aa6005b5cf6
https://github.com/Evolveum/midpoint/commit/c5831c45e54df210768b7089dc689aa6005b5cf6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityListRepeater.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityListRepeater.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityListRepeater.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.java
Log Message:
-----------
Merge branch 'gui-devel' of github.com:Evolveum/midpoint into gui-devel
Commit: 92d80c34de126ac2c218a6c64d9e2a407a63320f
https://github.com/Evolveum/midpoint/commit/92d80c34de126ac2c218a6c64d9e2a407a63320f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-06 (Sun, 06 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/TopMenuBar.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/TopMenuBar.java
Log Message:
-----------
top menu logo now links to "home" page which is dashboard.
Commit: 1bb5520877975879d6b8e72dd06203619e33b3e8
https://github.com/Evolveum/midpoint/commit/1bb5520877975879d6b8e72dd06203619e33b3e8
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityStepDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java
Log Message:
-----------
MID-1730 - CapabilityEditor implementation, hopefully finished.
Commit: 8c2933048701f5e0a3c6e04000871f364b638451
https://github.com/Evolveum/midpoint/commit/8c2933048701f5e0a3c6e04000871f364b638451
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)
Changed paths:
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: e84a2638b2b9f76959306afae51ba64b4eab623b
https://github.com/Evolveum/midpoint/commit/e84a2638b2b9f76959306afae51ba64b4eab623b
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/AddCapabilityDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityListRepeater.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
Log Message:
-----------
MID-1730 - CapabilityEditor small code cleanup.
Commit: fedee976462b336a34b70c236524c0c4d7b39dde
https://github.com/Evolveum/midpoint/commit/fedee976462b336a34b70c236524c0c4d7b39dde
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDialog.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.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/util/ProvisioningUtil.java
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 3767b27e77743f4b33e581786436af4185c3c580
https://github.com/Evolveum/midpoint/commit/3767b27e77743f4b33e581786436af4185c3c580
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DatePanel.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/PropertyWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LoadableModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/XmlGregorianCalendarModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.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
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReference.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ReferenceDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/CapabilityUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportObjectsFromFileTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractScannerTaskHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/AttributesToReturn.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/util/ProvisioningUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyNoActivation.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ConcurrencyTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
A samples/tasks/bulk-actions/list-selected-resource-objects-2.xml
A samples/tasks/bulk-actions/list-selected-resource-objects-3.xml
A samples/tasks/bulk-actions/list-selected-resource-objects.xml
A samples/tasks/bulk-actions/list-selected-users.xml
R samples/tasks/bulk-actions/log-selected-users.xml
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/clone/CloneProcessor.java
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 010de429b0cbc5fb0cb28314358c33c9d724a85f
https://github.com/Evolveum/midpoint/commit/010de429b0cbc5fb0cb28314358c33c9d724a85f
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/SchemaDefinitionType.java
Log Message:
-----------
Merge branch 'master' into gui-devel
Commit: 9b55d905b037e81d5c3ef54d352cf63a84d2b340
https://github.com/Evolveum/midpoint/commit/9b55d905b037e81d5c3ef54d352cf63a84d2b340
Author: Erik Suta <erik.suta at evolveum.com>
Date: 2014-07-11 (Fri, 11 Jul 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
Log Message:
-----------
Removing obsolte forms for deprecated enableDisable part in ResourceSchema
Commit: b9b6b4ab2299d0580eb0c4b3c4c388389ef8b411
https://github.com/Evolveum/midpoint/commit/b9b6b4ab2299d0580eb0c4b3c4c388389ef8b411
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
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/page/admin/users/PageUser.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanInspector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDiffEquals.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
A infra/schema/src/test/resources/common/task-bulk-action-1.xml
M infra/schema/src/test/resources/diff/resource-after-ns-change.xml
M infra/schema/src/test/resources/diff/resource-after.xml
M infra/schema/src/test/resources/diff/resource-before.xml
M infra/schema/testng.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/AssignExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ModifyExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
M model/model-intest/src/test/resources/scripting/assign-to-jack-2.xml
M model/model-intest/src/test/resources/scripting/assign-to-jack.xml
M model/model-intest/src/test/resources/scripting/delete-and-add-jack.xml
M model/model-intest/src/test/resources/scripting/log.xml
M model/model-intest/src/test/resources/scripting/modify-jack-back.xml
M model/model-intest/src/test/resources/scripting/modify-jack.xml
M model/model-intest/src/test/resources/scripting/search-for-shadows-nofetch.xml
M model/model-intest/src/test/resources/scripting/search-for-users-accounts-nofetch.xml
M model/model-intest/src/test/resources/scripting/search-for-users-accounts.xml
M samples/model-client-sample/src/main/bin/discover-rebind.xml
M samples/tasks/bulk-actions/assign-enduser-role-to-selected-users.xml
M samples/tasks/bulk-actions/assign-resource-to-selected-users.xml
M samples/tasks/bulk-actions/discover-rebind.xml
M samples/tasks/bulk-actions/modify-selected-users.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into gui-devel
Compare: https://github.com/Evolveum/midpoint/compare/80f22d1cd24a...b9b6b4ab2299
More information about the midPoint-svn
mailing list