You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/07/28 13:14:49 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup SetAllPropertiesRule.java Catalina.java

remm        2003/07/28 04:14:48

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Added:       catalina/src/share/org/apache/catalina/startup
                        SetAllPropertiesRule.java
  Log:
  - Set all properties on the connector, including those which have no explicit
    setter. This allows protocol dependent attributes (or other custom attributes)
    without the need for getters/setters.
  - Note: The attributes which have no get/set won't appear on the connector
    MBean (but of course, other beans could expose those).
  
  Revision  Changes    Path
  1.20      +6 -5      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Catalina.java	28 Jul 2003 08:46:39 -0000	1.19
  +++ Catalina.java	28 Jul 2003 11:14:48 -0000	1.20
  @@ -339,7 +339,8 @@
           digester.addObjectCreate("Server/Service/Connector",
                                    "org.apache.coyote.tomcat5.CoyoteConnector",
                                    "className");
  -        digester.addSetProperties("Server/Service/Connector");
  +        digester.addRule("Server/Service/Connector", 
  +                         new SetAllPropertiesRule());
           digester.addSetNext("Server/Service/Connector",
                               "addConnector",
                               "org.apache.catalina.Connector");
  
  
  
  1.1                  jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java
  
  Index: SetAllPropertiesRule.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java,v 1.1 2003/07/28 11:14:48 remm Exp $
   * $Revision: 1.1 $
   * $Date: 2003/07/28 11:14:48 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  
  
  package org.apache.catalina.startup;
  
  import org.apache.commons.digester.Rule;
  import org.xml.sax.Attributes;
  
  import org.apache.tomcat.util.IntrospectionUtils;
  
  /**
   * Rule that uses the introspection utils to set properties.
   * 
   * @author Remy Maucherat
   */
  public class SetAllPropertiesRule extends Rule {
  
  
      // ----------------------------------------------------------- Constructors
  
  
      // ----------------------------------------------------- Instance Variables
  
  
      // --------------------------------------------------------- Public Methods
  
  
      /**
       * Handle the beginning of an XML element.
       *
       * @param attributes The attributes of this element
       *
       * @exception Exception if a processing error occurs
       */
      public void begin(Attributes attributes) throws Exception {
  
          for (int i = 0; i < attributes.getLength(); i++) {
              String name = attributes.getLocalName(i);
              if ("".equals(name)) {
                  name = attributes.getQName(i);
              }
              String value = attributes.getValue(i);
              IntrospectionUtils.setProperty(digester.peek(), name, value);
          }
  
      }
  
  
  }
  
  
  

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