cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
billbarker2004/01/25 14:58:15
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
webapps/admin/connector connector.jsp
Log:
Adding support for the new clientAuth values to the admin webapp.
Revision ChangesPath
1.18 +24 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Lists.java14 Mar 2003 16:00:15 - 1.17
+++ Lists.java25 Jan 2004 22:58:15 - 1.18
@@ -137,6 +137,16 @@
booleanValues.add(new LabelValueBean(False, false));
}
+/**
+ * Precomputed list of clientAuth lables and values.
+ */
+private static List clientAuthValues = new ArrayList();
+
+static {
+clientAuthValues.add(new LabelValueBean(True,true));
+clientAuthValues.add(new LabelValueBean(False,false));
+clientAuthValues.add(new LabelValueBean(Want,want));
+}
// - Public Methods
@@ -168,6 +178,16 @@
public static List getBooleanValues() {
return (booleanValues);
+
+}
+
+/**
+ * Return a codeList/code of [EMAIL PROTECTED] LabelValueBean}s for the
legal
+ * settings for codeclientAuth/code properties.
+ */
+public static List getClientAuthValues() {
+
+return (clientAuthValues);
}
1.10 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AddConnectorAction.java 14 Mar 2003 17:53:50 - 1.9
+++ AddConnectorAction.java 25 Jan 2004 22:58:15 - 1.10
@@ -165,6 +165,7 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
+connectorFm.setClientAuthVals(Lists.getClientAuthValues());
String schemeTypes[]= new String[3];
schemeTypes[0] = HTTP;
1.14 +23 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConnectorForm.java24 Jan 2004 13:47:26 - 1.13
+++ ConnectorForm.java25 Jan 2004 22:58:15 - 1.14
@@ -225,6 +225,11 @@
*/
private List connectorTypeVals = null;
+/**
+ * Represent supported clientAuth values.
+ */
+private List clientAuthVals = null;
+
// - Properties
/**
@@ -585,6 +590,20 @@
this.booleanVals = booleanVals;
+}
+
+/**
+ * Return the clientAuth values.
+ */
+public List getClientAuthVals() {
+return clientAuthVals;
+}
+
+/**
+ * Set the clientAuth vaues.
+ */
+public void setClientAuthVals(List clientAuthVals) {
+this.clientAuthVals = clientAuthVals;
}
/**
1.7 +6 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
Index: EditConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EditConnectorAction.java 22 Jan 2004 02:39:33 - 1.6
+++ EditConnectorAction.java 25 Jan 2004 22:58:15 - 1.7
@@ -172,6 +172,7 @@
connectorFm.setNodeLabel(sb.toString());
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
larryi 2004/01/21 18:39:33
Modified:webapps/admin build.xml
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
ApplicationResources_ja.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java EditConnectorAction.java
SaveConnectorAction.java
webapps/admin/connector connector.jsp
Log:
Add support for URIEncoding, useBodyEncodingForURI, and allowTrace
properties on the connector.
Fixed some broken Spanish translations in the
ApplicationResources_es.properties file.
Revision ChangesPath
1.7 +1 -1 jakarta-tomcat-4.0/webapps/admin/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 18 Aug 2003 23:54:26 - 1.6
+++ build.xml 22 Jan 2004 02:39:33 - 1.7
@@ -55,7 +55,7 @@
classpath=${jmx.jar} /
available property=modeler.present
classname=org.apache.commons.modeler.Registry
- classpath=${commons-modeler.jar}/
+ classpath=${commons-modeler.jar}:${jmx.jar}/
available property=regexp.present
classname=org.apache.regexp.RE
classpath=${regexp.jar} /
1.75 +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.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ApplicationResources_en.properties20 Nov 2003 20:59:56 - 1.74
+++ ApplicationResources_en.properties22 Jan 2004 02:39:33 - 1.75
@@ -117,6 +117,8 @@
connector.default.buffer=Default Buffer Size
connector.enable.dns=Enable DNS Lookups
connector.uriencoding=URI Encoding
+connector.useBodyEncodingForURI=Use Body Encoding For URI Query Parameters
+connector.allowTrace=Allow TRACE Method
connector.address.ip=IP Address
connector.redirect.portnumber=Redirect Port Number
connector.min=Minimum
1.63 +23 -20
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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ApplicationResources_es.properties11 Feb 2003 02:27:15 - 1.62
+++ ApplicationResources_es.properties22 Jan 2004 02:39:33 - 1.63
@@ -21,15 +21,15 @@
sample.someText.required=li\u00abAlg\u00fan Texto\u00bb no puede estar
vac\u00edo/li
sample.moreText.required=li\u00abM\u00e1s Texto\u00bb no puede estar
vac\u00edo/li
save.success=\u00a1Guardardo con \u00e9xito!
-server.portnumber=N\u00fmero de Puerto
+server.portnumber=N\u00famero de Puerto
server.debuglevel=Nivel de Depuraci\u00f3n
server.shutdown=Detener
server.properties=Propiedades
warning.header=centerh4font color=redAlerta!/font/h4/center ul
server.port.warning=liEl numero de acceso menos de 1024 requiere capacidades
especiales del software logica./li
-error.portNumber.required=liEl n\u00fmero del puerto no puede estar
vac\u00edo./li
-error.portNumber.format=liEl n\u00fmero del puerto no es un entero v\u00elido!
/li
-error.portNumber.range=liEl n\u00fmero del puerto esta fuera del rango. El rango
v\u00elido es 1-65535./li
+error.portNumber.required=liEl n\u00famero del puerto no puede estar
vac\u00edo./li
+error.portNumber.format=liEl n\u00famero del puerto no es un entero v\u00elido!
/li
+error.portNumber.range=liEl n\u00famero del puerto esta fuera del rango. El rango
v\u00elido es 1-65535./li
error.shutdownText.length=liLa longitud del texto para Detener debe ser de al
menos 6 caracteres!/li
error.engineName.required=liSe requiere el nombre del motor/li
error.acceptCountText.required=liAccept count required/li
@@ -42,19 +42,19 @@
error.bufferSizeText.format=liTama\u00f1o del Buffer no es un entero! /li
error.bufferSizeText.range=liTama\u00f1o del Buffer esta fuera del rango. El
rango v\u00elido es 1-8192. /li
error.address.invalid=liDirecci\u00f3n IP inv\u00elida/li
-error.redirectPortText.required=liN\u00fmero del puerto de
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
amyroh 2002/12/10 12:41:48 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties ApplicationResources_ja.properties webapps/admin/connector connector.jsp Log: Fix 15245 - localize 'miliseconds' in admin. Revision ChangesPath 1.72 +1 -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.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- ApplicationResources_en.properties22 Nov 2002 21:49:46 - 1.71 +++ ApplicationResources_en.properties10 Dec 2002 20:41:47 - 1.72 @@ -119,6 +119,7 @@ connector.address.ip=IP Address connector.redirect.portnumber=Redirect Port Number connector.min=Minimum +connector.milliseconds=milliseconds connector.max=Maximum connector.proxy.name=Proxy Name connector.proxy.portnumber=Proxy Port Number 1.61 +1 -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.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ApplicationResources_es.properties22 Nov 2002 21:49:46 - 1.60 +++ ApplicationResources_es.properties10 Dec 2002 20:41:47 - 1.61 @@ -120,6 +120,7 @@ connector.address.ip=Direcci\u00f3n IP connector.redirect.portnumber=N\u00fmero del puerto de redireccionamiento connector.min=M\u00ednimo +connector.milliseconds=milisegundos connector.max=M\u00e1ximo connector.proxy.name=Nombre del Proxy connector.proxy.portnumber=N\u00fmero de Puerto del Proxy 1.3 +1 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties Index: ApplicationResources_ja.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ApplicationResources_ja.properties10 Dec 2002 01:55:41 - 1.2 +++ ApplicationResources_ja.properties10 Dec 2002 20:41:47 - 1.3 @@ -119,6 +119,7 @@ connector.address.ip=IP\u30a2\u30c9\u30ec\u30b9 connector.redirect.portnumber=\u30ea\u30c0\u30a4\u30ec\u30af\u30c8\u30dd\u30fc\u30c8\u756a\u53f7 connector.min=\u6700\u5c0f +connector.milliseconds=\u30df\u30ea\u79d2 connector.max=\u6700\u5927 connector.proxy.name=\u30d7\u30ed\u30ad\u30b7\u540d connector.proxy.portnumber=\u30d7\u30ed\u30ad\u30b7\u30dd\u30fc\u30c8\u756a\u53f7 1.20 +1 -1 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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- connector.jsp 24 Jul 2002 00:03:23 - 1.19 +++ connector.jsp 10 Dec 2002 20:41:48 - 1.20 @@ -105,7 +105,7 @@ controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=connector.connection.timeout/br -(milliseconds) :/controls:label +(bean:message key=connector.milliseconds/) :/controls:label controls:data html:text property=connTimeOutText size=10/ /controls:data -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/05/14 09:57:06 Modified:webapps/admin/connector connector.jsp Log: Fix for keystore Password value always null. Revision ChangesPath 1.16 +1 -4 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- connector.jsp 10 May 2002 22:41:40 - 1.15 +++ connector.jsp 14 May 2002 16:57:06 - 1.16 @@ -261,13 +261,10 @@ logic:equal name=connectorForm property=adminAction value=Create html:password property=keyStorePassword size=30/ /logic:equal - %-- display password only while creating connector. Do not display - password as cleartext --% - %-- + %-- display password only while creating connector --% logic:equal name=connectorForm property=adminAction value=Edit bean:write name=connectorForm property=keyStorePassword/ /logic:equal - --% /controls:data /controls:row /logic:equal -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/05/02 23:15:14 Modified:webapps/admin/connector connector.jsp Log: Missing comment in last checkin. Revision ChangesPath 1.14 +1 -0 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- connector.jsp 3 May 2002 06:14:04 - 1.13 +++ connector.jsp 3 May 2002 06:15:13 - 1.14 @@ -263,6 +263,7 @@ /logic:equal %-- display password only while creating connector. Do not display password as cleartext --% + %-- logic:equal name=connectorForm property=adminAction value=Edit bean:write name=connectorForm property=keyStorePassword/ /logic:equal -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/30 11:10:48
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/connector
AddConnectorAction.java SaveConnectorAction.java
webapps/admin/connector connector.jsp
Log:
Trying to use the new createConnector methods -- testing
Revision ChangesPath
1.48 +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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ApplicationResources_en.properties29 Apr 2002 01:07:53 - 1.47
+++ ApplicationResources_en.properties30 Apr 2002 18:10:47 - 1.48
@@ -129,6 +129,8 @@
host.wars=Unpack WARs
host.aliases=Aliases
host.alias.name=Alias Name
+error.aliasName.exists=liAlias already exists/li
+error.aliasName.required=liAlias name is required/li
context.properties=Context Properties
context.cookies=Cookies
context.cross.context=Cross Context
1.42 +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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ApplicationResources_es.properties29 Apr 2002 01:07:53 - 1.41
+++ ApplicationResources_es.properties30 Apr 2002 18:10:47 - 1.42
@@ -130,6 +130,8 @@
host.wars=Desempaquetar WARs
host.aliases=Aliases
host.alias.name=Alias Nombre
+error.aliasName.exists=liAlias ya existe/li
+error.aliasName.required=liAlias nombre requiredo/li
context.properties=Propiedades del contexto
context.cookies=Cookies
context.cross.context=Cross Context
1.6 +5 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddConnectorAction.java 26 Apr 2002 19:05:12 - 1.5
+++ AddConnectorAction.java 30 Apr 2002 18:10:47 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.5 2002/04/26 19:05:12 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/26 19:05:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.6 2002/04/30 18:10:47 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/04/30 18:10:47 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/04/26 19:05:12 $
+ * @version $Revision: 1.6 $ $Date: 2002/04/30 18:10:47 $
*/
public class AddConnectorAction extends Action {
@@ -169,7 +169,7 @@
String schemeTypes[]= new String[3];
schemeTypes[0] = HTTP;
schemeTypes[1] = HTTPS;
-schemeTypes[2] = HTTP(AJP);
+schemeTypes[2] = AJP;
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
1.6 +13 -11
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveConnectorAction.java 26 Apr 2002 07:11:02 - 1.5
+++ SaveConnectorAction.java 30 Apr 2002 18:10:47 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/26 00:02:15 Modified:webapps/admin/connector connector.jsp Log: Support for HTTP, HTTPS (Coyote http1.1) and AJP (HTTP) connectors. Revision ChangesPath 1.7 +8 -3 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- connector.jsp 26 Apr 2002 02:11:28 - 1.6 +++ connector.jsp 26 Apr 2002 07:02:15 - 1.7 @@ -199,7 +199,11 @@ /controls:data /controls:row -%-- The following properties are supported for both Coyote and JK2 Connectors --% +%-- The following properties are supported only for Coyote Connectors --% + logic:notEqual name=connectorForm property=connectorType scope=session + value=Ajp13Connector + logic:notEqual name=connectorForm property=connectorType scope=session + value=HTTP(AJP) controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelProxy/controls:label controls:datanbsp;/controls:data @@ -218,12 +222,13 @@ html:text property=proxyPortText size=5/ /controls:data /controls:row +/logic:notEqual +/logic:notEqual -%-- The following properties are supported only on HTTPS JK2 Connector --% +%-- The following properties are supported only on HTTPS Connector --% logic:equal name=connectorForm property=connectorType scope=session value=HTTPS br - controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelFactory Properties:/controls:label controls:datanbsp;/controls:data -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
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 ChangesPath
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.properties26 Apr 2002 03:39:04 - 1.45
+++ ApplicationResources_en.properties27 Apr 2002 01:05:03 - 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=liLogger already exists/li
+error.loggerName.exists=liA Logger already exists./li
error.directory.required=liDirectory cannot be empty./li
error.prefix.required=liPrefix cannot be empty./li
error.suffix.required=liSuffix cannot be empty./li
@@ -189,8 +189,8 @@
error.serviceName.required=liService Name required/li
error.serviceName.exists=liService Name already exists/li
error.realmName.bad=Invalid realm name {0}
-error.realmName.required=liRealm Name required/li
-error.realmName.exists=liRealm already exists/li
+error.realmName.required=liRealm Name required./li
+error.realmName.exists=liA realm already exists./li
error.contextName.bad=Invalid context name {0}
error.adminContext.delete=liCannot 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.java26 Apr 2002 19:05:12 - 1.4
+++ EditServiceAction.java27 Apr 2002 01:05:03 - 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 codeAction/code that sets up emEdit 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 - 1.8
+++ connector.jsp 27 Apr 2002 01:05:03 - 1.9
@@ -249,7 +249,7 @@
controls:row labelStyle=table-label-text dataStyle=table-normal-text
controls:labelbean: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 @@
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/25 16:24:31 Modified:webapps/admin/connector connector.jsp Log: Added support for SSL. Revision ChangesPath 1.5 +43 -6 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connector.jsp 5 Apr 2002 00:02:19 - 1.4 +++ connector.jsp 25 Apr 2002 23:24:31 - 1.5 @@ -83,12 +83,15 @@ /controls:data /controls:row +%-- do not show scheme while creating a new connector --% +logic:notEqual name=connectorForm property=adminAction value=Create controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=connector.scheme/:/controls:label controls:data bean:write name=connectorForm property=scheme scope=session/ /controls:data /controls:row + /logic:notEqual controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=connector.accept.count/:/controls:label @@ -193,11 +196,7 @@ /controls:data /controls:row -%-- The following properties are supported only on Coyote Connector --% - logic:equal name=connectorForm property=connectorType scope=session - value=CoyoteConnector - br - +%-- The following properties are supported for both Coyote and JK2 Connectors --% controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelProxy/controls:label controls:datanbsp;/controls:data @@ -216,8 +215,46 @@ html:text property=proxyPortText size=5/ /controls:data /controls:row + +%-- The following properties are supported only on HTTPS JK2 Connector --% + logic:equal name=connectorForm property=connectorType scope=session + value=HTTPS +br + +controls:row header=true labelStyle=table-header-text dataStyle=table-header-text +controls:labelFactory Properties:/controls:label +controls:datanbsp;/controls:data +/controls:row + +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.client.auth/:/controls:label +controls:data +html:select property=clientAuthentication + bean:define id=booleanVals name=connectorForm property=booleanVals/ + html:options collection=booleanVals property=value + labelProperty=label/ +/html:select +/controls:data +/controls:row + + %-- FIXME: Input only allowed on create transaction?? --% +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.keystore.filename/:/controls:label +controls:data +html:text property=keyStoreFileName size=15/ +/controls:data +/controls:row + +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean: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/ +/controls:data +/controls:row + /logic:equal - /controls:table + /controls:table /td /tr -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/25 19:11:28 Modified:webapps/admin/connector connector.jsp Log: Added check that one Should not be able to delete the connector on which the admin tool is running. Revision ChangesPath 1.6 +3 -0 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- connector.jsp 25 Apr 2002 23:24:31 - 1.5 +++ connector.jsp 26 Apr 2002 02:11:28 - 1.6 @@ -45,10 +45,13 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=connectorForm property=adminAction value=Create +logic:notEqual name=connectorForm property=portText +value='%= Integer.toString(request.getServerPort()) %' controls:action url='%= /DeleteConnector.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.connectors.delete/ /controls:action +/logic:notEqual /logic:notEqual /controls:actions /div -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
