[midPoint-git] midPoint branch bootstrap updated. v2.3devel-541-g7738476
Vilo Repan
git at evolveum.com
Tue Dec 3 16:16:26 CET 2013
Project "midPoint" branch bootstrap has been updated
via 7738476b347ec7033e53b5c72af89a2f56ce7904 (commit) v2.3devel-541-g7738476
via 46fbe4effe843013cebadaa7846b0dc263cb3012 (commit) v2.3devel-523-g46fbe4e
via 2e979ef4845d795c187bb6d10931f3f781c2a2b4 (commit) v2.3devel-304-g2e979ef
via 299781566534ac87f7d2ca05189d4e2cafd992e1 (commit) v2.3devel-298-g2997815
via 565ab3b9bec86cd3939c9f0023397e5ade554cbb (commit) v2.3devel-288-g565ab3b
via 609dd450327061e0e47c65932d76c2ea6bd200e3 (commit) v2.3devel-297-g609dd45
via c5efd082f10641c2c9c2043e0b9d194d1acd7b3b (commit) v2.3devel-296-gc5efd08
via 93367f05b45ba20fac9b6967b3f230e2b06942f9 (commit) v2.3devel-522-g93367f0
via 6cd3a908e83fd5de64103fe852bd89ceb2c30f38 (commit) v2.3devel-521-g6cd3a90
via 4b9fecd369fffa726eb6a2255e90370c8826ff39 (commit) v2.3devel-520-g4b9fecd
via a95f9eb8535f6deebd8b3c41832a897dcdee283c (commit) v2.3devel-287-ga95f9eb
via 248373ccc2073ff816345afdcb688ed974808f74 (commit) v2.3devel-286-g248373c
via d3e53a2782c2f3201765d127efb30008461b4146 (commit) v2.3devel-283-gd3e53a2
via b01c16a3602759b8ae954e47e9c6873dc2af9238 (commit) v2.3devel-282-gb01c16a
via 2da6caf275d939828b99501ae8362dd20c9712aa (commit) v2.3devel-295-g2da6caf
via ef75897dbc04e7a1fe51a6a7da2e23435b6d8bc3 (commit) v2.3devel-294-gef75897
via fe22352179bc6d4423a76a81ac75c82a04db1f45 (commit) v2.3devel-293-gfe22352
via 500e4f85a53c83e5876482d39f8126395623a065 (commit) v2.3devel-284-g500e4f8
via 1d5de9cfd4a098dab531c211da9ff8403a101f4d (commit) v2.3devel-283-g1d5de9c
via 81f0b489bd2881b95a17eef71459d1a45ab99864 (commit) v2.3devel-264-g81f0b48
via 1eca55172209fabc286c53d7641699144ef37267 (commit) v2.3devel-263-g1eca551
via 2873f63ef6013dc133784b54dc47e86751b0fba2 (commit) v2.3devel-262-g2873f63
via 726262a33887f3d0e1a286f97f5a9d94335fdc17 (commit) v2.3devel-254-g726262a
via 9a320205335d78ccaf5de82c005f3f8eff348f68 (commit) v2.3devel-243-g9a32020
via 0051b840b39f9203e26522c9e443ff4215ab475e (commit) v2.3devel-242-g0051b84
via f678767e5a59d69ea34c9455eca75d89323a869f (commit) v2.3devel-230-gf678767
from 4e09a8af231e087c503291432c73d79695965862 (commit) v2.3devel-515-g4e09a8a
- Log -----------------------------------------------------------------
commit 7738476b347ec7033e53b5c72af89a2f56ce7904
Merge: 46fbe4e 2e979ef
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 3 16:03:19 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
commit 46fbe4effe843013cebadaa7846b0dc263cb3012
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 3 16:02:51 2013 +0100
org. type editing, work in progress
commit 93367f05b45ba20fac9b6967b3f230e2b06942f9
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 3 14:25:54 2013 +0100
minor css fix.
commit 6cd3a908e83fd5de64103fe852bd89ceb2c30f38
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 3 14:25:45 2013 +0100
move root operation, tree root expanded now.
commit 4b9fecd369fffa726eb6a2255e90370c8826ff39
Merge: 4e09a8a a95f9eb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 3 14:05:01 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
-----------------------------------------------------------------------
(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:
gui/admin-gui/pom.xml | 2 +-
.../component/form/MultiValueTextFormGroup.html | 4 +-
.../component/form/MultiValueTextFormGroup.java | 2 +-
.../component/input/ListMultipleChoicePanel.html | 2 +-
.../web/component/util/PrismPropertyModel.java | 171 ++++-
.../midpoint/web/page/admin/users/PageOrgUnit.html | 2 +-
.../midpoint/web/page/admin/users/PageOrgUnit.java | 2 +-
.../page/admin/users/component/OrgUnitBrowser.java | 61 +-
.../page/admin/users/component/TreeTablePanel.java | 56 +-
.../web/page/admin/users/dto/OrgTableDto.java | 3 +
.../web/page/admin/users/dto/OrgTreeDto.java | 4 +
.../web/security/MidPointApplication.properties | 6 +-
.../evolveum/midpoint/web/util/WebModelUtils.java | 38 +-
.../evolveum/midpoint/web/TestCleanStartup.java | 4 +-
.../expression/script/TestScriptCaching.java | 8 +-
.../com/evolveum/midpoint/prism/path/ItemPath.java | 9 +
.../evolveum/midpoint/model/ModelWebService.java | 22 +-
.../midpoint/model/controller/ModelController.java | 30 +-
.../model/lens/projector/CredentialsProcessor.java | 2 +-
.../model/lens/projector/InboundProcessor.java | 43 +-
.../model/lens/projector/OutboundProcessor.java | 25 +-
.../model/trigger/TriggerScannerTaskHandler.java | 18 +-
.../com/evolveum/midpoint/model/util/Utils.java | 20 +
model/model-intest/pom.xml | 6 +
.../model/intest/TestModelServiceContract.java | 39 +-
.../model/intest/TestTolerantAttributes.java | 1 -
.../model/intest/sync/AbstractInboundSyncTest.java | 3 +-
.../test/resources/common/system-configuration.xml | 28 +-
.../src/test/resources/logback-test.xml | 3 +-
model/model-test/pom.xml | 4 +-
.../model/test/AbstractModelIntegrationTest.java | 78 +--
.../midpoint/model/test}/DummyTransport.java | 178 ++---
.../.gitignore | 0
model/{notifications => notifications-api}/pom.xml | 196 +++---
.../midpoint/notifications/api}/EventHandler.java | 63 +-
.../notifications/api/NotificationManager.java} | 78 ++-
.../notifications/api}/OperationStatus.java | 84 +--
.../notifications/api}/events/AccountEvent.java | 242 +++----
.../notifications/api/events/BaseEvent.java} | 334 +++++-----
.../midpoint/notifications/api/events/Event.java | 80 +++
.../notifications/api}/events/ModelEvent.java | 296 ++++-----
.../notifications/api/events/SimpleObjectRef.java} | 63 +-
.../notifications/api}/events/WorkItemEvent.java | 160 ++---
.../notifications/api}/events/WorkflowEvent.java | 254 ++++----
.../api}/events/WorkflowProcessEvent.java | 90 +--
.../notifications/api}/transports/Message.java | 144 ++---
.../notifications/api}/transports/Transport.java | 64 +-
.../testng.xml | 44 +-
.../notifications-impl}/.gitignore | 0
.../{workflow-impl => notifications-impl}/pom.xml | 372 +++++------
.../notifications/AccountOperationListener.java | 471 +++++++-------
.../notifications/NotificationChangeHook.java | 294 ++++-----
.../notifications/NotificationConstants.java | 84 +--
.../notifications/NotificationManagerImpl.java} | 273 ++++----
.../midpoint/notifications/NotificationsUtil.java | 258 ++++----
.../notifications/SimpleObjectRefImpl.java} | 130 ++--
.../midpoint/notifications/WorkflowListener.java | 365 +++++------
.../api}/transports/MailTransport.java | 364 +++++------
.../api}/transports/SimpleSmsTransport.java | 510 +++++++--------
.../api}/transports/TransportUtil.java | 66 +-
.../notifications/filters/CategoryFilter.java | 134 ++--
.../notifications/filters/ExpressionFilter.java | 120 ++--
.../notifications/filters/OperationFilter.java | 132 ++--
.../notifications/filters/StatusFilter.java | 132 ++--
.../notifications/formatters/TextFormatter.java | 679 ++++++++++----------
.../notifications/handlers/BaseHandler.java | 347 +++++-----
.../notifications/handlers/ChainHandler.java | 124 ++--
.../notifications/handlers/ForkHandler.java | 118 ++--
.../notifiers/AccountPasswordNotifier.java | 237 +++----
.../notifications/notifiers/GeneralNotifier.java | 646 +++++++++----------
.../notifiers/SimpleAccountNotifier.java | 536 ++++++++-------
.../notifiers/SimpleUserNotifier.java | 293 +++++----
.../notifiers/SimpleWorkflowNotifier.java | 236 +++----
.../notifiers/UserPasswordNotifier.java | 234 +++----
.../src/main/resources/ctx-notifications.xml | 60 +-
.../midpoint/notifications/TestTextFormatter.java | 236 +++++++
.../resources/changes/user-jack-modification.xml | 53 ++
.../src/test/resources/ctx-notifications-test.xml} | 17 +-
.../src/test/resources/logback-test.xml | 44 ++
.../src/test/resources/objects/account-jack.xml | 44 ++
.../src/test/resources/objects/user-jack.xml | 59 ++
.../testng.xml | 48 +-
.../notifications/notifiers/DummyNotifier.java | 119 ----
.../notifiers/SimpleUserNotifierOld.java | 245 -------
model/pom.xml | 3 +-
.../src/test/resources/ctx-report-test-main.xml | 1 -
model/workflow-impl/pom.xml | 8 +-
.../ucf/impl/ConnectorInstanceIcfImpl.java | 8 +-
.../midpoint/testing/longtest/TestLdap.java | 12 +-
.../test/resources/common/system-configuration.xml | 14 -
.../midpoint/testing/sanity/TestSanity.java | 78 ++-
.../src/test/resources/repo/resource-opendj.xml | 5 +-
.../evolveum/midpoint/testing/story/TestTrafo.java | 12 +-
.../test/resources/common/system-configuration.xml | 28 +-
94 files changed, 5940 insertions(+), 5375 deletions(-)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications/transports => model-test/src/main/java/com/evolveum/midpoint/model/test}/DummyTransport.java (79%)
rename model/{notifications => notifications-api}/.gitignore (100%)
rename model/{notifications => notifications-api}/pom.xml (89%)
copy model/{notifications/src/main/java/com/evolveum/midpoint/notifications/handlers => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/EventHandler.java (84%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications/handlers/EventHandler.java => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/NotificationManager.java} (53%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/OperationStatus.java (94%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/events/AccountEvent.java (93%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications/events/Event.java => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java} (77%)
create mode 100644 model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/events/ModelEvent.java (96%)
copy model/{notifications/src/main/java/com/evolveum/midpoint/notifications/transports/Transport.java => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/SimpleObjectRef.java} (64%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/events/WorkItemEvent.java (78%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/events/WorkflowEvent.java (93%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/events/WorkflowProcessEvent.java (93%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/transports/Message.java (92%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-api/src/main/java/com/evolveum/midpoint/notifications/api}/transports/Transport.java (91%)
copy model/{notifications => notifications-api}/testng.xml (79%)
copy {gui/admin-gui-en-US => model/notifications-impl}/.gitignore (100%)
copy model/{workflow-impl => notifications-impl}/pom.xml (77%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/AccountOperationListener.java (95%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/NotificationChangeHook.java (92%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/NotificationConstants.java (97%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications/NotificationManager.java => notifications-impl/src/main/java/com/evolveum/midpoint/notifications/NotificationManagerImpl.java} (92%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/NotificationsUtil.java (75%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications/SimpleObjectRef.java => notifications-impl/src/main/java/com/evolveum/midpoint/notifications/SimpleObjectRefImpl.java} (66%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/WorkflowListener.java (88%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api}/transports/MailTransport.java (96%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api}/transports/SimpleSmsTransport.java (96%)
rename model/{notifications/src/main/java/com/evolveum/midpoint/notifications => notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api}/transports/TransportUtil.java (91%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/filters/CategoryFilter.java (92%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/filters/ExpressionFilter.java (92%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/filters/OperationFilter.java (92%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/filters/StatusFilter.java (92%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/formatters/TextFormatter.java (87%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/handlers/BaseHandler.java (95%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/handlers/ChainHandler.java (92%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/handlers/ForkHandler.java (91%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/notifiers/AccountPasswordNotifier.java (91%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java (95%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/notifiers/SimpleAccountNotifier.java (94%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/notifiers/SimpleUserNotifier.java (91%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/notifiers/SimpleWorkflowNotifier.java (93%)
rename model/{notifications => notifications-impl}/src/main/java/com/evolveum/midpoint/notifications/notifiers/UserPasswordNotifier.java (94%)
rename model/{notifications => notifications-impl}/src/main/resources/ctx-notifications.xml (97%)
create mode 100644 model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/TestTextFormatter.java
create mode 100644 model/notifications-impl/src/test/resources/changes/user-jack-modification.xml
copy model/{report-impl/src/test/resources/ctx-report-test-main.xml => notifications-impl/src/test/resources/ctx-notifications-test.xml} (79%)
create mode 100644 model/notifications-impl/src/test/resources/logback-test.xml
create mode 100644 model/notifications-impl/src/test/resources/objects/account-jack.xml
create mode 100644 model/notifications-impl/src/test/resources/objects/user-jack.xml
rename model/{notifications => notifications-impl}/testng.xml (68%)
delete mode 100644 model/notifications/src/main/java/com/evolveum/midpoint/notifications/notifiers/DummyNotifier.java
delete mode 100644 model/notifications/src/main/java/com/evolveum/midpoint/notifications/notifiers/SimpleUserNotifierOld.java
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list