[midPoint-git] midPoint branch parser updated. v2.3devel-1275-g4de8f22

[Katka Valalikova]

Project "midPoint" branch parser has been updated
       via  4de8f2256c415f29a31a4835e0906c75622bbca4 (commit) v2.3devel-1275-g4de8f22
       via  52cf775960e5ed8b7089d76c2394cfc06fa10047 (commit) v2.3devel-1269-g52cf775
       via  3832ced0bd4480e739db36268e75f1ebc66b2d03 (commit) v2.3devel-1268-g3832ced
      from  591e2936d4190547f1ececac8a793f6c43fc7a6a (commit) v2.3devel-1272-g591e293

- Log -----------------------------------------------------------------
commit 4de8f2256c415f29a31a4835e0906c75622bbca4
Merge: 52cf775 591e293
Author: katkav <k.valalikova at evolveum.com>
Date:   Sat Mar 22 17:17:17 2014 +0100

    Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser
    
    Conflicts:
    	infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    	infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    	infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd

commit 52cf775960e5ed8b7089d76c2394cfc06fa10047
Author: katkav <k.valalikova at evolveum.com>
Date:   Sat Mar 22 16:58:32 2014 +0100

    some more changes in objectModificationType and ObjectDeltaType..fixing schema tests..still not working..

commit 3832ced0bd4480e739db36268e75f1ebc66b2d03
Author: katkav <k.valalikova at evolveum.com>
Date:   Thu Mar 20 10:33:27 2014 +0100

    working on ItemDeltaType ...changing Value to RawType..

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../web/component/prism/PrismPropertyPanel.java    |    2 +-
 .../midpoint/prism/parser/DomSerializer.java       |   13 +-
 .../prism/util/ValueSerializationUtil.java         |    9 +-
 .../midpoint/prism/xnode/PrimitiveXNode.java       |    4 +-
 .../com/evolveum/midpoint/prism/xnode/XNode.java   |    1 +
 .../xml/ns/_public/types_2/ItemDeltaType.java      |   22 +-
 .../prism/xml/ns/_public/types_2/ItemPathType.java |    9 +-
 .../xml/ns/_public/types_2/ObjectDeltaType.java    |   26 +-
 .../prism/xml/ns/_public/types_2/RawType.java      |  368 +++++++++++++++++++-
 .../src/main/resources/xml/ns/public/types-2.xsd   |   40 +--
 .../evolveum/midpoint/schema/DeltaConvertor.java   |  115 ++++--
 .../midpoint/schema/util/ObjectTypeUtil.java       |    9 +-
 .../midpoint/schema/util/SchemaDebugUtil.java      |    2 +-
 .../resources/xml/ns/public/common/api-types-2.xsd |   39 +++
 .../midpoint/schema/TestDeltaConverter.java        |   40 ++-
 .../evolveum/midpoint/schema/TestJaxbParsing.java  |    7 +-
 .../evolveum/midpoint/schema/TestJaxbSanity.java   |    3 +-
 .../midpoint/schema/TestParseDiffPatch.java        |   11 +-
 .../evolveum/midpoint/schema/test/XPathTest.java   |    4 +-
 ...odify-delete-assignment-account-opendj-attr.xml |    4 +-
 .../deltaconverter/user-modify-add-account.xml     |   17 +-
 .../deltaconverter/user-modify-add-role-pirate.xml |    9 +-
 .../deltaconverter/user-modify-givenname.xml       |    7 +-
 .../deltaconverter/user-modify-password.xml        |   14 +-
 .../evolveum/midpoint/model/ModelWebService.java   |    2 +-
 .../impl/CommunicationExceptionHandler.java        |    2 +-
 .../impl/ConfigurationExceptionHandler.java        |    2 +-
 .../consistency/impl/GenericErrorHandler.java      |    2 +-
 .../consistency/impl/ObjectNotFoundHandler.java    |    2 +-
 .../consistency/impl/SchemaExceptionHandler.java   |    2 +-
 .../consistency/impl/SecurityViolationHandler.java |    2 +-
 .../provisioning/impl/ShadowCacheProvisioner.java  |    2 +-
 .../provisioning/impl/ShadowCacheReconciler.java   |    2 +-
 .../midpoint/repo/sql/BaseSQLRepoTest.java         |   13 +
 .../com/evolveum/midpoint/repo/sql/ModifyTest.java |    5 +-
 .../modify/account-delete-object-change.xml        |   42 +--
 .../modify/assignment/modify-add-assignment.xml    |    5 +-
 .../modify/assignment/modify-add-inducement.xml    |    5 +-
 .../modify/assignment/modify-assignment.xml        |    9 +-
 .../assignment/modify-delete-add-assignment.xml    |   10 +-
 .../modify/assignment/modify-delete-assignment.xml |    5 +-
 .../modify/assignment/modify-delete-inducement.xml |    5 +-
 .../modify/assignment/modify-inducement.xml        |   19 +-
 .../resources/modify/change-add-non-existing.xml   |    3 +-
 .../src/test/resources/modify/change-add.xml       |    3 +-
 .../src/test/resources/modify/change-name.xml      |    5 +-
 .../modify/modify-orgStruct-add-orgref.xml         |    4 +-
 .../resources/modify/modify-orgStruct-add-user.xml |    4 +-
 .../resources/modify/modify-user-add-roles.xml     |   10 +-
 .../test/resources/modify/role-modify-change.xml   |    5 +-
 .../orgstruct/modify-orgStruct-delete-ref.xml      |    4 +-
 .../modify-orgStruct-incorrect-add-orgref.xml      |    4 +-
 .../modify-orgStruct-incorrect-delete-ref.xml      |    4 +-
 .../repo/sql/data/common/RAnyConverter.java        |    2 +-
 .../midpoint/repo/sql/data/common/RShadow.java     |    8 +-
 .../midpoint/testing/sanity/TestSanity.java        |    4 +-
 56 files changed, 747 insertions(+), 224 deletions(-)


hooks/post-receive
-- 
midPoint