[midPoint-git] [Evolveum/midpoint] 3be63b: Fixed bug related to marshalling specific types (e...

[Pavol Mederly]

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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java

  Log Message:
  -----------
  Fixed bug related to marshalling specific types (e.g. SearchFilterType).


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
    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-deniels.xml
    M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
    M testing/consistency-mechanism/src/test/resources/repo/sample-configuration-object.xml
    M testing/consistency-mechanism/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-abomba.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-deniels.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-guybrush-modify-not-found.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-guybrush.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-hector.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-jack2.xml
    M testing/consistency-mechanism/src/test/resources/request/account-guybrush-modify-attributes.xml
    M testing/consistency-mechanism/src/test/resources/request/account-modify-attrs-communication-problem.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/resource-modify-synchronization.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-communication-problem.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-delete-account-communication-problem.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-delete-account.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType-givenName.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml

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


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/entitlements/role-landluber.xml
    M model/model-intest/src/test/resources/entitlements/role-swashbuckler.xml
    M model/model-intest/src/test/resources/gensync/system-configuration.xml
    M model/model-intest/src/test/resources/scripthooks/resource-dummy-hook.xml
    M model/model-intest/src/test/resources/scripthooks/system-configuration-hooks.xml
    M model/model-intest/testng.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  Fixing some model-intest tests.


Compare: https://github.com/Evolveum/midpoint/compare/f52ed162a499...aa54efdc9c64