larryi 2004/01/21 18:05:05
Modified: 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.
Revision Changes Path
1.19 +2 -0
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ApplicationResources_en.properties 20 Nov 2003 21:00:26 -0000 1.18
+++ ApplicationResources_en.properties 22 Jan 2004 02:05:05 -0000 1.19
@@ -122,6 +122,8 @@
connector.connection.disableUploadTimeout=Disable Upload Timeout
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.18 +5 -2
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ApplicationResources_es.properties 17 Jan 2004 01:45:19 -0000 1.17
+++ ApplicationResources_es.properties 22 Jan 2004 02:05:05 -0000 1.18
@@ -121,6 +121,9 @@
connector.default.buffer=Tamaño por defecto del Búfer
connector.connection.disableUploadTimeout=Desactivar Tiempo de Espera de la Carga
connector.enable.dns=Permitir Búsquedas en el DNS
+connector.uriencoding=Codificación de URI
+connector.useBodyEncodingForURI=Usar Codificación de Cuerpo (Body) para Parámetros
de Consulta de URI
+connector.allowTrace=Permitir Método de TRAZA
connector.address.ip=Dirección IP
connector.redirect.portnumber=Número del puerto de redireccionamiento
connector.min=Mínimo
@@ -164,7 +167,7 @@
context.path=Trayectoria
context.reloadable=Recargable
context.swallowOutput=Salida del Trago (Swallow)
-context.usenaming=Utilice el Nombramiento (Naming)
+context.usenaming=Utilizar el Nombramiento (Naming)
context.workdir=Directorio de Trabajo
context.loader.properties=Propiedades del cargador
context.sessionmgr.properties=Propiedades del gestor de Sesión
@@ -172,7 +175,7 @@
context.sessionId=Inicializador de la Identificación De la Sesión
context.max.sessions=Máximas Sesiones Activas
defaultcontext.properties=Propiedades de DefaultContext
-error.context.directory=La base del documento no existe ni es un directorio legible
+error.context.directory=La base del documento ni existe ni es un directorio legible
error.docBase.required=<li>La base del documento no puede ser nula</li>
error.path.required=<li>La trayectoria no puede ser nula</li>
error.workDir.required=<li>El directorio de trabajo no puede ser nulo</li>
1.7 +2 -0
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties
Index: ApplicationResources_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApplicationResources_ja.properties 1 Dec 2003 21:34:00 -0000 1.6
+++ ApplicationResources_ja.properties 22 Jan 2004 02:05:05 -0000 1.7
@@ -122,6 +122,8 @@
connector.connection.disableUploadTimeout=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306e\u7121\u52b9\u5316
connector.enable.dns=DNS\u306e\u30eb\u30c3\u30af\u30a2\u30c3\u30d7
connector.uriencoding=URI\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
+connector.useBodyEncodingForURI=URI\u30af\u30a8\u30ea\u30d1\u30e9\u30e1\u30fc\u30bf\u306b\u30dc\u30c7\u30a3\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3092\u4f7f\u7528
+connector.allowTrace=TRACE\u30e1\u30bd\u30c3\u30c9\u3092\u8a31\u53ef
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
1.6 +75 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConnectorForm.java 29 Aug 2003 02:40:51 -0000 1.5
+++ ConnectorForm.java 22 Jan 2004 02:05:05 -0000 1.6
@@ -203,6 +203,21 @@
private String minSpare = null;
/**
+ * The text for the URIEncoding.
+ */
+ private String uriEncodingText = null;
+
+ /**
+ * The value of useBodyEncodingForURI.
+ */
+ private String useBodyEncodingForURI = "false";
+
+ /**
+ * The value of allowTrace.
+ */
+ private String allowTrace = "false";
+
+ /**
* The text for the port.
*/
private String portText = null;
@@ -907,6 +922,60 @@
}
/**
+ * Return the URIEncoding text.
+ */
+ public String getURIEncodingText() {
+
+ return this.uriEncodingText;
+
+ }
+
+ /**
+ * Set the URIEncoding Text.
+ */
+ public void setURIEncodingText(String uriEncodingText) {
+
+ this.uriEncodingText = uriEncodingText;
+
+ }
+
+ /**
+ * Return the useBodyEncodingForURI Text.
+ */
+ public String getUseBodyEncodingForURIText() {
+
+ return this.useBodyEncodingForURI;
+
+ }
+
+ /**
+ * Set the useBodyEncodingForURI Text.
+ */
+ public void setUseBodyEncodingForURIText(String useBodyEncodingForURI) {
+
+ this.useBodyEncodingForURI = useBodyEncodingForURI;
+
+ }
+
+ /**
+ * Return the allowTrace Text.
+ */
+ public String getAllowTraceText() {
+
+ return this.allowTrace;
+
+ }
+
+ /**
+ * Set the allowTrace Text.
+ */
+ public void setAllowTraceText(String allowTrace) {
+
+ this.allowTrace = allowTrace;
+
+ }
+
+ /**
* Return the port text.
*/
public String getPortText() {
@@ -1060,6 +1129,8 @@
this.maxSpare = null;
this.maxThreads = null;
this.minSpare = null;
+ this.uriEncodingText = null;
+ this.useBodyEncodingForURI = "false";
this.portText = null;
this.redirectPortText = null;
this.proxyName = null;
1.4 +13 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
Index: EditConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditConnectorAction.java 29 Aug 2003 02:40:51 -0000 1.3
+++ EditConnectorAction.java 22 Jan 2004 02:05:05 -0000 1.4
@@ -247,6 +247,15 @@
attribute = "xpoweredBy";
connectorFm.setXpoweredBy
(((Boolean) mBServer.getAttribute(cname, attribute)).toString());;
+ attribute = "URIEncoding";
+ connectorFm.setURIEncodingText
+ ((String) mBServer.getAttribute(cname, attribute));
+ attribute = "useBodyEncodingForURI";
+ connectorFm.setUseBodyEncodingForURIText
+ (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
+ attribute = "allowTrace";
+ connectorFm.setAllowTraceText
+ (((Boolean) mBServer.getAttribute(cname, attribute)).toString());
// Ports
attribute = "port";
1.11 +20 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SaveConnectorAction.java 6 Oct 2003 22:11:31 -0000 1.10
+++ SaveConnectorAction.java 22 Jan 2004 02:05:05 -0000 1.11
@@ -425,6 +425,22 @@
mBServer.setAttribute(coname,
new Attribute("xpoweredBy", new
Boolean(cform.getXpoweredBy())));
+ attribute = "URIEncoding";
+ String uriEnc = cform.getURIEncodingText();
+ if ((uriEnc != null) && (uriEnc.length()==0)) {
+ uriEnc = null;
+ }
+ mBServer.setAttribute(coname,
+ new Attribute(attribute, uriEnc));
+
+ attribute = "useBodyEncodingForURI";
+ mBServer.setAttribute(coname,
+ new Attribute(attribute, new
Boolean(cform.getUseBodyEncodingForURIText())));
+
+ attribute = "allowTrace";
+ mBServer.setAttribute(coname,
+ new Attribute(attribute, new
Boolean(cform.getAllowTraceText())));
+
// proxy name and port do not exist for AJP connector
if (!("AJP".equalsIgnoreCase(connectorType))) {
attribute = "proxyName";
1.7 +29 -0 jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp
Index: connector.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/connector/connector.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- connector.jsp 29 Aug 2003 02:40:52 -0000 1.6
+++ connector.jsp 22 Jan 2004 02:05:05 -0000 1.7
@@ -118,6 +118,35 @@
</controls:data>
</controls:row>
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="uriencoding">
+ <controls:label><bean:message
key="connector.uriencoding"/>:</controls:label>
+ <controls:data>
+ <html:text property="URIEncodingText" size="30"
styleId="uriencoding"/>
+ </controls:data>
+ </controls:row>
+
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="usebodyencoding">
+ <controls:label><bean:message
key="connector.useBodyEncodingForURI"/>:</controls:label>
+ <controls:data>
+ <html:select property="useBodyEncodingForURIText"
styleId="usebodyencoding">
+ <bean:define id="booleanVals" name="connectorForm"
property="booleanVals"/>
+ <html:options collection="booleanVals" property="value"
+ labelProperty="label"/>
+ </html:select>
+ </controls:data>
+ </controls:row>
+
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="allowTrace">
+ <controls:label><bean:message
key="connector.allowTrace"/>:</controls:label>
+ <controls:data>
+ <html:select property="allowTraceText" styleId="allowTrace">
+ <bean:define id="booleanVals" name="connectorForm"
property="booleanVals"/>
+ <html:options collection="booleanVals" property="value"
+ labelProperty="label"/>
+ </html:select>
+ </controls:data>
+ </controls:row>
+
<%-- Input only allowed on create transaction --%>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text"
styleId="address">
<controls:label><bean:message
key="connector.address.ip"/>:</controls:label>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
