manveen 02/04/26 18:05:03
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java
webapps/admin/connector connector.jsp
Log:
preliminary admin tool testing--some bug fixes
Revision Changes Path
1.46 +3 -3
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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ApplicationResources_en.properties 26 Apr 2002 03:39:04 -0000 1.45
+++ ApplicationResources_en.properties 27 Apr 2002 01:05:03 -0000 1.46
@@ -164,7 +164,7 @@
logger.filelogger.properties=Filelogger specific Properties
logger.verbositylevel=Verbosity Level
error.loggerName.bad=Invalid logger name {0}
-error.loggerName.exists=<li>Logger already exists</li>
+error.loggerName.exists=<li>A Logger already exists.</li>
error.directory.required=<li>Directory cannot be empty.</li>
error.prefix.required=<li>Prefix cannot be empty.</li>
error.suffix.required=<li>Suffix cannot be empty.</li>
@@ -189,8 +189,8 @@
error.serviceName.required=<li>Service Name required</li>
error.serviceName.exists=<li>Service Name already exists</li>
error.realmName.bad=Invalid realm name {0}
-error.realmName.required=<li>Realm Name required</li>
-error.realmName.exists=<li>Realm already exists</li>
+error.realmName.required=<li>Realm Name required.</li>
+error.realmName.exists=<li>A realm already exists.</li>
error.contextName.bad=Invalid context name {0}
error.adminContext.delete=<li>Cannot delete admin context</li>
error.loaderName.bad=Invalid loader name {0}
1.5 +7 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java
Index: EditServiceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditServiceAction.java 26 Apr 2002 19:05:12 -0000 1.4
+++ EditServiceAction.java 27 Apr 2002 01:05:03 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
1.4 2002/04/26 19:05:12 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/26 19:05:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
1.5 2002/04/27 01:05:03 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/27 01:05:03 $
*
* ====================================================================
*
@@ -91,7 +91,7 @@
* The <code>Action</code> that sets up <em>Edit Service</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/04/26 19:05:12 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/27 01:05:03 $
*/
public class EditServiceAction extends Action {
@@ -228,8 +228,9 @@
Iterator items = Lists.getHosts(mBServer, sname).iterator();
while (items.hasNext()) {
ObjectName hname = new ObjectName((String) items.next());
- String name = hname.getKeyProperty("name");
- hosts.add(new LabelValueBean(name, name));
+ String name = hname.getKeyProperty("host");
+ if (name!=null)
+ hosts.add(new LabelValueBean(name, name));
}
serviceFm.setHostNameVals(hosts);
1.9 +2 -2 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp
Index: connector.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- connector.jsp 26 Apr 2002 19:05:12 -0000 1.8
+++ connector.jsp 27 Apr 2002 01:05:03 -0000 1.9
@@ -249,7 +249,7 @@
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
<controls:label><bean:message
key="connector.keystore.filename"/>:</controls:label>
<controls:data>
- <html:text property="keyStoreFileName" size="15"/>
+ <html:text property="keyStoreFileName" size="30"/>
</controls:data>
</controls:row>
@@ -257,7 +257,7 @@
<controls:label><bean:message
key="connector.keystore.password"/>:</controls:label>
<controls:data>
<%-- should the password be of type html:password or is cleartext
ok? --%>
- <html:text property="keyStorePassword" size="15"/>
+ <html:text property="keyStorePassword" size="30"/>
</controls:data>
</controls:row>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
