rleland     2003/09/05 09:20:20

  Modified:    src/share/org/apache/struts/config ConfigRuleSet.java
  Log:
  Remove use od deprecated Digester methods
  and use ones with namespace's
  Also update License.
  
  Revision  Changes    Path
  1.15      +11 -11    
jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java
  
  Index: ConfigRuleSet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ConfigRuleSet.java        21 Dec 2002 04:42:20 -0000      1.14
  +++ ConfigRuleSet.java        5 Sep 2003 16:20:19 -0000       1.15
  @@ -7,7 +7,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,7 +23,7 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgement:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowlegement may appear in the software itself,
  @@ -35,8 +35,8 @@
    *    permission, please contact [EMAIL PROTECTED]
    *
    * 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.
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  @@ -286,7 +286,7 @@
           super();
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes) throws 
Exception {
           DataSourceConfig dsc = (DataSourceConfig) digester.peek();
           dsc.addProperty(attributes.getValue("property"),
                           attributes.getValue("value"));
  @@ -306,7 +306,7 @@
           super();
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String names, Attributes attributes) throws 
Exception {
           PlugInConfig plugInConfig = (PlugInConfig) digester.peek();
           plugInConfig.addProperty(attributes.getValue("property"),
                                    attributes.getValue("value"));
  @@ -326,7 +326,7 @@
           super();
       }
   
  -    public void begin(Attributes attributes) throws Exception {
  +    public void begin(String namespace, String name, Attributes attributes) throws 
Exception {
           String className = attributes.getValue("type");
           if (className != null) {
               ModuleConfig mc = (ModuleConfig) digester.peek();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to