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 Changes Path
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.properties 29 Apr 2002 01:07:53 -0000 1.47
+++ ApplicationResources_en.properties 30 Apr 2002 18:10:47 -0000 1.48
@@ -129,6 +129,8 @@
host.wars=Unpack WARs
host.aliases=Aliases
host.alias.name=Alias Name
+error.aliasName.exists=<li>Alias already exists</li>
+error.aliasName.required=<li>Alias 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.properties 29 Apr 2002 01:07:53 -0000 1.41
+++ ApplicationResources_es.properties 30 Apr 2002 18:10:47 -0000 1.42
@@ -130,6 +130,8 @@
host.wars=Desempaquetar WARs
host.aliases=Aliases
host.alias.name=Alias Nombre
+error.aliasName.exists=<li>Alias ya existe</li>
+error.aliasName.required=<li>Alias 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 -0000 1.5
+++ AddConnectorAction.java 30 Apr 2002 18:10:47 -0000 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 <code>Action</code> that sets up <em>Add 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 -0000 1.5
+++ SaveConnectorAction.java 30 Apr 2002 18:10:47 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.5 2002/04/26 07:11:02 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/26 07:11:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.6 2002/04/30 18:10:47 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/04/30 18:10:47 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
* <em>Edit Connector</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/04/26 07:11:02 $
+ * @version $Revision: 1.6 $ $Date: 2002/04/30 18:10:47 $
*/
public final class SaveConnectorAction extends Action {
@@ -205,11 +205,11 @@
// FIX ME -- fix all create operations
if ("HTTP".equalsIgnoreCase(connectorType)) {
- operation = "createHttp11Connector"; // HTTP
+ operation = "createHttpConnector"; // HTTP
} else if ("HTTPS".equalsIgnoreCase(connectorType)) {
- operation = "createCoyoteConnector"; // HTTPS
+ operation = "createHttpsConnector"; // HTTPS
} else {
- operation = "createAjp13Connector"; // HTTP (AJP)
+ operation = "createAjpConnector"; // AJP(HTTP)
}
cObjectName = (String)
@@ -337,9 +337,9 @@
mBServer.setAttribute(coname,
new Attribute("maxProcessors", new
Integer(maxProcessors)));
- // proxy name and port exist only for Coyote HTTP/1.1 Connectors.
- // and not for AJP connector
- if (!("HTTP(AJP)".equalsIgnoreCase(connectorType))) {
+ // proxy name and port do not exist for AJP connector
+ /*
+ if (!("AJP".equalsIgnoreCase(connectorType))) {
attribute = "proxyName";
mBServer.setAttribute(coname,
new Attribute("proxyName",
cform.getProxyName()));
@@ -353,12 +353,14 @@
mBServer.setAttribute(coname,
new Attribute("proxyPort", new Integer(proxyPort)));
}
+ */
// HTTPS specific properties
if("HTTPS".equalsIgnoreCase(connectorType)) {
attribute = "clientAuth";
mBServer.setAttribute(coname,
- new Attribute("clientAuth", new
Boolean(cform.getClientAuthentication())));
+ new Attribute("clientAuth", new Boolean(
+ cform.getClientAuthentication())));
attribute = "keystoreFile";
String keyFile = cform.getKeyStoreFileName();
1.10 +2 -5 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- connector.jsp 27 Apr 2002 01:05:03 -0000 1.9
+++ connector.jsp 30 Apr 2002 18:10:48 -0000 1.10
@@ -199,11 +199,9 @@
</controls:data>
</controls:row>
-<%-- The following properties are supported only for Coyote HTTP/1.1 Connectors --%>
+<%-- The following properties are supported only for Coyote HTTP/S 1.1 Connectors
--%>
<logic:notEqual name="connectorForm" property="connectorType" scope="session"
- value="Ajp13Connector">
- <logic:notEqual name="connectorForm" property="connectorType" scope="session"
- value="HTTP(AJP)">
+ value="AJP">
<controls:row header="true" labelStyle="table-header-text"
dataStyle="table-header-text">
<controls:label>Proxy</controls:label>
<controls:data> </controls:data>
@@ -222,7 +220,6 @@
<html:text property="proxyPortText" size="5"/>
</controls:data>
</controls:row>
- </logic:notEqual>
</logic:notEqual>
<%-- The following properties are supported only on HTTPS Connector --%>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
