dion        02/05/20 22:58:38

  Modified:    src/java/org/apache/maven/j2ee J2EEEntityResolver.java
  Added:       src/java/org/apache/maven/struts StrutsEntityResolver.java
  Log:
  Changes to allow J2EEEntityResolver to be easily extended.
  StrutsEntityResolver added to handle struts 1.0 and 1.1 DTDs
  
  Revision  Changes    Path
  1.3       +18 -1     
jakarta-turbine-maven/src/java/org/apache/maven/j2ee/J2EEEntityResolver.java
  
  Index: J2EEEntityResolver.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/j2ee/J2EEEntityResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- J2EEEntityResolver.java   21 May 2002 01:15:55 -0000      1.2
  +++ J2EEEntityResolver.java   21 May 2002 05:58:37 -0000      1.3
  @@ -67,7 +67,7 @@
    * A class to resolve external entity definitions for j2ee artifacts.
    *
    * @author  dion
  - * @version $Id: J2EEEntityResolver.java,v 1.2 2002/05/21 01:15:55 dion Exp $
  + * @version $Id: J2EEEntityResolver.java,v 1.3 2002/05/21 05:58:37 dion Exp $
    */
   public class J2EEEntityResolver implements EntityResolver
   {
  @@ -121,4 +121,21 @@
           }
           return null;
       }
  +    
  +    /** Getter for publicId to resource name map.
  +     * @return Value of property idToResource.
  +     */
  +    protected Map getIdToResource()
  +    {
  +        return idToResource;
  +    }
  +    
  +    /** Setter for publicId to resource name map.
  +     * @param idToResource New value of property idToResource.
  +     */
  +    protected void setIdToResource(Map idToResource)
  +    {
  +        this.idToResource = idToResource;
  +    }
  +    
   }
  
  
  
  1.1                  
jakarta-turbine-maven/src/java/org/apache/maven/struts/StrutsEntityResolver.java
  
  Index: StrutsEntityResolver.java
  ===================================================================
  package org.apache.maven.struts;
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 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 acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *    "Apache Maven" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache",
   *    "Apache Maven", 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
   * 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/>.
   */
  
  import org.apache.maven.j2ee.J2EEEntityResolver;
  
  /**
   * A class to resolve external entity definitions for struts artifacts.
   *
   * @author  dion
   * @version $Id: StrutsEntityResolver.java,v 1.1 2002/05/21 05:58:38 dion Exp $
   */
  public class StrutsEntityResolver extends J2EEEntityResolver
  {
    
      /** Creates a new instance of StrutsEntityResolver, adding the 
       */
      public StrutsEntityResolver()
      {
          getIdToResource().put(
              "-//Apache Software Foundation//DTD Struts Configuration 1.0//EN",
              "/struts-config_1_0.dtd");
          getIdToResource().put(
              "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN",
              "/struts-config_1_1.dtd");
      }
  }
  
  
  

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

Reply via email to