You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2002/04/29 23:47:08 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm SaveJDBCRealmAction.java SaveJNDIRealmAction.java SaveMemoryRealmAction.java SaveUserDatabaseRealmAction.java
manveen 02/04/29 14:47:08
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
SaveJDBCRealmAction.java SaveJNDIRealmAction.java
SaveMemoryRealmAction.java
SaveUserDatabaseRealmAction.java
Log:
Fix for new realm's nodelabel.
Revision Changes Path
1.2 +5 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Index: SaveJDBCRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveJDBCRealmAction.java 24 Mar 2002 04:18:21 -0000 1.1
+++ SaveJDBCRealmAction.java 29 Apr 2002 21:47:08 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v 1.1 2002/03/24 04:18:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/24 04:18:21 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v 1.2 2002/04/29 21:47:08 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/29 21:47:08 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* <em>Edit Realm</em> transactions for JDBC realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/24 04:18:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/29 21:47:08 $
*/
public final class SaveJDBCRealmAction extends Action {
@@ -229,8 +229,7 @@
if (control != null) {
TreeControlNode parentNode = control.findNode(rform.getParentObjectName());
if (parentNode != null) {
- String nodeLabel =
- "Realm (" + rform.getRealmType() + ")";
+ String nodeLabel = rform.getNodeLabel();
String encodedName =
URLEncoder.encode(rObjectName);
TreeControlNode childNode =
1.2 +6 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
Index: SaveJNDIRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveJNDIRealmAction.java 24 Mar 2002 04:18:21 -0000 1.1
+++ SaveJNDIRealmAction.java 29 Apr 2002 21:47:08 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v 1.1 2002/03/24 04:18:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/24 04:18:21 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v 1.2 2002/04/29 21:47:08 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/29 21:47:08 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* <em>Edit Realm</em> transactions for JNDI realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/24 04:18:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/29 21:47:08 $
*/
public final class SaveJNDIRealmAction extends Action {
@@ -228,9 +228,8 @@
session.getAttribute("treeControlTest");
if (control != null) {
TreeControlNode parentNode = control.findNode(rform.getParentObjectName());
- if (parentNode != null) {
- String nodeLabel =
- "Realm (" + rform.getRealmType() + ")";
+ if (parentNode != null) {
+ String nodeLabel = rform.getNodeLabel();
String encodedName =
URLEncoder.encode(rObjectName);
TreeControlNode childNode =
1.2 +5 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
Index: SaveMemoryRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveMemoryRealmAction.java 24 Mar 2002 04:18:21 -0000 1.1
+++ SaveMemoryRealmAction.java 29 Apr 2002 21:47:08 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java,v 1.1 2002/03/24 04:18:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/24 04:18:21 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java,v 1.2 2002/04/29 21:47:08 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/29 21:47:08 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* <em>Edit Realm</em> transactions for Memory realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/24 04:18:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/29 21:47:08 $
*/
public final class SaveMemoryRealmAction extends Action {
@@ -229,9 +229,7 @@
if (control != null) {
TreeControlNode parentNode = control.findNode(rform.getParentObjectName());
if (parentNode != null) {
- String nodeLabel =
- //"Realm (" + rform.getRealmType() + ")";
- "Realm (" + "MemoryRealm" + ")";
+ String nodeLabel = rform.getNodeLabel();
String encodedName =
URLEncoder.encode(rObjectName);
TreeControlNode childNode =
1.3 +5 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
Index: SaveUserDatabaseRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveUserDatabaseRealmAction.java 22 Mar 2002 21:45:07 -0000 1.2
+++ SaveUserDatabaseRealmAction.java 29 Apr 2002 21:47:08 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.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/SaveUserDatabaseRealmAction.java,v 1.3 2002/04/29 21:47:08 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/29 21:47:08 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* <em>Edit Realm</em> transactions for UserDatabase realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/03/22 21:45:07 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/29 21:47:08 $
*/
public final class SaveUserDatabaseRealmAction extends Action {
@@ -229,8 +229,7 @@
if (control != null) {
TreeControlNode parentNode = control.findNode(rform.getParentObjectName());
if (parentNode != null) {
- String nodeLabel =
- "Realm (" + rform.getRealmType() + ")";
+ String nodeLabel = rform.getNodeLabel();
String encodedName =
URLEncoder.encode(rObjectName);
TreeControlNode childNode =
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>