You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/04/10 00:24:36 UTC

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector SaveConnectorAction.java

amyroh      2003/04/09 15:24:36

  Modified:    webapps/admin/WEB-INF struts-config.xml
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
                        SaveConnectorAction.java
  Log:
  Fix "invalid path" problem in mozilla.
  
  Revision  Changes    Path
  1.4       +20 -0     jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- struts-config.xml	27 Mar 2003 03:08:05 -0000	1.3
  +++ struts-config.xml	9 Apr 2003 22:24:36 -0000	1.4
  @@ -636,6 +636,11 @@
                  type="org.apache.webapp.admin.realm.AddRealmAction">
       </action>
   
  +    <!-- Set up Add Realm transaction -->
  +    <action    path="/realm/AddRealm"
  +               type="org.apache.webapp.admin.realm.AddRealmAction">
  +    </action>
  +
       <!-- Set up Delete Realms transaction -->
       <action    path="/DeleteRealm"
                  type="org.apache.webapp.admin.realm.DeleteRealmAction"
  @@ -688,6 +693,11 @@
                  type="org.apache.webapp.admin.logger.AddLoggerAction">
       </action>
   
  +    <!-- Set up Add Logger transaction -->
  +    <action    path="/logger/AddLogger"
  +               type="org.apache.webapp.admin.logger.AddLoggerAction">
  +    </action>
  +
       <!-- Set up Delete Loggers transaction -->
       <action    path="/DeleteLogger"
                  type="org.apache.webapp.admin.logger.DeleteLoggerAction"
  @@ -781,6 +791,11 @@
                  type="org.apache.webapp.admin.connector.AddConnectorAction">
       </action>
   
  +    <!-- Set up Add Connector transaction -->
  +    <action    path="/connector/AddConnector"
  +               type="org.apache.webapp.admin.connector.AddConnectorAction">
  +    </action>
  +
       <!-- Set up Delete Connectors transaction -->
       <action    path="/DeleteConnector"
                  type="org.apache.webapp.admin.connector.DeleteConnectorAction"
  @@ -809,6 +824,11 @@
   
       <!-- Set up Add Valve transaction -->
       <action    path="/AddValve"
  +               type="org.apache.webapp.admin.valve.AddValveAction">
  +    </action>
  +
  +    <!-- Set up Add Valve transaction -->
  +    <action    path="/valve/AddValve"
                  type="org.apache.webapp.admin.valve.AddValveAction">
       </action>
   
  
  
  
  1.6       +9 -6      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SaveConnectorAction.java	24 Mar 2003 09:17:01 -0000	1.5
  +++ SaveConnectorAction.java	9 Apr 2003 22:24:36 -0000	1.6
  @@ -183,8 +183,11 @@
                   sb.append(TomcatTreeBuilder.CONNECTOR_TYPE);
                   sb.append(",port=" + cform.getPortText());
                   String address = cform.getAddress();
  -                if ((address!=null) && (address.length()>0)) {
  +                if ((address!=null) && (address.length()>0) && 
  +                        (!address.equalsIgnoreCase(" "))) {
                       sb.append(",address=" + address);
  +                } else {
  +                    address = null;
                   }
                   ObjectName oname = new ObjectName(sb.toString());
                                                   
  @@ -203,7 +206,7 @@
                   // Create a new Connector object
                   values = new Object[3];                
                   values[0] = serviceName;  //service parent object name
  -                values[1] = cform.getAddress();
  +                values[1] = address;
                   values[2] = new Integer(cform.getPortText());
   
                   if ("HTTP".equalsIgnoreCase(connectorType)) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org