[midPoint-git] [Evolveum/midpoint] 5c0446: Started fixing model-intest. Reworked notification...

[Pavol Mederly]

  Branch: refs/heads/parser
  Home:   https://github.com/Evolveum/midpoint
  Commit: 5c044697e8b5a8561fa3ca76132518dbb12e9a73
      https://github.com/Evolveum/midpoint/commit/5c044697e8b5a8561fa3ca76132518dbb12e9a73
  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/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.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 infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectFactory.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-intest/src/test/resources/common/system-configuration-with-template.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/NotificationManagerImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/CategoryFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/ExpressionFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/OperationFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/StatusFilter.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/AggregatedEventHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/ChainHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/ForkHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java

  Log Message:
  -----------
  Started fixing model-intest. Reworked notifications to get rid of XSD features unsupported in prism.


  Commit: 37d8d5fe6382621da8e1d79aec46331c08e8539e
      https://github.com/Evolveum/midpoint/commit/37d8d5fe6382621da8e1d79aec46331c08e8539e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M infra/prism/.gitignore
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-impl/.gitignore
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    M model/model-intest/.gitignore
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/repo/role-captain.xml
    M testing/sanity/src/test/resources/repo/role-pirate.xml
    M testing/sanity/src/test/resources/repo/sample-configuration-object.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync.xml
    M testing/sanity/src/test/resources/repo/user-template.xml
    M testing/sanity/src/test/resources/request/account-modify-attrs.xml
    M testing/sanity/src/test/resources/request/user-modify-activation-disable.xml
    M testing/sanity/src/test/resources/request/user-modify-activation-enable.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account-derby.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-captain-1.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-captain-2.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-judge.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-pirate.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-captain-1.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-captain-2.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-pirate.xml
    M testing/sanity/src/test/resources/request/user-modify-fullname-locality.xml
    M testing/sanity/src/test/resources/request/user-modify-givenname.xml
    M testing/sanity/src/test/resources/request/user-modify-name.xml
    M testing/sanity/src/test/resources/request/user-modify-password.xml

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

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java


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

  Changed paths:
    M model/model-intest/src/test/resources/multi/resource-dummy-beige.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-ivory.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/multi/role-dummies.xml

  Log Message:
  -----------
  Fixed TestResourceMulti in model-intest.


Compare: https://github.com/Evolveum/midpoint/compare/94a92fca712b...a87b7cf868dd