[midPoint-git] midPoint branch parser updated. v2.3devel-1078-g7158647

[Katka Valalikova]

Project "midPoint" branch parser has been updated
       via  715864793b43206ba47f3a187a9b1f6ee3c4c4a7 (commit) v2.3devel-1078-g7158647
       via  cdee62977130d419e21c5710eeee78ddef24bd15 (commit) v2.3devel-1077-gcdee629
       via  7d8337bb3e762a4a2ddc435a73f0889ba5a9791d (commit) v2.3devel-1075-g7d8337b
       via  d36cdfec785b069e6f7a64f724a8aef648da6c76 (commit) v2.3devel-1074-gd36cdfe
       via  9674a1bd86949feff033abf345ac9a51c500ec97 (commit) v2.3devel-1063-g9674a1b
      from  07f92fa3feccdbbecfa8818f83b5546017443282 (commit) v2.3devel-1073-g07f92fa

- Log -----------------------------------------------------------------
commit 715864793b43206ba47f3a187a9b1f6ee3c4c4a7
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Feb 3 20:46:53 2014 +0100

    fixing TestDomParserTest

commit cdee62977130d419e21c5710eeee78ddef24bd15
Merge: 7d8337b 07f92fa
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Feb 3 20:17:31 2014 +0100

    Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser

commit 7d8337bb3e762a4a2ddc435a73f0889ba5a9791d
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Feb 3 20:16:57 2014 +0100

    resolving conflict related to DOMParser.java after rename to DomParser.java

commit d36cdfec785b069e6f7a64f724a8aef648da6c76
Merge: 9674a1b 098049d
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Feb 3 20:12:01 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/xml/XmlTypeConverter.java

commit 9674a1bd86949feff033abf345ac9a51c500ec97
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Feb 3 19:56:32 2014 +0100

    yaml parsing/serializing

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

(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:
 infra/prism/pom.xml                                |   10 +-
 ...rismJsonSerializer.java => AbstractParser.java} |   96 ++-
 .../midpoint/prism/json/PrismJsonSerializer.java   |  688 ++++++++++----------
 .../parser/{DomParser.java => DOMParser.java}      |    0
 .../midpoint/prism/parser/XNodeProcessor.java      |    7 +-
 .../evolveum/midpoint/prism/parser/YamlParser.java |  261 ++++++++
 .../midpoint/prism/xml/XmlTypeConverter.java       |    6 +-
 .../midpoint/prism/parser/AbstractParserTest.java  |    4 +-
 .../{TestJsonParser.java => TestYamlParser.java}   |   15 +-
 .../src/test/resources/common/yaml/user-jack.yaml  |   78 ++-
 10 files changed, 756 insertions(+), 409 deletions(-)
 copy infra/prism/src/main/java/com/evolveum/midpoint/prism/json/{PrismJsonSerializer.java => AbstractParser.java} (86%)
 rename infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/{DomParser.java => DOMParser.java} (100%)
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
 copy infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/{TestJsonParser.java => TestYamlParser.java} (52%)


hooks/post-receive
-- 
midPoint