[midPoint-git] midPoint branch bootstrap updated. v2.3devel-347-ga4af0ed
Vilo Repan
git at evolveum.com
Mon Nov 11 18:16:15 CET 2013
Project "midPoint" branch bootstrap has been updated
via a4af0edf6e9bfa9e0c2414044264d385f08f0def (commit) v2.3devel-347-ga4af0ed
via d6473369e2ca5176c2980f1f10051e476958e9b5 (commit) v2.3devel-322-gd647336
via 933555ce994faa79ab55953c3a934cf556b5fb96 (commit) v2.3devel-321-g933555c
via f1dc11cd67ade9d672c1d463f78e05e74e493339 (commit) v2.3devel-189-gf1dc11c
via 2e8f0a139cc7d6d6abedcb0ca7d89835fd7f05ef (commit) v2.3devel-170-g2e8f0a1
via 9fad6a8736009a0313641b3a95b12ffbe5ee8d16 (commit) v2.3devel-187-g9fad6a8
via c9cdd2559d8c83048196bb754220d137dce2a3e9 (commit) v2.3devel-182-gc9cdd25
via 7c32ab4193bf9312326584e15001b0abc57ae9ce (commit) v2.3devel-320-g7c32ab4
via 1c7c5cb5003f0e248ec5874617d96eeb5d4a9ff9 (commit) v2.3devel-169-g1c7c5cb
via 17185276ecd38383503b9127a4d79157ae30fb8b (commit) v2.3devel-166-g1718527
via 4156d84fc1b5f992d99add741fac5c93b013c3e4 (commit) v2.3devel-167-g4156d84
via 8d76e3f5befc7f10b92868305b6238ce3bf74f8a (commit) v2.3devel-165-g8d76e3f
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 f04973905f1cf5d7e730b070100484990cc722c5 (commit) v2.3devel-319-gf049739
- Log -----------------------------------------------------------------
commit a4af0edf6e9bfa9e0c2414044264d385f08f0def
Merge: d647336 f1dc11c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Nov 11 18:08:03 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
commit d6473369e2ca5176c2980f1f10051e476958e9b5
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Nov 11 18:07:50 2013 +0100
full activation for org. units editing.
commit 933555ce994faa79ab55953c3a934cf556b5fb96
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Nov 11 17:50:54 2013 +0100
activation administrative status for org. units.
commit 7c32ab4193bf9312326584e15001b0abc57ae9ce
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Nov 11 16:56:59 2013 +0100
editor for org. units, work in progress
-----------------------------------------------------------------------
(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 +-
...-2.2-to-2.3.sql => h2-upgrade-2.2-to-2.2.1.sql} | 0
...2-to-2.3.sql => mysql-upgrade-2.2-to-2.2.1.sql} | 0
...-to-2.3.sql => oracle-upgrade-2.2-to-2.2.1.sql} | 0
...2.3.sql => postgresql-upgrade-2.2-to-2.2.1.sql} | 0
...-2.3.sql => sqlserver-upgrade-2.2-to-2.2.1.sql} | 0
.../web/component/form/CheckFormGroup.java | 2 +-
.../{TextAreaFormGroup.html => DateFormGroup.html} | 5 +-
.../{TextFormGroup.java => DateFormGroup.java} | 34 +-
...xtAreaFormGroup.html => DropDownFormGroup.html} | 5 +-
.../web/component/form/DropDownFormGroup.java | 74 +++
.../web/component/form/TextAreaFormGroup.java | 1 +
.../midpoint/web/component/form/TextFormGroup.html | 1 +
.../midpoint/web/component/form/TextFormGroup.java | 11 +-
.../midpoint/web/component/input/DatePanel.java | 59 +-
.../web/component/util/PrismPropertyModel.java | 93 ++++
.../component/util/XmlGregorianCalendarModel.java | 82 +++
.../midpoint/web/page/admin/PageAdmin.java | 7 +-
.../midpoint/web/page/admin/users/PageOrgUnit.html | 25 +-
.../midpoint/web/page/admin/users/PageOrgUnit.java | 183 ++++++-
.../web/page/admin/users/PageOrgUnit.properties | 3 +-
.../src/main/webapp/less/midpoint/midpoint.less | 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/controller/ModelController.java | 2 +-
.../model/lens/projector/CredentialsProcessor.java | 7 -
.../lens/projector/PasswordPolicyProcessor.java | 17 +-
.../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 +-
.../model/test/AbstractModelIntegrationTest.java | 15 +
.../provisioning/impl/ConnectorManager.java | 4 +-
.../provisioning/ucf/api/ConnectorFactory.java | 2 +-
.../ucf/impl/ConnectorFactoryIcfImpl.java | 5 +-
.../ucf/impl/ConnectorInstanceIcfImpl.java | 41 +-
.../midpoint/provisioning/ucf/impl/IcfUtil.java | 11 +-
.../provisioning/test/ucf/TestUcfDummy.java | 11 +-
.../provisioning/test/ucf/TestUcfOpenDj.java | 5 +-
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 +-
.../midpoint/testing/sanity}/ModelClientUtil.java | 4 +-
.../midpoint/testing/sanity/TestSanity.java | 76 ++-
80 files changed, 2919 insertions(+), 605 deletions(-)
copy config/{h2-upgrade-2.2-to-2.3.sql => h2-upgrade-2.2-to-2.2.1.sql} (100%)
copy config/{mysql-upgrade-2.2-to-2.3.sql => mysql-upgrade-2.2-to-2.2.1.sql} (100%)
copy config/{oracle-upgrade-2.2-to-2.3.sql => oracle-upgrade-2.2-to-2.2.1.sql} (100%)
copy config/{postgresql-upgrade-2.2-to-2.3.sql => postgresql-upgrade-2.2-to-2.2.1.sql} (100%)
copy config/{sqlserver-upgrade-2.2-to-2.3.sql => sqlserver-upgrade-2.2-to-2.2.1.sql} (100%)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/{TextAreaFormGroup.html => DateFormGroup.html} (86%)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/{TextFormGroup.java => DateFormGroup.java} (55%)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/{TextAreaFormGroup.html => DropDownFormGroup.html} (83%)
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/PrismPropertyModel.java
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/XmlGregorianCalendarModel.java
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%)
copy {model/model-client/src/main/java/com/evolveum/midpoint/model/client => testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity}/ModelClientUtil.java (98%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list