You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ma...@apache.org on 2004/11/30 06:52:23 UTC

cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

martinc     2004/11/29 21:52:23

  Modified:    chain    checkstyle.xml
               chain/src/java/org/apache/commons/chain Catalog.java
                        CatalogFactory.java Filter.java
               chain/src/java/org/apache/commons/chain/config
                        ConfigCatalogRule.java ConfigDefineRule.java
                        ConfigRegisterRule.java ConfigRuleSet.java
               chain/src/java/org/apache/commons/chain/generic
                        LookupCommand.java
               chain/src/java/org/apache/commons/chain/impl
                        CatalogBase.java CatalogFactoryBase.java
                        ChainBase.java ContextBase.java
               chain/src/java/org/apache/commons/chain/web
                        ChainListener.java ChainResources.java
                        ChainServlet.java MapEntry.java WebContext.java
               chain/src/java/org/apache/commons/chain/web/portlet
                        PortletApplicationScopeMap.java
                        PortletRequestScopeMap.java
                        PortletSessionScopeMap.java
               chain/src/java/org/apache/commons/chain/web/servlet
                        ChainProcessor.java ServletApplicationScopeMap.java
                        ServletHeaderValuesMap.java
                        ServletRequestScopeMap.java
                        ServletSessionScopeMap.java
  Added:       chain    license-header.txt
  Log:
  Fix around 660 Checkstyle errors prior to the 1.0 release.
  
  Revision  Changes    Path
  1.2       +5 -5      jakarta-commons/chain/checkstyle.xml
  
  Index: checkstyle.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/checkstyle.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkstyle.xml	1 Jul 2004 21:34:09 -0000	1.1
  +++ checkstyle.xml	30 Nov 2004 05:52:22 -0000	1.2
  @@ -29,15 +29,15 @@
             <!-- Checks that are different from the sun coding conventions ones -->
             <!-- ************************************************************** -->
             <module name="Header">
  -              <property name="headerFile" value="${basedir}/LICENSE.txt"/>
  -              <property name="ignoreLines" value="1,2,3,4,5,6"/>
  +              <property name="headerFile" value="${basedir}/license-header.txt"/>
  +              <property name="ignoreLines" value="2"/>
             </module>
             <property name="tabWidth" value="4"/>
             <module name="LeftCurly">
               <property name="option" value="eol"/>
             </module>
             <module name="RightCurly">
  -            <property name="option" value="alone"/>
  +            <property name="option" value="same"/>
             </module>
             <module name="LineLength">
               <property name="max" value="132"/>
  @@ -130,7 +130,7 @@
     
             <!-- Checks for class design                         -->
             <!-- See http://checkstyle.sf.net/config_design.html -->
  -          <module name="DesignForExtension"/>
  +          <!-- module name="DesignForExtension"/ -->
             <module name="FinalClass"/>
             <module name="HideUtilityClassConstructor"/>
             <module name="InterfaceIsType"/>
  @@ -140,7 +140,7 @@
             <!-- Miscellaneous other checks.                   -->
             <!-- See http://checkstyle.sf.net/config_misc.html -->
             <module name="ArrayTypeStyle"/>
  -          <module name="FinalParameters"/>
  +          <!-- module name="FinalParameters"/ -->
             <module name="GenericIllegalRegexp">
                 <property name="format" value="\s+$"/>
                 <property name="message" value="Line has trailing spaces."/>
  
  
  
  1.1                  jakarta-commons/chain/license-header.txt
  
  Index: license-header.txt
  ===================================================================
  /*
   * Copyright 2001-2004 The Apache Software Foundation
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  
  
  1.7       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java
  
  Index: Catalog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Catalog.java	25 Feb 2004 00:01:07 -0000	1.6
  +++ Catalog.java	30 Nov 2004 05:52:22 -0000	1.7
  @@ -37,7 +37,7 @@
        * <p>A default context attribute for storing a default {@link Catalog},
        * provided as a convenience only.</p>
        */
  -    public static final String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
  +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
   
   
       /**
  
  
  
  1.5       +6 -6      jakarta-commons/chain/src/java/org/apache/commons/chain/CatalogFactory.java
  
  Index: CatalogFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/CatalogFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CatalogFactory.java	18 Oct 2004 01:07:41 -0000	1.4
  +++ CatalogFactory.java	30 Nov 2004 05:52:22 -0000	1.5
  @@ -26,7 +26,7 @@
    * as well as {@link Catalog}s stored with a name key.  Follows the
    * Factory pattern (see GoF).</p>
    *
  - * @author Sean Schofield 
  + * @author Sean Schofield
    * @version $Revision$ $Date$
    */
   
  @@ -82,7 +82,7 @@
   
   
       // ------------------------------------------------------- Static Variables
  -    
  +
   
       /**
        * <p>The set of registered {@link CatalogFactory} instances,
  @@ -101,7 +101,7 @@
        * running inside a servet container), this will return a separate
        * instance for each application, even if this class is loaded from
        * a shared parent class loader.</p>
  -     * 
  +     *
        * @return the per-application singleton instance of {@link CatalogFactory}
        */
       public static CatalogFactory getInstance() {
  @@ -116,9 +116,9 @@
               }
           }
           return factory;
  -        
  +
       }
  -    
  +
   
       /**
        * <p>Clear all references to registered catalogs, as well as to the
  
  
  
  1.6       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Filter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Filter.java	25 Feb 2004 00:01:07 -0000	1.5
  +++ Filter.java	30 Nov 2004 05:52:23 -0000	1.6
  @@ -60,7 +60,7 @@
        * @return If a non-null <code>exception</code> was "handled" by this
        *  method (and therefore need not be rethrown), return <code>true</code>;
        *  otherwise return <code>false</code>
  -     */ 
  +     */
      boolean postprocess(Context context, Exception exception);
   
   
  
  
  
  1.2       +3 -5      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigCatalogRule.java
  
  Index: ConfigCatalogRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigCatalogRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigCatalogRule.java	18 Oct 2004 18:47:12 -0000	1.1
  +++ ConfigCatalogRule.java	30 Nov 2004 05:52:23 -0000	1.2
  @@ -18,8 +18,6 @@
   
   import org.apache.commons.chain.Catalog;
   import org.apache.commons.chain.CatalogFactory;
  -import org.apache.commons.chain.Chain;
  -import org.apache.commons.chain.Command;
   import org.apache.commons.digester.Rule;
   import org.xml.sax.Attributes;
   
  @@ -83,10 +81,10 @@
        * if there is no such attribute defined.  Push it onto the top of the
        * stack.</p>
        *
  -     * @param namespace the namespace URI of the matching element, or an 
  +     * @param namespace the namespace URI of the matching element, or an
        *   empty string if the parser is not namespace aware or the element has
        *   no namespace
  -     * @param name the local name if the parser is namespace aware, or just 
  +     * @param name the local name if the parser is namespace aware, or just
        *   the element name otherwise
        * @param attributes The attribute list of this element
        */
  
  
  
  1.2       +3 -6      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigDefineRule.java
  
  Index: ConfigDefineRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigDefineRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigDefineRule.java	16 Jul 2004 19:06:01 -0000	1.1
  +++ ConfigDefineRule.java	30 Nov 2004 05:52:23 -0000	1.2
  @@ -16,9 +16,6 @@
   package org.apache.commons.chain.config;
   
   
  -import org.apache.commons.chain.Catalog;
  -import org.apache.commons.chain.Chain;
  -import org.apache.commons.chain.Command;
   import org.apache.commons.digester.Rule;
   import org.xml.sax.Attributes;
   
  @@ -80,10 +77,10 @@
       /**
        * <p>Register new rules for the specified name and class.</p>
        *
  -     * @param namespace the namespace URI of the matching element, or an 
  +     * @param namespace the namespace URI of the matching element, or an
        *   empty string if the parser is not namespace aware or the element has
        *   no namespace
  -     * @param name the local name if the parser is namespace aware, or just 
  +     * @param name the local name if the parser is namespace aware, or just
        *   the element name otherwise
        * @param attributes The attribute list of this element
        */
  
  
  
  1.5       +5 -5      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRegisterRule.java
  
  Index: ConfigRegisterRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRegisterRule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConfigRegisterRule.java	25 Feb 2004 00:01:06 -0000	1.4
  +++ ConfigRegisterRule.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -69,10 +69,10 @@
       /**
        * <p>Register the top {@link Command} if appropriate.</p>
        *
  -     * @param namespace the namespace URI of the matching element, or an 
  +     * @param namespace the namespace URI of the matching element, or an
        *   empty string if the parser is not namespace aware or the element has
        *   no namespace
  -     * @param name the local name if the parser is namespace aware, or just 
  +     * @param name the local name if the parser is namespace aware, or just
        *   the element name otherwise
        * @param attributes The attribute list of this element
        */
  @@ -81,8 +81,8 @@
   
           // Is the top object a Command?
           Object top = digester.peek(0);
  -        if ((top == null) ||
  -            !(top instanceof Command)) {
  +        if ((top == null)
  +            || !(top instanceof Command)) {
               return;
           }
           Command command = (Command) top;
  
  
  
  1.9       +3 -7      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRuleSet.java
  
  Index: ConfigRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRuleSet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConfigRuleSet.java	18 Oct 2004 01:07:41 -0000	1.8
  +++ ConfigRuleSet.java	30 Nov 2004 05:52:23 -0000	1.9
  @@ -16,10 +16,6 @@
   package org.apache.commons.chain.config;
   
   
  -import org.apache.commons.chain.Catalog;
  -import org.apache.commons.chain.CatalogFactory;
  -import org.apache.commons.chain.Chain;
  -import org.apache.commons.chain.Command;
   import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.RuleSetBase;
   
  @@ -53,7 +49,7 @@
    * <li><strong>classAttribute</strong> -- Attribute on a chain (optional) or
    *     command (required) element that specifies the fully qualified class
    *     name of the implementation class that should be instantiated.
  - *     [className]</li> 
  + *     [className]</li>
    * <li><strong>commandElement</strong> -- Name of the XML element
    *     representing the addition of a {@link Command}.  An implementation
    *     class name must be provided on the attribute named by the
  @@ -69,7 +65,7 @@
    *     rules will be associated, or <code>null</code> for no namespace.
    *     [null]</li>
    * </ul>
  - * 
  + *
    * @author Craig R. McClanahan
    * @version $Revision$ $Date$
    */
  
  
  
  1.10      +5 -6      jakarta-commons/chain/src/java/org/apache/commons/chain/generic/LookupCommand.java
  
  Index: LookupCommand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/generic/LookupCommand.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LookupCommand.java	22 Oct 2004 18:06:47 -0000	1.9
  +++ LookupCommand.java	30 Nov 2004 05:52:23 -0000	1.10
  @@ -18,7 +18,6 @@
   
   import org.apache.commons.chain.Catalog;
   import org.apache.commons.chain.CatalogFactory;
  -import org.apache.commons.chain.Chain;
   import org.apache.commons.chain.Command;
   import org.apache.commons.chain.Context;
   import org.apache.commons.chain.Filter;
  @@ -246,12 +245,12 @@
               if ((command == null) && !isOptional()) {
                   if (catalogName == null) {
                       throw new IllegalArgumentException
  -                        ("Cannot find command '" + name +
  -                         "' in default catalog");
  +                        ("Cannot find command '" + name
  +                         + "' in default catalog");
                   } else {
                       throw new IllegalArgumentException
  -                        ("Cannot find command '" + name +
  -                         "' in catalog '" + catalogName + "'");
  +                        ("Cannot find command '" + name
  +                         + "' in catalog '" + catalogName + "'");
                   }
               }
               return (command);
  
  
  
  1.12      +1 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogBase.java
  
  Index: CatalogBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogBase.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CatalogBase.java	17 Nov 2004 07:59:18 -0000	1.11
  +++ CatalogBase.java	30 Nov 2004 05:52:23 -0000	1.12
  @@ -21,7 +21,6 @@
   import java.util.Iterator;
   import java.util.Map;
   import org.apache.commons.chain.Catalog;
  -import org.apache.commons.chain.Chain;
   import org.apache.commons.chain.Command;
   
   
  
  
  
  1.4       +18 -19    jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogFactoryBase.java
  
  Index: CatalogFactoryBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogFactoryBase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CatalogFactoryBase.java	18 Oct 2004 01:07:42 -0000	1.3
  +++ CatalogFactoryBase.java	30 Nov 2004 05:52:23 -0000	1.4
  @@ -16,7 +16,6 @@
   
   package org.apache.commons.chain.impl;
   
  -import java.util.Collections;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  @@ -26,26 +25,26 @@
   /**
    * <p>A simple implementation of {@link CatalogFactory}.</p>
    *
  - * @author Sean Schofield 
  + * @author Sean Schofield
    * @version $Revision$ $Date$
    */
   
   public class CatalogFactoryBase extends CatalogFactory {
  -    
  +
   
       // ----------------------------------------------------------- Constructors
  -    
  -    
  +
  +
       /**
        * <p>Construct an empty instance of {@link CatalogFactoryBase}.  This
        * constructor is intended solely for use by {@link CatalogFactory}.</p>
        */
  -    public CatalogFactoryBase() {}
  -    
  -    
  +    public CatalogFactoryBase() { }
  +
  +
       // ----------------------------------------------------- Instance Variables
  -    
  -    
  +
  +
       /**
        * <p>The default {@link Catalog} for this {@link CatalogFactory).</p>
        */
  @@ -56,14 +55,14 @@
        * <p>Map of named {@link Catalog}s, keyed by catalog name.</p>
        */
       private Map catalogs = new HashMap();
  -    
  -    
  +
  +
       // --------------------------------------------------------- Public Methods
  -    
  +
   
       // Documented in CatalogFactory interface
       public Catalog getCatalog() {
  -        
  +
           return catalog;
   
       }
  @@ -71,15 +70,15 @@
   
       // Documented in CatalogFactory interface
       public void setCatalog(Catalog catalog) {
  -        
  +
           this.catalog = catalog;
  -        
  +
       }
   
   
       // Documented in CatalogFactory interface
       public Catalog getCatalog(String name) {
  -        
  +
           synchronized (catalogs) {
               return (Catalog) catalogs.get(name);
           }
  @@ -95,7 +94,7 @@
           }
   
       }
  -    
  +
   
       // Documented in CatalogFactory interface
       public Iterator getNames() {
  
  
  
  1.6       +5 -5      jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ChainBase.java
  
  Index: ChainBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ChainBase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ChainBase.java	25 Feb 2004 00:01:06 -0000	1.5
  +++ ChainBase.java	30 Nov 2004 05:52:23 -0000	1.6
  @@ -71,7 +71,7 @@
        *  or one of the individual {@link Command} elements,
        *  is <code>null</code>
        */
  -    public ChainBase(Command commands[]) {
  +    public ChainBase(Command[] commands) {
   
           if (commands == null) {
               throw new IllegalArgumentException();
  @@ -114,7 +114,7 @@
        * the order in which they may delegate processing to the remainder of
        * the {@link Chain}.</p>
        */
  -    protected Command commands[] = new Command[0];
  +    protected Command[] commands = new Command[0];
   
   
       /**
  @@ -136,7 +136,7 @@
           if (frozen) {
               throw new IllegalStateException();
           }
  -        Command results[] = new Command[commands.length + 1];
  +        Command[] results = new Command[commands.length + 1];
           System.arraycopy(commands, 0, results, 0, commands.length);
           results[commands.length] = command;
           commands = results;
  @@ -170,7 +170,7 @@
               } catch (Exception e) {
                   saveException = e;
                   break;
  -            }   
  +            }
           }
   
           // Call postprocess methods on Filters in reverse order
  
  
  
  1.7       +17 -17    jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ContextBase.java
  
  Index: ContextBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ContextBase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ContextBase.java	25 Feb 2004 00:01:06 -0000	1.6
  +++ ContextBase.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -102,7 +102,7 @@
       /**
        * <p>The same <code>PropertyDescriptor</code>s as an array.</p>
        */
  -    private PropertyDescriptor pd[] = null;
  +    private PropertyDescriptor[] pd = null;
   
   
       /**
  @@ -127,7 +127,7 @@
        * <p>Zero-length array of parameter values for calling property getters.
        * </p>
        */
  -    private static Object zeroParams[] = new Object[0];
  +    private static Object[] zeroParams = new Object[0];
   
   
       // ------------------------------------------------------------- Map Methods
  @@ -188,7 +188,7 @@
               }
           }
           return (false);
  -        
  +
       }
   
   
  @@ -415,10 +415,10 @@
               }
           }
           if (j < 0) {
  -            throw new IllegalArgumentException("Property '" + name +
  -                                               "' is not present");
  +            throw new IllegalArgumentException("Property '" + name
  +                                               + "' is not present");
           }
  -        PropertyDescriptor results[] = new PropertyDescriptor[pd.length - 1];
  +        PropertyDescriptor[] results = new PropertyDescriptor[pd.length - 1];
           System.arraycopy(pd, 0, results, 0, j);
           System.arraycopy(pd, j + 1, results, j, pd.length - (j + 1));
           pd = results;
  @@ -506,14 +506,14 @@
               Method method = descriptor.getReadMethod();
               if (method == null) {
                   throw new UnsupportedOperationException
  -                    ("Property '" + descriptor.getName() +
  -                     "' is not readable");
  +                    ("Property '" + descriptor.getName()
  +                     + "' is not readable");
               }
               return (method.invoke(this, zeroParams));
           } catch (Exception e) {
               throw new UnsupportedOperationException
  -                ("Exception reading property '" + descriptor.getName() +
  -                 "': " + e.getMessage());
  +                ("Exception reading property '" + descriptor.getName()
  +                 + "': " + e.getMessage());
           }
   
       }
  @@ -574,14 +574,14 @@
               Method method = descriptor.getWriteMethod();
               if (method == null) {
                   throw new UnsupportedOperationException
  -                    ("Property '" + descriptor.getName() +
  -                     "' is not writeable");
  +                    ("Property '" + descriptor.getName()
  +                     + "' is not writeable");
               }
               method.invoke(this, new Object[] { value });
           } catch (Exception e) {
               throw new UnsupportedOperationException
  -                ("Exception writing property '" + descriptor.getName() +
  -                 "': " + e.getMessage());
  +                ("Exception writing property '" + descriptor.getName()
  +                 + "': " + e.getMessage());
           }
   
       }
  @@ -705,8 +705,8 @@
           }
   
           public int hashCode() {
  -            return (((key == null) ? 0 : key.hashCode()) ^
  -                    ((value == null) ? 0 : value.hashCode()));
  +            return (((key == null) ? 0 : key.hashCode())
  +                   ^ ((value == null) ? 0 : value.hashCode()));
           }
   
           public Object setValue(Object value) {
  
  
  
  1.7       +16 -16    jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainListener.java
  
  Index: ChainListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainListener.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChainListener.java	18 Oct 2004 01:48:51 -0000	1.6
  +++ ChainListener.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -207,9 +207,9 @@
                   Class clazz = loader.loadClass(ruleSet);
                   parser.setRuleSet((RuleSet) clazz.newInstance());
               } catch (Exception e) {
  -                throw new RuntimeException("Exception initalizing RuleSet '" +
  -                                           ruleSet + "' instance: " +
  -                                           e.getMessage());
  +                throw new RuntimeException("Exception initalizing RuleSet '"
  +                                           + ruleSet + "' instance: "
  +                                           + e.getMessage());
               }
           }
   
  @@ -264,9 +264,9 @@
               URL resourceURL = null;
               try {
                   URL jarURL = context.getResource(path);
  -                resourceURL = new URL("jar:" +
  -                                      translate(jarURL.toExternalForm()) +
  -                                      "!/META-INF/chain-config.xml");
  +                resourceURL = new URL("jar:"
  +                                      + translate(jarURL.toExternalForm())
  +                                      + "!/META-INF/chain-config.xml");
                   if (resourceURL == null) {
                       continue;
                   }
  @@ -284,9 +284,9 @@
                   parser.parse(resourceURL);
               } catch (Exception e) {
                   throw new RuntimeException
  -                    ("Exception parsing chain config resource '" +
  -                     resourceURL.toExternalForm() + "': " +
  -                     e.getMessage());
  +                    ("Exception parsing chain config resource '"
  +                     + resourceURL.toExternalForm() + "': "
  +                     + e.getMessage());
               }
           }
   
  @@ -322,9 +322,9 @@
               URL resourceURL = null;
               try {
                   URL jarURL = context.getResource(path);
  -                resourceURL = new URL("jar:" +
  -                                      translate(jarURL.toExternalForm()) +
  -                                      "!/META-INF/chain-config.xml");
  +                resourceURL = new URL("jar:"
  +                                      + translate(jarURL.toExternalForm())
  +                                      + "!/META-INF/chain-config.xml");
                   if (resourceURL == null) {
                       continue;
                   }
  @@ -342,9 +342,9 @@
                   parser.parse(catalog, resourceURL);
               } catch (Exception e) {
                   throw new RuntimeException
  -                    ("Exception parsing chain config resource '" +
  -                     resourceURL.toExternalForm() + "': " +
  -                     e.getMessage());
  +                    ("Exception parsing chain config resource '"
  +                     + resourceURL.toExternalForm() + "': "
  +                     + e.getMessage());
               }
           }
   
  
  
  
  1.7       +8 -8      jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainResources.java
  
  Index: ChainResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainResources.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChainResources.java	18 Oct 2004 01:07:42 -0000	1.6
  +++ ChainResources.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -91,8 +91,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  @@ -145,8 +145,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  @@ -192,8 +192,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  @@ -243,8 +243,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  
  
  
  1.8       +7 -7      jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainServlet.java
  
  Index: ChainServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ChainServlet.java	18 Oct 2004 01:48:51 -0000	1.7
  +++ ChainServlet.java	30 Nov 2004 05:52:23 -0000	1.8
  @@ -93,7 +93,7 @@
    */
   
   public class ChainServlet extends HttpServlet {
  -    
  +
   
       // ------------------------------------------------------ Manifest Constants
   
  @@ -167,12 +167,12 @@
        * @throws ServletException if the servlet could not be initialized
        */
       public void init() throws ServletException {
  -        
  +
           ServletConfig config = getServletConfig();
           ServletContext context = getServletContext();
           if (log.isInfoEnabled()) {
  -            log.info("Initializing chain servlet '" +
  -                     config.getServletName() + "'");
  +            log.info("Initializing chain servlet '"
  +                     + config.getServletName() + "'");
           }
   
           // Retrieve servlet init parameters that we need
  @@ -203,8 +203,8 @@
                   Class clazz = loader.loadClass(ruleSet);
                   parser.setRuleSet((RuleSet) clazz.newInstance());
               } catch (Exception e) {
  -                throw new ServletException("Exception initalizing RuleSet '" +
  -                                           ruleSet + "' instance", e);
  +                throw new ServletException("Exception initalizing RuleSet '"
  +                                           + ruleSet + "' instance", e);
               }
           }
   
  @@ -225,7 +225,7 @@
           if (attr != null) {
               context.setAttribute(attr, catalog);
           }
  -        
  +
       }
   
   
  
  
  
  1.3       +15 -15    jakarta-commons/chain/src/java/org/apache/commons/chain/web/MapEntry.java
  
  Index: MapEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/MapEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MapEntry.java	17 Oct 2004 01:53:53 -0000	1.2
  +++ MapEntry.java	30 Nov 2004 05:52:23 -0000	1.3
  @@ -47,7 +47,7 @@
   
       /**
        * <p>Creates a map entry that can either allow modifications or not.</p>
  -     * 
  +     *
        * @param key The entry key
        * @param value The entry value
        * @param modifiable Whether the entry should allow modification or not
  @@ -61,7 +61,7 @@
   
       /**
        * <p>Gets the entry key.</p>
  -     * 
  +     *
        * @return The entry key
        */
       public Object getKey() {
  @@ -71,7 +71,7 @@
   
       /**
        * <p>Gets the entry value.</p>
  -     * 
  +     *
        * @return The entry key
        */
       public Object getValue() {
  @@ -81,7 +81,7 @@
   
       /**
        * <p>Sets the entry value if the entry can be modified.</p>
  -     * 
  +     *
        * @param val The new value
        * @return The old entry value
        * @throws UnsupportedOperationException If the entry cannot be modified
  @@ -99,29 +99,29 @@
   
       /**
        * <p>Determines if this entry is equal to the passed object.</p>
  -     * 
  +     *
        * @param o The object to test
        * @return True if equal, else false
        */
       public boolean equals(Object o) {
           if (o != null && o instanceof Map.Entry) {
  -            Map.Entry entry = (Map.Entry)o; 
  -            return (this.getKey()==null ?
  -                    entry.getKey()==null : this.getKey().equals(entry.getKey()))  &&
  -                   (this.getValue()==null ?
  -                    entry.getValue()==null : this.getValue().equals(entry.getValue()));
  +            Map.Entry entry = (Map.Entry)o;
  +            return (this.getKey() == null ?
  +                    entry.getKey() == null : this.getKey().equals(entry.getKey()))  &&
  +                   (this.getValue() == null ?
  +                    entry.getValue() == null : this.getValue().equals(entry.getValue()));
           }
           return false;
  -    }    
  +    }
   
   
       /**
        * <p>Returns the hashcode for this entry.</p>
  -     * 
  +     *
        * @return The and'ed hashcode of the key and value
        */
       public int hashCode() {
  -        return (this.getKey()==null   ? 0 : this.getKey().hashCode()) ^
  -               (this.getValue()==null ? 0 : this.getValue().hashCode());
  +        return (this.getKey() == null   ? 0 : this.getKey().hashCode()) ^
  +               (this.getValue() == null ? 0 : this.getValue().hashCode());
       }
   }
  
  
  
  1.6       +1 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/WebContext.java
  
  Index: WebContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/WebContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebContext.java	25 Feb 2004 00:01:06 -0000	1.5
  +++ WebContext.java	30 Nov 2004 05:52:23 -0000	1.6
  @@ -17,7 +17,6 @@
   
   
   import java.util.Map;
  -import org.apache.commons.chain.Context;
   import org.apache.commons.chain.impl.ContextBase;
   
   
  
  
  
  1.4       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java
  
  Index: PortletApplicationScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletApplicationScopeMap.java	25 Feb 2004 00:01:06 -0000	1.3
  +++ PortletApplicationScopeMap.java	30 Nov 2004 05:52:23 -0000	1.4
  @@ -44,7 +44,7 @@
   
   
       private PortletContext context = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.4       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java
  
  Index: PortletRequestScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletRequestScopeMap.java	25 Feb 2004 00:01:06 -0000	1.3
  +++ PortletRequestScopeMap.java	30 Nov 2004 05:52:23 -0000	1.4
  @@ -44,7 +44,7 @@
   
   
       private PortletRequest request = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java
  
  Index: PortletSessionScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PortletSessionScopeMap.java	25 Feb 2004 00:01:06 -0000	1.4
  +++ PortletSessionScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -44,7 +44,7 @@
   
   
       private PortletSession session = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.7       +0 -1      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ChainProcessor.java
  
  Index: ChainProcessor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ChainProcessor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChainProcessor.java	18 Oct 2004 01:48:52 -0000	1.6
  +++ ChainProcessor.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -23,7 +23,6 @@
   import org.apache.commons.chain.Catalog;
   import org.apache.commons.chain.CatalogFactory;
   import org.apache.commons.chain.Command;
  -import org.apache.commons.chain.Context;
   import org.apache.commons.chain.web.ChainServlet;
   
   
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java
  
  Index: ServletApplicationScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletApplicationScopeMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletApplicationScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -45,7 +45,7 @@
   
   
       private ServletContext context = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.5       +3 -3      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java
  
  Index: ServletHeaderValuesMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletHeaderValuesMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletHeaderValuesMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -61,10 +61,10 @@
           if (!(value instanceof String[])) {
               return (false);
           }
  -        String test[] = (String[]) value;
  +        String[] test = (String[]) value;
           Iterator values = values().iterator();
           while (values.hasNext()) {
  -            String actual[] = (String[]) values.next();
  +            String[] actual = (String[]) values.next();
               if (test.length == actual.length) {
                   boolean matched = true;
                   for (int i = 0; i < test.length; i++) {
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java
  
  Index: ServletRequestScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletRequestScopeMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletRequestScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -45,7 +45,7 @@
   
   
       private HttpServletRequest request = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java
  
  Index: ServletSessionScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletSessionScopeMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletSessionScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -45,7 +45,7 @@
   
   
       private HttpSession session = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Sean Schofield <se...@gmail.com>.
I figured it had something to do with Maven (of which I know nothing.)
 Thanks for the concise explanation.  Sorry but I won't be able to
help out on this one!

sean


On Wed, 1 Dec 2004 10:14:08 -0800, Craig McClanahan <cr...@gmail.com> wrote:
> The build.xml scripts for Commons Email and Commons Chain were
> generated by Maven, and include attempts to download all their
> dependencies.  The problem is that the email and JSF jars required by
> these packages have license restrictions that prohibit them being
> posted on the repository -- so the Ant based builds now fail, because
> the jars were removed.
> 
> Craig
> 
> 
> 
> 
> On Wed, 1 Dec 2004 09:43:55 -0500, Sean Schofield
> <se...@gmail.com> wrote:
> > Greetings,
> >
> > I'm just back from a long (one month) vacation to Australia.  I've
> > been catching up on my mailing lists ...
> >
> > Apparently there are the issues with the build file and JSF.  I took a
> > look at my old copy of the source code and that was building just fine
> > with the RI.  I'm assuming I just downloaded it myself since it is not
> > freely distributable.
> >
> > Is there something about officially releasing commons that changes
> > this?  I don't quite understand why this is suddenly an issue (but I'm
> > sure there is a valid legal/procedural reason here somewhere.)
> >
> > Thanks,
> > sean
> >
>

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Craig McClanahan <cr...@gmail.com>.
The build.xml scripts for Commons Email and Commons Chain were
generated by Maven, and include attempts to download all their
dependencies.  The problem is that the email and JSF jars required by
these packages have license restrictions that prohibit them being
posted on the repository -- so the Ant based builds now fail, because
the jars were removed.

Craig


On Wed, 1 Dec 2004 09:43:55 -0500, Sean Schofield
<se...@gmail.com> wrote:
> Greetings,
> 
> I'm just back from a long (one month) vacation to Australia.  I've
> been catching up on my mailing lists ...
> 
> Apparently there are the issues with the build file and JSF.  I took a
> look at my old copy of the source code and that was building just fine
> with the RI.  I'm assuming I just downloaded it myself since it is not
> freely distributable.
> 
> Is there something about officially releasing commons that changes
> this?  I don't quite understand why this is suddenly an issue (but I'm
> sure there is a valid legal/procedural reason here somewhere.)
> 
> Thanks,
> sean
>

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Sean Schofield <se...@gmail.com>.
Greetings,

I'm just back from a long (one month) vacation to Australia.  I've
been catching up on my mailing lists ...

Apparently there are the issues with the build file and JSF.  I took a
look at my old copy of the source code and that was building just fine
with the RI.  I'm assuming I just downloaded it myself since it is not
freely distributable.

Is there something about officially releasing commons that changes
this?  I don't quite understand why this is suddenly an issue (but I'm
sure there is a valid legal/procedural reason here somewhere.)

Thanks,
sean

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Craig McClanahan <cr...@gmail.com>.
On Wed,  1 Dec 2004 14:07:20 +0800, Brett Porter <br...@apache.org> wrote:

> If you'd like to put together a feature request to file, I'm sure we'd be able
> to get someone to take a look.

  http://jira.codehaus.org/browse/MPANT-20

Craig

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Brett Porter <br...@apache.org>.
Quoting Craig McClanahan <cr...@gmail.com>:

> I'm a Maven newbie, but it's not obvious to me that the proposed
> change will do what I think we need.  It sounds like this change
> applies the overrides when you *generate* the build.xml file -- so the
> overrides in effect will be for those of the person running the
> generation.

You're right. Sorry, I got the issue of dealing with non-distributable artifacts
and the general ability to override confused.

If you'd like to put together a feature request to file, I'm sure we'd be able
to get someone to take a look.

> Also, which version of Maven will include the fixes listed on this issue?

The plugins are not particularly ties to a general Maven distribution - ie you
could have all of commons depend on a particular newer version of the Ant plugin
which would be released first.

This would probably be 1.1 which is not for a while yet (ie early next year) as
the next general release is only fixing some regressions and there are no others
planned on that branch.

Cheers,
Brett


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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Craig McClanahan <cr...@gmail.com>.
I'm a Maven newbie, but it's not obvious to me that the proposed
change will do what I think we need.  It sounds like this change
applies the overrides when you *generate* the build.xml file -- so the
overrides in effect will be for those of the person running the
generation.

In Commons, we've been having someone do the generation, and then
check in the generated build.xml file, so that Commons users who like
Ant can build the packages in the usual way.  In the generated
build.xml file, it would seem that the paths for <get> methods would
still be hard coded (either the default ones or the overrides for the
person who did the generation), wouldn't they?

Also, which version of Maven will include the fixes listed on this issue?

Craig


On Wed,  1 Dec 2004 12:54:31 +0800, Brett Porter <br...@apache.org> wrote:
> Quoting Craig McClanahan <cr...@gmail.com>:
> 
> > It would be really nice if the generated build.xml produced by Maven
> > would allow Ant property replacements for the paths to all the
> > dependencies, instead of hard coding them, so you could just define
> > your exceptions in a local build.properties file.
> 
> http://jira.codehaus.org/browse/MPANT-7
> 
> This *should* do what you want (specify ${libdir} in ant and put all your
> non repository stuff in there).
> 
> Cheers,
> Brett
>

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Brett Porter <br...@apache.org>.
Quoting Craig McClanahan <cr...@gmail.com>:

> It would be really nice if the generated build.xml produced by Maven
> would allow Ant property replacements for the paths to all the
> dependencies, instead of hard coding them, so you could just define
> your exceptions in a local build.properties file.

http://jira.codehaus.org/browse/MPANT-7

This *should* do what you want (specify ${libdir} in ant and put all your
non repository stuff in there).

Cheers,
Brett

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Craig McClanahan <cr...@gmail.com>.
On Tue, 30 Nov 2004 20:05:16 -0800, Martin Cooper <mf...@gmail.com> wrote:
> On Tue, 30 Nov 2004 19:11:00 -0500, Noel J. Bergman <no...@devtech.com> wrote:
> 
> 
> > Eric Pugh wrote:
> > > I'd guess that the JSF jar's are not distributable on IBiblio,
> > > just like the JavaMail ones?
> >
> > Check the license, but if it is the SBCL, then the restriction applies.
> > This would be a good reason to use MyFaces, of course.  :-)
> >
> > Martin Cooper wrote:
> >
> > > One alternative, I suppose, might be to get the MyFaces jars up on
> > > ibiblio and build against that instead. The lesser of two evils?
> >
> > Excuse me?  Why did MyFaces become any evil at all?
> 
> Sorry, I didn't mean that MyFaces is evil per se. ;-) The options appear to be:
> 
> 1) Change the build to compile against a copy of the JSF RI that has
> been downloaded "out of band". Not sure how we do this in a way that
> the path used works for everyone.

It would be really nice if the generated build.xml produced by Maven
would allow Ant property replacements for the paths to all the
dependencies, instead of hard coding them, so you could just define
your exceptions in a local build.properties file.

> 
> 2) Change the build to compile against MyFaces instead of the RI. The
> only problems I can see with this is are (a) it might be less than
> obvious to some people (who don't care about Chain and JSF) what
> MyFaces is and why it's needed; and (b) MyFaces, as I understand it,
> is an extension of the JSF JSR, so conceivably, Chain could end up
> depending on extensions if we're not compiling against the RI. (I
> honestly don't know how real that scenario is.)

MyFaces is more than one thing, but the most important part for our
purposes is an implementation of the spec (the other part is a JSF
component library, which is not relevant for the purposes of compiling
Chain).  In turn, this implementation is split into API classes and
implementation classes (just like the RI does it), so it would be
really easy to make this sort of change.

Craig

> 
> Neither of these is ideal, which is what led me to use the phrase "the
> 
> 
> lesser of two evils". ;-)
> 
> --
> Martin Cooper
> 
> >        --- Noe
> >
> > ---------------------------------------------------------------------
> >
> >
> > To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> >
> >
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> 
>

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Martin Cooper <mf...@gmail.com>.
On Tue, 30 Nov 2004 19:11:00 -0500, Noel J. Bergman <no...@devtech.com> wrote:
> Eric Pugh wrote:
> > I'd guess that the JSF jar's are not distributable on IBiblio,
> > just like the JavaMail ones?
> 
> Check the license, but if it is the SBCL, then the restriction applies.
> This would be a good reason to use MyFaces, of course.  :-)
> 
> Martin Cooper wrote:
> 
> > One alternative, I suppose, might be to get the MyFaces jars up on
> > ibiblio and build against that instead. The lesser of two evils?
> 
> Excuse me?  Why did MyFaces become any evil at all?

Sorry, I didn't mean that MyFaces is evil per se. ;-) The options appear to be:

1) Change the build to compile against a copy of the JSF RI that has
been downloaded "out of band". Not sure how we do this in a way that
the path used works for everyone.

2) Change the build to compile against MyFaces instead of the RI. The
only problems I can see with this is are (a) it might be less than
obvious to some people (who don't care about Chain and JSF) what
MyFaces is and why it's needed; and (b) MyFaces, as I understand it,
is an extension of the JSF JSR, so conceivably, Chain could end up
depending on extensions if we're not compiling against the RI. (I
honestly don't know how real that scenario is.)

Neither of these is ideal, which is what led me to use the phrase "the
lesser of two evils". ;-)

--
Martin Cooper


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

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


RE: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by "Noel J. Bergman" <no...@devtech.com>.
Eric Pugh wrote:
> I'd guess that the JSF jar's are not distributable on IBiblio,
> just like the JavaMail ones?

Check the license, but if it is the SBCL, then the restriction applies.
This would be a good reason to use MyFaces, of course.  :-)

Martin Cooper wrote:

> One alternative, I suppose, might be to get the MyFaces jars up on
> ibiblio and build against that instead. The lesser of two evils?

Excuse me?  Why did MyFaces become any evil at all?

	--- Noe


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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Martin Cooper <mf...@gmail.com>.
On Tue, 30 Nov 2004 22:26:31 +0100, Eric Pugh <ep...@upstate.com> wrote:
> I'd guess that the JSF jar's are not distributable on IBiblio, just like the
> JavaMail ones?

Yah, you might be right. I guess that would mean we'd have to tweak
the Ant build file by hand, as Craig did for the Email one recently?
Sigh. ;-(

One alternative, I suppose, might be to get the MyFaces jars up on
ibiblio and build against that instead. The lesser of two evils?

--
Martin Cooper


> ERic
> 
> 
> 
> > -----Original Message-----
> > From: Martin Cooper [mailto:mfncooper@gmail.com]
> > Sent: Tuesday, November 30, 2004 7:00 PM
> > To: Jakarta Commons Developers List; craigmcc@apache.org
> > Subject: Re: cvs commit:
> > jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet
> > ChainProcessor.java ServletApplicationScopeMap.java
> > ServletHeaderValuesMap.java ServletRequestScopeMap.java
> > ServletSessionScopeMap.java
> >
> >
> > On Tue, 30 Nov 2004 00:06:52 -0800, Craig McClanahan
> > <cr...@gmail.com> wrote:
> > > -1
> > >
> > > Besides the fact that this change bundle breaks the "ant clean dist"
> > > command that is necessary for the current ngihtly build scripts to
> > > work
> >
> > I don't believe that's why the build broke. The problem is that, for
> > some reason, the JSF jar files have disappeared from ibiblio. I don't
> > know how to fix that.
> >
> > >, it alters the semantics with changes like this:
> >
> > How does it change the semantics? All of 'public', 'static' and
> > 'final' are redundant here, because this is an interface.
> >
> > --
> > Martin Cooper
> >
> >
> > >
> > >
> > > >   Index: Catalog.java
> > > >   ===================================================================
> > > >   RCS file:
> > /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/
> > Catalog.java,v
> > > >   retrieving revision 1.6
> > > >   retrieving revision 1.7
> > > >   diff -u -r1.6 -r1.7
> > > >   --- Catalog.java      25 Feb 2004 00:01:07 -0000      1.6
> > > >   +++ Catalog.java      30 Nov 2004 05:52:22 -0000      1.7
> > > >   @@ -37,7 +37,7 @@
> > > >         * <p>A default context attribute for storing a
> > default {@link Catalog},
> > > >         * provided as a convenience only.</p>
> > > >         */
> > > >   -    public static final String CATALOG_KEY =
> > "org.apache.commons.chain.CATALOG";
> > > >   +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> > > >
> > > >        /**
> > > >
> > >
> > > Craig
> > >
> > >
> > >
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> > > For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> > >
> > >
> >
> > ---------------------------------------------------------------------
> 
> 
> > To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> 
>

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Craig McClanahan <cr...@gmail.com>.
On Tue, 30 Nov 2004 10:00:07 -0800, Martin Cooper <mf...@gmail.com> wrote:
> On Tue, 30 Nov 2004 00:06:52 -0800, Craig McClanahan <cr...@gmail.com> wrote:
> > -1
> >
> > Besides the fact that this change bundle breaks the "ant clean dist"
> > command that is necessary for the current ngihtly build scripts to
> > work
> 
> I don't believe that's why the build broke. The problem is that, for
> some reason, the JSF jar files have disappeared from ibiblio. I don't
> know how to fix that.
> 

Between us dual tracking (trying to get MyFaces up on ibiblio and a
solution to how build.xml files are generated) we should be able to
make progress on this.  On the other hand, we could also revert to the
build.xml before the one generated by Maven was checked in.

> >, it alters the semantics with changes like this:
> 
> How does it change the semantics? All of 'public', 'static' and
> 'final' are redundant here, because this is an interface.

True ... i've been tending to use abstract classes rather than
interfaces, to minimize the impact of future changes on backwards
compatibility.  Change my -1 to -0 ... the visual impact of seeing
"public static final" on a String constant in an interface is still
going to tell the developer looking at this file something about the
intent that this be a manifest constant, regardless of whether it is
technically redudant or not.

Craig

> 
> --
> Martin Cooper
> 
> 
> 
> 
> >
> >
> > >   Index: Catalog.java
> > >   ===================================================================
> > >   RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java,v
> > >   retrieving revision 1.6
> > >   retrieving revision 1.7
> > >   diff -u -r1.6 -r1.7
> > >   --- Catalog.java      25 Feb 2004 00:01:07 -0000      1.6
> > >   +++ Catalog.java      30 Nov 2004 05:52:22 -0000      1.7
> > >   @@ -37,7 +37,7 @@
> > >         * <p>A default context attribute for storing a default {@link Catalog},
> > >         * provided as a convenience only.</p>
> > >         */
> > >   -    public static final String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> > >   +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> > >
> > >        /**
> > >
> >
> > Craig
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> >
> >
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> 
>

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Martin Cooper <mf...@gmail.com>.
On Tue, 30 Nov 2004 10:00:07 -0800, Martin Cooper <mf...@gmail.com> wrote:
> On Tue, 30 Nov 2004 00:06:52 -0800, Craig McClanahan <cr...@gmail.com> wrote:
> > -1
> >
> > Besides the fact that this change bundle breaks the "ant clean dist"
> > command that is necessary for the current ngihtly build scripts to
> > work
> 
> I don't believe that's why the build broke. The problem is that, for
> some reason, the JSF jar files have disappeared from ibiblio. I don't
> know how to fix that.

By the way, it looks like the Commons Chain nightly builds have been
broken for at least a week:

http://cvs.apache.org/builds/jakarta-commons/nightly/commons-chain/

--
Martin Cooper


> >, it alters the semantics with changes like this:
> 
> How does it change the semantics? All of 'public', 'static' and
> 'final' are redundant here, because this is an interface.
> 
> --
> Martin Cooper
> 
> 
> 
> 
> >
> >
> > >   Index: Catalog.java
> > >   ===================================================================
> > >   RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java,v
> > >   retrieving revision 1.6
> > >   retrieving revision 1.7
> > >   diff -u -r1.6 -r1.7
> > >   --- Catalog.java      25 Feb 2004 00:01:07 -0000      1.6
> > >   +++ Catalog.java      30 Nov 2004 05:52:22 -0000      1.7
> > >   @@ -37,7 +37,7 @@
> > >         * <p>A default context attribute for storing a default {@link Catalog},
> > >         * provided as a convenience only.</p>
> > >         */
> > >   -    public static final String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> > >   +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> > >
> > >        /**
> > >
> >
> > Craig
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> >
> >
>

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


RE: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Eric Pugh <ep...@upstate.com>.
I'd guess that the JSF jar's are not distributable on IBiblio, just like the
JavaMail ones?

ERic

> -----Original Message-----
> From: Martin Cooper [mailto:mfncooper@gmail.com]
> Sent: Tuesday, November 30, 2004 7:00 PM
> To: Jakarta Commons Developers List; craigmcc@apache.org
> Subject: Re: cvs commit:
> jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet
> ChainProcessor.java ServletApplicationScopeMap.java
> ServletHeaderValuesMap.java ServletRequestScopeMap.java
> ServletSessionScopeMap.java
>
>
> On Tue, 30 Nov 2004 00:06:52 -0800, Craig McClanahan
> <cr...@gmail.com> wrote:
> > -1
> >
> > Besides the fact that this change bundle breaks the "ant clean dist"
> > command that is necessary for the current ngihtly build scripts to
> > work
>
> I don't believe that's why the build broke. The problem is that, for
> some reason, the JSF jar files have disappeared from ibiblio. I don't
> know how to fix that.
>
> >, it alters the semantics with changes like this:
>
> How does it change the semantics? All of 'public', 'static' and
> 'final' are redundant here, because this is an interface.
>
> --
> Martin Cooper
>
>
> >
> >
> > >   Index: Catalog.java
> > >   ===================================================================
> > >   RCS file:
> /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/
> Catalog.java,v
> > >   retrieving revision 1.6
> > >   retrieving revision 1.7
> > >   diff -u -r1.6 -r1.7
> > >   --- Catalog.java      25 Feb 2004 00:01:07 -0000      1.6
> > >   +++ Catalog.java      30 Nov 2004 05:52:22 -0000      1.7
> > >   @@ -37,7 +37,7 @@
> > >         * <p>A default context attribute for storing a
> default {@link Catalog},
> > >         * provided as a convenience only.</p>
> > >         */
> > >   -    public static final String CATALOG_KEY =
> "org.apache.commons.chain.CATALOG";
> > >   +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> > >
> > >        /**
> > >
> >
> > Craig
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org


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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Martin Cooper <mf...@gmail.com>.
On Tue, 30 Nov 2004 00:06:52 -0800, Craig McClanahan <cr...@gmail.com> wrote:
> -1
> 
> Besides the fact that this change bundle breaks the "ant clean dist"
> command that is necessary for the current ngihtly build scripts to
> work

I don't believe that's why the build broke. The problem is that, for
some reason, the JSF jar files have disappeared from ibiblio. I don't
know how to fix that.

>, it alters the semantics with changes like this:

How does it change the semantics? All of 'public', 'static' and
'final' are redundant here, because this is an interface.

--
Martin Cooper


> 
> 
> >   Index: Catalog.java
> >   ===================================================================
> >   RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java,v
> >   retrieving revision 1.6
> >   retrieving revision 1.7
> >   diff -u -r1.6 -r1.7
> >   --- Catalog.java      25 Feb 2004 00:01:07 -0000      1.6
> >   +++ Catalog.java      30 Nov 2004 05:52:22 -0000      1.7
> >   @@ -37,7 +37,7 @@
> >         * <p>A default context attribute for storing a default {@link Catalog},
> >         * provided as a convenience only.</p>
> >         */
> >   -    public static final String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> >   +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> >
> >        /**
> >
> 
> Craig
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> 
>

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


Re: cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java

Posted by Craig McClanahan <cr...@gmail.com>.
-1

Besides the fact that this change bundle breaks the "ant clean dist"
command that is necessary for the current ngihtly build scripts to
work, it alters the semantics with changes like this:

>   Index: Catalog.java
>   ===================================================================
>   RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java,v
>   retrieving revision 1.6
>   retrieving revision 1.7
>   diff -u -r1.6 -r1.7
>   --- Catalog.java      25 Feb 2004 00:01:07 -0000      1.6
>   +++ Catalog.java      30 Nov 2004 05:52:22 -0000      1.7
>   @@ -37,7 +37,7 @@
>         * <p>A default context attribute for storing a default {@link Catalog},
>         * provided as a convenience only.</p>
>         */
>   -    public static final String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
>   +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
> 
>        /**
> 

Craig

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