[midPoint-git] midPoint branch parser updated. v2.3devel-1044-g0100489

[Katka Valalikova]

Project "midPoint" branch parser has been updated
       via  0100489baf4a96f56531faa66c30afc99802fc9c (commit) v2.3devel-1044-g0100489
       via  516ee7a6a50fd983b4ee972ded11e09d4e42cb38 (commit) v2.3devel-1043-g516ee7a
       via  3584d3fa8ade22e0df641db23721a90baa25f842 (commit) v2.3devel-1039-g3584d3f
       via  905e92203c87c19036770bd706bb720bcb8ffb86 (commit) v2.3devel-1038-g905e922
       via  6152e63751f2f33f61a3cab44e4d19bce45746cd (commit) v2.3devel-1034-g6152e63
       via  20b70a80df2954c60e047b0c5976a5175d913e27 (commit) v2.3devel-1033-g20b70a8
       via  8c59a0dc2d040ade10a20bbcdbd142dd65fe1a2a (commit) v2.3devel-866-g8c59a0d
       via  1395de8967d0b6806a686bb328e9b909a82ba56e (commit) v2.3devel-865-g1395de8
       via  0fb09e0694cbc42759cb1d2cb120824e2e3a8d16 (commit) v2.3devel-864-g0fb09e0
       via  320969344b6fe0d11ca5d1f7fc83c90711ccaed8 (commit) v2.3devel-863-g3209693
       via  127cfe3d440d06864e73f583ef9583a44652830d (commit) v2.3devel-862-g127cfe3
       via  d23c547cf5c6d0088cd772cc526839c5344fcd49 (commit) v2.3devel-861-gd23c547
       via  327451e350cd5222d30d7fce100131e4db2d5792 (commit) v2.3devel-185-g327451e
       via  2177c7eb70b96ac54c58ff2cd942d7c90dad4962 (commit) v2.3devel-184-g2177c7e
       via  2247600d02b357409c62e79f7feecdbf9be3034a (commit) v2.3devel-183-g2247600
       via  90bfe5c774dc9af6fceb1b11ceb818269c6ec01c (commit) v2.3devel-182-g90bfe5c
       via  2a4dcad5514de4d869f89b24a13a05db0cd5d405 (commit) v2.3devel-181-g2a4dcad
       via  75d706edf6836dc7cdf70a26eda6c630b10e6753 (commit) v2.3devel-180-g75d706e
      from  34889a2dbd89b9fd903fcaffcb169b16c0ea281f (commit) v2.3devel-1026-g34889a2

- Log -----------------------------------------------------------------
commit 0100489baf4a96f56531faa66c30afc99802fc9c
Author: katkav <k.valalikova at evolveum.com>
Date:   Wed Jan 29 10:44:27 2014 +0100

    build fix after merge..

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

(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                                |   48 +-
 .../midpoint/prism/json/DOMDeserializer.java       |   86 ++
 .../midpoint/prism/json/DOMSerializer.java         |  134 +++
 .../prism/json/JaxbElementDeserializer.java        |  216 +++++
 .../midpoint/prism/json/JaxbElementSerializer.java |   73 ++
 .../midpoint/prism/json/PolyStringSerializer.java  |   24 +
 .../midpoint/prism/json/PrismJasonProcessor.java   |  519 +++++++++--
 .../midpoint/prism/json/PrismJsonSerializer.java   |  967 ++++++++++++++++++++
 .../midpoint/prism/json/QNameDeserializer.java     |   46 +
 .../midpoint/prism/json/QNameSerializer.java       |   24 +
 .../midpoint/prism/xml/PrismJaxbProcessor.java     |    2 +-
 .../midpoint/prism/parser/AbstractParserTest.java  |    8 +-
 .../midpoint/prism/parser/TestDomParser.java       |   48 +-
 .../midpoint/prism/parser/TestJsonParser.java      |   28 +
 .../test/resources/common/json/user-jack-v1.json   |   55 ++
 .../src/test/resources/common/json/user-jack.json  |   59 +-
 .../prism/src/test/resources}/json/user-jack.json  |    3 +-
 infra/prism/testng.xml                             |    1 +
 .../resources/xml/ns/public/common/common-2a.xsd   |   17 +
 .../evolveum/midpoint/schema/TestJsonParsing.java  |  267 +++++-
 .../resources/common/json/resource-opendj.json     |  105 +++
 .../src/test/resources/common/resource-opendj.xml  |    2 +-
 .../schema/src/test/resources/common/user-jack.xml |    2 +-
 .../resources/testdata/attribute-description-1.xml |    8 +-
 pom.xml                                            |   15 +-
 .../rest/modification-assign-account.xml           |   10 +-
 .../midpoint/testing/rest/TestRestService.java     |  319 +++----
 .../src/test/resources/repo/account-chuck.xml      |   71 +-
 28 files changed, 2828 insertions(+), 329 deletions(-)
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMDeserializer.java
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMSerializer.java
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementSerializer.java
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameDeserializer.java
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameSerializer.java
 create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java
 create mode 100644 infra/prism/src/test/resources/common/json/user-jack-v1.json
 copy {samples => infra/prism/src/test/resources}/json/user-jack.json (59%)
 create mode 100644 infra/schema/src/test/resources/common/json/resource-opendj.json
 copy testing/consistency-mechanism/src/test/resources/request/user-modify-add-account.xml => samples/rest/modification-assign-account.xml (82%)
 copy testing/{consistency-mechanism => rest}/src/test/resources/repo/account-chuck.xml (87%)


hooks/post-receive
-- 
midPoint