Author: scottbw
Date: Thu Jun 17 09:02:21 2010
New Revision: 955514
URL: http://svn.apache.org/viewvc?rev=955514&view=rev
Log:
Applied patch to fix issues caused by the JSPs assuming that the first 1 or 2
elements are reserved or hidden; relies on seed data names/keys instead of
persistent id sort order to protect/hide built-in whitelist and services from
being viewed, edited, or deleted in admin pages. Thanks to Randy Watler for the
patch.
Modified:
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addnewservice.jsp
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addtowhitelist.jsp
incubator/wookie/branches/pluggablepersistence/WebContent/admin/listservices.jsp
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removeservice.jsp
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removewhitelist.jsp
incubator/wookie/branches/pluggablepersistence/WebContent/admin/viewwhitelist.jsp
Modified:
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addnewservice.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/WebContent/admin/addnewservice.jsp?rev=955514&r1=955513&r2=955514&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addnewservice.jsp
(original)
+++
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addnewservice.jsp
Thu Jun 17 09:02:21 2010
@@ -133,7 +133,7 @@ function doDialog(){
<tr class="ui-widget-header"><td> Existing service
types</td></tr>
- <%for (int i=1; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if
(!services[i].getServiceName().equals("unsupported")) {%>
<tr><td width="100%">
<div id="nifty">
<b class="rtop">
Modified:
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addtowhitelist.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/WebContent/admin/addtowhitelist.jsp?rev=955514&r1=955513&r2=955514&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addtowhitelist.jsp
(original)
+++
incubator/wookie/branches/pluggablepersistence/WebContent/admin/addtowhitelist.jsp
Thu Jun 17 09:02:21 2010
@@ -128,7 +128,7 @@ function doDialog(){
<br>
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td> Existing
entries</td></tr>
- <%for (int i=2; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if
(!services[i].getfUrl().equals("http://localhost";) &&
!services[i].getfUrl().equals("http://127.0.0.1";)) {%>
<tr><td width="100%">
<div id="nifty">
<b class="rtop">
Modified:
incubator/wookie/branches/pluggablepersistence/WebContent/admin/listservices.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/WebContent/admin/listservices.jsp?rev=955514&r1=955513&r2=955514&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/WebContent/admin/listservices.jsp
(original)
+++
incubator/wookie/branches/pluggablepersistence/WebContent/admin/listservices.jsp
Thu Jun 17 09:02:21 2010
@@ -76,7 +76,7 @@ $(document).ready(function(){
<table width="500" class="ui-widget ui-widget-content"
align="center">
<tr class="ui-widget-header"><td> Existing service
types</td></tr>
- <%for (int i=1; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if
(!services[i].getServiceName().equals("unsupported")) {%>
<tr><td width="100%">
<div id="nifty">
Modified:
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removeservice.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/WebContent/admin/removeservice.jsp?rev=955514&r1=955513&r2=955514&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removeservice.jsp
(original)
+++
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removeservice.jsp
Thu Jun 17 09:02:21 2010
@@ -95,7 +95,7 @@ $(document).ready(function(){
<table width="500" class="ui-widget ui-widget-content"
align="center">
<tr class="ui-widget-header"><td colspan="2">Services</td></tr>
- <%for (int i=1; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if
(!services[i].getServiceName().equals("unsupported")) {%>
<tr><td>
<div id="nifty">
<b class="rtop">
Modified:
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removewhitelist.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/WebContent/admin/removewhitelist.jsp?rev=955514&r1=955513&r2=955514&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removewhitelist.jsp
(original)
+++
incubator/wookie/branches/pluggablepersistence/WebContent/admin/removewhitelist.jsp
Thu Jun 17 09:02:21 2010
@@ -103,7 +103,7 @@ var answer = confirm("Are you sure you w
<table width="500" class="ui-widget ui-widget-content" align="center">
<tr class="ui-widget-header"><td colspan="2">Existing
entries</td></tr>
- <%for (int i=2; i<list.length; i++){%>
+ <%for (int i=0; i<list.length; i++) if
(!list[i].getfUrl().equals("http://localhost";) &&
!list[i].getfUrl().equals("http://127.0.0.1";)) {%>
<tr><td>
<div id="nifty">
<b class="rtop">
Modified:
incubator/wookie/branches/pluggablepersistence/WebContent/admin/viewwhitelist.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/WebContent/admin/viewwhitelist.jsp?rev=955514&r1=955513&r2=955514&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/WebContent/admin/viewwhitelist.jsp
(original)
+++
incubator/wookie/branches/pluggablepersistence/WebContent/admin/viewwhitelist.jsp
Thu Jun 17 09:02:21 2010
@@ -58,7 +58,7 @@
<table width="500" class="ui-widget ui-widget-content"
align="center">
<tr class="ui-widget-header"><td> Existing
entries</td></tr>
- <%for (int i=2; i<services.length; i++){%>
+ <%for (int i=0; i<services.length; i++) if
(!services[i].getfUrl().equals("http://localhost";) &&
!services[i].getfUrl().equals("http://127.0.0.1";)) {%>
<tr><td width="100%">
<div id="nifty">
<b class="rtop">
