You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2009/09/22 11:34:36 UTC
svn commit: r817572 - in /geronimo/server/trunk:
framework/configs/server-security-config/src/main/resources/security/
framework/modules/geronimo-jmx-remoting/
framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/
frame...
Author: genspring
Date: Tue Sep 22 09:34:34 2009
New Revision: 817572
URL: http://svn.apache.org/viewvc?rev=817572&view=rev
Log:
GERONIMO-4823 role-based administration capabilities
Modified:
geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/groups.properties
geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/users.properties
geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml
geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java
geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml (contents, props changed)
geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml (contents, props changed)
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp (contents, props changed)
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (contents, props changed)
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml
Modified: geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/groups.properties?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/groups.properties (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/groups.properties Tue Sep 22 09:34:34 2009
@@ -15,3 +15,4 @@
# limitations under the License.
#=====================================================================
admin=system
+monitor=monitor
Modified: geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/users.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/users.properties?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/users.properties (original)
+++ geronimo/server/trunk/framework/configs/server-security-config/src/main/resources/security/users.properties Tue Sep 22 09:34:34 2009
@@ -15,3 +15,4 @@
# limitations under the License.
#=====================================================================
system=manager
+monitor=password
Modified: geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml Tue Sep 22 09:34:34 2009
@@ -46,7 +46,13 @@
<artifactId>geronimo-system</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
</project>
+
Modified: geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java Tue Sep 22 09:34:34 2009
@@ -16,17 +16,20 @@
*/
package org.apache.geronimo.jmxremoting;
-import java.util.Map;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.Notification;
+import javax.management.NotificationListener;
import javax.management.remote.JMXAuthenticator;
import javax.management.remote.JMXConnectionNotification;
-import javax.management.NotificationListener;
-import javax.management.Notification;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
+import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
/**
* JMX Authenticator that checks the Credentials by logging in via JAAS.
*
@@ -67,6 +70,18 @@
LoginContext context = new LoginContext(configName, credentials);
context.login();
threadContext.set(context);
+ Subject sub = context.getSubject();
+ Set<GeronimoGroupPrincipal> pricipalsGroup = sub.getPrincipals(GeronimoGroupPrincipal.class);
+ boolean isInAdminGroup = false;
+ for (GeronimoGroupPrincipal principal : pricipalsGroup) {
+ if (principal.getName().equals("admin")) {
+ isInAdminGroup = true;
+ break;
+ }
+ }
+ if(!isInAdminGroup){
+ throw new LoginException("Only users in admin group are allowed");
+ }
return context.getSubject();
} catch (LoginException e) {
// do not propogate cause - we don't know what information is may contain
Modified: geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java Tue Sep 22 09:34:34 2009
@@ -18,8 +18,10 @@
import java.security.Principal;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -28,12 +30,14 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginException;
import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
import junit.framework.TestCase;
+import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
+
/**
*
*
@@ -43,6 +47,9 @@
private static final String CONFIG_NAME = "testConfig";
private Configuration oldConfiguration;
private Authenticator authenticator;
+ public void testMonitorGroupLogin() throws Exception {
+ testFailure("monitor", "monitor");
+ }
public void testLogin() {
try {
@@ -137,6 +144,16 @@
private CallbackHandler handler;
private Map options;
private String username;
+ private static Map<String, Set<String>> userGroupsMap = new HashMap<String, Set<String>>();
+ static {
+ Set<String> systemGroupsSet = new HashSet<String>();
+ systemGroupsSet.add("admin");
+ systemGroupsSet.add("monitor");
+ userGroupsMap.put("system", systemGroupsSet);
+ Set<String> monitorGroupsSet = new HashSet<String>();
+ monitorGroupsSet.add("monitor");
+ userGroupsMap.put("monitor", monitorGroupsSet);
+ }
public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
this.subject = subject;
@@ -167,6 +184,10 @@
public boolean commit() throws LoginException {
subject.getPrincipals().add(new MockPrincipal(username));
+ for (String groupName : userGroupsMap.get(username)) {
+ subject.getPrincipals().add(
+ new GeronimoGroupPrincipal(groupName));
+ }
return true;
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Tue Sep 22 09:34:34 2009
@@ -56,6 +56,7 @@
<!-- Geronimo Links -->
<td valign="top">
+ <%if(request.isUserInRole("admin")){ %>
<table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
<tr>
@@ -73,6 +74,7 @@
</td>
</tr>
</table>
+ <%} %>
<br />
<br />
Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml Tue Sep 22 09:34:34 2009
@@ -232,6 +232,9 @@
<role role-name="admin">
<principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
</role>
+ <role role-name="monitor">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor" />
+ </role>
</role-mappings>
</security>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp Tue Sep 22 09:34:34 2009
@@ -113,6 +113,8 @@
for(int i=0;i<catNames_len;i++){
String catName = catNames.get(i);
pageContext.setAttribute("catName",catName);
+ if(request.isUserInRole("admin")||
+ (request.isUserInRole("monitor") &&catName.equals("Server"))){
%>
<tr><td><div class="Selection">
<table width="100%" border="0" cellpadding="1" cellspacing="0">
@@ -127,6 +129,7 @@
</table>
</div></td></tr>
<%
+ }
ArrayList<PageConfig> list = categories.get(catName);
int list_len = list.size();
for(int k=0;k<list_len;k++){
@@ -134,6 +137,11 @@
PageConfig pageConfig = list.get(k);
pageContext.setAttribute("page",pageConfig);
pageName = shortNames.get(pageConfig.getName());
+ if(request.isUserInRole("admin")||
+ (request.isUserInRole("monitor") &&(pageName.equals("Information")
+ ||pageName.equals("Java System Info")
+ ||pageName.equals("Thread Pools")
+ ||pageName.equals("Monitoring")))){
String icon = pageConfig.getIcon();
if (icon == null || icon.trim().length() == 0) {
icon = "/images/ico_doc_16x16.gif";
@@ -158,6 +166,7 @@
</table>
</div></td></tr>
<%
+ }
}
}
%>
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml Tue Sep 22 09:34:34 2009
@@ -269,12 +269,40 @@
</web-resource-collection>
<auth-constraint>
<role-name>admin</role-name>
+ <role-name>monitor</role-name>
</auth-constraint>
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>console monitor</web-resource-name>
+ <url-pattern>/portal</url-pattern>
+ <url-pattern>/portal/Welcome</url-pattern>
+ <url-pattern>/portal/Welcome/*</url-pattern>
+ <url-pattern>/portal/Server/Information</url-pattern>
+ <url-pattern>/portal/Server/Information/*</url-pattern>
+ <url-pattern>/portal/Server/Java System Info</url-pattern>
+ <url-pattern>/portal/Server/Java System Info/*</url-pattern>
+ <url-pattern>/portal/Server/Thread Pools</url-pattern>
+ <url-pattern>/portal/Server/Thread Pools/*</url-pattern>
+ <url-pattern>/portal/Server/Monitoring</url-pattern>
+ <url-pattern>/portal/Server/Monitoring/*</url-pattern>
+ <url-pattern>/forwards/*</url-pattern>
+ <url-pattern>/dwr/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>monitor</role-name>
+ <role-name>admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
<security-constraint>
<web-resource-collection>
<web-resource-name>console</web-resource-name>
@@ -295,7 +323,6 @@
<role-name>admin</role-name>
</auth-constraint>
</security-constraint>
-
<login-config>
<auth-method>FORM</auth-method>
<realm-name>geronimo-admin</realm-name>
@@ -308,6 +335,10 @@
<security-role>
<role-name>admin</role-name>
</security-role>
+
+ <security-role>
+ <role-name>monitor</role-name>
+ </security-role>
</web-app>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Tue Sep 22 09:34:34 2009
@@ -233,6 +233,9 @@
<role role-name="admin">
<principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
</role>
+ <role role-name="monitor">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor" />
+ </role>
</role-mappings>
</security>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml Tue Sep 22 09:34:34 2009
@@ -47,5 +47,19 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
+
+ <security-realm-name>geronimo-admin</security-realm-name>
+
+ <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
+ <role-mappings>
+ <role role-name="admin">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
+ </role>
+ <role role-name="monitor">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor" />
+ </role>
+ </role-mappings>
+ </security>
+
</web-app>
Propchange: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml Tue Sep 22 09:34:34 2009
@@ -47,5 +47,17 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
+ <security-realm-name>geronimo-admin</security-realm-name>
+
+ <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
+ <role-mappings>
+ <role role-name="admin">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
+ </role>
+ <role role-name="monitor">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor" />
+ </role>
+ </role-mappings>
+ </security>
</web-app>
Propchange: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java Tue Sep 22 09:34:34 2009
@@ -16,6 +16,9 @@
*/
package org.apache.geronimo.monitoring.console;
+import java.net.InetAddress;
+import java.sql.Connection;
+import java.sql.Statement;
import java.io.IOException;
import java.text.Format;
import java.text.SimpleDateFormat;
@@ -37,9 +40,11 @@
import javax.naming.Context;
import javax.naming.InitialContext;
+import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.crypto.EncryptionManager;
import org.apache.geronimo.monitoring.MasterRemoteControlRemote;
import org.apache.geronimo.monitoring.console.data.Node;
+import org.apache.geronimo.system.jmx.RealMBeanServerReference;
public class MRCConnector {
@@ -94,6 +99,12 @@
} else {
try {
+ InetAddress host = InetAddress.getLocalHost();//maybe throw a UnknownHostException
+ if (ip.equals("localhost") || ip.equals(host.getHostAddress())
+ || ip.equals(host.getHostName())
+ ||ip.equals("127.0.0.1")) {
+ mbServerConn = ((RealMBeanServerReference)PortletManager.getKernel().getGBean("MBeanServerReference")).getMBeanServer();
+ } else {
JMXServiceURL serviceURL = new JMXServiceURL(
"service:jmx:rmi:///jndi/rmi://" + ip + ":" + port
+ "/JMXConnector");
@@ -105,6 +116,7 @@
connector = JMXConnectorFactory.connect(
serviceURL, env);
mbServerConn = connector.getMBeanServerConnection();
+ }
// retrieve the mbean name to the agent-car-jmx plugin
if(PATH == null) {
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp Tue Sep 22 09:34:34 2009
@@ -72,8 +72,9 @@
<td class="${backgroundClass}" width="20%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=graph.getNode().getName()%>" /></portlet:actionURL>"><%=graph.getNode().getName()%></a></td>
<td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
<td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=graph.getIdString()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
-<%}
+<%} }
else
{
%>
@@ -81,14 +82,20 @@
<td class="${backgroundClass}" width="20%" align="center"><%=graph.getNode().getName()%></td>
<td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
<td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="15%" align="center"><img
border=0 src="/monitoring/images/edit-b.png" alt="edit"><fmt:message key="monitor.common.edit"/></td>
<%
}
}%>
</tr>
+ <%}
+%>
</table>
+ <%if(request.isUserInRole("admin")){ %>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Graph"><fmt:message key="monitor.graph.addGraph"/></a></div>
+<%}
+%>
</td>
<td> </td>
Propchange: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringGraphs.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp Tue Sep 22 09:34:34 2009
@@ -65,15 +65,19 @@
<td class="${backgroundClass}" width="30%" align="center"><%="" + view.getGraphs().size()%></td>
<%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>--%>
<%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>--%>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="40%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
+ <%} %>
</tr>
<%
}
// rs.close();
%>
</table>
+<% if (request.isUserInRole("admin")) {%>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Create View"><fmt:message key="monitor.view.create"/></a></div>
<b><fmt:message key="monitor.common.server"/>:</b>
+<% }%>
<table width="100%" class="TableLine" summary="Monitoring - Servers">
<tr>
<th scope="col" class="DarkBackground" width="30%"><fmt:message key="monitor.common.name"/></th>
@@ -147,56 +151,63 @@
if (collecting == 0) { // not collecting statistics
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red">(<fmt:message key="monitor.server.stopped"/>)</font></td>
-<%
+<%if (request.isUserInRole("admin")) {
if(node.isEnabled()) { // enable the links
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></a></td>
-<%
+<%
} else { // do not provide links
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></td>
-<%
+<%
}
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
-<%
+<% } //end admin
+
}
else if (collecting == -1) { // not collecting statistics
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red"><fmt:message key="monitor.server.stopping"/></font></td>
- <%
+ <%if (request.isUserInRole("admin")) {
if(node.isEnabled()) { // enable the links
+
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></td>
- <%
+ <%
} else { // do not provide links
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></td>
- <%
+ <%
}
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
<%
+ }//end admin
}
else { // collecting statistics
if (node.isEnabled())
{
%>
<td class="${backgroundClass}" width="15%" align="center"><%=snapshotDuration/1000/60+" min. "%>(<fmt:message key="monitor.server.run"/>)</td>
+ <% if (request.isUserInRole("admin")) {%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></a></td>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
-<%
+<% }//end admin
}
else
{
%>
<td class="${backgroundClass}" width="15%" align="center"><fmt:message key="monitor.server.stopped"/></td>
+ <% if (request.isUserInRole("admin")) {%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></td>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
- <%
+ <% }
}
}
+if (request.isUserInRole("admin")) {
if(node.isEnabled()) { // enabled server
+
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable"><fmt:message key="monitor.server.disable"/></a></td>
<%
@@ -205,12 +216,15 @@
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable"><fmt:message key="monitor.server.enable"/></a></td>
<%
}
+}//end admin
%>
</tr>
<%}
%>
</table>
+<%if (request.isUserInRole("admin")) {%>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Server"><fmt:message key="monitor.server.addServer"/></a></div>
+<% } %>
<b><fmt:message key="monitor.common.graph"/>:</b>
<table width="100%" class="TableLine" summary="Monitoring - Graphs">
<tr>
@@ -245,8 +259,9 @@
<td class="${backgroundClass}" width="20%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=graph.getNode().getName()%>" /></portlet:actionURL>"><%=graph.getNode().getName()%></a></td>
<td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
<td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=graph.getIdString()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
-<%}
+<%} }
else
{
%>
@@ -254,11 +269,14 @@
<td class="${backgroundClass}" width="20%" align="center"><%=graph.getNode().getName()%></td>
<td class="${backgroundClass}" width="15%" align="center"><%=graph.getTimeFrame()%></td>
<td class="${backgroundClass}" width="20%" align="center"><%=graph.getDataName1()%><%if (graph.getOperation() != null && !graph.getOperation().equals("null")){%><%=graph.getOperation()%><%}%><%if (graph.getDataName2() != null && !graph.getDataName2().equals("null")){%><%=graph.getDataName2()%><%}%></td>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="15%" align="center"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></td>
- <%
+ <% } %><%
}%>
</tr>
<%}
%>
</table>
+<% if (request.isUserInRole("admin")) {%>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Graph"><fmt:message key="monitor.graph.addGraph"/></a></div>
+<%}%>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringPage.jsp Tue Sep 22 09:34:34 2009
@@ -124,6 +124,7 @@
</table>
<br>
<br>
+ <%if(request.isUserInRole("admin")){ %>
<table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
<tr>
<td class="DarkBackground" align="left" nowrap>
@@ -142,6 +143,7 @@
</td>
</tr>
</table>
+ <%} %>
</td>
</tr>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringServers.jsp Tue Sep 22 09:34:34 2009
@@ -106,68 +106,82 @@
<td class="${backgroundClass}" width="15%" align="center"><font color="red">(<fmt:message key="monitor.server.stopped"/>)</font></td>
<%
if(node.isEnabled()) { // enable the links
+ if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="startThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="snapshotDuration" value="<%=java.lang.Long.toString(snapshotDuration)%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></a></td>
-<%
+<% }//end admin
} else { // do not provide links
+ if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></td>
-<%
+<% }//end admin
}
+if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
-<%
+<%}//end admin
}
else if (collecting == -1) { // not collecting statistics
%>
<td class="${backgroundClass}" width="15%" align="center"><font color="red"><fmt:message key="monitor.server.stopping"/></font></td>
<%
if(node.isEnabled()) { // enable the links
+ if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></td>
- <%
+ <% }//end admin
} else { // do not provide links
+ if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/max-b.png" alt="Enable Query"><fmt:message key="monitor.server.enableQuery"/></td>
- <%
+ <% }//end admin
}
+ if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
- <%
+ <%}//end admin
}
else { // collecting statistics
if (node.isEnabled())
{
%>
<td class="${backgroundClass}" width="15%" align="center"><%=snapshotDuration/1000/60+" min. (running)"%></td>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="stopThread" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.disableQuery"/></a></td>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
-<%
+<%}//end admin
+
}
else
{
%>
<td class="${backgroundClass}" width="15%" align="center"><fmt:message key="monitor.server.stopped"/></td>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="10%" align="center"><img border=0 src="/monitoring/images/close-b.png" alt="Disable Query"><fmt:message key="monitor.server.enableQuery"/></td>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
- <%
+ <% }//end admin
}
}
if(node.isEnabled()) { // enabled server
+ if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="disableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/close-b.png" alt="Disable"><fmt:message key="monitor.server.disable"/></a></td>
-<%
+<%}//end admin
} else { // disabled server
+ if(request.isUserInRole("admin")){
%>
<td class="${backgroundClass}" width="10%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServer" /><portlet:param name="server_id" value="<%=node.getName()%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Enable"><fmt:message key="monitor.server.enable"/></a></td>
-<%
+<%}//end admin
}
%>
</tr>
<%}
%>
</table>
+<%if(request.isUserInRole("admin")){ %>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddServer" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Add Server"><fmt:message key="monitor.server.addServer"/></a></div>
+<%}
+%>
</td>
<td> </td>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp Tue Sep 22 09:34:34 2009
@@ -194,8 +194,11 @@
{
String dataName = itt.next().toString();
%>
+ <%if(request.isUserInRole("admin")){ %>
<tr><td><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddGraph" /><portlet:param name="server_id" value="<%=node.getName()%>" /><portlet:param name="mbean" value="<%=trackedBeansMap.get(prettyBean)%>" /><portlet:param name="dataname" value="<%=dataName%>" /></portlet:actionURL>"><%=dataName%></a></td><td><%=beanStats.get(dataName) %></td></tr>
- <%
+ <% }else{ %>
+ <tr><td><a><%=dataName%></a></td><td><%=beanStats.get(dataName) %></td></tr>
+ <%}//end request.isUserInRole
}
} else {
%>
@@ -254,6 +257,7 @@
</table>
<br>
<br>
+ <%if(request.isUserInRole("admin")){ %>
<table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
<tr>
<td class="DarkBackground" align="left" nowrap>
@@ -419,6 +423,7 @@
}
%>
</table>
+ <% } //end admin%>
</td>
</tr>
</table>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp Tue Sep 22 09:34:34 2009
@@ -58,14 +58,19 @@
<td class="${backgroundClass}" width="10%" align="center"><%=view.getGraphs().size()%></td>
<%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>--%>
<%--<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>--%>
+ <%if(request.isUserInRole("admin")){ %>
<td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=view.getIdString()%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png" alt="Edit"><fmt:message key="monitor.common.edit"/></a></td>
+<%} %>
</tr>
<%
}
// rs.close();
%>
</table>
+<%if(request.isUserInRole("admin")){ %>
<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png" alt="Create View"><fmt:message key="monitor.view.create"/></a></div>
+<%}
+%>
</td>
<td> </td>
Propchange: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml?rev=817572&r1=817571&r2=817572&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml Tue Sep 22 09:34:34 2009
@@ -73,5 +73,11 @@
<persistence-context-ref-name>jpa/monitoring</persistence-context-ref-name>
<persistence-unit-name>jpa/monitoring</persistence-unit-name>
</persistence-context-ref>
+ <security-role>
+ <role-name>admin</role-name>
+ </security-role>
+ <security-role>
+ <role-name>monitor</role-name>
+ </security-role>
</web-app>