[midPoint-git] [Evolveum/midpoint] 2a47e8: Partly fixing MID-1969 - fixed losing namespaces i...

Pavol Mederly mederly at evolveum.com
Wed Jul 16 08:28:27 CEST 2014 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  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: 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


Compare: https://github.com/Evolveum/midpoint/compare/bbd03e354f56...7d1a6631ad07

More information about the midPoint-svn mailing list