You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/03/07 22:41:23 UTC
[5/5] directory-fortress-commander git commit: FC-152 - Upgrade to
kendo wicket.kendo-ui.version 6.15.0
FC-152 - Upgrade to kendo wicket.kendo-ui.version 6.15.0
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/9e4f4d59
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/9e4f4d59
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/9e4f4d59
Branch: refs/heads/master
Commit: 9e4f4d59db215f394ce034ffb4f97e1b00b4b0f9
Parents: 61375d2
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Mar 7 15:41:14 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Mar 7 15:41:14 2016 -0600
----------------------------------------------------------------------
pom.xml | 4 +--
src/main/resources/FortressWebDemoUsers.xml | 5 ++-
.../fortress/web/FortressWebBasePage.html | 8 ++---
src/main/webapp/css/kendo.common.min.css | 17 ++++++++++
src/main/webapp/css/kendo.uniform.min.css | 17 ++++++++++
src/main/webapp/css/kendo/Default/editor.png | Bin 816 -> 0 bytes
.../webapp/css/kendo/Default/imagebrowser.png | Bin 6454 -> 0 bytes
.../webapp/css/kendo/Default/loading-image.gif | Bin 6138 -> 0 bytes
src/main/webapp/css/kendo/Default/loading.gif | Bin 2218 -> 0 bytes
src/main/webapp/css/kendo/Default/slider-h.gif | Bin 130 -> 0 bytes
src/main/webapp/css/kendo/Default/slider-v.gif | Bin 130 -> 0 bytes
src/main/webapp/css/kendo/Default/sprite.png | Bin 17730 -> 0 bytes
src/main/webapp/css/kendo/kendo.common.min.css | 31 -------------------
src/main/webapp/css/kendo/kendo.default.min.css | 29 -----------------
.../webapp/css/kendo/textures/brushed-metal.png | Bin 15533 -> 0 bytes
src/main/webapp/css/kendo/textures/dots1.png | Bin 116 -> 0 bytes
src/main/webapp/css/kendo/textures/dots10.png | Bin 268 -> 0 bytes
src/main/webapp/css/kendo/textures/dots11.png | Bin 273 -> 0 bytes
src/main/webapp/css/kendo/textures/dots12.png | Bin 365 -> 0 bytes
src/main/webapp/css/kendo/textures/dots13.png | Bin 313 -> 0 bytes
src/main/webapp/css/kendo/textures/dots2.png | Bin 118 -> 0 bytes
src/main/webapp/css/kendo/textures/dots3.png | Bin 123 -> 0 bytes
src/main/webapp/css/kendo/textures/dots4.png | Bin 124 -> 0 bytes
src/main/webapp/css/kendo/textures/dots5.png | Bin 126 -> 0 bytes
src/main/webapp/css/kendo/textures/dots6.png | Bin 122 -> 0 bytes
src/main/webapp/css/kendo/textures/dots7.png | Bin 211 -> 0 bytes
src/main/webapp/css/kendo/textures/dots8.png | Bin 218 -> 0 bytes
src/main/webapp/css/kendo/textures/dots9.png | Bin 252 -> 0 bytes
.../webapp/css/kendo/textures/glass-lighter.png | Bin 382 -> 0 bytes
src/main/webapp/css/kendo/textures/glass.png | Bin 360 -> 0 bytes
.../webapp/css/kendo/textures/highlight.png | Bin 330 -> 0 bytes
src/main/webapp/css/kendo/textures/leather1.png | Bin 5191 -> 0 bytes
src/main/webapp/css/kendo/textures/leather2.png | Bin 5415 -> 0 bytes
src/main/webapp/css/kendo/textures/noise.png | Bin 5106 -> 0 bytes
src/main/webapp/css/kendo/textures/stripe1.png | Bin 254 -> 0 bytes
src/main/webapp/css/kendo/textures/stripe2.png | Bin 297 -> 0 bytes
src/main/webapp/css/kendo/textures/stripe3.png | Bin 178 -> 0 bytes
src/main/webapp/css/kendo/textures/stripe4.png | Bin 180 -> 0 bytes
src/main/webapp/css/kendo/textures/stripe5.png | Bin 119 -> 0 bytes
src/main/webapp/css/kendo/textures/stripe6.png | Bin 118 -> 0 bytes
40 files changed, 42 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/9e4f4d59/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48895cc..1fddeba 100755
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,8 @@
<fortress.realm.version>1.0-RC42</fortress.realm.version>
<wicket.version>6.19.0</wicket.version>
- <wicket.jquery.version>6.14.0</wicket.jquery.version>
- <wicket.kendo-ui.version>6.14.0</wicket.kendo-ui.version>
+ <wicket.jquery.version>6.15.0</wicket.jquery.version>
+ <wicket.kendo-ui.version>6.15.0</wicket.kendo-ui.version>
<!--
<wicket.jquery.version>6.19.0</wicket.jquery.version>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/9e4f4d59/src/main/resources/FortressWebDemoUsers.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/FortressWebDemoUsers.xml b/src/main/resources/FortressWebDemoUsers.xml
index 046ffe8..fe83353 100644
--- a/src/main/resources/FortressWebDemoUsers.xml
+++ b/src/main/resources/FortressWebDemoUsers.xml
@@ -44,7 +44,7 @@
<userrole userId="test" name="fortress-web-super-user" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
<userrole userId="test1" name="ROLE_USERS" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
<userrole userId="test2" name="ROLE_AUDITOR" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
- <userrole userId="test3" name="fortress-web-group-admin-user" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>
+ <!--<userrole userId="test3" name="fortress-web-group-admin-user" beginTime="0000" endTime="0000" beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"/>-->
</adduserrole>
<addadminrole>
@@ -133,9 +133,12 @@
<relationship child="fortress-web-super-user" parent="ROLE_ADMINROLES"/>
<relationship child="fortress-web-super-user" parent="ROLE_ADMINOBJS"/>
<relationship child="fortress-web-super-user" parent="ROLE_ADMINPERMS"/>
+<!--
+ Group page disabled until the datatable is replaced:
<relationship child="fortress-web-super-user" parent="ROLE_GROUPS"/>
<relationship child="fortress-web-group-admin-user" parent="ROLE_GROUPS"/>
+-->
<relationship child="fortress-web-group-admin-user" parent="ROLE_POLICIES"/>
<relationship child="fortress-web-group-admin-user" parent="ROLE_USERS"/>
<relationship child="fortress-web-group-admin-user" parent="ROLE_AUDIT_AUTHZS"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/9e4f4d59/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html b/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
index dfc1a6b..6319e8f 100644
--- a/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
+++ b/src/main/resources/org/apache/directory/fortress/web/FortressWebBasePage.html
@@ -25,12 +25,8 @@
content="wicket jquery, wicket jquery ui, autocomplete, dialog, draggable, droppable, progress bar, wizard, kendo ui, border layout, calendar"/>
<link rel="stylesheet" type="text/css" href="css/camo-style.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.10.2.custom.min.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/kendo/kendo.common.min.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/kendo/kendo.default.min.css" media="all"/>
-<!--
- <link rel="stylesheet" type="text/css" href="css/kendo/kendo.ui.core.min.css" media="all"/>
- <link rel="stylesheet" type="text/css" href="css/kendo/kendo.ui.core.css" media="all"/>
--->
+ <link rel="stylesheet" type="text/css" href="css/kendo.common.min.css" media="all"/>
+ <link rel="stylesheet" type="text/css" href="css/kendo.uniform.min.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/splitter-style.css" media="all"/>
<style type="text/css">