amyroh 2004/04/19 14:50:48
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
AddRealmAction.java DataSourceRealmForm.java
EditRealmAction.java
webapps/admin/realm dataSourceRealm.jsp
webapps/admin/resources dataSources.jspf
Log:
Add minor fixes to complete fix for 28441.
DataSourceRealm is now supported via admin.
Revision Changes Path
1.8 +2 -1
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
Index: AddRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AddRealmAction.java 17 Apr 2004 02:50:41 -0000 1.7
+++ AddRealmAction.java 19 Apr 2004 21:50:48 -0000 1.8
@@ -231,6 +231,7 @@
realmFm.setUserTable("");
realmFm.setDebugLvlVals(Lists.getDebugLevels());
realmFm.setRealmTypeVals(types);
+ realmFm.setBooleanVals(Lists.getBooleanValues());
}
1.2 +24 -2
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java
Index: DataSourceRealmForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataSourceRealmForm.java 17 Apr 2004 02:53:17 -0000 1.1
+++ DataSourceRealmForm.java 19 Apr 2004 21:50:48 -0000 1.2
@@ -78,6 +78,10 @@
*/
private String userTable = null;
+ /*
+ * Represent boolean (true, false) values for unpackWARs etc.
+ */
+ private List booleanVals = null;
// ------------------------------------------------------------- Properties
@@ -226,6 +230,24 @@
}
+ /**
+ * Return the booleanVals.
+ */
+ public List getBooleanVals() {
+
+ return this.booleanVals;
+
+ }
+
+ /**
+ * Set the booleanVals.
+ */
+ public void setBooleanVals(List booleanVals) {
+
+ this.booleanVals = booleanVals;
+
+ }
+
// --------------------------------------------------------- Public Methods
/**
@@ -239,7 +261,7 @@
super.reset(mapping, request);
this.dataSourceName = null;
this.digest = null;
- this.localDataSource = null;
+ this.localDataSource = "false";
this.roleNameCol = null;
this.userCredCol = null;
1.7 +2 -1
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EditRealmAction.java 17 Apr 2004 02:50:41 -0000 1.6
+++ EditRealmAction.java 19 Apr 2004 21:50:48 -0000 1.7
@@ -415,6 +415,7 @@
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
realmFm.setAllowDeletion(allowDeletion(rname));
+ realmFm.setBooleanVals(Lists.getBooleanValues());
String attribute = null;
try {
1.2 +3 -3 jakarta-tomcat-catalina/webapps/admin/realm/dataSourceRealm.jsp
Index: dataSourceRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/dataSourceRealm.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dataSourceRealm.jsp 17 Apr 2004 02:53:17 -0000 1.1
+++ dataSourceRealm.jsp 19 Apr 2004 21:50:48 -0000 1.2
@@ -107,12 +107,12 @@
<html:text property="digest" size="30" styleId="digest"/>
</controls:data>
</controls:row>
-
- <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="localDataSource">
+
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="localDataSource">
<controls:label><bean:message
key="realm.localDataSource"/>:</controls:label>
<controls:data>
<html:select property="localDataSource" styleId="localDataSource">
- <bean:define id="booleanVals" name="hostForm"
property="booleanVals"/>
+ <bean:define id="booleanVals" name="dataSourceRealmForm"
property="booleanVals"/>
<html:options collection="booleanVals" property="value"
labelProperty="label"/>
</html:select>
1.5 +1 -1 jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf
Index: dataSources.jspf
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dataSources.jspf 28 Mar 2003 02:51:07 -0000 1.4
+++ dataSources.jspf 19 Apr 2004 21:50:48 -0000 1.5
@@ -28,7 +28,6 @@
<input type="checkbox" name="dataSources"
value="<%= dataSource %>" styleId="dataSources">
</td>
- </logic:present>
<td scope="row"><div align="left" class="table-normal-text">
<html:link page='<%= "/resources/setUpDataSource.do?objectName=" +
URLEncoder.encode(dataSource) + "&resourcetype=" +
@@ -42,6 +41,7 @@
<td scope="row"><div align="left" class="table-normal-text">
<controls:attribute name="dataSource" attribute="driverClassName"/>
</div></td>
+ </logic:present>
</tr>
</logic:iterate>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
