manveen 02/05/29 23:23:08
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
EditRealmAction.java JDBCRealmForm.java
SaveJDBCRealmAction.java
webapps/admin/realm jdbcRealm.jsp
Log:
Added userNameCol attribute to JDBCRealm.
Revision Changes Path
1.59 +2 -0
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ApplicationResources_en.properties 9 May 2002 21:27:27 -0000 1.58
+++ ApplicationResources_en.properties 30 May 2002 06:23:08 -0000 1.59
@@ -209,6 +209,7 @@
realm.digest=Digest Algorithm
realm.passwordCol=Password Column
realm.roleNameCol=Role Name Column
+realm.userNameCol=User Name Column
realm.userRoleTable=User Role Table
realm.userTable=User Table
realm.resource=Resource Name
@@ -239,6 +240,7 @@
error.pathName.required=<li>Path Name is required.</li>
error.driver.required=<li>Database driver is required.</li>
error.roleNameCol.required=<li>Role name column is required.</li>
+error.userNameCol.required=<li>User name column is required.</li>
error.passwordCol.required=<li>Password column is required.</li>
error.userTable.required=<li>User table is required.</li>
error.roleTable.required=<li>User role table is required.</li>
1.50 +2 -0
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ApplicationResources_es.properties 9 May 2002 21:27:27 -0000 1.49
+++ ApplicationResources_es.properties 30 May 2002 06:23:08 -0000 1.50
@@ -209,6 +209,7 @@
realm.digest=Digest Algorithm
realm.passwordCol=Columna de Password
realm.roleNameCol=Columna del Nombre del Rol
+realm.userNameCol=Columna del Nombre del User
realm.userRoleTable=Vector Del Papel Del Utilizador
realm.userTable=Vector De Utilizador
realm.resource=Nombre Del Recurso
@@ -239,6 +240,7 @@
error.pathName.required=<li>Se requiere el nombre del path.</li>
error.driver.required=<li>Se requiere el programa piloto de la base de datos.</li>
error.roleNameCol.required=<li>Se requiere la columna conocida del papel.</li>
+error.userNameCol.required=<li>Se requiere la columna conocida del user.</li>
error.passwordCol.required=<li>Se requiere la columna de la palabra de paso.</li>
error.userTable.required=<li>Se requiere el vector de utilizador.</li>
error.roleTable.required=<li>Se requiere el vector del papel del utilizador.</li>
1.6 +7 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditRealmAction.java 21 May 2002 00:36:43 -0000 1.5
+++ EditRealmAction.java 30 May 2002 06:23:08 -0000 1.6
@@ -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.5 2002/05/21 00:36:43 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/21 00:36:43 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.6 2002/05/30 06:23:08 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/30 06:23:08 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* Realm </em> transactions, based on the type of Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/05/21 00:36:43 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/30 06:23:08 $
*/
public class EditRealmAction extends Action {
@@ -321,6 +321,9 @@
((String) mBServer.getAttribute(rname, attribute));
attribute = "roleNameCol";
realmFm.setRoleNameCol
+ ((String) mBServer.getAttribute(rname, attribute));
+ attribute = "userNameCol";
+ realmFm.setUserNameCol
((String) mBServer.getAttribute(rname, attribute));
attribute = "userCredCol";
realmFm.setPasswordCol
1.6 +37 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCRealmForm.java 3 May 2002 18:34:14 -0000 1.5
+++ JDBCRealmForm.java 30 May 2002 06:23:08 -0000 1.6
@@ -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.5 2002/05/03 18:34:14 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/03 18:34:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
1.6 2002/05/30 06:23:08 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/30 06:23:08 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Form bean for the jdbc realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/05/03 18:34:14 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/30 06:23:08 $
*/
public final class JDBCRealmForm extends RealmForm {
@@ -98,7 +98,12 @@
* The text for the roleNameCol.
*/
private String roleNameCol = null;
-
+
+ /**
+ * The text for the userNameCol.
+ */
+ private String userNameCol = null;
+
/**
* The text for the passwordCol.
*/
@@ -172,6 +177,24 @@
this.roleNameCol = roleNameCol;
}
+
+ /**
+ * Return the userNameCol.
+ */
+ public String getUserNameCol() {
+
+ return this.userNameCol;
+
+ }
+
+ /**
+ * Set the userNameCol.
+ */
+ public void setUserNameCol(String userNameCol) {
+
+ this.userNameCol = userNameCol;
+
+ }
/**
* Return the driver.
*/
@@ -316,6 +339,7 @@
this.driver = null;
this.roleNameCol = null;
+ this.userNameCol = null;
this.passwordCol = null;
this.userTable = null;
this.roleTable = null;
@@ -341,6 +365,8 @@
sb.append(driver);
sb.append("',roleNameCol=");
sb.append(roleNameCol);
+ sb.append("',userNameCol=");
+ sb.append(userNameCol);
sb.append(",passwordCol=");
sb.append(passwordCol);
sb.append("',userTable='");
@@ -394,7 +420,12 @@
errors.add("roleNameCol",
new ActionError("error.roleNameCol.required"));
}
-
+
+ if ((userNameCol == null) || (userNameCol.length() < 1)) {
+ errors.add("userNameCol",
+ new ActionError("error.userNameCol.required"));
+ }
+
if ((passwordCol == null) || (passwordCol.length() < 1)) {
errors.add("passwordCol",
new ActionError("error.passwordCol.required"));
1.4 +8 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveJDBCRealmAction.java 9 May 2002 01:07:31 -0000 1.3
+++ SaveJDBCRealmAction.java 30 May 2002 06:23:08 -0000 1.4
@@ -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.3 2002/05/09 01:07:31 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/09 01:07:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
1.4 2002/05/30 06:23:08 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/30 06:23:08 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* <em>Edit Realm</em> transactions for JDBC realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/09 01:07:31 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/30 06:23:08 $
*/
public final class SaveJDBCRealmAction extends Action {
@@ -293,6 +293,10 @@
attribute = "roleNameCol";
mBServer.setAttribute(roname,
new Attribute("roleNameCol",
rform.getRoleNameCol()));
+
+ attribute = "userNameCol";
+ mBServer.setAttribute(roname,
+ new Attribute("userNameCol",
rform.getUserNameCol()));
attribute = "userCredCol";
mBServer.setAttribute(roname,
1.7 +8 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jdbcRealm.jsp 21 May 2002 00:36:43 -0000 1.6
+++ jdbcRealm.jsp 30 May 2002 06:23:08 -0000 1.7
@@ -43,7 +43,7 @@
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="jdbcRealmForm" property="adminAction"
value="Create">
- <logic:notEqual name="userDatabaseRealmForm" property="allowDeletion"
value="false">
+ <logic:notEqual name="jdbcRealmForm" property="allowDeletion"
value="false">
<controls:action url='<%= "/DeleteRealm.do?select=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.delete"/>
@@ -141,6 +141,13 @@
<controls:label><bean:message
key="realm.roleNameCol"/>:</controls:label>
<controls:data>
<html:text property="roleNameCol" size="30"/>
+ </controls:data>
+ </controls:row>
+
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
+ <controls:label><bean:message
key="realm.userNameCol"/>:</controls:label>
+ <controls:data>
+ <html:text property="userNameCol" size="30"/>
</controls:data>
</controls:row>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
