[midPoint-git] [Evolveum/midpoint] 93c091: fixing MID-3634
Katarina Valalikova
k.valalikova at evolveum.com
Tue Dec 5 14:04:58 CET 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 93c0913409bec00aaa00b2f724fba1c8f13e6dd2
https://github.com/Evolveum/midpoint/commit/93c0913409bec00aaa00b2f724fba1c8f13e6dd2
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
Log Message:
-----------
fixing MID-3634
Commit: 24039dc28d204fb355a3e0556ee0ef1935c9e62b
https://github.com/Evolveum/midpoint/commit/24039dc28d204fb355a3e0556ee0ef1935c9e62b
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
Log Message:
-----------
fixing MID-4259
Commit: 28990e702567ba27ab4c116c96ebb118b4eb0749
https://github.com/Evolveum/midpoint/commit/28990e702567ba27ab4c116c96ebb118b4eb0749
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-12-05 (Tue, 05 Dec 2017)
Changed paths:
M build-system/pom.xml
M config/sql/_all/h2-3.7-all.sql
R config/sql/_all/h2-upgrade-3.5-3.6.sql
A config/sql/_all/h2-upgrade-3.6-3.7-quartz.sql
M config/sql/_all/h2-upgrade-3.6-3.7.sql
M config/sql/_all/postgresql-3.7-all.sql
R config/sql/_all/postgresql-upgrade-3.5-3.6.sql
M config/sql/_all/postgresql-upgrade-3.6-3.7.sql
R config/sql/midpoint/3.5/h2/h2-3.5.sql
R config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
R config/sql/midpoint/3.5/mysql/mysql-3.5.sql
R config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
R config/sql/midpoint/3.5/oracle/oracle-3.5.sql
R config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
R config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
R config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
R config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
R config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
R config/sql/midpoint/3.6/h2/h2-3.6.sql
R config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
R config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
R config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
A config/sql/midpoint/3.7/h2/h2-3.7.sql
M config/sql/midpoint/3.7/h2/h2-upgrade-3.6-3.7.sql
A config/sql/midpoint/3.7/postgresql/postgresql-3.7.sql
M config/sql/midpoint/3.7/postgresql/postgresql-upgrade-3.6-3.7.sql
M dist/src/main/bin/springboot.sh
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java
M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationService.java
M infra/common/src/main/java/com/evolveum/midpoint/common/LocalizationServiceImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/TypeDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaPostProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaProcessorUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidpointParsingMigrator.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
M infra/schema/src/test/resources/common/xml/ns/wf-context.xml
M infra/util/pom.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessage.java
M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageBuilder.java
A infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageList.java
A infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageListBuilder.java
A infra/util/src/main/java/com/evolveum/midpoint/util/SingleLocalizableMessage.java
M infra/util/src/main/java/com/evolveum/midpoint/util/exception/CommonException.java
M infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
M model/model-common/pom.xml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ObjectValuePolicyEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.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/hooks/PolicyRuleEnforcerHook.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/credentials/CredentialPolicyEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/NoncePolicyEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/PasswordPolicyEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/SecurityQuestionsPolicyEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ConstraintEvaluatorHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ObjectPolicyAspectPart.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Conflicts:
infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
Compare: https://github.com/Evolveum/midpoint/compare/03f44070a485...28990e702567
More information about the midPoint-svn
mailing list