[midPoint-git] midPoint branch master updated. v2.3devel-304-g2e979ef
Pavol Mederly
git at evolveum.com
Tue Dec 3 16:07:27 CET 2013
Project "midPoint" branch master has been updated
via 2e979ef4845d795c187bb6d10931f3f781c2a2b4 (commit) v2.3devel-304-g2e979ef
via 299781566534ac87f7d2ca05189d4e2cafd992e1 (commit) v2.3devel-298-g2997815
via 609dd450327061e0e47c65932d76c2ea6bd200e3 (commit) v2.3devel-297-g609dd45
via c5efd082f10641c2c9c2043e0b9d194d1acd7b3b (commit) v2.3devel-296-gc5efd08
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 565ab3b9bec86cd3939c9f0023397e5ade554cbb (commit) v2.3devel-288-g565ab3b
- Log -----------------------------------------------------------------
commit 2e979ef4845d795c187bb6d10931f3f781c2a2b4
Merge: 2997815 565ab3b
Author: Pavol Mederly <mederly at evolveum.com>
Date: Tue Dec 3 15:56:12 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 299781566534ac87f7d2ca05189d4e2cafd992e1
Author: Pavol Mederly <mederly at evolveum.com>
Date: Tue Dec 3 15:56:07 2013 +0100
Fixed last references to old notifications. Fixed admin-gui tests for Windows platform.
commit 609dd450327061e0e47c65932d76c2ea6bd200e3
Author: Pavol Mederly <mederly at evolveum.com>
Date: Tue Dec 3 15:07:51 2013 +0100
Changed script tests to work on fast cpu with imprecise timers (windows).
commit c5efd082f10641c2c9c2043e0b9d194d1acd7b3b
Author: Pavol Mederly <mederly at evolveum.com>
Date: Tue Dec 3 15:07:00 2013 +0100
Finally, MID-1681 (notifications) is ok.
commit 2da6caf275d939828b99501ae8362dd20c9712aa
Author: Pavol Mederly <mederly at evolveum.com>
Date: Tue Dec 3 09:30:03 2013 +0100
Continuing with notifications refactoring and debugging.
commit ef75897dbc04e7a1fe51a6a7da2e23435b6d8bc3
Author: Pavol Mederly <mederly at evolveum.com>
Date: Tue Dec 3 00:18:26 2013 +0100
Notifications: some fixes and new tests.
commit fe22352179bc6d4423a76a81ac75c82a04db1f45
Merge: 500e4f8 f6910f0
Author: Pavol Mederly <mederly at evolveum.com>
Date: Mon Dec 2 23:07:29 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 500e4f85a53c83e5876482d39f8126395623a065
Author: Pavol Mederly <mederly at evolveum.com>
Date: Mon Dec 2 23:07:19 2013 +0100
Notifications splitted into api/impl + few tests.
commit 1d5de9cfd4a098dab531c211da9ff8403a101f4d
Merge: 81f0b48 7a8b1f4
Author: Pavol Mederly <mederly at evolveum.com>
Date: Mon Dec 2 10:39:28 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 81f0b489bd2881b95a17eef71459d1a45ab99864
Author: Pavol Mederly <mederly at evolveum.com>
Date: Mon Dec 2 10:39:24 2013 +0100
(intermediate commit)
commit 1eca55172209fabc286c53d7641699144ef37267
Author: Pavol Mederly <mederly at evolveum.com>
Date: Mon Dec 2 10:38:05 2013 +0100
Splitting notifications into api/impl (intermediate commit).
commit 2873f63ef6013dc133784b54dc47e86751b0fba2
Merge: 726262a a2fea96
Author: Pavol Mederly <mederly at evolveum.com>
Date: Thu Nov 28 11:39:54 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 726262a33887f3d0e1a286f97f5a9d94335fdc17
Merge: 9a32020 8a445fb
Author: Pavol Mederly <mederly at evolveum.com>
Date: Wed Nov 27 18:15:36 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 9a320205335d78ccaf5de82c005f3f8eff348f68
Author: Pavol Mederly <mederly at evolveum.com>
Date: Wed Nov 27 18:15:27 2013 +0100
Continuing with fixing notifications...
commit 0051b840b39f9203e26522c9e443ff4215ab475e
Merge: f678767 eb10642
Author: Pavol Mederly <mederly at evolveum.com>
Date: Wed Nov 27 12:13:51 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit f678767e5a59d69ea34c9455eca75d89323a869f
Author: Pavol Mederly <mederly at evolveum.com>
Date: Tue Nov 26 09:39:23 2013 +0100
Fixing notifications (unfinished).
-----------------------------------------------------------------------
(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 +-
.../web/security/MidPointApplication.properties | 4 +-
.../evolveum/midpoint/web/TestCleanStartup.java | 4 +-
.../expression/script/TestScriptCaching.java | 8 +-
.../com/evolveum/midpoint/prism/path/ItemPath.java | 9 +
model/model-intest/pom.xml | 6 +
.../model/intest/TestModelServiceContract.java | 39 +-
.../model/intest/TestTolerantAttributes.java | 1 -
.../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 +-
.../midpoint/testing/longtest/TestLdap.java | 12 +-
.../test/resources/common/system-configuration.xml | 14 -
.../evolveum/midpoint/testing/story/TestTrafo.java | 12 +-
.../test/resources/common/system-configuration.xml | 28 +-
72 files changed, 5428 insertions(+), 5286 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