You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/05/12 22:21:39 UTC
cvs commit: jakarta-tomcat-catalina/webapps/admin/service service.jsp
amyroh 2003/05/12 13:21:39
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
SaveServiceAction.java
webapps/admin/service service.jsp
Log:
Disable realm operations for engine until jaas realm is supported in admin.
Setting userdatabase in admin by default fails when a user deletes the realm since it falls back to using jaas realm which is not supported.
Revision Changes Path
1.12 +26 -26 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java
Index: SaveServiceAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SaveServiceAction.java 24 Apr 2003 07:56:34 -0000 1.11
+++ SaveServiceAction.java 12 May 2003 20:21:38 -0000 1.12
@@ -274,9 +274,9 @@
values[0] = eObjectName;
values[1] = "UserDatabase";
operation = "createUserDatabaseRealm";
- realmOName = (String)
- mBServer.invoke(fname, operation,
- values, createUserDatabaseRealmTypes);
+ //realmOName = (String)
+ // mBServer.invoke(fname, operation,
+ // values, createUserDatabaseRealmTypes);
//Enumeration enum = onames.elements();
//while (enum.hasMoreElements()) {
@@ -331,25 +331,25 @@
true, engineName);
parentNode.addChild(childNode);
// update tree to display the newly added realm
- Iterator realmNames =
- Lists.getRealms(mBServer, sObjectName).iterator();
- while (realmNames.hasNext()) {
- String realmName = (String) realmNames.next();
- ObjectName objectName = new ObjectName(realmName);
- nodeLabel = "Realm for service (" +
- sform.getServiceName() + ")";
- TreeControlNode realmNode =
- new TreeControlNode(realmName,
- "Realm.gif",
- nodeLabel,
- "EditRealm.do?select=" +
- URLEncoder.encode(realmName) +
- "&nodeLabel=" +
- URLEncoder.encode(nodeLabel),
- "content",
- false, engineName);
- childNode.addChild(realmNode);
- }
+ //Iterator realmNames =
+ // Lists.getRealms(mBServer, sObjectName).iterator();
+ //while (realmNames.hasNext()) {
+ // String realmName = (String) realmNames.next();
+ // ObjectName objectName = new ObjectName(realmName);
+ // nodeLabel = "Realm for service (" +
+ // sform.getServiceName() + ")";
+ // TreeControlNode realmNode =
+ // new TreeControlNode(realmName,
+ // "Realm.gif",
+ // nodeLabel,
+ // "EditRealm.do?select=" +
+ // URLEncoder.encode(realmName) +
+ // "&nodeLabel=" +
+ // URLEncoder.encode(nodeLabel),
+ // "content",
+ // false, engineName);
+ // childNode.addChild(realmNode);
+ //}
// FIXME - force a redisplay
} else {
getServlet().log
1.11 +2 -0 jakarta-tomcat-catalina/webapps/admin/service/service.jsp
Index: service.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- service.jsp 24 Apr 2003 07:56:35 -0000 1.10
+++ service.jsp 12 May 2003 20:21:38 -0000 1.11
@@ -100,6 +100,7 @@
<controls:action disabled="true">
-------------------------------------
</controls:action>
+ <%--
<controls:action url='<%= "/AddRealm.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.create"/>
@@ -108,6 +109,7 @@
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.deletes"/>
</controls:action>
+ --%>
</logic:notEqual>
<controls:action disabled="true">
-------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org