[midPoint-git] midPoint branch master updated. v2.3devel-903-g9cded0e
Vilo Repan
git at evolveum.com
Wed Jan 15 15:44:31 CET 2014
Project "midPoint" branch master has been updated
via 9cded0eb10f642d06cd3c628cb564cbc28f9d000 (commit) v2.3devel-903-g9cded0e
via 497db4d343b4e9e1db58b2daeab79419a8de47c2 (commit) v2.3devel-898-g497db4d
via 66199ab5833a7aa1b98a33da3160635928008fe7 (commit) v2.3devel-897-g66199ab
via 7a7f67628565173cf792dfafec19586506a27960 (commit) v2.3devel-896-g7a7f676
via d832ac9127177b58b65a5bf37620c3b83cd13f28 (commit) v2.3devel-894-gd832ac9
via 25f1d5e976b2675c2d643349bfb1c74572e7d8e7 (commit) v2.3devel-892-g25f1d5e
via 737ddedd1c63c930536004528930d0894a85bdd3 (commit) v2.3devel-891-g737dded
via 3ef85282247c0aa150d0a724f0ce5349354c70c9 (commit) v2.3devel-890-g3ef8528
via a3561f1e26f3cca3a7dc223ae5cb561112503f69 (commit) v2.3devel-889-ga3561f1
via 30dab561b4bfd188f0665245bcb7dd589c2a98ca (commit) v2.3devel-887-g30dab56
via d1f07a32bc23e494d7dd4ec3aa2e41ba6bb2778a (commit) v2.3devel-885-gd1f07a3
via b0d153b8207ee899d76a37294e4f59ab4837bc95 (commit) v2.3devel-883-gb0d153b
via 9ff903bd46fd37f661a72cce75bdfe25313bdcd3 (commit) v2.3devel-882-g9ff903b
via 6795ddf1c1d86e2bc459a944d3f6cdcd589af9b6 (commit) v2.3devel-875-g6795ddf
via 2503f9fcf231cc24f17f598a0bc5d329722f17f8 (commit) v2.3devel-867-g2503f9f
via e57ff01ec7996ddc237652c81f2d4261e3316ebd (commit) v2.3devel-866-ge57ff01
via 18cb4d99d03bf2b3580fcd7915b227e83a49dc2c (commit) v2.3devel-863-g18cb4d9
from a1cbd08509d06c31015a2102f0d206229e053dde (commit) v2.3devel-886-ga1cbd08
- Log -----------------------------------------------------------------
commit 9cded0eb10f642d06cd3c628cb564cbc28f9d000
Merge: 497db4d a1cbd08
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Wed Jan 15 15:33:49 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 497db4d343b4e9e1db58b2daeab79419a8de47c2
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Wed Jan 15 15:33:41 2014 +0100
added simple security to page descriptor annotation
commit 66199ab5833a7aa1b98a33da3160635928008fe7
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Wed Jan 15 11:47:15 2014 +0100
added page annotations
commit 7a7f67628565173cf792dfafec19586506a27960
Merge: d832ac9 b06755e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Wed Jan 15 11:02:23 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit d832ac9127177b58b65a5bf37620c3b83cd13f28
Merge: 25f1d5e c99ce96
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Jan 14 14:34:50 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 25f1d5e976b2675c2d643349bfb1c74572e7d8e7
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 23:24:15 2014 +0100
improved page url mapping, not finished yet.
commit 737ddedd1c63c930536004528930d0894a85bdd3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 21:47:41 2014 +0100
removed unused test pages, minor fixes to descriptor loader and midpoint application class.
commit 3ef85282247c0aa150d0a724f0ce5349354c70c9
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 21:20:03 2014 +0100
main menu customization implementation, work in progress.
commit a3561f1e26f3cca3a7dc223ae5cb561112503f69
Merge: 30dab56 8970d06
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 20:50:51 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 30dab561b4bfd188f0665245bcb7dd589c2a98ca
Merge: d1f07a3 5ae10b2
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 18:35:38 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit d1f07a32bc23e494d7dd4ec3aa2e41ba6bb2778a
Merge: b0d153b ff46217
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 16:07:27 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit b0d153b8207ee899d76a37294e4f59ab4837bc95
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 16:07:16 2014 +0100
admin gui xml descriptor schema update
refactore onepageparameter encoder
commit 9ff903bd46fd37f661a72cce75bdfe25313bdcd3
Merge: 6795ddf eb216d9
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 15:41:41 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 6795ddf1c1d86e2bc459a944d3f6cdcd589af9b6
Merge: 2503f9f b3692cb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 10:31:14 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 2503f9fcf231cc24f17f598a0bc5d329722f17f8
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Mon Jan 13 10:31:10 2014 +0100
admin gui xml descriptor added to schema (will used for menu)
commit e57ff01ec7996ddc237652c81f2d4261e3316ebd
Merge: 18cb4d9 6a8eba4
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Sun Jan 12 13:05:48 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit 18cb4d99d03bf2b3580fcd7915b227e83a49dc2c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Fri Jan 10 15:34:47 2014 +0100
fixes on resource content accounts page.
-----------------------------------------------------------------------
(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:
.../midpoint/web/application/DescriptorLoader.java | 179 +++++++++++++++++++
.../midpoint/web/application/PageDescriptor.java | 24 +--
.../web/component/wf/workItems/WorkItemsPanel.java | 3 +-
.../midpoint/web/page/admin/PageAdmin.java | 4 +
.../web/page/admin/configuration/PageAbout.java | 6 +-
.../web/page/admin/configuration/PageAccounts.java | 2 +
.../page/admin/configuration/PageDebugList.java | 3 +-
.../page/admin/configuration/PageDebugView.java | 2 +
.../page/admin/configuration/PageImportObject.java | 2 +
.../web/page/admin/configuration/PageLogging.java | 2 +
.../configuration/PageSystemConfiguration.java | 2 +
.../web/page/admin/configuration/PageTimeTest.java | 2 +
.../web/page/admin/home/PageAdminHome.java | 4 +-
.../web/page/admin/home/PageDashboard.java | 8 +
.../web/page/admin/home/PageMyPasswords.java | 2 +
.../web/page/admin/reports/PageReports.java | 2 +
.../page/admin/resources/PageAdminResources.java | 7 +-
.../web/page/admin/resources/PageResource.java | 5 +-
.../web/page/admin/resources/PageResourceEdit.java | 5 +-
.../page/admin/resources/PageResourceWizard.java | 3 +
.../web/page/admin/resources/PageResources.java | 9 +-
.../page/admin/resources/content/PageAccount.java | 9 +-
.../resources/content/PageContentAccounts.java | 29 ++-
.../resources/content/PageContentEntitlements.java | 5 +-
.../content/dto/AccountContentSearchDto.java | 4 +
.../midpoint/web/page/admin/roles/PageRole.java | 8 +-
.../midpoint/web/page/admin/roles/PageRoles.java | 7 +-
.../web/page/admin/server/PageTaskAdd.java | 2 +
.../web/page/admin/server/PageTaskEdit.java | 9 +-
.../midpoint/web/page/admin/server/PageTasks.java | 7 +-
.../WorkflowInformationPanel.java | 11 +-
.../web/page/admin/users/PageBulkUsers.java | 2 +
.../web/page/admin/users/PageFindUsers.java | 2 +
.../midpoint/web/page/admin/users/PageOrgTree.java | 2 +
.../midpoint/web/page/admin/users/PageOrgUnit.java | 47 ++---
.../midpoint/web/page/admin/users/PageUser.java | 3 +
.../midpoint/web/page/admin/users/PageUsers.java | 2 +
.../page/admin/users/component/TreeTablePanel.java | 3 +-
.../page/admin/workflow/PageProcessInstance.java | 6 +-
.../page/admin/workflow/PageProcessInstances.java | 3 +-
.../admin/workflow/PageProcessInstancesAll.java | 2 +
.../workflow/PageProcessInstancesRequestedBy.java | 3 +
.../workflow/PageProcessInstancesRequestedFor.java | 2 +
.../web/page/admin/workflow/PageWorkItem.java | 8 +-
.../web/page/admin/workflow/PageWorkItems.java | 5 +-
.../page/admin/workflow/ProcessInstancePanel.java | 3 +-
.../midpoint/web/page/login/PageLogin.java | 2 +
.../midpoint/web/page/test/PageBootstrap.html | 70 --------
.../midpoint/web/page/test/PageBootstrap.java | 64 -------
.../web/page/test/PageBootstrap.properties | 3 -
.../evolveum/midpoint/web/page/test/PageTest.html | 42 -----
.../evolveum/midpoint/web/page/test/PageTest.java | 184 --------------------
.../midpoint/web/page/test/PageTest.properties | 23 ---
.../midpoint/web/security/MidPointApplication.java | 24 ++-
.../midpoint/web/security/PageUrlMapping.java | 140 ++++++++-------
.../midpoint/web/util/OnePageParameterEncoder.java | 19 +-
.../src/main/webapp/WEB-INF/descriptor.xml | 175 +++++++++++++++++++
.../schema/src/main/resources/META-INF/catalog.xml | 3 +
.../META-INF/jax-ws-catalog-model-context.xml | 3 +
.../main/resources/xml/ns/private/fake/fake-1.wsdl | 3 +
.../main/resources/xml/ns/public/gui/admin-1.xsd | 111 ++++++++++++
61 files changed, 742 insertions(+), 584 deletions(-)
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
copy repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/VirtualCollection.java => gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java (63%)
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageBootstrap.html
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageBootstrap.java
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageBootstrap.properties
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.html
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.java
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.properties
create mode 100644 gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
create mode 100644 infra/schema/src/main/resources/xml/ns/public/gui/admin-1.xsd
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list