[midPoint-git] midPoint branch bootstrap updated. v2.3devel-796-g8ed37bb
Vilo Repan
git at evolveum.com
Mon Jan 6 15:28:48 CET 2014
Project "midPoint" branch bootstrap has been updated
via 8ed37bb55d8de1b6bdc87dce729a1086f5142afa (commit) v2.3devel-796-g8ed37bb
via c25b55b885768acdb84635497808310c5cee4e4b (commit) v2.3devel-476-gc25b55b
via 45d1f15e4d9efd37e78f5cf64ddcafacbf4e4d09 (commit) v2.3devel-475-g45d1f15
via 2ea554b535d6199770f187704f5c7ad6da1b40b3 (commit) v2.3devel-473-g2ea554b
via 73ccce79f75fa39852d6331a6b020728b931886b (commit) v2.3devel-473-g73ccce7
via 0f6650144b3063868c1bec16430888fb30bfe0aa (commit) v2.3devel-787-g0f66501
via 0f405738086334152087d91fe8870845f2ad08db (commit) v2.3devel-786-g0f40573
via 03fbf601455743797fccda8a749b85a131e61004 (commit) v2.3devel-785-g03fbf60
via 55210610a03c917b8dbfcb2742efaf1bcdb7d6ad (commit) v2.3devel-784-g5521061
via f819749a459ea7a3b4ec7c74a83d1f6c571d7f7e (commit) v2.3devel-472-gf819749
via ece438977fa36cb486ee57642b8e0107ea801265 (commit) v2.3devel-471-gece4389
via ff49f94c0087227147654f0ba78a7cae65f3ed67 (commit) v2.3devel-783-gff49f94
via cddbd8271455b4763a95f3d49c030d67e3c32389 (commit) v2.3devel-470-gcddbd82
via 801c2b1970d3aad9a42203a84f1b90273d5f976b (commit) v2.3devel-466-g801c2b1
via 46ab6a1a4682226e9c4a9f01cdd69b34148b0ded (commit) v2.3devel-468-g46ab6a1
via 43d32ec0451db2eb4574c7469a47db271ed02b1a (commit) v2.3devel-465-g43d32ec
via 0da14f1c74d9983bfe6ce4dc9492d68dde70a3f9 (commit) v2.3devel-466-g0da14f1
via 6666b32755201ffa71749457fb55ba069ea812bd (commit) v2.3devel-463-g6666b32
via 2fbcca07b29229c83dde51c67e3bd91bdf667d9d (commit) v2.3devel-464-g2fbcca0
via 7d11fa683520e3f351d2c597198ef91ef78f32c9 (commit) v2.3devel-462-g7d11fa6
via 7cb55829b127ac6eeb1dafbae92b09d6cb80f3c1 (commit) v2.3devel-776-g7cb5582
via 15dbe181842ae19f552dad85abab751291da7ee3 (commit) v2.3devel-772-g15dbe18
via c6a13d7fd6e86c8acdd36a9d6575e1493d5ec987 (commit) v2.3devel-462-gc6a13d7
via 8bfc1296344b7bddfdf71d1d91dfdb90185a94fa (commit) v2.3devel-461-g8bfc129
via ec6a299832c0ce0aacb5edf2e6d3125fc4b2aa70 (commit) v2.3devel-396-gec6a299
from 08976cde68268340a8924f06060b8e0364b3feeb (commit) v2.3devel-771-g08976cd
- Log -----------------------------------------------------------------
commit 8ed37bb55d8de1b6bdc87dce729a1086f5142afa
Merge: 0f66501 c25b55b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 6 14:04:28 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
Conflicts:
infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
commit 0f6650144b3063868c1bec16430888fb30bfe0aa
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 4 14:47:30 2014 +0100
update content accounts.
commit 0f405738086334152087d91fe8870845f2ad08db
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 4 14:26:59 2014 +0100
updating i18n modules.
commit 03fbf601455743797fccda8a749b85a131e61004
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 4 14:11:04 2014 +0100
removing obsolete code
commit 55210610a03c917b8dbfcb2742efaf1bcdb7d6ad
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sat Jan 4 14:00:38 2014 +0100
updating resources/accounts page, work in progress.
commit ff49f94c0087227147654f0ba78a7cae65f3ed67
Merge: 7cb5582 46ab6a1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Fri Jan 3 20:28:05 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
Conflicts:
infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
commit 7cb55829b127ac6eeb1dafbae92b09d6cb80f3c1
Merge: 15dbe18 c6a13d7
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Thu Jan 2 21:52:56 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
commit 15dbe181842ae19f552dad85abab751291da7ee3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Thu Jan 2 20:03:51 2014 +0100
more style improvements, not finished yet.
-----------------------------------------------------------------------
(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:
.../PageResourceImport_en_US.utf8.properties | 14 -
.../content/PageAccount_en_US.utf8.properties | 2 +-
.../PageContentAccounts_en_US.utf8.properties | 14 +-
.../PageResourceImport_sk_SK.utf8.properties | 14 -
.../content/PageAccount_sk_SK.utf8.properties | 20 +-
.../PageContentAccounts_sk_SK.utf8.properties | 11 +-
.../web/component/data/column/ButtonColumn.java | 72 ----
.../web/component/data/column/ButtonPanel.html | 22 -
.../web/component/data/column/ButtonPanel.java | 46 ---
.../web/component/dialog/ConfirmationDialog.java | 1 -
.../configuration/component/ChooseTypePanel.java | 2 -
.../web/page/admin/resources/PageResources.java | 5 -
.../page/admin/resources/content/PageAccount.html | 7 +-
.../page/admin/resources/content/PageAccount.java | 12 +-
.../admin/resources/content/PageAccount.properties | 2 +-
.../resources/content/PageContentAccounts.html | 44 +-
.../resources/content/PageContentAccounts.java | 294 +++++++-------
.../content/PageContentAccounts.properties | 9 +-
.../content/dto/AccountContentDataProvider.java | 13 +-
.../resources/content/dto/AccountContentDto.java | 12 +-
.../web/page/admin/server/PageTaskAdd.java | 1 -
.../web/page/admin/server/PageTaskEdit.java | 2 -
.../page/admin/workflow/PageProcessInstance.java | 1 -
.../web/component/button/AjaxLinkButton.css | 88 ----
.../web/component/button/AjaxLinkButton.java | 108 -----
.../midpoint/web/component/button/ButtonType.java | 25 --
...tor.java => AssignmentExpressionEvaluator.java} | 38 +-
...a => AssignmentExpressionEvaluatorFactory.java} | 16 +-
infra/common/src/main/resources/ctx-common.xml | 2 +-
.../midpoint/schema/constants/SchemaConstants.java | 2 -
.../resources/xml/ns/public/common/common-2a.xsd | 39 +-
.../model/sync/SynchronizationService.java | 43 +-
model/model-impl/src/main/resources/ctx-model.xml | 29 +-
.../src/test/resources/common/resource-dummy.xml | 17 +-
.../resources/common/user-template-complex.xml | 29 ++
.../evolveum/midpoint/report/DataSourceReport.java | 52 ++-
.../midpoint/report/ReportCreateTaskHandler.java | 109 ++---
.../evolveum/midpoint/report/ReportManager.java | 3 -
.../midpoint/report/ReportManagerImpl.java | 422 +-------------------
.../{ReportManagerImpl.java => ReportUtils.java} | 282 ++++---------
.../evolveum/midpoint/report/BasicReportTest.java | 236 ++++++++---
pom.xml | 6 +-
.../repo/sql/data/common/RReportOutput.java | 4 -
samples/model-client-sample/pom.xml | 2 +-
.../src/test/resources/repo/resource-opendj.xml | 24 +-
.../src/test/resources/repo/resource-opendj.xml | 26 +-
testing/systest/pom.xml | 6 +-
47 files changed, 727 insertions(+), 1501 deletions(-)
delete mode 100644 gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResourceImport_en_US.utf8.properties
delete mode 100644 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResourceImport_sk_SK.utf8.properties
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ButtonColumn.java
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ButtonPanel.html
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ButtonPanel.java
delete mode 100644 gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/button/AjaxLinkButton.css
delete mode 100644 gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/button/AjaxLinkButton.java
delete mode 100644 gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/button/ButtonType.java
copy infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/{AsIsExpressionEvaluator.java => AssignmentExpressionEvaluator.java} (66%)
copy infra/common/src/main/java/com/evolveum/midpoint/common/expression/evaluator/{AsIsExpressionEvaluatorFactory.java => AssignmentExpressionEvaluatorFactory.java} (78%)
copy model/report-impl/src/main/java/com/evolveum/midpoint/report/{ReportManagerImpl.java => ReportUtils.java} (62%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list