taylor 2004/12/22 11:07:27
Modified: applications/security/src/webapp/WEB-INF
jetspeed-portlet.xml
applications/security/src/webapp/WEB-INF/security/users
user-browser.jsp user-details.jsp
Added: applications/security/src/webapp/WEB-INF/view tabs.jsp
applications/security/src/webapp/WEB-INF jetspeed-tree.tld
Removed: applications/security/src/webapp/WEB-INF portlet.tld
Log:
added tabs.tld and jsp
Revision Changes Path
1.1
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/view/tabs.jsp
Index: tabs.jsp
===================================================================
<%--
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.
--%>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<c:forEach var="tab" items="${tab_items}">
<td <c:if test="${tab == currentTab}"> class="LTabLeft" </c:if>
<c:if test="${tab != currentTab}"> class="LTabLeftLow"
</c:if>
style="font-size:1pt;" nowrap="true">
</td>
<td <c:if test="${tab == currentTab}"> class="LTab" </c:if>
<c:if test="${tab != currentTab}"> class="LTabLow" </c:if>
align="center" valign="middle" >
<%
String tabid =
((TabBean)pageContext.getAttribute("tab")).getId();
String paramName =
(String)pageContext.getAttribute("url_param_name");
%>
<c:choose>
<c:when test="${tab != currentTab}">
<portlet:actionURL var="select_portlet_tab_link" >
<portlet:param name="<%= paramName %>" value="<%= tabid
%>" />
</portlet:actionURL>
<a href="<c:out value="${select_portlet_tab_link}"/>">
<fmt:message>pam.details.tabs.<c:out
value="${tab.id}"/></fmt:message>
</a>
</c:when>
<c:otherwise>
<fmt:message>pam.details.tabs.<c:out
value="${tab.id}"/></fmt:message>
</c:otherwise>
</c:choose>
</td>
<td <c:if test="${tab == currentTab}"> class="LTabRight" </c:if>
<c:if test="${tab != currentTab}"> class="LTabRightLow" </c:if>
style="font-size:1pt;" nowrap="true">
</td>
</c:forEach>
</tr>
</table>
1.4 +1 -0
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/jetspeed-portlet.xml
Index: jetspeed-portlet.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/jetspeed-portlet.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jetspeed-portlet.xml 22 Dec 2004 17:50:10 -0000 1.3
+++ jetspeed-portlet.xml 22 Dec 2004 19:07:27 -0000 1.4
@@ -33,6 +33,7 @@
<js:service name='UserManager'/>
<js:service name='RoleManager'/>
<js:service name='GroupManager'/>
+ <js:service name="Profiler" />
</js:services>
</portlet-app>
1.1
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/jetspeed-tree.tld
Index: jetspeed-tree.tld
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";>
<!--
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.
-->
<taglib>
<tlib-version>1.0</tlib-version>
<jsp-version>1.2</jsp-version>
<short-name>Tags for PAM</short-name>
<!-- ========== Tree Control Tag ========================================
-->
<tag>
<name>tree</name>
<tag-class>org.apache.jetspeed.portlets.tags.PortletTreeControlTag</tag-class>
<body-content>empty</body-content>
<description>
Render a "tree" control, based on the current state of a data object
of type org.apache.webapp.admin.TreeControl, which is identified
by the name specified in the "tree" attribute, in the JSP scope
specified by the "scope" attribute.
</description>
<attribute>
<name>action</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>
Hyperlink to which expand/contract actions should be sent,
with a string "${node}" marking where the node name of the
affected node should be included (which will usually be as
the value of a request parameter).
</description>
</attribute>
<attribute>
<name>images</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>
Name of a directory containing the images for our icons,
relative to the page including this tag. If not specified,
defaults to "images".
</description>
</attribute>
<attribute>
<name>scope</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>
The JSP scope within which the "tree" attribute is to be found
(page, request, session, or application). If not specified, the
"tree" attribute will be searched for in any scope.
</description>
</attribute>
<attribute>
<name>style</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>
The CSS style class to be applied to the entire rendered output
of the tree control. If not specified, no overall style class
is applied.
</description>
</attribute>
<attribute>
<name>styleSelected</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>
The CSS style class to be applied to the text of any node that
is currently selected. If not specified, no style class will be
applied to the text of the selected node.
</description>
</attribute>
<attribute>
<name>styleUnselected</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>
The CSS style class to be applied to the text of any node that
is *not* currently selected. If not specified, no style class will
be applied to the text of non-selected nodes.
</description>
</attribute>
<attribute>
<name>tree</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<description>
Name of the attribute (in the scope specified by the "scope"
attribute, if any) under which an object of type
org.apache.webapp.admin.TreeControl is stored. This object
represents the entire current state of the tree, including
a representation of the hierarchical representation of the
nodes, plus the current expanded/ or contracted state of
non-leaf nodes.
</description>
</attribute>
</tag>
</taglib>
1.2 +2 -2
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/users/user-browser.jsp
Index: user-browser.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/users/user-browser.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user-browser.jsp 22 Dec 2004 17:50:10 -0000 1.1
+++ user-browser.jsp 22 Dec 2004 19:07:27 -0000 1.2
@@ -11,9 +11,9 @@
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/portlet"; prefix="portlet"%>
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
-<%@ taglib uri="/WEB-INF/pam.tld" prefix="pam" %>
+<%@ taglib uri="/WEB-INF/jetspeed-tree.tld" prefix="pam" %>
<portlet:defineObjects/>
<portlet:actionURL var="nodeLink" >
1.3 +2 -3
jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/users/user-details.jsp
Index: user-details.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/security/src/webapp/WEB-INF/security/users/user-details.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- user-details.jsp 22 Dec 2004 18:33:26 -0000 1.2
+++ user-details.jsp 22 Dec 2004 19:07:27 -0000 1.3
@@ -18,7 +18,7 @@
<%@ page import="org.apache.jetspeed.om.common.preference.*" %>
<%@ page import="org.apache.jetspeed.om.common.*" %>
-<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ 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" %>
@@ -48,9 +48,8 @@
<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"%>
+ <%@ include file="/WEB-INF/view/tabs.jsp"%>
</div>
-
<%--Beginning of User Attributes tab data--%>
<%--TODO: switch to c:choose --%>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
