[midPoint-git] [Evolveum/midpoint] a8eb85: Heterogeneous lists almost done.

Pavol Mederly mederly at evolveum.com
Mon Jan 23 09:45:09 CET 2017 

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


Compare: https://github.com/Evolveum/midpoint/compare/1fb7fa6cb7e2...034751536588

More information about the midPoint-svn mailing list