manveen 02/03/23 20:13:24
Modified: webapps/admin/WEB-INF struts-config.xml
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
DeleteLoggerAction.java LoggerForm.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
EditRealmAction.java JDBCRealmForm.java
JNDIRealmForm.java MemoryRealmForm.java
UserDatabaseRealmForm.java
webapps/admin/host host.jsp
webapps/admin/logger logger.jsp
webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
memoryRealm.jsp userDatabaseRealm.jsp
webapps/admin/service service.jsp
Removed: webapps/admin context.jsp
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextAction.java SetUpContextAction.java
Log:
- Enabled delete contexts from host page.
- Fix for delete Logger.
- Implemented add realms.
Revision Changes Path
1.40 +11 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- struts-config.xml 23 Mar 2002 22:18:12 -0000 1.39
+++ struts-config.xml 24 Mar 2002 04:13:23 -0000 1.40
@@ -132,10 +132,6 @@
<forward name="Connector"
path="/connector.jsp"
redirect="false"/>
-
- <forward name="Context"
- path="/context.jsp"
- redirect="false"/>
<forward name="Save Successful"
path="/saved.jsp"
@@ -179,6 +175,16 @@
path="/logger/loggers.jsp"
redirect="false"/>
+ <!-- ============ Context Module ============== -->
+
+ <forward name="Context"
+ path="/context/context.jsp"
+ redirect="false"/>
+
+ <forward name="Contexts"
+ path="/context/contexts.jsp"
+ redirect="false"/>
+
<!-- ============ Realm Module ============== -->
<forward name="JDBCRealm"
@@ -207,7 +213,7 @@
path="/context/context.jsp"
redirect="false"/>
- <forward name="Hosts"
+ <forward name="Contexts"
path="/context/contexts.jsp"
redirect="false"/>
1.4 +5 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java
Index: DeleteLoggerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeleteLoggerAction.java 22 Mar 2002 21:45:07 -0000 1.3
+++ DeleteLoggerAction.java 24 Mar 2002 04:13:23 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java,v
1.3 2002/03/22 21:45:07 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/03/22 21:45:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.java,v
1.4 2002/03/24 04:13:23 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/24 04:13:23 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* The <code>Action</code> that sets up <em>Delete Loggers</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/03/22 21:45:07 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/24 04:13:23 $
*/
public class DeleteLoggerAction extends Action {
@@ -214,7 +214,7 @@
StringBuffer sb = new StringBuffer(MBeanType);
ObjectName poname = new ObjectName(parent);
String type = poname.getKeyProperty("type");
- if ("Context".equalsIgnoreCase(type)) { // container is context
+ if ("Context".equalsIgnoreCase(type)) { // container is context
sb.append(",path=");
sb.append(poname.getKeyProperty("path"));
sb.append(",host=");
1.4 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java
Index: LoggerForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoggerForm.java 21 Mar 2002 17:11:28 -0000 1.3
+++ LoggerForm.java 24 Mar 2002 04:13:23 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java,v
1.3 2002/03/21 17:11:28 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/03/21 17:11:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.java,v
1.4 2002/03/24 04:13:23 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/24 04:13:23 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Form bean for the logger page.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/03/21 17:11:28 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/24 04:13:23 $
*/
public final class LoggerForm extends ActionForm {
@@ -143,7 +143,7 @@
// ------------------------------------------------------------- Properties
- /**
+ /**
* Return the administrative action represented by this form.
*/
public String getAdminAction() {
@@ -399,7 +399,7 @@
}
- /**
+ /**
* Return the loggerTypeVals.
*/
public List getLoggerTypeVals() {
1.2 +5 -11
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EditRealmAction.java 21 Mar 2002 19:03:06 -0000 1.1
+++ EditRealmAction.java 24 Mar 2002 04:13:24 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.1 2002/03/21 19:03:06 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/21 19:03:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.2 2002/03/24 04:13:24 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/24 04:13:24 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* Realm </em> transactions, based on the type of Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/21 19:03:06 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/24 04:13:24 $
*/
public class EditRealmAction extends Action {
@@ -199,13 +199,7 @@
}
return (mapping.findForward(realmType));
-
- /*
- */
-
- // Forward to the realm display page
- // return (mapping.findForward("Realm"));
-
+
}
private void setUpUserDatabaseRealm(ObjectName rname,
1.3 +52 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
Index: JDBCRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCRealmForm.java 21 Mar 2002 19:03:06 -0000 1.2
+++ JDBCRealmForm.java 24 Mar 2002 04:13:24 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
1.2 2002/03/21 19:03:06 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/21 19:03:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
1.3 2002/03/24 04:13:24 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/24 04:13:24 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Form bean for the jdbc realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/03/21 19:03:06 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/24 04:13:24 $
*/
public final class JDBCRealmForm extends ActionForm {
@@ -165,6 +165,16 @@
*/
private String connectionURL = null;
+ /**
+ * The object name of the parent of this Realm.
+ */
+ private String parentObjectName = null;
+
+ /**
+ * Set of valid values for realms.
+ */
+ private List realmTypeVals = null;
+
// ------------------------------------------------------------- Properties
/**
@@ -436,6 +446,44 @@
public void setConnectionURL(String connectionURL) {
this.connectionURL = connectionURL;
+
+ }
+
+ /**
+ * Return the parent object name of the Realm this bean refers to.
+ */
+ public String getParentObjectName() {
+
+ return this.parentObjectName;
+
+ }
+
+
+ /**
+ * Set the parent object name of the Realm this bean refers to.
+ */
+ public void setParentObjectName(String parentObjectName) {
+
+ this.parentObjectName = parentObjectName;
+
+ }
+
+
+ /**
+ * Return the realmTypeVals.
+ */
+ public List getRealmTypeVals() {
+
+ return this.realmTypeVals;
+
+ }
+
+ /**
+ * Set the realmTypeVals.
+ */
+ public void setRealmTypeVals(List realmTypeVals) {
+
+ this.realmTypeVals = realmTypeVals;
}
1.3 +52 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java
Index: JNDIRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JNDIRealmForm.java 21 Mar 2002 19:03:06 -0000 1.2
+++ JNDIRealmForm.java 24 Mar 2002 04:13:24 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java,v
1.2 2002/03/21 19:03:06 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/21 19:03:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java,v
1.3 2002/03/24 04:13:24 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/24 04:13:24 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Form bean for the JNDI realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/03/21 19:03:06 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/24 04:13:24 $
*/
public final class JNDIRealmForm extends ActionForm {
@@ -174,6 +174,16 @@
*/
private List searchVals = null;
+ /**
+ * The object name of the parent of this Realm.
+ */
+ private String parentObjectName = null;
+
+ /**
+ * Set of valid values for realms.
+ */
+ private List realmTypeVals = null;
+
// ------------------------------------------------------------- Properties
/**
@@ -500,6 +510,44 @@
public void setContextFactory(String contextFactory ) {
this.contextFactory = contextFactory ;
+
+ }
+
+ /**
+ * Return the parent object name of the Realm this bean refers to.
+ */
+ public String getParentObjectName() {
+
+ return this.parentObjectName;
+
+ }
+
+
+ /**
+ * Set the parent object name of the Realm this bean refers to.
+ */
+ public void setParentObjectName(String parentObjectName) {
+
+ this.parentObjectName = parentObjectName;
+
+ }
+
+
+ /**
+ * Return the realmTypeVals.
+ */
+ public List getRealmTypeVals() {
+
+ return this.realmTypeVals;
+
+ }
+
+ /**
+ * Set the realmTypeVals.
+ */
+ public void setRealmTypeVals(List realmTypeVals) {
+
+ this.realmTypeVals = realmTypeVals;
}
1.3 +52 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java
Index: MemoryRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryRealmForm.java 21 Mar 2002 19:03:06 -0000 1.2
+++ MemoryRealmForm.java 24 Mar 2002 04:13:24 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java,v
1.2 2002/03/21 19:03:06 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/21 19:03:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java,v
1.3 2002/03/24 04:13:24 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/24 04:13:24 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Form bean for the memory realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/03/21 19:03:06 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/24 04:13:24 $
*/
public final class MemoryRealmForm extends ActionForm {
@@ -119,6 +119,16 @@
*/
private String nodeLabel = null;
+ /**
+ * The object name of the parent of this Realm.
+ */
+ private String parentObjectName = null;
+
+ /**
+ * Set of valid values for realms.
+ */
+ private List realmTypeVals = null;
+
// ------------------------------------------------------------- Properties
/**
@@ -157,6 +167,44 @@
}
+ /**
+ * Return the parent object name of the Realm this bean refers to.
+ */
+ public String getParentObjectName() {
+
+ return this.parentObjectName;
+
+ }
+
+
+ /**
+ * Set the parent object name of the Realm this bean refers to.
+ */
+ public void setParentObjectName(String parentObjectName) {
+
+ this.parentObjectName = parentObjectName;
+
+ }
+
+
+ /**
+ * Return the realmTypeVals.
+ */
+ public List getRealmTypeVals() {
+
+ return this.realmTypeVals;
+
+ }
+
+ /**
+ * Set the realmTypeVals.
+ */
+ public void setRealmTypeVals(List realmTypeVals) {
+
+ this.realmTypeVals = realmTypeVals;
+
+ }
+
/**
* Return the Realm type.
*/
1.3 +29 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java
Index: UserDatabaseRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserDatabaseRealmForm.java 22 Mar 2002 21:45:07 -0000 1.2
+++ UserDatabaseRealmForm.java 24 Mar 2002 04:13:24 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v
1.2 2002/03/22 21:45:07 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/22 21:45:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v
1.3 2002/03/24 04:13:24 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/24 04:13:24 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Form bean for the User Database realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/03/22 21:45:07 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/24 04:13:24 $
*/
public final class UserDatabaseRealmForm extends ActionForm {
@@ -94,7 +94,7 @@
private String objectName = null;
/**
- * The object name of the parent of this Logger.
+ * The object name of the parent of this Realm.
*/
private String parentObjectName = null;
@@ -124,6 +124,12 @@
*/
private String nodeLabel = null;
+ /**
+ * Set of valid values for realms.
+ */
+ private List realmTypeVals = null;
+
+
// ------------------------------------------------------------- Properties
/**
@@ -268,6 +274,24 @@
public void setNodeLabel(String nodeLabel) {
this.nodeLabel = nodeLabel;
+
+ }
+
+ /**
+ * Return the realmTypeVals.
+ */
+ public List getRealmTypeVals() {
+
+ return this.realmTypeVals;
+
+ }
+
+ /**
+ * Set the realmTypeVals.
+ */
+ public void setRealmTypeVals(List realmTypeVals) {
+
+ this.realmTypeVals = realmTypeVals;
}
1.9 +15 -6 jakarta-tomcat-4.0/webapps/admin/host/host.jsp
Index: host.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/host/host.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- host.jsp 22 Mar 2002 01:31:25 -0000 1.8
+++ host.jsp 24 Mar 2002 04:13:24 -0000 1.9
@@ -1,5 +1,4 @@
<!-- Standard Struts Entries -->
-
<%@ page language="java" import="java.net.URLEncoder" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
@@ -64,16 +63,26 @@
<%--
<controls:action url=""> <bean:message
key="actions.requestfilter.create"/> </controls:action>
<controls:action url=""> <bean:message
key="actions.requestfilter.delete"/> </controls:action>
- <controls:action> -------------------------------------
</controls:action>
- <controls:action url=""> <bean:message key="actions.realms.create"/>
</controls:action>
- <controls:action url=""> <bean:message key="actions.realms.deletes"/>
</controls:action>
- <controls:action> -------------------------------------
</controls:action>
+ <controls:action disabled="true"> -------------------------------------
</controls:action>
<controls:action url=""> <bean:message key="actions.valves.create"/>
</controls:action>
+ <controls:action url=""> <bean:message key="actions.valves.deletes"/>
</controls:action>
+ <controls:action disabled="true"> -------------------------------------
</controls:action>
+ <controls:action url='<%= "/AddContext.do?parent=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.contexts.create"/>
+ </controls:action>
+ --%>
+ <controls:action url='<%= "/DeleteContext.do?parent=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.contexts.deletes"/>
+ </controls:action>
+ <controls:action disabled="true">
+ -------------------------------------
+ </controls:action>
<controls:action url='<%= "/AddRealm.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.create"/>
</controls:action>
- --%>
<controls:action url='<%= "/DeleteRealm.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.deletes"/>
1.3 +3 -1 jakarta-tomcat-4.0/webapps/admin/logger/logger.jsp
Index: logger.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/logger/logger.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logger.jsp 21 Mar 2002 19:03:06 -0000 1.2
+++ logger.jsp 24 Mar 2002 04:13:24 -0000 1.3
@@ -43,10 +43,12 @@
<controls:actions>
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action disabled="true"> ---------------------------------
</controls:action>
+ <logic:notEqual name="loggerForm" property="adminAction"
value="Create">
<controls:action url='<%= "/DeleteLogger.do?select=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.loggers.delete"/>
- </controls:action>
+ </controls:action>
+ </logic:notEqual>
</controls:actions>
</div>
</td>
1.3 +25 -5 jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp
Index: jdbcRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jdbcRealm.jsp 21 Mar 2002 19:03:06 -0000 1.2
+++ jdbcRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3
@@ -1,8 +1,9 @@
<!-- Standard Struts Entries -->
-<%@ page language="java" %>
+<%@ page language="java" import="java.net.URLEncoder" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<html:html locale="true">
@@ -18,15 +19,21 @@
<html:form method="POST" action="/SaveJDBCRealm">
<bean:define id="thisObjectName" type="java.lang.String"
- name="userDatabaseRealmForm" property="objectName"/>
+ name="jdbcRealmForm" property="objectName"/>
<html:hidden property="adminAction"/>
+ <html:hidden property="parentObjectName"/>
<html:hidden property="objectName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
<td width="81%">
<div class="page-title-text" align="left">
- <bean:write name="jdbcRealmForm" property="nodeLabel" scope="session"/>
+ <logic:equal name="jdbcRealmForm" property="adminAction" value="Create">
+ <bean:message key="actions.realms.create"/>
+ </logic:equal>
+ <logic:equal name="jdbcRealmForm" property="adminAction" value="Edit">
+ <bean:message key="actions.realms.edit"/>
+ </logic:equal>
</div>
</td>
<td width="19%">
@@ -34,7 +41,12 @@
<controls:actions>
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
- <controls:action url=""> <bean:message
key="actions.thisrealm.delete"/> </controls:action>
+ <logic:notEqual name="jdbcRealmForm" property="adminAction"
value="Create">
+ <controls:action url='<%= "/DeleteRealm.do?select=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.realms.delete"/>
+ </controls:action>
+ </logic:notEqual>
</controls:actions>
</div>
</td>
@@ -56,7 +68,15 @@
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
- <bean:write name="jdbcRealmForm" property="realmType"
scope="session"/>
+ <logic:equal name="jdbcRealmForm" property="adminAction"
value="Create">
+ <html:select property="realmType"
onchange="IA_jumpMenu('self',this)">
+ <bean:define id="realmTypeVals" name="jdbcRealmForm"
property="realmTypeVals"/>
+ <html:options collection="realmTypeVals" property="value"
labelProperty="label"/>
+ </html:select>
+ </logic:equal>
+ <logic:equal name="jdbcRealmForm" property="adminAction"
value="Edit">
+ <bean:write name="jdbcRealmForm" property="realmType"
scope="session"/>
+ </logic:equal>
</controls:data>
</controls:row>
1.3 +25 -7 jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp
Index: jndiRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jndiRealm.jsp 21 Mar 2002 19:03:06 -0000 1.2
+++ jndiRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3
@@ -1,8 +1,9 @@
<!-- Standard Struts Entries -->
-<%@ page language="java" %>
+<%@ page language="java" import="java.net.URLEncoder" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<html:html locale="true">
@@ -17,15 +18,21 @@
<html:form method="POST" action="/SaveJNDIRealm">
<bean:define id="thisObjectName" type="java.lang.String"
- name="userDatabaseRealmForm" property="objectName"/>
+ name="jndiRealmForm" property="objectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
+ <html:hidden property="parentObjectName"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
<td width="81%">
<div class="page-title-text" align="left">
- <bean:write name="jndiRealmForm" property="nodeLabel" scope="session"/>
+ <logic:equal name="jndiRealmForm" property="adminAction" value="Create">
+ <bean:message key="actions.realms.create"/>
+ </logic:equal>
+ <logic:equal name="jndiRealmForm" property="adminAction" value="Edit">
+ <bean:message key="actions.realms.edit"/>
+ </logic:equal>
</div>
</td>
<td width="19%">
@@ -33,9 +40,12 @@
<controls:actions>
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
- <%--
- <controls:action url=""> <bean:message
key="actions.thisrealm.delete"/> </controls:action>
- --%>
+ <logic:notEqual name="jndiRealmForm" property="adminAction"
value="Create">
+ <controls:action url='<%= "/DeleteRealm.do?select=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.realms.delete"/>
+ </controls:action>
+ </logic:notEqual>
</controls:actions>
</div>
</td>
@@ -57,7 +67,15 @@
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
<controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
- <bean:write name="jndiRealmForm" property="realmType"
scope="session"/>
+ <logic:equal name="jndiRealmForm" property="adminAction"
value="Create">
+ <html:select property="realmType"
onchange="IA_jumpMenu('self',this)">
+ <bean:define id="realmTypeVals" name="jndiRealmForm"
property="realmTypeVals"/>
+ <html:options collection="realmTypeVals" property="value"
labelProperty="label"/>
+ </html:select>
+ </logic:equal>
+ <logic:equal name="jndiRealmForm" property="adminAction"
value="Edit">
+ <bean:write name="jndiRealmForm" property="realmType"
scope="session"/>
+ </logic:equal>
</controls:data>
</controls:row>
1.3 +26 -9 jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp
Index: memoryRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- memoryRealm.jsp 21 Mar 2002 19:03:06 -0000 1.2
+++ memoryRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Standard Struts Entries -->
-<%@ page language="java" %>
+<%@ page language="java" import="java.net.URLEncoder" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
@@ -19,7 +19,8 @@
<html:form method="GET" action="/SaveMemoryRealm">
<bean:define id="thisObjectName" type="java.lang.String"
- name="userDatabaseRealmForm" property="objectName"/>
+ name="memoryRealmForm" property="objectName"/>
+ <html:hidden property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
@@ -27,7 +28,12 @@
<tr bgcolor="7171A5">
<td width="81%">
<div class="page-title-text" align="left">
- <bean:write name="memoryRealmForm" property="nodeLabel" scope="session"/>
+ <logic:equal name="memoryRealmForm" property="adminAction" value="Create">
+ <bean:message key="actions.realms.create"/>
+ </logic:equal>
+ <logic:equal name="memoryRealmForm" property="adminAction" value="Edit">
+ <bean:message key="actions.realms.edit"/>
+ </logic:equal>
</div>
</td>
<td width="19%">
@@ -35,9 +41,12 @@
<controls:actions>
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
- <%--
- <controls:action url=""> <bean:message
key="actions.thisrealm.delete"/> </controls:action>
- --%>
+ <logic:notEqual name="memoryRealmForm" property="adminAction"
value="Create">
+ <controls:action url='<%= "/DeleteRealm.do?select=" +
+ URLEncoder.encode(thisObjectName) %>'>
+ <bean:message key="actions.realms.delete"/>
+ </controls:action>
+ </logic:notEqual>
</controls:actions>
</div>
</td>
@@ -50,16 +59,24 @@
<tr>
<td>
<controls:table tableStyle="front-table" lineStyle="line-row">
- <controls:row header="true"
+ <controls:row header="true"
labelStyle="table-header-text" dataStyle="table-header-text">
<controls:label><bean:message key="service.property"/></controls:label>
<controls:data><bean:message key="service.value"/></controls:data>
</controls:row>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
- <controls:label><bean:message key="connector.type"/>:</controls:label>
+ <controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
- <bean:write name="memoryRealmForm" property="realmType"
scope="session"/>
+ <logic:equal name="memoryRealmForm" property="adminAction"
value="Create">
+ <html:select property="realmType"
onchange="IA_jumpMenu('self',this)">
+ <bean:define id="realmTypeVals" name="memoryRealmForm"
property="realmTypeVals"/>
+ <html:options collection="realmTypeVals" property="value"
labelProperty="label"/>
+ </html:select>
+ </logic:equal>
+ <logic:equal name="memoryRealmForm" property="adminAction"
value="Edit">
+ <bean:write name="memoryRealmForm" property="realmType"
scope="session"/>
+ </logic:equal>
</controls:data>
</controls:row>
1.3 +17 -5 jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp
Index: userDatabaseRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- userDatabaseRealm.jsp 22 Mar 2002 01:31:25 -0000 1.2
+++ userDatabaseRealm.jsp 24 Mar 2002 04:13:24 -0000 1.3
@@ -20,6 +20,7 @@
<bean:define id="thisObjectName" type="java.lang.String"
name="userDatabaseRealmForm" property="objectName"/>
+ <html:hidden property="parentObjectName"/>
<html:hidden property="adminAction"/>
<html:hidden property="objectName"/>
@@ -27,8 +28,12 @@
<tr bgcolor="7171A5">
<td width="81%">
<div class="page-title-text" align="left">
- <bean:write name="userDatabaseRealmForm" property="nodeLabel"
- scope="session"/>
+ <logic:equal name="userDatabaseRealmForm" property="adminAction"
value="Create">
+ <bean:message key="actions.realms.create"/>
+ </logic:equal>
+ <logic:equal name="userDatabaseRealmForm" property="adminAction"
value="Edit">
+ <bean:message key="actions.realms.edit"/>
+ </logic:equal>
</div>
</td>
<td width="19%">
@@ -61,10 +66,17 @@
</controls:row>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
- <controls:label><bean:message key="connector.type"/>:</controls:label>
+ <controls:label><bean:message key="connector.type"/>:</controls:label>
<controls:data>
- <bean:write name="userDatabaseRealmForm"
- property="realmType" scope="session"/>
+ <logic:equal name="userDatabaseRealmForm" property="adminAction"
value="Create">
+ <html:select property="realmType"
onchange="IA_jumpMenu('self',this)">
+ <bean:define id="realmTypeVals" name="userDatabaseRealmForm"
property="realmTypeVals"/>
+ <html:options collection="realmTypeVals" property="value"
labelProperty="label"/>
+ </html:select>
+ </logic:equal>
+ <logic:equal name="userDatabaseRealmForm" property="adminAction"
value="Edit">
+ <bean:write name="userDatabaseRealmForm" property="realmType"
scope="session"/>
+ </logic:equal>
</controls:data>
</controls:row>
1.10 +3 -4 jakarta-tomcat-4.0/webapps/admin/service/service.jsp
Index: service.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service/service.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- service.jsp 22 Mar 2002 01:31:25 -0000 1.9
+++ service.jsp 24 Mar 2002 04:13:24 -0000 1.10
@@ -100,12 +100,12 @@
<controls:action>
-------------------------------------
</controls:action>
+ --%>
<controls:action url='<%= "/AddRealm.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.create"/>
- </controls:action>
- --%>
- <controls:action url='<%= "/DeleteRealm.do?parent=" +
+ </controls:action>
+ <controls:action url='<%= "/DeleteRealm.do?parent=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.deletes"/>
</controls:action>
@@ -210,7 +210,6 @@
</controls:label>
<controls:data>
<logic:equal name="serviceForm" property="adminAction" value="Create">
-
<html:text property="engineName" size="24" maxlength="24"/>
</logic:equal>
<logic:equal name="serviceForm" property="adminAction" value="Edit">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
