[midPoint-git] [Evolveum/midpoint] ab16b0: remote jasper report query executer + datasource.
Katarina Valalikova
k.valalikova at evolveum.com
Tue Jun 23 15:22:25 CEST 2015
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: ab16b01236875b7e80af60883ecb8edee51242cf
https://github.com/Evolveum/midpoint/commit/ab16b01236875b7e80af60883ecb8edee51242cf
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-06 (Sat, 06 Jun 2015)
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/parser/QueryConvertor.java
M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
M infra/schema/pom.xml
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/RetrieveOption.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/MiscSchemaUtil.java
M infra/schema/src/main/resources/META-INF/catalog-runtime.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-report.xml
M infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M model/model-client/src/compile/resources/jax-ws-catalog.xml
M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
M model/report-ds-impl/pom.xml
A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/CustomDataWriter.java
A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/CustomWrappedOutInterceptor.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointClientConfiguration.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointLocalQueryExecutor.java
R model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutorFactory.java
A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteDataSource.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutorFactory.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/test/MidPointRemoteQueryExecuterTest.java
R model/report-ds-impl/src/main/resources/jasperreports.properties
A model/report-ds-impl/src/main/resources/jasperreports_extension.properties
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebServiceRaw.java
M model/report-impl/src/main/resources/ctx-report.xml
M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
Log Message:
-----------
remote jasper report query executer + datasource.
Commit: 00a6cae007863e9978c67aa382b9e9c836785203
https://github.com/Evolveum/midpoint/commit/00a6cae007863e9978c67aa382b9e9c836785203
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
Log Message:
-----------
fixing script evaluation. adding support for container value
Commit: 630cd515460fa159b8afa25fc627aff82ef6401a
https://github.com/Evolveum/midpoint/commit/630cd515460fa159b8afa25fc627aff82ef6401a
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointClientConfiguration.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteDataSource.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/test/MidPointRemoteQueryExecuterTest.java
M model/report-ds-impl/src/main/resources/ctx-report-ds-context.xml
Log Message:
-----------
improving remote jaspersoft studio plugin
Commit: 40aba5afffecb9f0ef15dcb4644e0d3f59c1abfd
https://github.com/Evolveum/midpoint/commit/40aba5afffecb9f0ef15dcb4644e0d3f59c1abfd
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
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/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
A infra/prism/src/test/resources/query/filter-type-user-none.xml
M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteDataSource.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/test/MidPointRemoteQueryExecuterTest.java
M model/report-ds-impl/src/main/resources/ctx-report-ds-context.xml
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebServiceRaw.java
Log Message:
-----------
imrpovements for remote query executer - improving report WS..
Commit: 600fe041bdaea53b7adfb830aba713a81ac47d0c
https://github.com/Evolveum/midpoint/commit/600fe041bdaea53b7adfb830aba713a81ac47d0c
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-16 (Tue, 16 Jun 2015)
Changed paths:
M build-system/pom.xml
M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword_en_US.utf8.properties
M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_en_US.utf8.properties
M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/login/PageLogin_en_US.utf8.properties
M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_tr_TR.utf8.properties
M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword_tr_TR.utf8.properties
M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_tr_TR.utf8.properties
A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword_tr_TR.utf8.properties
M gui/admin-gui/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SingleButtonPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SingleButtonPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SingleButtonPanel.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/DirectlyEditablePropertyColumn.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/SingleButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.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/PageAdmin.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageAdminCertification.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageAdminCertification.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.properties
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDtoProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandler.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.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/LoggingConfigPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
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/component/SystemConfigPanel.properties
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/PageMyPasswordQuestions.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties
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/component/JasperReportConfigurationPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.properties
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/roles/PageRole.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
M gui/admin-gui/src/main/webapp/css/font-awesome.css
M gui/admin-gui/src/main/webapp/fonts/FontAwesome.otf
M gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.eot
M gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.svg
M gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.ttf
M gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.woff
A gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.woff2
M gui/admin-gui/src/test/resources/ctx-test.xml
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
A infra/common/src/main/java/com/evolveum/midpoint/common/SystemConfigurationHolder.java
M infra/common/src/main/java/com/evolveum/midpoint/common/monitor/InternalMonitor.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.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/PrismContainerDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.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/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
A infra/prism/src/main/java/com/evolveum/midpoint/prism/match/DistinguishedNameMatchingRule.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistryFactory.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/query/AllFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.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/GreaterFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NoneFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/TypeFilter.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/CloneUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismContainerArrayList.java
M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountType.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectDeltaOperation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/SearchResultMetadata.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.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/ActivationUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.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/resource/annotation-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
A infra/schema/src/test/resources/common/value-filter-with-any.xml
M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif.startok
M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif
M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif.save
M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/00000000.jdb
M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.config.csv
M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.info.0
M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.stat.csv
M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/access
M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/errors
M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/replication
M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/server.out
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
A model/certification-api/pom.xml
A model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationApiConstants.java
A model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationEventListener.java
A model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/CertificationManager.java
A model/certification-api/testng.xml
A model/certification-impl/pom.xml
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertEventHelper.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertGeneralHelper.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertQueryHelper.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertResponseComputationHelper.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageApproachingTriggerHandler.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageTriggerHandler.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationConstants.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationRemediationTaskHandler.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/BaseCertificationHandler.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/CertificationHandler.java
A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
A model/certification-impl/src/main/resources/ctx-certification.xml
A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
A model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml
A model/certification-impl/src/test/resources/common/certification-of-eroot-user-assignments.xml
A model/certification-impl/src/test/resources/common/certification-of-role-inducements.xml
A model/certification-impl/src/test/resources/common/metarole-cxo.xml
A model/certification-impl/src/test/resources/common/orgs-and-users.xml
A model/certification-impl/src/test/resources/common/resource-dummy-black.xml
A model/certification-impl/src/test/resources/common/resource-dummy.xml
A model/certification-impl/src/test/resources/common/role-ceo.xml
A model/certification-impl/src/test/resources/common/role-coo.xml
A model/certification-impl/src/test/resources/common/role-superuser.xml
A model/certification-impl/src/test/resources/common/system-configuration.xml
A model/certification-impl/src/test/resources/common/user-administrator.xml
A model/certification-impl/src/test/resources/common/user-assignment-more-reviewers-certification.xml
A model/certification-impl/src/test/resources/common/user-jack.xml
A model/certification-impl/src/test/resources/ctx-model-test-main.xml
A model/certification-impl/src/test/resources/logback-test.xml
A model/certification-impl/testng.xml
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/AccessCertificationService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluatorFactory.java
M model/model-impl/pom.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.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/controller/SystemConfigurationHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.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/ContextLoader.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/lens/projector/ShadowConstraintsChecker.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DebugReconciliationTaskResultListener.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-impl/src/test/resources/common/task-reconcile-dummy.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
M model/model-intest/src/test/resources/common/resource-dummy-green.xml
M model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
M model/model-intest/src/test/resources/common/task-dumy-green-livesync.xml
M model/model-intest/src/test/resources/common/task-dumy-livesync.xml
M model/model-intest/src/test/resources/common/task-reconcile-dummy-blue.xml
M model/model-intest/src/test/resources/common/task-reconcile-dummy-green.xml
M model/model-intest/src/test/resources/common/task-reconcile-dummy.xml
M model/model-intest/src/test/resources/importer/import-ref.xml
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/src/test/resources/orgstruct/object-template-org.xml
A model/model-intest/src/test/resources/orgstruct/org-fictional.xml
M model/model-intest/src/test/resources/orgstruct/role-organized.xml
A model/model-intest/src/test/resources/sync/resource-dummy-uuid.xml
M model/model-intest/src/test/resources/sync/task-dummy-byzantine-livesync.xml
M model/model-intest/src/test/resources/sync/task-dummy-byzantine-recon.xml
M model/model-intest/src/test/resources/sync/task-dummy-emerald-livesync.xml
M model/model-intest/src/test/resources/sync/task-dummy-emerald-recon.xml
M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
M model/model-intest/src/test/resources/sync/task-reconcile-dummy-lime.xml
M model/model-intest/src/test/resources/sync/task-reconcile-dummy-single.xml
A model/model-intest/src/test/resources/sync/task-reconcile-dummy-uuid.xml
M model/model-intest/testng.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/AccessCertificationEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/CertCampaignEvent.java
A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/CertCampaignStageEvent.java
A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/CertReviewEvent.java
M model/notifications-impl/pom.xml
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/AccountOperationListener.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/CertificationListener.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/SimpleObjectRefImpl.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/cert/CertEventFactory.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/BaseHelper.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/CertHelper.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountPasswordNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignNotifier.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignStageNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleResourceObjectNotifier.java
A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleReviewerNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
M model/pom.xml
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
M provisioning/provisioning-impl/pom.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.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/impl/ResourceObjectDiscriminator.java
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectOperations.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.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/ShadowManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/FilterInterpreter.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/ProvisioningTestUtil.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDJTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestConnectorDiscovery.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDBTable.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/TestDummyCaseIgnore.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnoreUpcaseName.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.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/impl/TestDummyPrioritiesAndReadReplace.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyReadReplaceForAll.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummySchemaless.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuid.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-bad.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete-repo.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-disable-simulated-opendj.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-password.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-repo.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-morgan.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-disabled.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-with-password.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-opendj-no-sn.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search-iterative.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1.xml
M provisioning/provisioning-impl/src/test/resources/impl/opendj/group-swashbucklers.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/query-complex-filter.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-bind-dn.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-credentials.xml
R provisioning/provisioning-impl/src/test/resources/impl/query-complex-filter.xml
M provisioning/provisioning-impl/src/test/resources/impl/query-filter-all-accounts.xml
M provisioning/provisioning-impl/src/test/resources/logback-test.xml
A provisioning/provisioning-impl/src/test/resources/logging.properties
M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-bad.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-initialized.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-create.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-delete.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-read.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-update.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
A samples/certification/def-all-user-assignments.xml
A samples/certification/def-role-inducements.xml
A samples/demo/PageLogin.html
A samples/demo/PageTemplate.html
A samples/demo/lookup-empl-type.xml
M samples/demo/opendj.xml
A samples/demo/orgs-metaRole.xml
A samples/demo/orgs-objectTemplate.xml
A samples/demo/orgs-objectType.xml
A samples/demo/orgs.ldif
A samples/demo/projects-metaRole.xml
A samples/demo/projects-objectType.xml
A samples/demo/projects.ldif
M samples/demo/user-template.xml
M samples/objects/security-policy.xml
A samples/resources/liferay/extension-accountAuthorization.xsd
A samples/resources/liferay/liferay-localhost-advanced.xml
M samples/resources/liferay/liferay-localhost-medium.xml
A samples/resources/liferay/liferay-localhost-metarole-orgs.xml
A samples/resources/liferay/liferay-localhost-metarole-roles.xml
M samples/resources/liferay/liferay-localhost-sync.xml
M samples/resources/opendj/opendj-localhost-basic.xml
M samples/resources/opendj/opendj-localhost-medium.xml
M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
M samples/resources/opendj/opendj-resource-genericsync.xml
M samples/resources/opendj/piracy/piracy-schema-modify.ldif
M samples/resources/openldap/olcAccess.ldif
A samples/tasks/bulk-actions/recompute-selected-orgs.xml
M testing/conntest/pom.xml
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
A testing/conntest/src/test/resources/389ds/resource-localhost.xml
A testing/conntest/src/test/resources/389ds/task-sync.xml
R testing/conntest/src/test/resources/common/resource-opendj.xml
R testing/conntest/src/test/resources/common/resource-openldap.xml
M testing/conntest/src/test/resources/common/system-configuration.xml
M testing/conntest/src/test/resources/logback-test.xml
M testing/conntest/src/test/resources/logging.properties
A testing/conntest/src/test/resources/opendj/resource.xml
A testing/conntest/src/test/resources/opendj/task-sync-inetorgperson.xml
A testing/conntest/src/test/resources/opendj/task-sync.xml
A testing/conntest/src/test/resources/openldap/resource.xml
A testing/conntest/src/test/resources/openldap/task-sync-inetorgperson.xml
A testing/conntest/src/test/resources/openldap/task-sync.xml
M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
M testing/consistency-mechanism/src/test/resources/logback-test.xml
M testing/consistency-mechanism/src/test/resources/repo/account-chuck.xml
M testing/consistency-mechanism/src/test/resources/repo/account-deniels.xml
M testing/consistency-mechanism/src/test/resources/repo/account-guybrush-not-found.xml
M testing/consistency-mechanism/src/test/resources/repo/account-guybrush.xml
M testing/consistency-mechanism/src/test/resources/repo/account-hector-not-found.xml
M testing/consistency-mechanism/src/test/resources/repo/account-herman.xml
M testing/consistency-mechanism/src/test/resources/repo/resource-derby.xml
M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
M testing/consistency-mechanism/src/test/resources/repo/task-derby-reconciliation.xml
M testing/consistency-mechanism/src/test/resources/repo/task-opendj-reconciliation.xml
M testing/consistency-mechanism/src/test/resources/request/add-account-jack.xml
M testing/consistency-mechanism/src/test/resources/request/resource-modify-resource-schema.xml
M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-already-exist-communication-problem.xml
M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-already-exist-linked.xml
M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-already-exist-unlinked.xml
M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-communication-problem.xml
M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-deniels.xml
M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-directly.xml
M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account.xml
M testing/longtest/pom.xml
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
M testing/longtest/src/test/resources/common/resource-opendj-complex.xml
M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
M testing/longtest/src/test/resources/common/resource-opendj-university.xml
M testing/longtest/src/test/resources/common/resource-opendj-vlv.xml
M testing/longtest/src/test/resources/common/resource-opendj.xml
M testing/longtest/src/test/resources/ldap/role-pirate.xml
M testing/longtest/src/test/resources/logging.properties
M testing/sanity/pom.xml
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
A testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
M testing/sanity/src/test/resources/logback-test.xml
A testing/sanity/src/test/resources/repo/resource-opendj-legacy.xml
M testing/sanity/src/test/resources/repo/resource-opendj.xml
M testing/sanity/src/test/resources/repo/task-derby-reconciliation.xml
A testing/sanity/src/test/resources/repo/task-opendj-reconciliation-legacy.xml
M testing/sanity/src/test/resources/repo/task-opendj-reconciliation.xml
A testing/sanity/src/test/resources/repo/task-opendj-sync-legacy.xml
M testing/sanity/src/test/resources/repo/task-opendj-sync.xml
A testing/sanity/src/test/resources/request/account-angelika-legacy.xml
M testing/sanity/src/test/resources/request/account-angelika.xml
A testing/sanity/src/test/resources/request/user-modify-add-account-legacy.xml
M testing/sanity/src/test/resources/request/user-modify-add-account.xml
M testing/sanity/testng.xml
M testing/story/pom.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
M testing/story/src/test/resources/logback-test.xml
M testing/story/src/test/resources/orgsync/resource-opendj.xml
M testing/story/src/test/resources/orgsync/task-reconcile-opendj-default-single.xml
M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
M testing/story/src/test/resources/uuid/resource-opendj.xml
M testing/story/src/test/resources/uuid/role-client.xml
M testing/story/src/test/resources/village/resource-opendj.xml
M testing/story/src/test/resources/village/role-account-construction.xml
M testing/story/src/test/resources/village/role-basic.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Conflicts:
infra/prism/src/main/resources/xml/ns/public/query-3.xsd
infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
Commit: 29443ace49a83cd9439b0fd623790d04ef1458bb
https://github.com/Evolveum/midpoint/commit/29443ace49a83cd9439b0fd623790d04ef1458bb
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
R config/sql/_all/h2-3.1.1-all.sql
A config/sql/_all/h2-3.2-all.sql
A config/sql/_all/h2-upgrade-3.1.1-3.2.sql
R config/sql/_all/mysql-3.1.1-all.sql
A config/sql/_all/mysql-3.2-all.sql
R config/sql/_all/mysql-upgrade-3.1-3.1.1.sql
A config/sql/_all/mysql-upgrade-3.1.1-3.2.sql
R config/sql/_all/oracle-3.1.1-all.sql
A config/sql/_all/oracle-3.2-all.sql
R config/sql/_all/oracle-upgrade-3.1-3.1.1.sql
A config/sql/_all/oracle-upgrade-3.1.1-3.2.sql
R config/sql/_all/postgresql-3.1.1-all.sql
A config/sql/_all/postgresql-3.2-all.sql
R config/sql/_all/postgresql-upgrade-3.1-3.1.1.sql
A config/sql/_all/postgresql-upgrade-3.1.1-3.2.sql
R config/sql/_all/sqlserver-3.1.1-all.sql
A config/sql/_all/sqlserver-3.2-all.sql
R config/sql/_all/sqlserver-upgrade-3.1-3.1.1.sql
A config/sql/_all/sqlserver-upgrade-3.1.1-3.2.sql
R config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
R config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
R config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
R config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
R config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
R config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
R config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
R config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
R config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
A config/sql/midpoint/3.2/h2/h2-3.2.sql
A config/sql/midpoint/3.2/h2/h2-upgrade-3.1.1-3.2.sql
A config/sql/midpoint/3.2/mysql/mysql-3.2.sql
A config/sql/midpoint/3.2/mysql/mysql-upgrade-3.1.1-3.2.sql
A config/sql/midpoint/3.2/oracle/oracle-3.2.sql
A config/sql/midpoint/3.2/oracle/oracle-upgrade-3.1.1-3.2.sql
A config/sql/midpoint/3.2/postgresql/postgresql-3.2.sql
A config/sql/midpoint/3.2/postgresql/postgresql-upgrade-3.1.1-3.2.sql
A config/sql/midpoint/3.2/sqlserver/sqlserver-3.2.sql
A config/sql/midpoint/3.2/sqlserver/sqlserver-upgrade-3.1.1-3.2.sql
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
M model/model-intest/src/test/resources/logback-test.xml
M repo/repo-sql-impl-test/sql-procedures/mysql.sql
M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 5da2535cc000ecd89beacdbf73ebd2ace010bcc8
https://github.com/Evolveum/midpoint/commit/5da2535cc000ecd89beacdbf73ebd2ace010bcc8
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-23 (Tue, 23 Jun 2015)
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/parser/PrismBeanInspector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/test/MidPointRemoteQueryExecuterTest.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
Log Message:
-----------
improving report service, fixing parsing for any elements..
Commit: c852c0baa8f70af43e6fed67704037970bd33641
https://github.com/Evolveum/midpoint/commit/c852c0baa8f70af43e6fed67704037970bd33641
Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
Date: 2015-06-23 (Tue, 23 Jun 2015)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/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/page/admin/PageAdmin.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageAdminCertification.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.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/PageAdminConfiguration.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/configuration/PageDebugList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.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/dto/DebugConfDialogDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugSearchDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageAdminHome.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/home/PageMyPasswordQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAdminReports.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/PageNewReport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.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/PageResourceEdit.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/PageResources.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/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/java/com/evolveum/midpoint/web/page/admin/roles/PageAdminRoles.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/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageAdminTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.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
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageAdminUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageContacts.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAdminWorkItems.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/PageProcessInstancesAll.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedBy.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedFor.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/PageWorkItemsClaimable.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/DummyResource.java
A infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/ResourceShadowDiscriminator.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
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/PrismContext.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.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/XNodeProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.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/PrismUtil.java
M infra/schema/pom.xml
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.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/ShadowUtil.java
M infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
M infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd
M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
M infra/schema/src/main/resources/xml/ns/standard/XMLSchema.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
A infra/schema/src/test/resources/object-template/wrong-template.xml
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
M infra/util/pom.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
A model/model-common/src/test/resources/mapping/mapping-script-custom-enum.xml
M model/model-common/src/test/resources/schema/extension.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.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/sync/LiveSyncTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
M model/model-intest/pom.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
M model/model-intest/src/test/resources/entitlements/role-landluber.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/sync/task-delete-dummy-shadows.xml
M model/model-test/pom.xml
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceEventListener.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/ConnectorManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContextFactory.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/ResourceEventListenerImpl.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/ResourceObjectOperations.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.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/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyNegative.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/mock/SynchornizationServiceMock.java
R provisioning/provisioning-impl/src/test/resources/impl/account-change-description.xml
R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete-repo.xml
R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-change.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack-repo.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-jack.xml
R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-repo.xml
R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify.xml
R provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton-change.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-posix-mcmutton.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow-repo.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-sparrow.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-will.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/query-filter-all-accounts.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/query-vanhelgen.xml
A provisioning/provisioning-impl/src/test/resources/impl/opendj/vanhelgen.ldif
R provisioning/provisioning-impl/src/test/resources/impl/query-filter-all-accounts.xml
M provisioning/provisioning-impl/src/test/resources/logback-test.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/util/RUtil.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
M samples/samples-test/pom.xml
M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
M testing/consistency-mechanism/pom.xml
M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
A testing/longtest/src/test/resources/ldap/task-delete-opendj-accounts.xml
A testing/longtest/src/test/resources/ldap/task-delete-opendj-shadows.xml
M testing/longtest/src/test/resources/logback-test.xml
M testing/rest/pom.xml
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Conflicts:
infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
Compare: https://github.com/Evolveum/midpoint/compare/7540ff5cf653...c852c0baa8f7
More information about the midPoint-svn
mailing list