portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r695888 [1/2] - in /portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF: security/chgpwd/ security/login/ security/users/ view/
Date Tue, 16 Sep 2008 14:13:39 GMT
Author: ate
Date: Tue Sep 16 07:13:38 2008
New Revision: 695888

URL: http://svn.apache.org/viewvc?rev=695888&view=rev
Log:
Adjusting jtsl taglib declaration to use the required JSP 2.0 format (servlet api 2.4)

Modified:
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/chgpwd/change-password.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/portal-login.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-browser.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details-edit.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/errors-include.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/locale-list.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/palm.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-browser.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/prototype.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/site-detail.jsp
    portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/user-admin.jsp

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/chgpwd/change-password.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/chgpwd/change-password.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/chgpwd/change-password.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/chgpwd/change-password.jsp Tue Sep 16 07:13:38 2008
@@ -17,9 +17,9 @@
 <%@page import="org.apache.jetspeed.request.RequestContext"%>
 <%@page import="org.apache.jetspeed.portlets.security.ChangePasswordPortlet"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
-<%@taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
 <portlet:defineObjects/>
 <fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.ChgPwdResources" />

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login-xhtmlbasic.jsp Tue Sep 16 07:13:38 2008
@@ -16,8 +16,8 @@
 --%>
 <%@page import="org.apache.jetspeed.login.LoginConstants"%>
 <%@page import="org.apache.jetspeed.request.RequestContext"%>
-<%@taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
-<%@taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
 <fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.LoginResources" />
 <c_rt:set var="requestContext" value="<%=request.getAttribute(RequestContext.REQUEST_PORTALENV)%>"/>

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/login.jsp Tue Sep 16 07:13:38 2008
@@ -16,8 +16,8 @@
 --%>
 <%@page import="org.apache.jetspeed.login.LoginConstants"%>
 <%@page import="org.apache.jetspeed.request.RequestContext"%>
-<%@taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
-<%@taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
 
 <fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.LoginResources" />

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/portal-login.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/portal-login.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/portal-login.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/login/portal-login.jsp Tue Sep 16 07:13:38 2008
@@ -17,8 +17,8 @@
 <%@page import="org.apache.jetspeed.login.LoginConstants"%>
 <%@page import="org.apache.jetspeed.request.RequestContext"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
-<%@taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
 
 <portlet:defineObjects/>

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-browser.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-browser.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-browser.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-browser.jsp Tue Sep 16 07:13:38 2008
@@ -1,92 +1,92 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ page language="java" import="javax.portlet.*, java.util.List, java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication" session="true" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/jetspeed-tree.tld" prefix="pam" %>
-<portlet:defineObjects/>
-
-<portlet:actionURL var="nodeLink" >
-	<portlet:param name="node" value="${name}" />
-</portlet:actionURL>
-
-<pam:tree tree="j2_tree" images="/j2-admin/images" scope="portlet_request"
-          action="<%= nodeLink %>"
-          style="tree-control"
-          styleSelected="portlet-section-alternate"
-  />
-
-<h3 class="portlet-section-subheader">Add User</h3>
-
-<div class="portlet-section-text">
-
-<portlet:actionURL var="addUser" />
-
-<form action="<c:out value="${addUser}"/>" method="post">
-<input type='hidden' name='browser.action' value='adduser'/>
-<table>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">New User Name:&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="jetspeed.user" size="30" value="" class="portlet-form-field-label">
-    </td>
-  </tr>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">Password:&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="password" name="jetspeed.password" size="30" value="" class="portlet-form-field-label">
-    </td>
-  </tr>
-  
-  <!-- Select Roles -->
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">Default Role:&nbsp;</td>
-    <td class="portlet-section-body" align="left">
- 		<select name="jetspeedRoles" class="portlet-form-field-label">		
-			<option value=""/> 		 		
-			<c:forEach var="roleName" items="${jetspeedRoles}">			    
-			    <option value="<c:out value='${roleName}'/>"
-  			    <c:if test="${roleName == 'user'}">selected="true"</c:if>>			    
-				  <c:out value="${roleName}"/>
-			    </option>
-			</c:forEach>
-		</select>      
-    </td>
-  </tr>
-
-  <!-- Select Profiling Rules -->
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">Profiling Rule:&nbsp;</td>
-    <td class="portlet-section-body" align="left">
- 		<select name="jetspeedRules" class="portlet-form-field-label">		
-			<option value=""/> 		
-			<c:forEach var="ruleName" items="${jetspeedRules}">
-			    <option value="<c:out value='${ruleName}'/>"
-  			    <c:if test="${ruleName == 'role-fallback'}">selected="true"</c:if>>
-				  <c:out value="${ruleName}"/>
-			    </option>
-			</c:forEach>
-		</select>      
-    </td>
-  </tr>
-  
-</table>
-<br/>
-<input type="submit" value="Add User" class="portlet-form-button"/>
-</form>
-<c:if test="${errorMessage != null}">
-  <li style="color:red"><c:out value="${errorMessage}"/></li>
-</c:if>
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page language="java" import="javax.portlet.*, java.util.List, java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication" session="true" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/jetspeed-tree.tld" prefix="pam" %>
+<portlet:defineObjects/>
+
+<portlet:actionURL var="nodeLink" >
+	<portlet:param name="node" value="${name}" />
+</portlet:actionURL>
+
+<pam:tree tree="j2_tree" images="/j2-admin/images" scope="portlet_request"
+          action="<%= nodeLink %>"
+          style="tree-control"
+          styleSelected="portlet-section-alternate"
+  />
+
+<h3 class="portlet-section-subheader">Add User</h3>
+
+<div class="portlet-section-text">
+
+<portlet:actionURL var="addUser" />
+
+<form action="<c:out value="${addUser}"/>" method="post">
+<input type='hidden' name='browser.action' value='adduser'/>
+<table>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">New User Name:&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="jetspeed.user" size="30" value="" class="portlet-form-field-label">
+    </td>
+  </tr>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">Password:&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="password" name="jetspeed.password" size="30" value="" class="portlet-form-field-label">
+    </td>
+  </tr>
+  
+  <!-- Select Roles -->
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">Default Role:&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+ 		<select name="jetspeedRoles" class="portlet-form-field-label">		
+			<option value=""/> 		 		
+			<c:forEach var="roleName" items="${jetspeedRoles}">			    
+			    <option value="<c:out value='${roleName}'/>"
+  			    <c:if test="${roleName == 'user'}">selected="true"</c:if>>			    
+				  <c:out value="${roleName}"/>
+			    </option>
+			</c:forEach>
+		</select>      
+    </td>
+  </tr>
+
+  <!-- Select Profiling Rules -->
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">Profiling Rule:&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+ 		<select name="jetspeedRules" class="portlet-form-field-label">		
+			<option value=""/> 		
+			<c:forEach var="ruleName" items="${jetspeedRules}">
+			    <option value="<c:out value='${ruleName}'/>"
+  			    <c:if test="${ruleName == 'role-fallback'}">selected="true"</c:if>>
+				  <c:out value="${ruleName}"/>
+			    </option>
+			</c:forEach>
+		</select>      
+    </td>
+  </tr>
+  
+</table>
+<br/>
+<input type="submit" value="Add User" class="portlet-form-button"/>
+</form>
+<c:if test="${errorMessage != null}">
+  <li style="color:red"><c:out value="${errorMessage}"/></li>
+</c:if>
   
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details-edit.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details-edit.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details-edit.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details-edit.jsp Tue Sep 16 07:13:38 2008
@@ -1,67 +1,67 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ page language="java" session="true" %>
-<%@ page import="org.apache.jetspeed.portlets.security.SecurityResources" %>
-
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
-
-<fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.SecurityResources" />
-
-<c:set var="errorMessagesKey"><%=SecurityResources.ERROR_MESSAGES%></c:set>
-<c:set var="errorMessages" value="${requestScope[errorMessagesKey]}"/>
-
-<portlet:defineObjects/>
-<script language="JavaScript">function t(i,f){if(i.checked) f.value='true';else f.value='false';}</script>
-<h3 class="portlet-section-header">User Detail Preferences</h3>
-<c:if test="${errorMessages != null}">
-  <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
-</c:if>
-<form action="<portlet:actionURL/>" method="post">
-<c:set var="prefs" value="${renderRequest.preferences.map}"/>
-<table border="0" cellspacing="2" cellpadding="3">
-  <c:forEach var="prefName" items="showUserTab,showAttributesTab,showPasswordTab,showPasswordExpiration,showRoleTab,showGroupTab,showProfileTab,showPasswordOnUserTab,showChangePasswordRequiredForAddUser,showRoleForAddUser,showProfileForAddUser,showSubsiteForAddUser,defaultChangePasswordRequired">
-  <tr>
-    <c:set var="prefValue" value='${prefs[prefName][0]}'/>
-    <td class="portlet-section-alternate">
-      <font class="portlet-form-field-label"><fmt:message key="user.details.preference.${prefName}"/></font>
-    </td>
-    <td class="portlet-section-body">
-      <input type="hidden" name="<c:out value="${prefName}"/>" value="<c:out value="${prefValue}"/>"/>
-      <input type="checkbox" <c:if test="${prefValue}">checked</c:if> 
-             onclick="t(this,<c:out value="${prefName}"/>)" class="portlet-form-field-label" />
-    </td>
-  </tr>
- </c:forEach>
-  <tr>
-    <c:set var="prefName" value="defaultRole"/>
-    <c:set var="prefValue" value='${prefs[prefName][0]}'/>
-    <td class="portlet-section-alternate">
-      <font class="portlet-form-field-label"><fmt:message key="user.details.preference.${prefName}"/></font>
-    </td>
-    <td class="portlet-section-body">
-      <select name="<c:out value="${prefName}"/>" class="portlet-form-field-label">     
-              <option value=""/>                
-              <c:forEach var="item" items="${jetspeedRoles}">
-                <option value="<c:out value='${item}'/>" <c:if test="${item == prefValue}">selected="true"</c:if>>
-                    <c:out value="${item}"/>
-                </option>
-              </c:forEach>
-          </select>      
-    </td>
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page language="java" session="true" %>
+<%@ page import="org.apache.jetspeed.portlets.security.SecurityResources" %>
+
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.SecurityResources" />
+
+<c:set var="errorMessagesKey"><%=SecurityResources.ERROR_MESSAGES%></c:set>
+<c:set var="errorMessages" value="${requestScope[errorMessagesKey]}"/>
+
+<portlet:defineObjects/>
+<script language="JavaScript">function t(i,f){if(i.checked) f.value='true';else f.value='false';}</script>
+<h3 class="portlet-section-header">User Detail Preferences</h3>
+<c:if test="${errorMessages != null}">
+  <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
+</c:if>
+<form action="<portlet:actionURL/>" method="post">
+<c:set var="prefs" value="${renderRequest.preferences.map}"/>
+<table border="0" cellspacing="2" cellpadding="3">
+  <c:forEach var="prefName" items="showUserTab,showAttributesTab,showPasswordTab,showPasswordExpiration,showRoleTab,showGroupTab,showProfileTab,showPasswordOnUserTab,showChangePasswordRequiredForAddUser,showRoleForAddUser,showProfileForAddUser,showSubsiteForAddUser,defaultChangePasswordRequired">
+  <tr>
+    <c:set var="prefValue" value='${prefs[prefName][0]}'/>
+    <td class="portlet-section-alternate">
+      <font class="portlet-form-field-label"><fmt:message key="user.details.preference.${prefName}"/></font>
+    </td>
+    <td class="portlet-section-body">
+      <input type="hidden" name="<c:out value="${prefName}"/>" value="<c:out value="${prefValue}"/>"/>
+      <input type="checkbox" <c:if test="${prefValue}">checked</c:if> 
+             onclick="t(this,<c:out value="${prefName}"/>)" class="portlet-form-field-label" />
+    </td>
+  </tr>
+ </c:forEach>
+  <tr>
+    <c:set var="prefName" value="defaultRole"/>
+    <c:set var="prefValue" value='${prefs[prefName][0]}'/>
+    <td class="portlet-section-alternate">
+      <font class="portlet-form-field-label"><fmt:message key="user.details.preference.${prefName}"/></font>
+    </td>
+    <td class="portlet-section-body">
+      <select name="<c:out value="${prefName}"/>" class="portlet-form-field-label">     
+              <option value=""/>                
+              <c:forEach var="item" items="${jetspeedRoles}">
+                <option value="<c:out value='${item}'/>" <c:if test="${item == prefValue}">selected="true"</c:if>>
+                    <c:out value="${item}"/>
+                </option>
+              </c:forEach>
+          </select>      
+    </td>
   </tr>
  <tr>
     <c:set var="prefName" value="requiredRole"/>
@@ -79,24 +79,24 @@
               </c:forEach>
           </select>      
     </td>
-  </tr>  
-  <tr>
-    <c:set var="prefName" value="defaultProfile"/>
-    <c:set var="prefValue" value='${prefs[prefName][0]}'/>
-    <td class="portlet-section-alternate">
-      <font class="portlet-form-field-label"><fmt:message key="user.details.preference.${prefName}"/></font>
-    </td>
-    <td class="portlet-section-body">
-      <select name="<c:out value="${prefName}"/>" class="portlet-form-field-label">     
-              <option value=""/>                
-              <c:forEach var="item" items="${jetspeedRules}">
-                <option value="<c:out value='${item}'/>" <c:if test="${item == prefValue}">selected="true"</c:if>>
-                    <c:out value="${item}"/>
-                </option>
-              </c:forEach>
-          </select>      
-    </td>
-  </tr>
+  </tr>  
+  <tr>
+    <c:set var="prefName" value="defaultProfile"/>
+    <c:set var="prefValue" value='${prefs[prefName][0]}'/>
+    <td class="portlet-section-alternate">
+      <font class="portlet-form-field-label"><fmt:message key="user.details.preference.${prefName}"/></font>
+    </td>
+    <td class="portlet-section-body">
+      <select name="<c:out value="${prefName}"/>" class="portlet-form-field-label">     
+              <option value=""/>                
+              <c:forEach var="item" items="${jetspeedRules}">
+                <option value="<c:out value='${item}'/>" <c:if test="${item == prefValue}">selected="true"</c:if>>
+                    <c:out value="${item}"/>
+                </option>
+              </c:forEach>
+          </select>      
+    </td>
+  </tr>
   <tr>
     <c:set var="prefName" value="newUserTemplateDirectory"/>
     <c:set var="prefValue" value='${prefs[prefName][0]}'/>
@@ -127,6 +127,6 @@
     	<input type="text" name="<c:out value="${prefName}"/>" value="<c:out value="${prefValue}"/>" class="portlet-form-field-label"/>
     </td>
   </tr>  
-</table>
-<input type="submit" value="<fmt:message key="user.details.save.preferences"/>" class="portlet-form-button" />
-</form>
+</table>
+<input type="submit" value="<fmt:message key="user.details.save.preferences"/>" class="portlet-form-button" />
+</form>

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/security/users/user-details.jsp Tue Sep 16 07:13:38 2008
@@ -23,8 +23,8 @@
 <%@ page import="org.apache.jetspeed.om.common.*" %>
 
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <fmt:setBundle basename="org.apache.jetspeed.portlets.security.resources.SecurityResources" />
 

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/errors-include.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/errors-include.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/errors-include.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/errors-include.jsp Tue Sep 16 07:13:38 2008
@@ -12,7 +12,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
   <br/>
   <table width="100%" cellpadding="0" cellspacing="0" border="0">
     <c:forEach items="${errorMessages}" var="error">

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/locale-list.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/locale-list.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/locale-list.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/locale-list.jsp Tue Sep 16 07:13:38 2008
@@ -1,44 +1,44 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ page language="java" import="javax.portlet.*, java.util.List, java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication" session="true" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
-<c:set var="currentLocale"><%= request.getAttribute("currentLocale") %></c:set>
-<fmt:setBundle basename="org.apache.jetspeed.portlets.localeselector.resources.LocaleSelectorResources" />
-
-<portlet:actionURL var="changeLocaleAction">
-</portlet:actionURL>
-
-<form action="<%=changeLocaleAction%>" method="POST">
-<table border="0">
-	<tr>
-		<td align="right"><fmt:message key="localeselector.label.language"/></td>
-		<td align="left">
-			<select name="org.apache.jetspeed.prefered.locale">
-				<c:set var="locales"><fmt:message key="localeselector.locales"/></c:set>
-				<c:forTokens var="l" items="${locales}" delims=",">
-				<option value="<c:out value="${l}"/>"
-					<c:if test="${currentLocale == l}">selected</c:if>
-				><fmt:message>localeselector.locale.<c:out value="${l}"/></fmt:message></option>
-				</c:forTokens>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td align="center" colspan="2"><input type="submit" value="<fmt:message key="localeselector.label.change"/>"/></td>
-	</tr>
-</table>
-</form>
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page language="java" import="javax.portlet.*, java.util.List, java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication" session="true" %>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:set var="currentLocale"><%= request.getAttribute("currentLocale") %></c:set>
+<fmt:setBundle basename="org.apache.jetspeed.portlets.localeselector.resources.LocaleSelectorResources" />
+
+<portlet:actionURL var="changeLocaleAction">
+</portlet:actionURL>
+
+<form action="<%=changeLocaleAction%>" method="POST">
+<table border="0">
+	<tr>
+		<td align="right"><fmt:message key="localeselector.label.language"/></td>
+		<td align="left">
+			<select name="org.apache.jetspeed.prefered.locale">
+				<c:set var="locales"><fmt:message key="localeselector.locales"/></c:set>
+				<c:forTokens var="l" items="${locales}" delims=",">
+				<option value="<c:out value="${l}"/>"
+					<c:if test="${currentLocale == l}">selected</c:if>
+				><fmt:message>localeselector.locale.<c:out value="${l}"/></fmt:message></option>
+				</c:forTokens>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td align="center" colspan="2"><input type="submit" value="<fmt:message key="localeselector.label.change"/>"/></td>
+	</tr>
+</table>
+</form>

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/palm.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/palm.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/palm.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/palm.jsp Tue Sep 16 07:13:38 2008
@@ -1,114 +1,114 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%--
-  @author <a href="mailto:ate@douma.nu">Ate Douma</a>
-  @version $Id: palm.jsp 348264 2005-11-22 22:06:45Z taylor $
---%>
-<%@taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
-<portlet:defineObjects/>
-<script type="text/javascript">
-  function doSubmit(a,pa) {
-    for (ix = 0; ix < document.forms.length; ix++) {
-      var f = document.forms[ix];
-      if (f.name == "palmForm") {
-        for (iy = 0; iy < f.elements.length; iy++) {
-          var el = f.elements[iy];
-          if (el.name == "action") el.value = a;
-          if (el.name == "value") el.value = pa;
-        }
-        f.submit();
-      }
-    }
-  }
-  function checkSubmit(a,pa,d) { if (confirm("Are you Sure to "+a+" "+pa+"?")) doSubmit(a,pa); return false; }
-</script>
-
-
-<form name="palmForm" action="<portlet:actionURL/>" method="post">
-  <input name="action" type="hidden" value="">
-  <input name="value" type="hidden" value="">
-</form>
-<c:if test="${not empty requestScope.statusMsg}">
-<br/>
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
-  <div class="<c:out value="${requestScope.statusMsg.type}"/>"><c:out value="${requestScope.statusMsg.text}"/></div>
-</tr>
-</table>
-</c:if>
-<table cellpadding=0 cellspacing=1 border=0 width="100%">
-  <tr>
-    <th colspan="5" class="portlet-section-header">Portlet Applications</th>
-  </tr>
-  <tr>
-    <th class="portlet-section-subheader">Name</th>
-    <th class="portlet-section-subheader">Version</th>
-    <th class="portlet-section-subheader">Path</th>
-    <th class="portlet-section-subheader">Running</th>
-    <th class="portlet-section-subheader">Commands</th>
-  </tr>
-<c_rt:set var='list' value='<%=renderRequest.getPortletSession().getAttribute("list")%>'/>
-<c:forEach var="pa" items="${list}" varStatus="status">
-  <c:choose>
-    <c:when test="${status.count % 2 != 0}">
-      <c:set var="rowClass" value="portlet-section-body"/>
-    </c:when>
-    <c:otherwise>
-      <c:set var="rowClass" value="portlet-section-alternate"/>
-    </c:otherwise>
-  </c:choose>
-  <tr>
-    <td class='<c:out value="${rowClass}"/>'>&nbsp;<c:out value="${pa.name}"/></td>
-    <td class='<c:out value="${rowClass}"/>'>&nbsp;<c:out value="${pa.version}"/></td>
-    <td class='<c:out value="${rowClass}"/>'>&nbsp;<c:out value="${pa.path}"/></td>
-    <td style='text-align:center' class='<c:out value="${rowClass}"/>'><c:out value="${pa.running}"/></td>
-    <td class='<c:out value="${rowClass}"/>'>
-      &nbsp;
-      <c:if test="${requestScope.serverManagerAvailable}">
-        <c:choose>
-          <c:when test="${pa.local or pa.path == pageContext.request.contextPath}">
-            <%-- management of local pa not yet supported and mustn't for current (this) pa --%>
-            start&nbsp;&nbsp;stop&nbsp;&nbsp;undeploy&nbsp;
-          </c:when>
-          <c:otherwise>
-            <c:choose>
-              <c:when test="${pa.running}">
-                start&nbsp;&nbsp;<a href="#" onClick='return checkSubmit("stop","<c:out value="${pa.name}"/>")'>stop</a>&nbsp;
-              </c:when>
-              <c:otherwise>
-                <a href="#" onClick='return checkSubmit("start","<c:out value="${pa.name}"/>")'>start</a>&nbsp;&nbsp;stop&nbsp;
-              </c:otherwise>
-            </c:choose>
-            <a href="#" onclick='return checkSubmit("undeploy","<c:out value="${pa.name}"/>")'>undeploy</a>&nbsp;
-          </c:otherwise>
-        </c:choose>
-      </c:if>
-      <c:choose>
-        <c:when test="${pa.running}">
-          delete
-        </c:when>
-        <c:otherwise>
-          <a href="#" onClick='return checkSubmit("delete","<c:out value="${pa.name}"/>")'>delete</a>
-        </c:otherwise>
-      </c:choose>
-    </td>
-  </tr>
-</c:forEach>
-  <tr>
-    <td class='portlet-section-footer' colspan='5'><input type="button" class="portlet-dlg-icon-label" value="refresh" onClick='doSubmit("refresh",null)'></td>
-  </tr>
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%--
+  @author <a href="mailto:ate@douma.nu">Ate Douma</a>
+  @version $Id: palm.jsp 348264 2005-11-22 22:06:45Z taylor $
+--%>
+<%@taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
+<portlet:defineObjects/>
+<script type="text/javascript">
+  function doSubmit(a,pa) {
+    for (ix = 0; ix < document.forms.length; ix++) {
+      var f = document.forms[ix];
+      if (f.name == "palmForm") {
+        for (iy = 0; iy < f.elements.length; iy++) {
+          var el = f.elements[iy];
+          if (el.name == "action") el.value = a;
+          if (el.name == "value") el.value = pa;
+        }
+        f.submit();
+      }
+    }
+  }
+  function checkSubmit(a,pa,d) { if (confirm("Are you Sure to "+a+" "+pa+"?")) doSubmit(a,pa); return false; }
+</script>
+
+
+<form name="palmForm" action="<portlet:actionURL/>" method="post">
+  <input name="action" type="hidden" value="">
+  <input name="value" type="hidden" value="">
+</form>
+<c:if test="${not empty requestScope.statusMsg}">
+<br/>
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
+<tr>
+  <div class="<c:out value="${requestScope.statusMsg.type}"/>"><c:out value="${requestScope.statusMsg.text}"/></div>
+</tr>
+</table>
+</c:if>
+<table cellpadding=0 cellspacing=1 border=0 width="100%">
+  <tr>
+    <th colspan="5" class="portlet-section-header">Portlet Applications</th>
+  </tr>
+  <tr>
+    <th class="portlet-section-subheader">Name</th>
+    <th class="portlet-section-subheader">Version</th>
+    <th class="portlet-section-subheader">Path</th>
+    <th class="portlet-section-subheader">Running</th>
+    <th class="portlet-section-subheader">Commands</th>
+  </tr>
+<c_rt:set var='list' value='<%=renderRequest.getPortletSession().getAttribute("list")%>'/>
+<c:forEach var="pa" items="${list}" varStatus="status">
+  <c:choose>
+    <c:when test="${status.count % 2 != 0}">
+      <c:set var="rowClass" value="portlet-section-body"/>
+    </c:when>
+    <c:otherwise>
+      <c:set var="rowClass" value="portlet-section-alternate"/>
+    </c:otherwise>
+  </c:choose>
+  <tr>
+    <td class='<c:out value="${rowClass}"/>'>&nbsp;<c:out value="${pa.name}"/></td>
+    <td class='<c:out value="${rowClass}"/>'>&nbsp;<c:out value="${pa.version}"/></td>
+    <td class='<c:out value="${rowClass}"/>'>&nbsp;<c:out value="${pa.path}"/></td>
+    <td style='text-align:center' class='<c:out value="${rowClass}"/>'><c:out value="${pa.running}"/></td>
+    <td class='<c:out value="${rowClass}"/>'>
+      &nbsp;
+      <c:if test="${requestScope.serverManagerAvailable}">
+        <c:choose>
+          <c:when test="${pa.local or pa.path == pageContext.request.contextPath}">
+            <%-- management of local pa not yet supported and mustn't for current (this) pa --%>
+            start&nbsp;&nbsp;stop&nbsp;&nbsp;undeploy&nbsp;
+          </c:when>
+          <c:otherwise>
+            <c:choose>
+              <c:when test="${pa.running}">
+                start&nbsp;&nbsp;<a href="#" onClick='return checkSubmit("stop","<c:out value="${pa.name}"/>")'>stop</a>&nbsp;
+              </c:when>
+              <c:otherwise>
+                <a href="#" onClick='return checkSubmit("start","<c:out value="${pa.name}"/>")'>start</a>&nbsp;&nbsp;stop&nbsp;
+              </c:otherwise>
+            </c:choose>
+            <a href="#" onclick='return checkSubmit("undeploy","<c:out value="${pa.name}"/>")'>undeploy</a>&nbsp;
+          </c:otherwise>
+        </c:choose>
+      </c:if>
+      <c:choose>
+        <c:when test="${pa.running}">
+          delete
+        </c:when>
+        <c:otherwise>
+          <a href="#" onClick='return checkSubmit("delete","<c:out value="${pa.name}"/>")'>delete</a>
+        </c:otherwise>
+      </c:choose>
+    </td>
+  </tr>
+</c:forEach>
+  <tr>
+    <td class='portlet-section-footer' colspan='5'><input type="button" class="portlet-dlg-icon-label" value="refresh" onClick='doSubmit("refresh",null)'></td>
+  </tr>
 </table>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-browser.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-browser.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-browser.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-browser.jsp Tue Sep 16 07:13:38 2008
@@ -1,109 +1,109 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ page language="java" import="javax.portlet.*, java.util.List, java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication" session="true" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="/WEB-INF/pam.tld" prefix="pam" %>
-
-<%@ page import="java.util.Collection" %>
-<%@ page import ="java.util.Map" %>
-<%@ page import="org.apache.jetspeed.search.ParsedObject" %>
-
-<portlet:defineObjects/>
-<h2 class="portlet-section-header">Portlet Application Manager</h2>
-
-<h3 class="portlet-section-subheader">Search</h3>
-
-<div class="portlet-section-text">
-
-<portlet:actionURL var="searchLink" />
-<portlet:actionURL var="searchSelectLink"/>
-
-<form action="<c:out value="${searchLink}"/>" method="post">
-
-	<input type="text" name="query" value="" class="portlet-form-field-label"/>
-	<input type="submit" value="Search" class="portlet-form-button"/>
-
-</form>
-
-<c:set var="results" value="${requestScope.search_results}" />
-
-<c:if test="${results != null}">
-	<c:forEach var="result" items="${search_results}">
-	
-		<%
-			String name = "";
-			ParsedObject po = (ParsedObject)pageContext.findAttribute("result");
-			Map fields = po.getFields();
-			if(fields != null)
-			{
-				Object id = fields.get("ID");
-		
-				if(id != null)
-				{
-					if(id instanceof Collection)
-					{
-						Collection coll = (Collection)id;
-						name = (String) coll.iterator().next();
-					}
-					else
-					{
-						name = (String)id;
-					}
-				}
-				
-				if(po.getType().equals("portlet"))
-				{
-					Object pa = fields.get("portlet_application");
-					String paName = "";
-					if(pa != null)
-					{
-						if(id instanceof Collection)
-						{
-							Collection coll = (Collection)pa;
-							paName = (String) coll.iterator().next();
-						}
-						else
-						{
-							paName = (String)pa;
-						}
-					}
-					name = paName + "::" + name;
-				}
-			}
-		%>
-	
-		<a href="<c:out value="${searchSelectLink}"/>?select_node=<%=name%>"><c:out value="${result.title}"/></a> <br />
-		 <%-- | <c:out value="${result.description}"/> <br /> --%>
-	</c:forEach>
-</c:if>
-
-</div>
-<h3 class="portlet-section-subheader">Application Tree View</h3>
-
-<div class="portlet-section-text">
-
-<portlet:actionURL var="nodeLink" >
-	<portlet:param name="node" value="${name}" />
-</portlet:actionURL>
-
-<pam:tree tree="j2_tree" images="/j2-admin/images" scope="portlet_request"
-          action="<%= nodeLink %>"
-          style="tree-control"
-          styleSelected="portlet-section-alternate"
-          
-  />
-  
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page language="java" import="javax.portlet.*, java.util.List, java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication" session="true" %>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/pam.tld" prefix="pam" %>
+
+<%@ page import="java.util.Collection" %>
+<%@ page import ="java.util.Map" %>
+<%@ page import="org.apache.jetspeed.search.ParsedObject" %>
+
+<portlet:defineObjects/>
+<h2 class="portlet-section-header">Portlet Application Manager</h2>
+
+<h3 class="portlet-section-subheader">Search</h3>
+
+<div class="portlet-section-text">
+
+<portlet:actionURL var="searchLink" />
+<portlet:actionURL var="searchSelectLink"/>
+
+<form action="<c:out value="${searchLink}"/>" method="post">
+
+	<input type="text" name="query" value="" class="portlet-form-field-label"/>
+	<input type="submit" value="Search" class="portlet-form-button"/>
+
+</form>
+
+<c:set var="results" value="${requestScope.search_results}" />
+
+<c:if test="${results != null}">
+	<c:forEach var="result" items="${search_results}">
+	
+		<%
+			String name = "";
+			ParsedObject po = (ParsedObject)pageContext.findAttribute("result");
+			Map fields = po.getFields();
+			if(fields != null)
+			{
+				Object id = fields.get("ID");
+		
+				if(id != null)
+				{
+					if(id instanceof Collection)
+					{
+						Collection coll = (Collection)id;
+						name = (String) coll.iterator().next();
+					}
+					else
+					{
+						name = (String)id;
+					}
+				}
+				
+				if(po.getType().equals("portlet"))
+				{
+					Object pa = fields.get("portlet_application");
+					String paName = "";
+					if(pa != null)
+					{
+						if(id instanceof Collection)
+						{
+							Collection coll = (Collection)pa;
+							paName = (String) coll.iterator().next();
+						}
+						else
+						{
+							paName = (String)pa;
+						}
+					}
+					name = paName + "::" + name;
+				}
+			}
+		%>
+	
+		<a href="<c:out value="${searchSelectLink}"/>?select_node=<%=name%>"><c:out value="${result.title}"/></a> <br />
+		 <%-- | <c:out value="${result.description}"/> <br /> --%>
+	</c:forEach>
+</c:if>
+
+</div>
+<h3 class="portlet-section-subheader">Application Tree View</h3>
+
+<div class="portlet-section-text">
+
+<portlet:actionURL var="nodeLink" >
+	<portlet:param name="node" value="${name}" />
+</portlet:actionURL>
+
+<pam:tree tree="j2_tree" images="/j2-admin/images" scope="portlet_request"
+          action="<%= nodeLink %>"
+          style="tree-control"
+          styleSelected="portlet-section-alternate"
+          
+  />
+  
 </div>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/pam-detail.jsp Tue Sep 16 07:13:38 2008
@@ -1,306 +1,306 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ page language="java" session="true" %>
-<%@ page import="javax.portlet.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="org.apache.portals.bridges.beans.TabBean" %>
-<%@ page import="org.apache.jetspeed.om.common.preference.*" %>
-<%@ page import="org.apache.jetspeed.om.common.*" %>
-<%@ page import="org.apache.jetspeed.om.common.portlet.*" %>
-
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
-
-<fmt:setBundle basename="org.apache.jetspeed.portlets.pam.resources.PAMResources" />
-
-
-<portlet:defineObjects/>
-
-<c:set var="pa" value="${requestScope.portletApplication}" />
-<c:set var="name" value="${pa.name}" />
-<c:set var="version" value="${pa.version}" />
-
-<c:set var="tabs" value="${requestScope.tabs}"/>
-<c:set var="selectedTab" value="${requestScope.selected_tab}"/>
-<c:set var="selectedPDef" value="${requestScope.portletDefinition}"/>
-
-<table border="0" cellspacing="0" cellpadding="0">
-  <tr>
-    <td class="portlet-menu-caption">
-      Information
-    </td>
-
-  </tr>
-  <tr>
-    <td class="portlet-menu">
-      <table border="0" cellspacing="2" cellpadding="0">
-        <tr>
-          <td class="portlet-menu-item">
-<fmt:message key="pam.details.name"/> = <c:out value="${name}"/>
-          </td>
-        </tr>
-        <tr>
-          <td class="portlet-menu-item">
-<fmt:message key="pam.details.version"/> = <c:out value="${version}"/> 
-          </td>
-        </tr>
-      </table>
-
-    </td>
-  </tr>
-</table>
-<br/>
-
-<div id="tabs">
-	<c:set var="tab_items" value="${tabs}"/>
-	<c:set var="currentTab" value="${selectedTab}"/>
-	<c:set var="url_param_name" value="selected_tab"/>
-	<%@ include file="tabs.jsp"%>
-</div>
-
-<%--Beginning of Portlets tab data--%>
-<%--TODO:  switch to c:choose --%>
-<c:if test="${selectedTab.id == 'pa_portlets'}">
-  <div id="portlets">
-	
-	<portlet:actionURL var="select_portlet_link" >
-        <%--<portlet:param name="select_portlet" value="<%= pdefName %>" />--%>
-    </portlet:actionURL>
-	<form action="<c:out value="${select_portlet_link}"/>" method="post">
-		<select name="select_portlet" onChange="this.form.submit();" class="portlet-form-field">
-		
-			<option value="" <c:if test="! ${selectedPDef}"> selected="true"</c:if> >
-				<fmt:message key="pam.details.choose_portlet"/>
-			</option>
-
-			<c:forEach var="portletDef" items="${pa.portletDefinitions}">
-			    <c:set var="pdefName" value="${portletDef.name}"/>
-			    
-			    <%--We must do this since portlet taglib doesn't support expressions--%>
-			    <% String pdefName = (String) pageContext.getAttribute("pdefName"); %>
-			    
-			    <option value="<c:out value="${portletDef.name}"/>" <c:if test="${selectedPDef.name == portletDef.name}">selected="true"</c:if>>
-				  <c:out value="${portletDef.name}"/>
-			    </option>
-				<%--
-			    <a href="<c:out value="${select_portlet_link}"/>">
-			        <c:out value="${portletDef.name}" /><br />
-			    </a>
-			    --%>
-			</c:forEach>
-		</select>
-		
-		<!--<input type="submit" value="Select"/>-->
-    </form>
-  </div>
-    
-  <div id="selectedPortlet" class="">
-	
-	<c:if test="${selectedPDef != null}">
-		<%@ include file="portlet-detail.jsp" %>
-	</c:if>
-    
-  </div>
-</c:if>
-<%--End of Portlets tab data--%>
-
-<%--Beginning of UserAttr tab data--%>
-<%--TODO:  switch to c:choose --%>
-<c:if test="${selectedTab.id == 'pa_user_attribtues'}">
-  <div id="Details">
-	<portlet:actionURL var="edit_user_attr_link" >
-	</portlet:actionURL>
-		
-	<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>" method="post">
-		<input type="hidden" name="portlet_action" value="portlet_app.edit_user_attribute"/>
-		
-		<table>
-			<tr>
-				<th class="portlet-section-header">&nbsp;</th>
-				<th class="portlet-section-header"><fmt:message key="pam.details.name"/></th>
-				<th class="portlet-section-header"><fmt:message key="pam.details.value"/></th>
-			</tr>
-		<c:forEach var="userAttr" items="${pa.userAttributes}">
-			<tr>
-			<%--<input type="hidden" name="user_attr_name" value="<c:out value="${userAttr.name}"/>"/>--%>
-			
-				<td class="portlet-section-body">
-					<input type="checkbox" name="user_attr_id" value="<c:out value="${userAttr.name}"/>"/>
-				</td>
-				<td class="portlet-section-body">
-					<c:out value="${userAttr.name}"/>
-				</td>
-				<td class="portlet-section-body">
-					<input type="text" name="<c:out value="${userAttr.name}"/>:description" value="<c:out value="${userAttr.description}"/>" class="portlet-form-field-label"/>
-				</td>
-			</tr>
-		</c:forEach>
-		</table>
-		
-		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet_app.edit_user_attribute'" class="portlet-form-button"/>
-		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet_app.remove_user_attribute'" class="portlet-form-button"/>
-	</form>
-	
-	<form action="<c:out value="${edit_user_attr_link}"/>" method="post">
-		<input type="hidden" name="portlet_action" value="portlet_app.add_user_attribute"/>
-		
-		<table>
-			<tr>
-				<td class="portlet-section-alternate">
-					<fmt:message key="pam.details.name"/>
-				</td>
-				<td class="portlet-section-body">
-					<input type="text" name="user_attr_name" value="" class="portlet-form-field-label"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="portlet-section-alternate">
-					<fmt:message key="pam.details.description"/>
-				</td>
-				<td class="portlet-section-body">
-					<input type="text" name="user_attr_desc" value="" class="portlet-form-field-label"/>
-				</td>
-			</tr>
-		</table>
-		<input type="submit" value="<fmt:message key="pam.details.add_user_attribute"/>" class="portlet-form-button"/>
-	</form>
-  </div>
-</c:if>
-<%--End of UserAttr tab data--%>
-
-
-<%--Beginning of Metadata tab data--%>
-<%--TODO:  switch to c:choose --%>
-<c:if test="${selectedTab.id == 'pa_metadata'}">
-	<div id="metadata">
-		<c:set var="md" value="${pa.metadata}"/>
-	
-		<portlet:actionURL var="edit_metadata_link" >
-			
-		</portlet:actionURL>
-		<c:set var="action_prefix" value="portlet_app."/>
-		
-		<%@ include file="metadata-detail.jsp" %>
-		
-	</div>
-</c:if>
-<%--End of Metadata tab data--%>
-
-<%--Beginning of Details tab data--%>
-<%--TODO:  switch to c:choose --%>
-<c:if test="${selectedTab.id == 'pa_details'}">
-	<div id="details">
-		<table>
-			<tr>
-				<td class="portlet-section-alternate">
-					<fmt:message key="pam.details.name"/>
-                </td>
-				<td class="portlet-section-body">
-					<c:out value="${name}"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="portlet-section-alternate">
-					<fmt:message key="pam.details.version"/>
-				</td>
-				<td class="portlet-section-body">
-					<c:out value="${version}"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="portlet-section-alternate">		
-					<fmt:message key="pam.details.description"/>
-				</td>
-				<td class="portlet-section-body">
-					<c:out value="${pa.description}"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="portlet-section-alternate">
-					<fmt:message key="pam.details.type"/>
-				</td>
-				<td class="portlet-section-body">
-					<c:choose>
-						<c:when test="${pa.applicationType == '0'}">
-							<fmt:message key="pam.details.type.webapp"/>
-						</c:when>
-						<c:when test="${pa.applicationType == '1'}">
-							<fmt:message key="pam.details.type.local"/>
-						</c:when>
-					</c:choose>
-				</td>
-			</tr>
-			<tr>
-				<td class="portlet-section-alternate">
-					<fmt:message key="pam.details.id"/>
-				</td>
-				<td class="portlet-section-body">
-					<c:out value="${pa.applicationIdentifier}"/>
-				</td>
-			</tr>
-		</table>
-		
-		<br />
-	    <portlet:actionURL var="edit_security_constraint" >
-	    </portlet:actionURL>
-	    <form action="<c:out value="${edit_security_constraint}"/>" method="post">
-	      <input type="hidden" name="portlet_action" value="portlet_app.edit_security_constraint"/>
-	      <table>
-	        <tr>
-	          <td class="portlet-section-alternate"><fmt:message key="pam.security_constraint"/></td>
-	          <td>
-			    <select name="security-constraint-ref">
-				  <option value="" <c:if test="${empty currentSecurityConstraintRef}">selected</c:if> >No Constraint</option>
-				  <c:forEach var="secRef" items="${securityContraintRefList}">
-				    <option value="<c:out value="${secRef.name}"/>"  <c:if test="${secRef.name == currentSecurityConstraintRef}">selected</c:if>  ><c:out value="${secRef.name}"/></option>
-				  </c:forEach>
-				</select>
-			  </td>
-			  <td>
-			    <input type="submit" value="<fmt:message key="pam.details.update"/>" class="portlet-form-button"/>
-	  	      </td>
-		    </tr>
-		  </table>
-	    </form>
-	
-		
-		<c:if test="${! empty pa.jetspeedServices}">
-            <br/>
-            <table border="0"  cellspacing="0" cellpadding="0">
-                <tr>
-                    <td class="portlet-menu-caption">
-			<fmt:message key="pam.details.services"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="portlet-menu">
-            <div class="portlet-section-body">
-			<c:forEach var="service" items="${pa.jetspeedServices}">
-				<c:out value="${service.name}"/> <br /> <%--| <c:out value="${service.appId}"/> | <c:out value="${service.id}"/><br />--%>
-			</c:forEach>
-            </div>
-                    </td>
-                </tr>
-            </table>
-		</c:if>
-	</div>
-</c:if>
-<%--End of Details tab data--%>
-
-<br />
-<br />
-
-
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page language="java" session="true" %>
+<%@ page import="javax.portlet.*" %>
+<%@ page import="java.util.*" %>
+<%@ page import="org.apache.portals.bridges.beans.TabBean" %>
+<%@ page import="org.apache.jetspeed.om.common.preference.*" %>
+<%@ page import="org.apache.jetspeed.om.common.*" %>
+<%@ page import="org.apache.jetspeed.om.common.portlet.*" %>
+
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<fmt:setBundle basename="org.apache.jetspeed.portlets.pam.resources.PAMResources" />
+
+
+<portlet:defineObjects/>
+
+<c:set var="pa" value="${requestScope.portletApplication}" />
+<c:set var="name" value="${pa.name}" />
+<c:set var="version" value="${pa.version}" />
+
+<c:set var="tabs" value="${requestScope.tabs}"/>
+<c:set var="selectedTab" value="${requestScope.selected_tab}"/>
+<c:set var="selectedPDef" value="${requestScope.portletDefinition}"/>
+
+<table border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td class="portlet-menu-caption">
+      Information
+    </td>
+
+  </tr>
+  <tr>
+    <td class="portlet-menu">
+      <table border="0" cellspacing="2" cellpadding="0">
+        <tr>
+          <td class="portlet-menu-item">
+<fmt:message key="pam.details.name"/> = <c:out value="${name}"/>
+          </td>
+        </tr>
+        <tr>
+          <td class="portlet-menu-item">
+<fmt:message key="pam.details.version"/> = <c:out value="${version}"/> 
+          </td>
+        </tr>
+      </table>
+
+    </td>
+  </tr>
+</table>
+<br/>
+
+<div id="tabs">
+	<c:set var="tab_items" value="${tabs}"/>
+	<c:set var="currentTab" value="${selectedTab}"/>
+	<c:set var="url_param_name" value="selected_tab"/>
+	<%@ include file="tabs.jsp"%>
+</div>
+
+<%--Beginning of Portlets tab data--%>
+<%--TODO:  switch to c:choose --%>
+<c:if test="${selectedTab.id == 'pa_portlets'}">
+  <div id="portlets">
+	
+	<portlet:actionURL var="select_portlet_link" >
+        <%--<portlet:param name="select_portlet" value="<%= pdefName %>" />--%>
+    </portlet:actionURL>
+	<form action="<c:out value="${select_portlet_link}"/>" method="post">
+		<select name="select_portlet" onChange="this.form.submit();" class="portlet-form-field">
+		
+			<option value="" <c:if test="! ${selectedPDef}"> selected="true"</c:if> >
+				<fmt:message key="pam.details.choose_portlet"/>
+			</option>
+
+			<c:forEach var="portletDef" items="${pa.portletDefinitions}">
+			    <c:set var="pdefName" value="${portletDef.name}"/>
+			    
+			    <%--We must do this since portlet taglib doesn't support expressions--%>
+			    <% String pdefName = (String) pageContext.getAttribute("pdefName"); %>
+			    
+			    <option value="<c:out value="${portletDef.name}"/>" <c:if test="${selectedPDef.name == portletDef.name}">selected="true"</c:if>>
+				  <c:out value="${portletDef.name}"/>
+			    </option>
+				<%--
+			    <a href="<c:out value="${select_portlet_link}"/>">
+			        <c:out value="${portletDef.name}" /><br />
+			    </a>
+			    --%>
+			</c:forEach>
+		</select>
+		
+		<!--<input type="submit" value="Select"/>-->
+    </form>
+  </div>
+    
+  <div id="selectedPortlet" class="">
+	
+	<c:if test="${selectedPDef != null}">
+		<%@ include file="portlet-detail.jsp" %>
+	</c:if>
+    
+  </div>
+</c:if>
+<%--End of Portlets tab data--%>
+
+<%--Beginning of UserAttr tab data--%>
+<%--TODO:  switch to c:choose --%>
+<c:if test="${selectedTab.id == 'pa_user_attribtues'}">
+  <div id="Details">
+	<portlet:actionURL var="edit_user_attr_link" >
+	</portlet:actionURL>
+		
+	<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>" method="post">
+		<input type="hidden" name="portlet_action" value="portlet_app.edit_user_attribute"/>
+		
+		<table>
+			<tr>
+				<th class="portlet-section-header">&nbsp;</th>
+				<th class="portlet-section-header"><fmt:message key="pam.details.name"/></th>
+				<th class="portlet-section-header"><fmt:message key="pam.details.value"/></th>
+			</tr>
+		<c:forEach var="userAttr" items="${pa.userAttributes}">
+			<tr>
+			<%--<input type="hidden" name="user_attr_name" value="<c:out value="${userAttr.name}"/>"/>--%>
+			
+				<td class="portlet-section-body">
+					<input type="checkbox" name="user_attr_id" value="<c:out value="${userAttr.name}"/>"/>
+				</td>
+				<td class="portlet-section-body">
+					<c:out value="${userAttr.name}"/>
+				</td>
+				<td class="portlet-section-body">
+					<input type="text" name="<c:out value="${userAttr.name}"/>:description" value="<c:out value="${userAttr.description}"/>" class="portlet-form-field-label"/>
+				</td>
+			</tr>
+		</c:forEach>
+		</table>
+		
+		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet_app.edit_user_attribute'" class="portlet-form-button"/>
+		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet_app.remove_user_attribute'" class="portlet-form-button"/>
+	</form>
+	
+	<form action="<c:out value="${edit_user_attr_link}"/>" method="post">
+		<input type="hidden" name="portlet_action" value="portlet_app.add_user_attribute"/>
+		
+		<table>
+			<tr>
+				<td class="portlet-section-alternate">
+					<fmt:message key="pam.details.name"/>
+				</td>
+				<td class="portlet-section-body">
+					<input type="text" name="user_attr_name" value="" class="portlet-form-field-label"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="portlet-section-alternate">
+					<fmt:message key="pam.details.description"/>
+				</td>
+				<td class="portlet-section-body">
+					<input type="text" name="user_attr_desc" value="" class="portlet-form-field-label"/>
+				</td>
+			</tr>
+		</table>
+		<input type="submit" value="<fmt:message key="pam.details.add_user_attribute"/>" class="portlet-form-button"/>
+	</form>
+  </div>
+</c:if>
+<%--End of UserAttr tab data--%>
+
+
+<%--Beginning of Metadata tab data--%>
+<%--TODO:  switch to c:choose --%>
+<c:if test="${selectedTab.id == 'pa_metadata'}">
+	<div id="metadata">
+		<c:set var="md" value="${pa.metadata}"/>
+	
+		<portlet:actionURL var="edit_metadata_link" >
+			
+		</portlet:actionURL>
+		<c:set var="action_prefix" value="portlet_app."/>
+		
+		<%@ include file="metadata-detail.jsp" %>
+		
+	</div>
+</c:if>
+<%--End of Metadata tab data--%>
+
+<%--Beginning of Details tab data--%>
+<%--TODO:  switch to c:choose --%>
+<c:if test="${selectedTab.id == 'pa_details'}">
+	<div id="details">
+		<table>
+			<tr>
+				<td class="portlet-section-alternate">
+					<fmt:message key="pam.details.name"/>
+                </td>
+				<td class="portlet-section-body">
+					<c:out value="${name}"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="portlet-section-alternate">
+					<fmt:message key="pam.details.version"/>
+				</td>
+				<td class="portlet-section-body">
+					<c:out value="${version}"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="portlet-section-alternate">		
+					<fmt:message key="pam.details.description"/>
+				</td>
+				<td class="portlet-section-body">
+					<c:out value="${pa.description}"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="portlet-section-alternate">
+					<fmt:message key="pam.details.type"/>
+				</td>
+				<td class="portlet-section-body">
+					<c:choose>
+						<c:when test="${pa.applicationType == '0'}">
+							<fmt:message key="pam.details.type.webapp"/>
+						</c:when>
+						<c:when test="${pa.applicationType == '1'}">
+							<fmt:message key="pam.details.type.local"/>
+						</c:when>
+					</c:choose>
+				</td>
+			</tr>
+			<tr>
+				<td class="portlet-section-alternate">
+					<fmt:message key="pam.details.id"/>
+				</td>
+				<td class="portlet-section-body">
+					<c:out value="${pa.applicationIdentifier}"/>
+				</td>
+			</tr>
+		</table>
+		
+		<br />
+	    <portlet:actionURL var="edit_security_constraint" >
+	    </portlet:actionURL>
+	    <form action="<c:out value="${edit_security_constraint}"/>" method="post">
+	      <input type="hidden" name="portlet_action" value="portlet_app.edit_security_constraint"/>
+	      <table>
+	        <tr>
+	          <td class="portlet-section-alternate"><fmt:message key="pam.security_constraint"/></td>
+	          <td>
+			    <select name="security-constraint-ref">
+				  <option value="" <c:if test="${empty currentSecurityConstraintRef}">selected</c:if> >No Constraint</option>
+				  <c:forEach var="secRef" items="${securityContraintRefList}">
+				    <option value="<c:out value="${secRef.name}"/>"  <c:if test="${secRef.name == currentSecurityConstraintRef}">selected</c:if>  ><c:out value="${secRef.name}"/></option>
+				  </c:forEach>
+				</select>
+			  </td>
+			  <td>
+			    <input type="submit" value="<fmt:message key="pam.details.update"/>" class="portlet-form-button"/>
+	  	      </td>
+		    </tr>
+		  </table>
+	    </form>
+	
+		
+		<c:if test="${! empty pa.jetspeedServices}">
+            <br/>
+            <table border="0"  cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class="portlet-menu-caption">
+			<fmt:message key="pam.details.services"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="portlet-menu">
+            <div class="portlet-section-body">
+			<c:forEach var="service" items="${pa.jetspeedServices}">
+				<c:out value="${service.name}"/> <br /> <%--| <c:out value="${service.appId}"/> | <c:out value="${service.id}"/><br />--%>
+			</c:forEach>
+            </div>
+                    </td>
+                </tr>
+            </table>
+		</c:if>
+	</div>
+</c:if>
+<%--End of Details tab data--%>
+
+<br />
+<br />
+
+

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/prototype.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/prototype.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/prototype.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/prototype.jsp Tue Sep 16 07:13:38 2008
@@ -1,89 +1,89 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
-
-<link href='css/security-admin.css' type='text/css'/>
-
-<f:view>
-<h:panelGrid columns='2'>
-<h:panelGroup>
-<h:dataTable
-    value="#{users.users}"
-    var="user"
-    styleClass="portlet-section-body"
-    headerClass="portlet-section-header"
-    rowClasses="portlet-section-body,portlet-section-alternate"
->
-    <h:column>
-       <f:facet name="header">
-         <h:outputText value="User"
-            style="font-weight: bold"/>
-       </f:facet>
-        <h:outputText value='#{user.last}'/>
-    </h:column>
-    <h:column>
-        <f:verbatim>
-        ...
-       </f:verbatim>        
-    </h:column>    
-    <h:column>
-        <h:selectBooleanCheckbox value="false"/>
-    </h:column>
-</h:dataTable>
-</h:panelGroup>
-<h:panelGroup>
-
-<x:panelTabbedPane bgcolor="#FFFFCC" >
-
-    <f:verbatim>
-        <p>User Information</p>
-    </f:verbatim>
-
-    <x:panelTab id="tab1" label="Attributes" rendered="#{tabbedPaneBean.tab1Visible}">
-        <h:inputText id="inp1"/><f:verbatim><br></f:verbatim>
-        <h:inputText id="inp2" required="true" /><h:message for="inp2" showSummary="false" showDetail="true" />
-    </x:panelTab>
-
-    <x:panelTab id="tab2" label="Roles" rendered="#{tabbedPaneBean.tab2Visible}">
-
-    <f:verbatim>
-        <p> TAB TWO </p>
-    </f:verbatim>
-    </x:panelTab>
-
-    <x:panelTab id="tab3" label="Prefs" rendered="#{tabbedPaneBean.tab3Visible}">
-        <h:inputText id="inp3"/><f:verbatim><br></f:verbatim>
-        <h:inputText id="inp4"/><f:verbatim><br></f:verbatim>
-        <h:inputText id="inp5"/><f:verbatim><br></f:verbatim>
-    </x:panelTab>
-
-    <f:verbatim><br></f:verbatim>
-
-    <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab1Visible}"/><f:verbatim>Tab 1 visible<br></f:verbatim>
-    <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab2Visible}"/><f:verbatim>Tab 2 visible<br></f:verbatim>
-    <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab3Visible}"/><f:verbatim>Tab 3 visible<br></f:verbatim>
-
-    <h:commandButton value="Save" />
-
-</x:panelTabbedPane>
-
-
-</h:panelGroup>
-</h:panelGrid>
-</f:view>
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+
+<link href='css/security-admin.css' type='text/css'/>
+
+<f:view>
+<h:panelGrid columns='2'>
+<h:panelGroup>
+<h:dataTable
+    value="#{users.users}"
+    var="user"
+    styleClass="portlet-section-body"
+    headerClass="portlet-section-header"
+    rowClasses="portlet-section-body,portlet-section-alternate"
+>
+    <h:column>
+       <f:facet name="header">
+         <h:outputText value="User"
+            style="font-weight: bold"/>
+       </f:facet>
+        <h:outputText value='#{user.last}'/>
+    </h:column>
+    <h:column>
+        <f:verbatim>
+        ...
+       </f:verbatim>        
+    </h:column>    
+    <h:column>
+        <h:selectBooleanCheckbox value="false"/>
+    </h:column>
+</h:dataTable>
+</h:panelGroup>
+<h:panelGroup>
+
+<x:panelTabbedPane bgcolor="#FFFFCC" >
+
+    <f:verbatim>
+        <p>User Information</p>
+    </f:verbatim>
+
+    <x:panelTab id="tab1" label="Attributes" rendered="#{tabbedPaneBean.tab1Visible}">
+        <h:inputText id="inp1"/><f:verbatim><br></f:verbatim>
+        <h:inputText id="inp2" required="true" /><h:message for="inp2" showSummary="false" showDetail="true" />
+    </x:panelTab>
+
+    <x:panelTab id="tab2" label="Roles" rendered="#{tabbedPaneBean.tab2Visible}">
+
+    <f:verbatim>
+        <p> TAB TWO </p>
+    </f:verbatim>
+    </x:panelTab>
+
+    <x:panelTab id="tab3" label="Prefs" rendered="#{tabbedPaneBean.tab3Visible}">
+        <h:inputText id="inp3"/><f:verbatim><br></f:verbatim>
+        <h:inputText id="inp4"/><f:verbatim><br></f:verbatim>
+        <h:inputText id="inp5"/><f:verbatim><br></f:verbatim>
+    </x:panelTab>
+
+    <f:verbatim><br></f:verbatim>
+
+    <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab1Visible}"/><f:verbatim>Tab 1 visible<br></f:verbatim>
+    <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab2Visible}"/><f:verbatim>Tab 2 visible<br></f:verbatim>
+    <h:selectBooleanCheckbox value="#{tabbedPaneBean.tab3Visible}"/><f:verbatim>Tab 3 visible<br></f:verbatim>
+
+    <h:commandButton value="Save" />
+
+</x:panelTabbedPane>
+
+
+</h:panelGroup>
+</h:panelGrid>
+</f:view>

Modified: portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/site-detail.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/site-detail.jsp?rev=695888&r1=695887&r2=695888&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/site-detail.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/branches/security-refactoring/src/webapp/WEB-INF/view/site-detail.jsp Tue Sep 16 07:13:38 2008
@@ -1,143 +1,143 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-
-<%@ page session="true" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="/WEB-INF/pam.tld" prefix="pam" %>
-
-<%@ page import="org.apache.portals.bridges.TabBean" %>
-<%@ page import="org.apache.jetspeed.page.document.*" %>
-
-<fmt:setBundle basename="org.apache.jetspeed.portlets.site.resources.SiteResources" />
-
-<!--
-/*
- * Copyright 2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-//-->
-
-<c:set var="selectedTab" value="${requestScope.selected_tab}"/>
-
-<c:if test="${folder == null && page == null}">
-	<fmt:message key="site.details.choose_folder_or_page"/>
-</c:if>
-
-<div id="tabs">
-	<c:set var="tab_items" value="${requestScope.tabs}"/>
-	<c:set var="currentTab" value="${selectedTab}"/>
-	<c:set var="url_param_name" value="selected_site_tab"/>
-	<%@ include file="tabs.jsp"%>
-</div>
-
-<c:set var="node" value="${folder}"/>
-<c:if test="${page != null}">
-	<c:set var="node" value="${page}"/>
-</c:if>
-
-<c:if test="${currentTab.id == 'site_details' && node != null}">
-	Name (Node): <c:out value="${node.name}"/> <br />
-	Path (Node): <c:out value="${node.path}"/> <br />
-	Title (BaseElement): <c:out value="${node.title}"/> <br />
-	Parent (Node): <c:out value="${node.parent.title}"/> <br />
-	ID (BaseElement): <c:out value="${node.id}"/> <br />
-	Type (Node): <c:out value="${node.type}"/> <br />
-	URL (Node): <c:out value="${node.url}"/> <br />
-	ACL (SecuredResource): <c:out value="${node.acl}"/> <br />
-	Hidden (Node): <c:out value="${node.hidden}"/> <br />
-
-
-	<c:choose>
-		<c:when test="${folder != null}">
-			Default Page (Folder): <c:out value="${folder.defaultPage}"/> <br />
-			Default Theme (Folder): <c:out value="${folder.defaultTheme}"/> <br />
-			
-			
-			<c:forEach var="field" items="${folder.metadataFields}">
-				<c:out value="${field.name}"/> | <c:out value="${field.value}"/> | <c:out value="${field.locale}"/> <br />
-			</c:forEach>
-			
-			
-		</c:when>
-
-		<c:when test="${page != null}">
-		
-			Name: <c:out value="${page.name}"/> <br />
-			Title: <c:out value="${page.title}"/> <br />
-			Parent: <c:out value="${page.parent.title}"/> <br />
-			
-		</c:when>
-		
-
-	</c:choose>
-</c:if>
-
-<c:if test="${currentTab.id == 'site_security'  && node != null}">
-		<portlet:actionURL var="edit_page_link" />
-
-		<form action="<c:out value="${edit_page_link}"/>" method="post">
-			<c:if test="${folder != null}">
-				<input type="hidden" name="action_type" value="folder"/>
-			</c:if>
-			<c:if test="${page != null}">
-				<input type="hidden" name="action_type" value="page"/>
-			</c:if>
-			
-			<input type="hidden" name="node_name" value="<c:out value="${node.name}"/>"/>
-		<table>
-			<tr>
-				<td>Node Name</td>
-				<td><c:out value="${node.name}"/></td>
-			</tr>
-			<tr>
-				<td>Current ACL</td>
-				<td>
-					<%
-						Node node = (Node)pageContext.findAttribute("node");
-						out.write("" + node.getAcl());
-					%>
-				</td>
-			</tr>
-			<tr>
-				<td>New Role</td>
-				<td>
-					<select name="acl">
-						<option value="user">User</option>
-						<option value="admin">Admin</option>
-						<option value="guest">Guest</option>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<input type="submit" value="Add Role"/>
-				</td>
-			</tr>
-		</table>
-		</form>
-	</c:if>
+the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+
+<%@ page session="true" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="/WEB-INF/pam.tld" prefix="pam" %>
+
+<%@ page import="org.apache.portals.bridges.TabBean" %>
+<%@ page import="org.apache.jetspeed.page.document.*" %>
+
+<fmt:setBundle basename="org.apache.jetspeed.portlets.site.resources.SiteResources" />
+
+<!--
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//-->
+
+<c:set var="selectedTab" value="${requestScope.selected_tab}"/>
+
+<c:if test="${folder == null && page == null}">
+	<fmt:message key="site.details.choose_folder_or_page"/>
+</c:if>
+
+<div id="tabs">
+	<c:set var="tab_items" value="${requestScope.tabs}"/>
+	<c:set var="currentTab" value="${selectedTab}"/>
+	<c:set var="url_param_name" value="selected_site_tab"/>
+	<%@ include file="tabs.jsp"%>
+</div>
+
+<c:set var="node" value="${folder}"/>
+<c:if test="${page != null}">
+	<c:set var="node" value="${page}"/>
+</c:if>
+
+<c:if test="${currentTab.id == 'site_details' && node != null}">
+	Name (Node): <c:out value="${node.name}"/> <br />
+	Path (Node): <c:out value="${node.path}"/> <br />
+	Title (BaseElement): <c:out value="${node.title}"/> <br />
+	Parent (Node): <c:out value="${node.parent.title}"/> <br />
+	ID (BaseElement): <c:out value="${node.id}"/> <br />
+	Type (Node): <c:out value="${node.type}"/> <br />
+	URL (Node): <c:out value="${node.url}"/> <br />
+	ACL (SecuredResource): <c:out value="${node.acl}"/> <br />
+	Hidden (Node): <c:out value="${node.hidden}"/> <br />
+
+
+	<c:choose>
+		<c:when test="${folder != null}">
+			Default Page (Folder): <c:out value="${folder.defaultPage}"/> <br />
+			Default Theme (Folder): <c:out value="${folder.defaultTheme}"/> <br />
+			
+			
+			<c:forEach var="field" items="${folder.metadataFields}">
+				<c:out value="${field.name}"/> | <c:out value="${field.value}"/> | <c:out value="${field.locale}"/> <br />
+			</c:forEach>
+			
+			
+		</c:when>
+
+		<c:when test="${page != null}">
+		
+			Name: <c:out value="${page.name}"/> <br />
+			Title: <c:out value="${page.title}"/> <br />
+			Parent: <c:out value="${page.parent.title}"/> <br />
+			
+		</c:when>
+		
+
+	</c:choose>
+</c:if>
+
+<c:if test="${currentTab.id == 'site_security'  && node != null}">
+		<portlet:actionURL var="edit_page_link" />
+
+		<form action="<c:out value="${edit_page_link}"/>" method="post">
+			<c:if test="${folder != null}">
+				<input type="hidden" name="action_type" value="folder"/>
+			</c:if>
+			<c:if test="${page != null}">
+				<input type="hidden" name="action_type" value="page"/>
+			</c:if>
+			
+			<input type="hidden" name="node_name" value="<c:out value="${node.name}"/>"/>
+		<table>
+			<tr>
+				<td>Node Name</td>
+				<td><c:out value="${node.name}"/></td>
+			</tr>
+			<tr>
+				<td>Current ACL</td>
+				<td>
+					<%
+						Node node = (Node)pageContext.findAttribute("node");
+						out.write("" + node.getAcl());
+					%>
+				</td>
+			</tr>
+			<tr>
+				<td>New Role</td>
+				<td>
+					<select name="acl">
+						<option value="user">User</option>
+						<option value="admin">Admin</option>
+						<option value="guest">Guest</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<input type="submit" value="Add Role"/>
+				</td>
+			</tr>
+		</table>
+		</form>
+	</c:if>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message