[midPoint-git] [Evolveum/midpoint] 1fb7fa: enable/disable buttons in the context menu
Pavol Mederly
mederly at evolveum.com
Tue Jan 24 00:17:47 CET 2017
Branch: refs/heads/feature/sod
Home: https://github.com/Evolveum/midpoint
Commit: 1fb7fa6cb7e2cc6e1b22d90919d560c16623dcd3
https://github.com/Evolveum/midpoint/commit/1fb7fa6cb7e2cc6e1b22d90919d560c16623dcd3
Author: honchar <honchar at evolveum.com>
Date: 2017-01-22 (Sun, 22 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
Log Message:
-----------
enable/disable buttons in the context menu
Commit: a8eb85b4cdd77ac77d0396f8818d62037aaaa6fe
https://github.com/Evolveum/midpoint/commit/a8eb85b4cdd77ac77d0396f8818d62037aaaa6fe
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-22 (Sun, 22 Jan 2017)
Changed paths:
M build-system/pom.xml
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.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/LayerRefinedResourceSchemaImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.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/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.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/ItemInfo.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.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/ListXNode.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-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/TestParseTaskBulkAction.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
A infra/schema/src/test/resources/common/json/no-ns/form.json
A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
A infra/schema/src/test/resources/common/json/ns/form.json
A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
M infra/schema/src/test/resources/common/task-bulk-action-1.xml
A infra/schema/src/test/resources/common/xml/no-ns/form.xml
A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
A infra/schema/src/test/resources/common/xml/ns/form.xml
A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
A infra/schema/src/test/resources/common/yaml/ns/form.yaml
A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
M infra/schema/src/test/resources/object-template/wrong-template.xml
M infra/schema/testng-unit.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.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/helpers/ExpressionHelper.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
Log Message:
-----------
Heterogeneous lists almost done.
Commit: f32ff05bb5401edb84f6ddfe6744fb860007c95b
https://github.com/Evolveum/midpoint/commit/f32ff05bb5401edb84f6ddfe6744fb860007c95b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M build-system/pom.xml
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.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/LayerRefinedResourceSchemaImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.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/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.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/ItemInfo.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.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/ListXNode.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-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/TestParseTaskBulkAction.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
A infra/schema/src/test/resources/common/json/no-ns/form.json
A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
A infra/schema/src/test/resources/common/json/ns/form.json
A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
M infra/schema/src/test/resources/common/task-bulk-action-1.xml
A infra/schema/src/test/resources/common/xml/no-ns/form.xml
A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
A infra/schema/src/test/resources/common/xml/ns/form.xml
A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
A infra/schema/src/test/resources/common/yaml/ns/form.yaml
A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
M infra/schema/src/test/resources/object-template/wrong-template.xml
M infra/schema/testng-unit.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.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/helpers/ExpressionHelper.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
Log Message:
-----------
Merge branch 'feature/heterogeneous-lists'
# Conflicts:
# infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Commit: 034751536588151eb0a9719b85bd8eb11c5721ea
https://github.com/Evolveum/midpoint/commit/034751536588151eb0a9719b85bd8eb11c5721ea
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
Log Message:
-----------
Fixing compilation errors.
Commit: 09e398bc3912632c1e3024461a5fb8422843d840
https://github.com/Evolveum/midpoint/commit/09e398bc3912632c1e3024461a5fb8422843d840
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
Log Message:
-----------
Checking type/element names conflicts when using '@value' items in JSON/YAML
Commit: 769fdc2eb84e13266c7027359093cf32702d35d9
https://github.com/Evolveum/midpoint/commit/769fdc2eb84e13266c7027359093cf32702d35d9
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
Log Message:
-----------
Stripping NS from @element names (if possible) + fixing a related bug.
Commit: 81c71b9c07885b790141ffa3c49ce4b637aa50d0
https://github.com/Evolveum/midpoint/commit/81c71b9c07885b790141ffa3c49ce4b637aa50d0
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-23 (Mon, 23 Jan 2017)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.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/LayerRefinedAttributeDefinitionImpl.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/LayerRefinedResourceSchemaImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchemaImpl.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/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLFactory.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.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/ItemInfo.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismBeanInspector.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/GlobalDefinitionsStore.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.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/ListXNode.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-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/TestParseTaskBulkAction.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/AbstractParserTest.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpression.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseScriptingExpressionXsiType.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseUser.java
A infra/schema/src/test/resources/common/json/no-ns/form.json
A infra/schema/src/test/resources/common/json/no-ns/scripting-expression.json
A infra/schema/src/test/resources/common/json/ns/form.json
A infra/schema/src/test/resources/common/json/ns/scripting-expression.json
M infra/schema/src/test/resources/common/task-bulk-action-1.xml
A infra/schema/src/test/resources/common/xml/no-ns/form.xml
A infra/schema/src/test/resources/common/xml/no-ns/scripting-expression.xml
A infra/schema/src/test/resources/common/xml/ns/form.xml
A infra/schema/src/test/resources/common/xml/ns/scripting-expression-xsi-type.xml
A infra/schema/src/test/resources/common/xml/ns/scripting-expression.xml
A infra/schema/src/test/resources/common/yaml/no-ns/form.yaml
A infra/schema/src/test/resources/common/yaml/no-ns/scripting-expression.yaml
A infra/schema/src/test/resources/common/yaml/ns/form.yaml
A infra/schema/src/test/resources/common/yaml/ns/scripting-expression.yaml
M infra/schema/src/test/resources/object-template/wrong-template.xml
M infra/schema/testng-unit.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.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/helpers/ExpressionHelper.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
Log Message:
-----------
Merge branch 'master' into feature/sod
Commit: b2de2103ded5898f3d4d2da2478332906fbd8b86
https://github.com/Evolveum/midpoint/commit/b2de2103ded5898f3d4d2da2478332906fbd8b86
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths:
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/WorkItemPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.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-workflows-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/DefaultProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/ProcessMidPointInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ActivitiUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareApprover.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java
R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PolicyRuleBasedAspect.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/TriggeredApprovalAction.java
M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/sod/AbstractTestSoD.java
M model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
M model/workflow-impl/src/test/resources/policy/sod/role-judge.xml
M model/workflow-impl/src/test/resources/policy/sod/role-pirate.xml
M model/workflow-impl/src/test/resources/policy/sod/role-respectable.xml
M model/workflow-impl/src/test/resources/policy/sod/role-thief.xml
Log Message:
-----------
SoD approval. Approver instruction. Approval level information in GUI. (Still not quite finished.)
Commit: bc881d687423b7a25a1a41643f6f9a5a20794ffd
https://github.com/Evolveum/midpoint/commit/bc881d687423b7a25a1a41643f6f9a5a20794ffd
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths:
M model/model-intest/src/test/resources/rbac/role-meta-color.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/feature/sod' into feature/sod
Compare: https://github.com/Evolveum/midpoint/compare/c81258a51095...bc881d687423
More information about the midPoint-svn
mailing list