[midPoint-git] [Evolveum/midpoint] c76ad9: Merge remote-tracking branch 'origin/master' into ...

[Viliam Repan]

  Branch: refs/heads/gui-devel
  Home:   https://github.com/Evolveum/midpoint
  Commit: c76ad9b3b01e0285e662336c019068eafdf1ce9e
      https://github.com/Evolveum/midpoint/commit/c76ad9b3b01e0285e662336c019068eafdf1ce9e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-07 (Mon, 07 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 remote-tracking branch 'origin/master' into gui-devel


  Commit: f75046b16ef1279b2cbedff62aeeca37265d6713
      https://github.com/Evolveum/midpoint/commit/f75046b16ef1279b2cbedff62aeeca37265d6713
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-12 (Sat, 12 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/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/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/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/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.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
    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.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/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/SchemaDefinitionType.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/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    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 infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.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/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
    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 'gui-devel' of github.com:Evolveum/midpoint into gui-devel


  Commit: 710e55f712f1fee0f1c638d218cf406a2b17573a
      https://github.com/Evolveum/midpoint/commit/710e55f712f1fee0f1c638d218cf406a2b17573a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDJTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Fixing simulated activation (+tests)


  Commit: 2a47e8a52353fefc5ddef7c2dbafbbae7a3c3156
      https://github.com/Evolveum/midpoint/commit/2a47e8a52353fefc5ddef7c2dbafbbae7a3c3156
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.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/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/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.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/query/TestQueryConvertors.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/ModelClientUtil.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Partly fixing MID-1969 - fixed losing namespaces in some paths/qnames. (Work in progress.)

Changed QueryConvertor to include "preliminary parsing" mode in which most XNodes are parsed without actually constructing ObjectQuery. This is invoked when parsing the source file, to eliminate unparsed XNodes as much as possible.
Also, simplifying SearchFilterType by eliminating DOM version of the filter clause.


  Commit: e9fb86c63684eb78f56da2f0f6d72358df07f0b9
      https://github.com/Evolveum/midpoint/commit/e9fb86c63684eb78f56da2f0f6d72358df07f0b9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.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/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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LocalePanel.java
    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
    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
    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/CapabilityStepDto.java
    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
    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/PageTest2.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/configuration/component/ChooseTypeDialog.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/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
    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/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    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
    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/PageUsers.java
    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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java
    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/component/TreeTablePanel.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
    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
    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/page/admin/workflow/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/main/webapp/js/midpoint/midpoint.js
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDJTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: fb0e5491a4803c8e904b90efd466bcc5e43e3894
      https://github.com/Evolveum/midpoint/commit/fb0e5491a4803c8e904b90efd466bcc5e43e3894
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-07-15 (Tue, 15 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentEntitlements.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  fixing MID-1976 (some GUI authorization problem)


  Commit: 1cd83bcbf70bf8e4057f77f11f8112880073862b
      https://github.com/Evolveum/midpoint/commit/1cd83bcbf70bf8e4057f77f11f8112880073862b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-15 (Tue, 15 Jul 2014)

  Changed paths:
    A gui/admin-gui/src/main/webapp/status.html

  Log Message:
  -----------
  fix for MID-1983


  Commit: 1a93713eb2838312be2b6a52e105f75da42ad3d7
      https://github.com/Evolveum/midpoint/commit/1a93713eb2838312be2b6a52e105f75da42ad3d7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-15 (Tue, 15 Jul 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/ResourceShadowDiscriminator.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/Projector.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/village/org-project-jolly-roger.xml
    M testing/story/src/test/resources/village/orgs.xml
    M testing/story/src/test/resources/village/resource-opendj.xml
    A testing/story/src/test/resources/village/role-meta-project-org.xml

  Log Message:
  -----------
  Fixing dependencies between object types on the same resource (MID-1841)


  Commit: bbd03e354f569aa304fdb547fd2791d6eeef5683
      https://github.com/Evolveum/midpoint/commit/bbd03e354f569aa304fdb547fd2791d6eeef5683
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-15 (Tue, 15 Jul 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java

  Log Message:
  -----------
  Fixing administrativeStatus, validFrom and validTo mapping confusion.


  Commit: 0d1b634de71130b02750e693d2c67941e20db8c0
      https://github.com/Evolveum/midpoint/commit/0d1b634de71130b02750e693d2c67941e20db8c0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 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/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/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M infra/common/src/test/resources/validator/resource-1-valid.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PartiallyResolvedValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.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/PartiallyResolvedDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.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/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/IdItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.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/ItemPathType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.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/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/diff/resource-after.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-xpath.xml
    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/ProjectionValuesProcessor.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/expressions/SearchEvaluator.java
    M model/model-impl/src/test/resources/common/user-barbossa.xml
    M model/model-intest/src/test/resources/scripting/disable-jack.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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.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/query/ValueOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-csv.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    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/query/restriction/AnyPropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml

  Log Message:
  -----------
  Resolving MID-1969 (#3 and partly #1). MID-1970 (#1). Making XMLNS-less imports really work.

Made equals() in ItemPath/ItemPathType/NameItemPathSegment stricter w.r.t. schemaless items. Introduced equivalent() method to these types as an substitution for previous equals() behavior.
Changed XMLNS handling when serializing objects. Repetitive genXXX declarations are now mostly avoided.
Preliminary parsing of search filters (MID-1970/#1).
Changing schema for bulk actions to avoid name clash (c:expression/s:expression). Fixing PrismBeanConverter to work correctly with changed schema.
Made all caches in PrismBeanInspector synchronized (caused lockup when running multithreaded tests).
Changed parsing/schema registry to really implement XMLNS-less imports.


  Commit: 7d1a6631ad0767f70423ba99c73b2e5cfe6a9da8
      https://github.com/Evolveum/midpoint/commit/7d1a6631ad0767f70423ba99c73b2e5cfe6a9da8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentEntitlements.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.java
    A gui/admin-gui/src/main/webapp/status.html
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/ResourceShadowDiscriminator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.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/Projector.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/village/org-project-jolly-roger.xml
    M testing/story/src/test/resources/village/orgs.xml
    M testing/story/src/test/resources/village/resource-opendj.xml
    A testing/story/src/test/resources/village/role-meta-project-org.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 146de80eff8fb5086879cf716e0c3d1730716439
      https://github.com/Evolveum/midpoint/commit/146de80eff8fb5086879cf716e0c3d1730716439
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java

  Log Message:
  -----------
  Recognizing prefix changes in item paths.


  Commit: 5872a07d82b61caa720b3af141e0940aff90a906
      https://github.com/Evolveum/midpoint/commit/5872a07d82b61caa720b3af141e0940aff90a906
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java

  Log Message:
  -----------
  Fixed NPE when creating/editing a user.


  Commit: a89d117fd90686562d64fb62da48570df6b25c10
      https://github.com/Evolveum/midpoint/commit/a89d117fd90686562d64fb62da48570df6b25c10
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java

  Log Message:
  -----------
  Automatic completion of unqualified QNames when parsing objects.


  Commit: b7ea65cebd19c41a874acdad023c092dd7110568
      https://github.com/Evolveum/midpoint/commit/b7ea65cebd19c41a874acdad023c092dd7110568
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java

  Log Message:
  -----------
  Fixing path-related tests.


  Commit: 4f7c1416001892e37f26a26933ab4b0e564abebe
      https://github.com/Evolveum/midpoint/commit/4f7c1416001892e37f26a26933ab4b0e564abebe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java

  Log Message:
  -----------
  Fixing report test.


  Commit: d88afe05ae66ff4c1aa5085ec7fcc14bf6e98bac
      https://github.com/Evolveum/midpoint/commit/d88afe05ae66ff4c1aa5085ec7fcc14bf6e98bac
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml

  Log Message:
  -----------
  Fixing MID-1995 (superfluous xsi:type).


  Commit: 6166d4ef4fab3f3851dc787b9c92f892215e9564
      https://github.com/Evolveum/midpoint/commit/6166d4ef4fab3f3851dc787b9c92f892215e9564
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml

  Log Message:
  -----------
  Merge branch 'master' of x:\midpoint


  Commit: 0be265303bbbef350a4e9527d75232af159ed180
      https://github.com/Evolveum/midpoint/commit/0be265303bbbef350a4e9527d75232af159ed180
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java

  Log Message:
  -----------
  Fixing failed test in model-intest.


  Commit: d9262d9ffb0f7573bc4e3c11365fdfb9ee3780db
      https://github.com/Evolveum/midpoint/commit/d9262d9ffb0f7573bc4e3c11365fdfb9ee3780db
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    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/ActivationProcessor.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/MappingEvaluationHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorHelperParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/resources/activation/resource-dummy-khaki.xml

  Log Message:
  -----------
  Refactoring mapping evaluation.


  Commit: fe16a5a8e4704d935086c31c20385345669074f4
      https://github.com/Evolveum/midpoint/commit/fe16a5a8e4704d935086c31c20385345669074f4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-16 (Wed, 16 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/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/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M infra/common/src/test/resources/validator/resource-1-valid.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PartiallyResolvedValue.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/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.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/PartiallyResolvedDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.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/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/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/IdItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemPathType.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/query/TestQueryConvertors.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.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/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml
    M infra/schema/src/test/resources/diff/resource-after.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-xpath.xml
    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/ProjectionValuesProcessor.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/expressions/SearchEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/resources/common/user-barbossa.xml
    M model/model-intest/src/test/resources/scripting/disable-jack.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/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.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/query/ValueOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-csv.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    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/query/restriction/AnyPropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/ModelClientUtil.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 58b31d92b6d73685fa71be71bb07d137a2019740
      https://github.com/Evolveum/midpoint/commit/58b31d92b6d73685fa71be71bb07d137a2019740
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-16 (Wed, 16 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java

  Log Message:
  -----------
  Reducing accidental use of "object" element name.


  Commit: 3f562443b8c34fbeaac67ea34f0a8897e158df8b
      https://github.com/Evolveum/midpoint/commit/3f562443b8c34fbeaac67ea34f0a8897e158df8b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Fix for MID-1920.


  Commit: 8e7aa6400bfa9cb26887702562fe09a265154459
      https://github.com/Evolveum/midpoint/commit/8e7aa6400bfa9cb26887702562fe09a265154459
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Fix for MID-1921.


  Commit: f1bba38ddccbcdfd35201cd93e2a518efdd86d1a
      https://github.com/Evolveum/midpoint/commit/f1bba38ddccbcdfd35201cd93e2a518efdd86d1a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java

  Log Message:
  -----------
  Fix for MID-1950.


  Commit: a2b6ed1844eea490484dd933d1effa0b19204304
      https://github.com/Evolveum/midpoint/commit/a2b6ed1844eea490484dd933d1effa0b19204304
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/LogicalOperation.java

  Log Message:
  -----------
  fixing query interpretation for connectors..


  Commit: 94185a4d33b7b1af8597cf2b460fa59060ff9d0a
      https://github.com/Evolveum/midpoint/commit/94185a4d33b7b1af8597cf2b460fa59060ff9d0a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/LogicalOperation.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 45df2807b46cb61e10d1ea9a076ada5e6e4d4e85
      https://github.com/Evolveum/midpoint/commit/45df2807b46cb61e10d1ea9a076ada5e6e4d4e85
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/LogicalOperation.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 5e323e12c648f3485aefc55240d00abb761f33d9
      https://github.com/Evolveum/midpoint/commit/5e323e12c648f3485aefc55240d00abb761f33d9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.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/TestActivation.java
    M model/model-intest/src/test/resources/activation/resource-dummy-khaki.xml

  Log Message:
  -----------
  Fixing validTo/validFrom mappings


  Commit: d0edf1fd2de66fe083bda6b4755d74e4747f9c5a
      https://github.com/Evolveum/midpoint/commit/d0edf1fd2de66fe083bda6b4755d74e4747f9c5a
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    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

  Log Message:
  -----------
  fixing authorization in GUI


  Commit: 2a9d3292298d7085fa79548b7687fc469c933d72
      https://github.com/Evolveum/midpoint/commit/2a9d3292298d7085fa79548b7687fc469c933d72
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.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/home/PageDashboard.java
    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/PageProcessInstances.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/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  MID-1971: Workflow calls are going through model API.


  Commit: ddb8abc7a778f52054fa162a68ac5559e472f2fb
      https://github.com/Evolveum/midpoint/commit/ddb8abc7a778f52054fa162a68ac5559e472f2fb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.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/LensProjectionContext.java
    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/ActivationProcessor.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/MappingEvaluationHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorHelperParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputProcessor.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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/activation/resource-dummy-khaki.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 4426ba07f0e028205773b50fc748c780760e5db4
      https://github.com/Evolveum/midpoint/commit/4426ba07f0e028205773b50fc748c780760e5db4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  model-api support for bulk actions (MID-637)


  Commit: 5a165f927163b4a48c6c18a8c8202bae5efc17bd
      https://github.com/Evolveum/midpoint/commit/5a165f927163b4a48c6c18a8c8202bae5efc17bd
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java

  Log Message:
  -----------
  fixing GUI authorzation


  Commit: 17ecc6a2b03969fab974c15ee0606841a4dfeb76
      https://github.com/Evolveum/midpoint/commit/17ecc6a2b03969fab974c15ee0606841a4dfeb76
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 130a4411b1edcc9b07172ff701d92a9d090a3391
      https://github.com/Evolveum/midpoint/commit/130a4411b1edcc9b07172ff701d92a9d090a3391
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    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/PageAccounts.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.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/resources/content/PageContentAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDto.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/session/ConfigurationStorage.java

  Log Message:
  -----------
  MID-1912 - several GUI improvements for gen sync in pageShadowDetails and pageAccountContents + complex search in shadows. Improving searches in several other pages.


  Commit: e81146bb56034e8f64c82a017c3481a5000b249f
      https://github.com/Evolveum/midpoint/commit/e81146bb56034e8f64c82a017c3481a5000b249f
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.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/LensProjectionContext.java
    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/ActivationProcessor.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/MappingEvaluationHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorHelperParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputProcessor.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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/activation/resource-dummy-khaki.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 8752c721ff08baf50553a2b87bf3e1fa17df1ef9
      https://github.com/Evolveum/midpoint/commit/8752c721ff08baf50553a2b87bf3e1fa17df1ef9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java
    M infra/prism/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java

  Log Message:
  -----------
  Preventing serialization of incorrect XML characters (MID-1944)


  Commit: 98e4be8927f38601edb4e02decc2900507786817
      https://github.com/Evolveum/midpoint/commit/98e4be8927f38601edb4e02decc2900507786817
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    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/PageAccounts.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.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/resources/content/PageContentAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDto.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/session/ConfigurationStorage.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 9588a4df1ce60622724287661648ce6fe5717bd7
      https://github.com/Evolveum/midpoint/commit/9588a4df1ce60622724287661648ce6fe5717bd7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.java

  Log Message:
  -----------
  Fix (workaround?) for MID-2001 - web service failing to return a resource object.


  Commit: 7f4996b21e1f906861a2bc9f98f9d1f7872a8dc6
      https://github.com/Evolveum/midpoint/commit/7f4996b21e1f906861a2bc9f98f9d1f7872a8dc6
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml

  Log Message:
  -----------
  fixing MID-1973 (allow password reset for end user role)


  Commit: ef641e29738d191b0d4cd29409e51c9dd55b6d2b
      https://github.com/Evolveum/midpoint/commit/ef641e29738d191b0d4cd29409e51c9dd55b6d2b
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.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.html
    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/PageAccounts.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.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/resources/content/PageContentAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDto.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/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/PageProcessInstances.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/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java
    M infra/prism/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 544e1d5aac6099f8e7552179482489dd61978789
      https://github.com/Evolveum/midpoint/commit/544e1d5aac6099f8e7552179482489dd61978789
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    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/PageAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.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/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less

  Log Message:
  -----------
  MID-1903 - fixing few issues/adding some improvements


  Commit: f909b073ea695053e121763bc9cc556a812695e8
      https://github.com/Evolveum/midpoint/commit/f909b073ea695053e121763bc9cc556a812695e8
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 4e871a2e09443a40feda6245cf1d08738e13a849
      https://github.com/Evolveum/midpoint/commit/4e871a2e09443a40feda6245cf1d08738e13a849
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java

  Log Message:
  -----------
  MID-1999 fix


  Commit: 933992ae2176800d94163a9a00d86c1249cbe350
      https://github.com/Evolveum/midpoint/commit/933992ae2176800d94163a9a00d86c1249cbe350
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less

  Log Message:
  -----------
  parametrized wicket autocomplete styles in less.


  Commit: 26f4fc811620c0ed18d0351731195a2f1f3911af
      https://github.com/Evolveum/midpoint/commit/26f4fc811620c0ed18d0351731195a2f1f3911af
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 55981306cdf7cc3bbf954ed3103593a913989c3b
      https://github.com/Evolveum/midpoint/commit/55981306cdf7cc3bbf954ed3103593a913989c3b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  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/util/ObjectWrapperUtil.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/configuration/component/PageDebugDownloadBehaviour.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java

  Log Message:
  -----------
  Fixing authorizations (attributes were not shown correctly when authorizations were declared for request phase).
Added comments with object names to references - when displaying object in debug pages.


  Commit: d6364b289e162a410d2396735b8177a6b7bdd512
      https://github.com/Evolveum/midpoint/commit/d6364b289e162a410d2396735b8177a6b7bdd512
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 06e55eee73b27e7a95493ea624bfd64b4bbd5dfc
      https://github.com/Evolveum/midpoint/commit/06e55eee73b27e7a95493ea624bfd64b4bbd5dfc
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  guiAll security implemented MID-1964


  Commit: 39877bf0ffa36aacf3804904fdf8570d1a982f66
      https://github.com/Evolveum/midpoint/commit/39877bf0ffa36aacf3804904fdf8570d1a982f66
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  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/util/ObjectWrapperUtil.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/configuration/component/PageDebugDownloadBehaviour.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 9c61714dec4fa2cdfe018e2538d7815b54fa8a48
      https://github.com/Evolveum/midpoint/commit/9c61714dec4fa2cdfe018e2538d7815b54fa8a48
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M build-system/pom.xml
    M infra/common/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog.xml
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/ws-util/pom.xml
    M infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java
    M infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/ClientPasswordHandler.java
    M model/model-client/pom.xml
    M model/model-client/src/compile/resources/catalog.xml
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-client/src/main/resources/META-INF/catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationJanitorInterceptor.java
    M samples/model-client-sample/pom.xml
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/ClientPasswordHandler.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/RunScript.java

  Log Message:
  -----------
  Switch to CXF 3.0


  Commit: 87345affcaae813a78688bddce5cea201594cf43
      https://github.com/Evolveum/midpoint/commit/87345affcaae813a78688bddce5cea201594cf43
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.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/util/ObjectWrapperUtil.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/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    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/PageAccounts.properties
    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/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.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/resources/content/PageContentAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDto.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/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/PageProcessInstances.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/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java
    M infra/prism/testng.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.java
    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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: d0d9c769ac38304bb50cfdf1b69928d30ab988e6
      https://github.com/Evolveum/midpoint/commit/d0d9c769ac38304bb50cfdf1b69928d30ab988e6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-19 (Sat, 19 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 branch 'gui-devel' of github.com:Evolveum/midpoint into gui-devel


  Commit: 2269b9ddca8ae46f1167e46975214683b8697805
      https://github.com/Evolveum/midpoint/commit/2269b9ddca8ae46f1167e46975214683b8697805
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-07-19 (Sat, 19 Jul 2014)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.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/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.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/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/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    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/PageAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.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/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AccountDetailsSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/NotificationConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.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/resources/content/PageContentAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentEntitlements.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDto.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/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.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/PageProcessInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.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/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    A gui/admin-gui/src/main/webapp/status.html
    M infra/common/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/ResourceShadowDiscriminator.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M infra/common/src/test/resources/validator/resource-1-valid.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PartiallyResolvedValue.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/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.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/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PartiallyResolvedDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.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/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/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/IdItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestXmlSerialization.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/prism/testng.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/common/task-bulk-action-1.xml
    M infra/schema/src/test/resources/diff/resource-after.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/ws-util/pom.xml
    M infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/AbstractWebServiceClient.java
    M infra/ws-util/src/main/java/com/evolveum/midpoint/infra/wsutil/ClientPasswordHandler.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-client/pom.xml
    M model/model-client/src/compile/resources/catalog.xml
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-client/src/main/resources/META-INF/catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-xpath.xml
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.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/LensProjectionContext.java
    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/ActivationProcessor.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/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluationHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorHelperParams.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    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/expressions/SearchEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationJanitorInterceptor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/resources/common/user-barbossa.xml
    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/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/activation/resource-dummy-khaki.xml
    M model/model-intest/src/test/resources/scripting/disable-jack.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/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationManagerImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationsUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.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/query/LogicalOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.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/AbstractOpenDJTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-csv.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    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/query/restriction/AnyPropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/model-client-sample/pom.xml
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/ClientPasswordHandler.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/RunScript.java
    M samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/ModelClientUtil.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/village/org-project-jolly-roger.xml
    M testing/story/src/test/resources/village/orgs.xml
    M testing/story/src/test/resources/village/resource-opendj.xml
    A testing/story/src/test/resources/village/role-meta-project-org.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin' into gui-devel


Compare: https://github.com/Evolveum/midpoint/compare/b9b6b4ab2299...2269b9ddca8a