[midPoint-git] midPoint branch master updated. v2.3devel-187-g9fad6a8

[Katka Valalikova]

Project "midPoint" branch master has been updated
       via  9fad6a8736009a0313641b3a95b12ffbe5ee8d16 (commit) v2.3devel-187-g9fad6a8
       via  c9cdd2559d8c83048196bb754220d137dce2a3e9 (commit) v2.3devel-182-gc9cdd25
       via  c4ebf3a34efdee772f3994f2d4c17f31e6c30931 (commit) v2.3devel-181-gc4ebf3a
       via  e660ebd83358bec0b75ef7c31d2874bef0250e05 (commit) v2.3devel-179-ge660ebd
       via  5b650fbcbd4aaa8e0ae760a65ed153f8d2485252 (commit) v2.3devel-151-g5b650fb
       via  5dfce0561c21bfff5452d3a62006e5fd6cee7c15 (commit) v2.3devel-150-g5dfce05
       via  4e12ff9f191643bf1b5e537eb3430a6e386f2f6f (commit) v2.3devel-149-g4e12ff9
       via  cacf8deb6a6664e1c99a5be486adea9934aad1cf (commit) v2.3devel-148-gcacf8de
       via  4f1f62a1dcda2053cca8770fab5a40d2079e6a70 (commit) v2.3devel-147-g4f1f62a
       via  dc1b02550006619c52b827ecf729b3f16b146d57 (commit) v2.3devel-87-gdc1b025
       via  7039d8d87c413cfcd15c602a0c186e85af91933a (commit) v2.3devel-86-g7039d8d
       via  ce81d1acc6eec4fc7156f9af0961643ef5f879ba (commit) v2.3devel-85-gce81d1a
       via  57556afbf0eafb4e89485b6f27af231bde82452e (commit) v2.3devel-84-g57556af
       via  12b8edc52793acb95c2fdcf2810f6255d80f5dde (commit) v2.3devel-83-g12b8edc
       via  d026074501cc70686c24ae7291b25401ea6ee013 (commit) v2.3devel-24-gd026074
       via  a13873fa35853eeb22c651ed5f92dfbb6c38537d (commit) v2.3devel-23-ga13873f
       via  769244ae518e773b7d2275303df633a90407eefc (commit) v2.3devel-22-g769244a
       via  41e57b55a15f452a5a70d77b38a40fb3d2b141e3 (commit) v2.3devel-21-g41e57b5
      from  1c7c5cb5003f0e248ec5874617d96eeb5d4a9ff9 (commit) v2.3devel-169-g1c7c5cb

- Log -----------------------------------------------------------------
commit 9fad6a8736009a0313641b3a95b12ffbe5ee8d16
Merge: c9cdd25 1c7c5cb
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Nov 11 17:03:44 2013 +0100

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

commit c9cdd2559d8c83048196bb754220d137dce2a3e9
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Nov 11 17:03:23 2013 +0100

    fixing build after merge of rest..

commit c4ebf3a34efdee772f3994f2d4c17f31e6c30931
Merge: 18fa248 e660ebd
Author: katkav <k.valalikova at evolveum.com>
Date:   Mon Nov 11 16:15:54 2013 +0100

    Merge remote-tracking branch 'remotes/origin/restNew'

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

(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:
 build-system/pom.xml                               |   12 +-
 infra/prism/pom.xml                                |   11 +
 .../com/evolveum/midpoint/prism/PrismContext.java  |    8 +
 .../midpoint/prism/dom/PrismDomProcessor.java      |   15 +
 .../midpoint/prism/json/PrismJasonProcessor.java   |  442 +++++++++++++++
 .../midpoint/prism/util/JavaTypeConverter.java     |   10 +
 .../midpoint/prism/xml/PrismJaxbProcessor.java     |   38 +-
 infra/prism/testng.xml                             |    1 +
 infra/schema/pom.xml                               |    8 +-
 .../schema/MidPointPrismContextFactory.java        |    7 +
 .../midpoint/schema/constants/ObjectTypes.java     |   58 +-
 .../evolveum/midpoint/schema/TestJsonParsing.java  |   39 ++
 .../src/test/resources/common/json/user-jack.json  |   46 ++
 infra/schema/testng.xml                            |    1 +
 .../midpoint/model/api/ModelExecuteOptions.java    |   31 ++
 model/model-impl/pom.xml                           |   16 +
 .../evolveum/midpoint/model/ModelCrudService.java  |   72 ++-
 .../evolveum/midpoint/model/ModelRestService.java  |  561 ++++++++++++++++++++
 .../evolveum/midpoint/model/ModelWebService.java   |    6 +-
 .../midpoint/model/rest/MidpointXmlProvider.java   |  143 +++++
 .../com/evolveum/midpoint/model/rest/PATCH.java    |   15 +
 .../MidpointRestAuthenticationHandler.java         |  127 +++++
 model/model-impl/src/main/resources/ctx-model.xml  |   20 +
 .../model/controller/ControllerAddObjectTest.java  |   10 +-
 .../controller/ControllerModifyObjectTest.java     |    8 +-
 .../model/intest/TestModelCrudService.java         |   18 +-
 samples/json/user-jack.json                        |    7 +
 samples/objects/user-jack-with-password.xml        |    2 +-
 .../account-jack.xml => rest/account-jack-csv.xml} |    4 +-
 .../account-jack-opendj.xml}                       |    4 +-
 samples/rest/default-user-template.xml             |   37 ++
 samples/rest/default-user-template2.xml            |   36 ++
 .../rest/modification-assign-account.xml           |    8 +-
 .../opendj-resource-sync.xml}                      |   76 +--
 .../rest/query-all-accounts.xml                    |   80 ++-
 testing/pom.xml                                    |    1 +
 testing/{sanity => rest}/pom.xml                   |   94 ++--
 .../midpoint/testing/rest/TestRestService.java     |  304 +++++++++++
 .../src/test/resources/ctx-rest-test-main.xml}     |   95 ++--
 .../src/test/resources/ctx-rest-test.xml}          |   82 +--
 .../src/test/resources/logback-test.xml            |  108 ++--
 .../src/test/resources/repo/resource-opendj.xml    |    0
 .../test/resources/repo/system-configuration.xml   |    0
 .../src/test/resources/repo/user-administrator.xml |   10 +-
 .../src/test/resources/repo/user-template.xml      |    0
 testing/{sanity => rest}/testng.xml                |   56 +-
 46 files changed, 2313 insertions(+), 414 deletions(-)
 create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
 create mode 100644 infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
 create mode 100644 infra/schema/src/test/resources/common/json/user-jack.json
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelRestService.java
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/rest/MidpointXmlProvider.java
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/rest/PATCH.java
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/security/MidpointRestAuthenticationHandler.java
 create mode 100644 samples/json/user-jack.json
 copy samples/{objects/account-jack.xml => rest/account-jack-csv.xml} (92%)
 copy samples/{objects/account-jack.xml => rest/account-jack-opendj.xml} (92%)
 create mode 100644 samples/rest/default-user-template.xml
 create mode 100644 samples/rest/default-user-template2.xml
 copy testing/consistency-mechanism/src/test/resources/request/user-modify-add-account.xml => samples/rest/modification-assign-account.xml (85%)
 copy samples/{resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml => rest/opendj-resource-sync.xml} (91%)
 copy provisioning/provisioning-impl/src/test/resources/impl/query-filter-all-accounts.xml => samples/rest/query-all-accounts.xml (91%)
 copy testing/{sanity => rest}/pom.xml (66%)
 create mode 100644 testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
 copy testing/{sanity/src/test/resources/ctx-sanity-test-main.xml => rest/src/test/resources/ctx-rest-test-main.xml} (94%)
 copy testing/{sanity/src/test/resources/ctx-sanity-test.xml => rest/src/test/resources/ctx-rest-test.xml} (97%)
 copy testing/{consistency-mechanism => rest}/src/test/resources/logback-test.xml (91%)
 copy testing/{consistency-mechanism => rest}/src/test/resources/repo/resource-opendj.xml (100%)
 copy testing/{consistency-mechanism => rest}/src/test/resources/repo/system-configuration.xml (100%)
 copy testing/{consistency-mechanism => rest}/src/test/resources/repo/user-administrator.xml (75%)
 copy testing/{consistency-mechanism => rest}/src/test/resources/repo/user-template.xml (100%)
 copy testing/{sanity => rest}/testng.xml (86%)


hooks/post-receive
-- 
midPoint