[midPoint-git] [Evolveum/midpoint] e1904c: Stopped parsing RawType also when it is part of pr...

[Pavol Mederly]

  Branch: refs/heads/parser
  Home:   https://github.com/Evolveum/midpoint
  Commit: e1904c41de895901dd88d558d2bdfe89825817b4
      https://github.com/Evolveum/midpoint/commit/e1904c41de895901dd88d558d2bdfe89825817b4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/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/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/xml/user-jack.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  Stopped parsing RawType also when it is part of prism property. Fixing tests (in progress).


  Commit: c7a4c7ad11616621628ae37f14db67be4e444611
      https://github.com/Evolveum/midpoint/commit/c7a4c7ad11616621628ae37f14db67be4e444611
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.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/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-impl/src/test/resources/common/user-barbossa.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-assignment-replace-ac.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive_empl_number.xml
    M model/model-impl/src/test/resources/sync/correlation-first-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-or-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-second-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition-emplNumber.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/EntityDefinition.java

  Log Message:
  -----------
  Merge branch 'parser' of github.com:Evolveum/midpoint into parser

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
	infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java


  Commit: 52b4a7a1be33cf111813f9fa67aa241aca40de53
      https://github.com/Evolveum/midpoint/commit/52b4a7a1be33cf111813f9fa67aa241aca40de53
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.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/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java
    M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism/src/test/resources/common/json/user-jack-modified.json
    M infra/prism/src/test/resources/common/json/user-jack-object.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism/src/test/resources/common/xml/user-jack-object.xml
    M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java

  Log Message:
  -----------
  Implemented hashCode & equals for XNodes.
Changed RawType do deal with value content (not the wrapping element).
Removed RawType.setXNode.
Enhanced parser tests to deal with complex RawType.


Compare: https://github.com/Evolveum/midpoint/compare/df5e92879fdb...52b4a7a1be33