[midPoint-git] midPoint branch parser updated. v2.3devel-1229-gf5d4e86
Katka Valalikova
git at evolveum.com
Wed Feb 19 00:25:54 CET 2014
Project "midPoint" branch parser has been updated
via f5d4e86eabe027f6a44987d93e2f9ad4395e4a02 (commit) v2.3devel-1229-gf5d4e86
via cec9b647ed538ac8cb9c5e977020cbddd64261d1 (commit) v2.3devel-1228-gcec9b64
via de2475493afbed70b6f33511b29526355d2d403b (commit) v2.3devel-1227-gde24754
via 57edfa8038f43a428808445cf46d4c3f44fde989 (commit) v2.3devel-1197-g57edfa8
via c53603907e8fa0fc8239b46a9b6adc13ad3bb90f (commit) v2.3devel-1196-gc536039
via 0e9d8994afb252aa5915f658a0c289ef63607c68 (commit) v2.3devel-1168-g0e9d899
via bdfb64cff19cb7192697545a7a65954f0968cb46 (commit) v2.3devel-1167-gbdfb64c
from 7a2bb795cfe01d1c5347d8dd8b0b2f438ef5802d (commit) v2.3devel-1222-g7a2bb79
- Log -----------------------------------------------------------------
commit f5d4e86eabe027f6a44987d93e2f9ad4395e4a02
Author: katkav <k.valalikova at evolveum.com>
Date: Wed Feb 19 00:25:33 2014 +0100
fixing schema tests..
commit cec9b647ed538ac8cb9c5e977020cbddd64261d1
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Feb 18 21:24:44 2014 +0100
tests for yaml and json..itemPath deserialization..
commit de2475493afbed70b6f33511b29526355d2d403b
Merge: 57edfa8 7a2bb79
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Feb 17 19:16:29 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/xnode/XNode.java
commit 57edfa8038f43a428808445cf46d4c3f44fde989
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Feb 17 19:14:35 2014 +0100
extending tests to support json, yaml..
commit c53603907e8fa0fc8239b46a9b6adc13ad3bb90f
Merge: 0e9d899 fe14785
Author: katkav <k.valalikova at evolveum.com>
Date: Wed Feb 12 09:28:55 2014 +0100
Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser
Conflicts:
infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
commit 0e9d8994afb252aa5915f658a0c289ef63607c68
Author: katkav <k.valalikova at evolveum.com>
Date: Wed Feb 12 09:24:59 2014 +0100
extending tests for json and yaml
commit bdfb64cff19cb7192697545a7a65954f0968cb46
Author: katkav <k.valalikova at evolveum.com>
Date: Tue Feb 11 10:43:03 2014 +0100
prism tests - support for yaml and json..
-----------------------------------------------------------------------
(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:
.../com/evolveum/midpoint/prism/PrismContext.java | 6 +
.../midpoint/prism/parser/AbstractParser.java | 170 +++++++++++++++-----
.../evolveum/midpoint/prism/parser/JsonParser.java | 15 +-
.../midpoint/prism/parser/PrismBeanConverter.java | 13 ++
.../midpoint/prism/parser/QueryConvertor.java | 22 ++-
.../midpoint/prism/parser/XNodeProcessor.java | 4 +-
.../midpoint/prism/parser/XNodeSerializer.java | 3 +-
.../midpoint/prism/parser/XPathHolder.java | 3 +-
.../evolveum/midpoint/prism/parser/YamlParser.java | 15 +-
.../prism/parser/json/ItemPathDeserializer.java | 22 ++-
.../parser/json/ItemPathTypeDeserializer.java | 46 ++++++
.../prism/parser/json/JsonValueParser.java | 40 ++---
.../evolveum/midpoint/prism/xml/XsdTypeMapper.java | 2 +-
.../prism/xml/ns/_public/types_2/ItemPathType.java | 6 +-
.../com/evolveum/midpoint/prism/Generator.java | 63 ++++++++
.../midpoint/prism/PrismInternalTestUtil.java | 30 +++-
.../com/evolveum/midpoint/prism/TestCompare.java | 49 +++---
.../evolveum/midpoint/prism/TestCompareJson.java | 21 +++
.../evolveum/midpoint/prism/TestCompareXml.java | 19 +++
.../TestYamlParser.java => TestCompareYaml.java} | 19 +--
.../evolveum/midpoint/prism/TestExtraSchema.java | 3 +-
.../prism/TestPrismObjectConstruction.java | 2 +-
.../evolveum/midpoint/prism/TestPrismParsing.java | 152 ++++++++---------
.../midpoint/prism/TestPrismParsingJson.java | 28 ++++
.../midpoint/prism/TestPrismParsingXml.java | 90 +++++++++++
.../midpoint/prism/TestPrismParsingYaml.java | 51 ++++++
.../test/resources/common/json/user-barbossa.json | 12 ++
.../json/{user-jack.json => user-jack-adhoc.json} | 35 +---
.../{user-jack.json => user-jack-modified.json} | 35 ++--
.../json/{user-jack.json => user-jack-object.json} | 29 ++--
.../test/resources/common/json/user-jack-old.json | 95 +++++++++++
.../src/test/resources/common/json/user-jack.json | 2 +-
.../src/test/resources/common/json/user-will.json | 51 ++++++
.../resources/common/{ => xml}/user-barbossa.xml | 0
.../resources/common/{ => xml}/user-jack-adhoc.xml | 0
.../common/{ => xml}/user-jack-modified.xml | 0
.../common/{ => xml}/user-jack-object.xml | 0
.../test/resources/common/{ => xml}/user-will.xml | 0
.../test/resources/common/yaml/user-barbossa.yaml | 10 ++
.../yaml/{user-jack.yaml => user-jack-adhoc.yaml} | 30 +---
.../{user-jack.yaml => user-jack-modified.yaml} | 36 ++---
.../yaml/{user-jack.yaml => user-jack-object.yaml} | 24 ++-
.../src/test/resources/common/yaml/user-will.yaml | 46 ++++++
infra/prism/testng.xml | 6 +
.../midpoint/schema/TestParseResource.java | 6 +-
.../evolveum/midpoint/schema/TestParseUser.java | 9 +-
.../midpoint/tools/ninja/ExportObjects.java | 2 +-
.../midpoint/tools/ninja/FileTransformer.java | 135 ++++++++++++++++
.../midpoint/tools/ninja/KeyStoreDumper.java | 2 +-
.../com/evolveum/midpoint/tools/ninja/Main.java | 41 ++++-
50 files changed, 1172 insertions(+), 328 deletions(-)
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/ItemPathTypeDeserializer.java
create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/Generator.java
create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompareJson.java
create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompareXml.java
copy infra/prism/src/test/java/com/evolveum/midpoint/prism/{parser/TestYamlParser.java => TestCompareYaml.java} (53%)
create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingJson.java
create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingYaml.java
create mode 100644 infra/prism/src/test/resources/common/json/user-barbossa.json
copy infra/prism/src/test/resources/common/json/{user-jack.json => user-jack-adhoc.json} (71%)
copy infra/prism/src/test/resources/common/json/{user-jack.json => user-jack-modified.json} (86%)
copy infra/prism/src/test/resources/common/json/{user-jack.json => user-jack-object.json} (93%)
create mode 100644 infra/prism/src/test/resources/common/json/user-jack-old.json
create mode 100644 infra/prism/src/test/resources/common/json/user-will.json
rename infra/prism/src/test/resources/common/{ => xml}/user-barbossa.xml (100%)
rename infra/prism/src/test/resources/common/{ => xml}/user-jack-adhoc.xml (100%)
rename infra/prism/src/test/resources/common/{ => xml}/user-jack-modified.xml (100%)
rename infra/prism/src/test/resources/common/{ => xml}/user-jack-object.xml (100%)
rename infra/prism/src/test/resources/common/{ => xml}/user-will.xml (100%)
create mode 100644 infra/prism/src/test/resources/common/yaml/user-barbossa.yaml
copy infra/prism/src/test/resources/common/yaml/{user-jack.yaml => user-jack-adhoc.yaml} (67%)
copy infra/prism/src/test/resources/common/yaml/{user-jack.yaml => user-jack-modified.yaml} (71%)
copy infra/prism/src/test/resources/common/yaml/{user-jack.yaml => user-jack-object.yaml} (78%)
create mode 100644 infra/prism/src/test/resources/common/yaml/user-will.yaml
create mode 100644 tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/FileTransformer.java
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list