User: rinkrank
  Date: 02/05/15 11:55:43

  Modified:    modules/web/src/xdoclet/modules/web Tag:
                        MODULE_REFACTORING_BRANCH JspTaglibSubTask.java
                        WebXmlSubTask.java
  Log:
  -xdoclet.web.WebDocletTask -> xdoclet.modules.bweb.WebDocletTask in various places
  -introduced ${xdoclet.root.dir} in stead of relative paths from ${basedir}
  -modified classpath used when building xdoclet.xml (include previously built module 
jars)
  -removed common.xml. obsolete
  -simplified module build scripts
  -renamed deploymentdescriptor subtask (in ejb and web) to ejbjarxml and webxml. due 
to duplicate key lookup in DocletTask
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +529 -492  
xdoclet/modules/web/src/xdoclet/modules/web/Attic/JspTaglibSubTask.java
  
  Index: JspTaglibSubTask.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/Attic/JspTaglibSubTask.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -w -r1.1.2.4 -r1.1.2.5
  --- JspTaglibSubTask.java     9 May 2002 16:42:52 -0000       1.1.2.4
  +++ JspTaglibSubTask.java     15 May 2002 18:55:43 -0000      1.1.2.5
  @@ -4,95 +4,95 @@
    */
   package xdoclet.modules.web;
   
  -import xdoclet.XmlSubTask;
  +import java.io.File;
   import xdoclet.XDocletException;
  -import xdoclet.util.Translator;
   
  -import java.io.File;
  +import xdoclet.XmlSubTask;
  +import xdoclet.util.Translator;
   
   /**
    * Generates taglib.tld deployment descriptor for JSP taglibs.
    *
  - * @xdoclet:subtask name="jsptaglib" parent="xdoclet.web.WebDocletTask"
  - *
    * @author Ara Abrahamian ([EMAIL PROTECTED])
    * @created July 12, 2001
  - * @version $Revision: 1.1.2.4 $
  + * @xdoclet:subtask   name="jsptaglib" parent="xdoclet.modules.web.WebDocletTask"
  + * @version           $Revision: 1.1.2.5 $
    */
  -public class JspTaglibSubTask extends XmlSubTask {
  -
  +public class JspTaglibSubTask extends XmlSubTask
  +{
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String taglibversion = "1.0";
  +    public final static String SUBTASK_NAME = "jspTagLib";
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String jspversion = "1.2";
  -
  +    private static String DEFAULT_TEMPLATE_FILE = "resources/taglib_tld.xdt";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String shortname = "";
  -
  +    private static String TLD_PUBLICID_1_2 = "-//Sun Microsystems, Inc.//DTD JSP 
XTag Library 1.2//EN";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String uri = "";
  -
  +    private static String TLD_PUBLICID_1_1 = "-//Sun Microsystems, Inc.//DTD JSP 
XTag Library 1.1//EN";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String displayname = "";
  +    private static String TLD_SYSTEMID_1_2 = 
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";;
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String smallicon = "";
  +    private static String TLD_SYSTEMID_1_1 = 
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";;
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String largeicon = "";
  +    private static String TLD_DTD_FILE_NAME_1_2 = 
"resources/web-jsptaglibrary_1_2.dtd";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String description = "";
  +    private static String TLD_DTD_FILE_NAME_1_1 = 
"resources/web-jsptaglibrary_1_1.dtd";
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String filename = "taglib.tld";
  +    protected String taglibversion = "1.0";
        /**
         * @todo-javadoc Describe the field
         */
  -     public final static String SUBTASK_NAME = "jspTagLib";
  +    protected String jspversion = "1.2";
   
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String DEFAULT_TEMPLATE_FILE = "resources/taglib_tld.xdt";
  +    protected String shortname = "";
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String TLD_PUBLICID_1_2 = "-//Sun Microsystems, Inc.//DTD JSP 
XTag Library 1.2//EN";
  +    protected String uri = "";
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String TLD_PUBLICID_1_1 = "-//Sun Microsystems, Inc.//DTD JSP 
XTag Library 1.1//EN";
  +    protected String displayname = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String TLD_SYSTEMID_1_2 = 
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";;
  +    protected String smallicon = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String TLD_SYSTEMID_1_1 = 
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";;
  +    protected String largeicon = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String TLD_DTD_FILE_NAME_1_2 = 
"resources/web-jsptaglibrary_1_2.dtd";
  +    protected String description = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String TLD_DTD_FILE_NAME_1_1 = 
"resources/web-jsptaglibrary_1_1.dtd";
  +    protected String filename = "taglib.tld";
   
   
        /**
  @@ -100,7 +100,8 @@
         *
         * @todo-javadoc Write javadocs for constructor
         */
  -     public JspTaglibSubTask() {
  +    public JspTaglibSubTask()
  +    {
                setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
                setDestinationFile(filename);
   
  @@ -112,202 +113,222 @@
   
   
        /**
  -      * Sets the Taglibversion attribute of the JspTaglibSubTask object
  +     * Gets the SubTaskName attribute of the JspTaglibSubTask object
         *
  -      * @param taglibversion The new Taglibversion value
  +     * @return   The SubTaskName value
         */
  -     public void setTaglibversion(String taglibversion) {
  -             this.taglibversion = taglibversion;
  +    public String getSubTaskName()
  +    {
  +        return SUBTASK_NAME;
        }
   
   
        /**
  -      * Sets the Jspversion attribute of the JspTaglibSubTask object
  +     * Gets the Taglibversion attribute of the JspTaglibSubTask object
         *
  -      * @param jspversion The new Jspversion value
  +     * @return   The Taglibversion value
         */
  -     public void setJspversion(JspVersionTypes jspversion) {
  -             this.jspversion = jspversion.getValue();
  +    public String getTaglibversion()
  +    {
  +        return taglibversion;
        }
   
   
        /**
  -      * Sets the Shortname attribute of the JspTaglibSubTask object
  +     * Gets the Jspversion attribute of the JspTaglibSubTask object
         *
  -      * @param shortname The new Shortname value
  +     * @return   The Jspversion value
         */
  -     public void setShortname(String shortname) {
  -             this.shortname = shortname;
  +    public String getJspversion()
  +    {
  +        return jspversion;
        }
   
   
        /**
  -      * Sets the Uri attribute of the JspTaglibSubTask object
  +     * Gets the Shortname attribute of the JspTaglibSubTask object
         *
  -      * @param uri The new Uri value
  +     * @return   The Shortname value
         */
  -     public void setUri(String uri) {
  -             this.uri = uri;
  +    public String getShortname()
  +    {
  +        return shortname;
        }
   
   
        /**
  -      * Sets the Displayname attribute of the JspTaglibSubTask object
  +     * Gets the Uri attribute of the JspTaglibSubTask object
         *
  -      * @param new_display_name The new Displayname value
  +     * @return   The Uri value
         */
  -     public void setDisplayname(String new_display_name) {
  -             displayname = new_display_name;
  +    public String getUri()
  +    {
  +        return uri;
        }
   
   
        /**
  -      * Sets the Smallicon attribute of the JspTaglibSubTask object
  +     * Gets the Displayname attribute of the JspTaglibSubTask object
         *
  -      * @param new_icon The new Smallicon value
  +     * @return   The Displayname value
         */
  -     public void setSmallicon(String new_icon) {
  -             smallicon = new_icon;
  +    public String getDisplayname()
  +    {
  +        return displayname;
        }
   
   
        /**
  -      * Sets the Largeicon attribute of the JspTaglibSubTask object
  +     * Gets the Smallicon attribute of the JspTaglibSubTask object
         *
  -      * @param new_icon The new Largeicon value
  +     * @return   The Smallicon value
         */
  -     public void setLargeicon(String new_icon) {
  -             largeicon = new_icon;
  +    public String getSmallicon()
  +    {
  +        return smallicon;
        }
   
   
        /**
  -      * Sets the Description attribute of the JspTaglibSubTask object
  +     * Gets the Largeicon attribute of the JspTaglibSubTask object
         *
  -      * @param new_description The new Description value
  +     * @return   The Largeicon value
         */
  -     public void setDescription(String new_description) {
  -             description = new_description;
  +    public String getLargeicon()
  +    {
  +        return largeicon;
        }
   
   
        /**
  -      * Sets the Filename attribute of the JspTaglibSubTask object
  +     * Gets the Description attribute of the JspTaglibSubTask object
         *
  -      * @param new_filename The new Filename value
  +     * @return   The Description value
         */
  -     public void setFilename(String new_filename) {
  -             filename = new_filename;
  -             setDestinationFile(filename);
  +    public String getDescription()
  +    {
  +        return description;
        }
   
   
        /**
  -      * Gets the SubTaskName attribute of the JspTaglibSubTask object
  +     * Gets the Filename attribute of the JspTaglibSubTask object
         *
  -      * @return The SubTaskName value
  +     * @return   The Filename value
         */
  -     public String getSubTaskName() {
  -             return SUBTASK_NAME;
  +    public String getFilename()
  +    {
  +        return filename;
        }
   
   
        /**
  -      * Gets the Taglibversion attribute of the JspTaglibSubTask object
  +     * Sets the Taglibversion attribute of the JspTaglibSubTask object
         *
  -      * @return The Taglibversion value
  +     * @param taglibversion  The new Taglibversion value
         */
  -     public String getTaglibversion() {
  -             return taglibversion;
  +    public void setTaglibversion(String taglibversion)
  +    {
  +        this.taglibversion = taglibversion;
        }
   
   
        /**
  -      * Gets the Jspversion attribute of the JspTaglibSubTask object
  +     * Sets the Jspversion attribute of the JspTaglibSubTask object
         *
  -      * @return The Jspversion value
  +     * @param jspversion  The new Jspversion value
         */
  -     public String getJspversion() {
  -             return jspversion;
  +    public void setJspversion(JspVersionTypes jspversion)
  +    {
  +        this.jspversion = jspversion.getValue();
        }
   
   
        /**
  -      * Gets the Shortname attribute of the JspTaglibSubTask object
  +     * Sets the Shortname attribute of the JspTaglibSubTask object
         *
  -      * @return The Shortname value
  +     * @param shortname  The new Shortname value
         */
  -     public String getShortname() {
  -             return shortname;
  +    public void setShortname(String shortname)
  +    {
  +        this.shortname = shortname;
        }
   
   
        /**
  -      * Gets the Uri attribute of the JspTaglibSubTask object
  +     * Sets the Uri attribute of the JspTaglibSubTask object
         *
  -      * @return The Uri value
  +     * @param uri  The new Uri value
         */
  -     public String getUri() {
  -             return uri;
  +    public void setUri(String uri)
  +    {
  +        this.uri = uri;
        }
   
   
        /**
  -      * Gets the Displayname attribute of the JspTaglibSubTask object
  +     * Sets the Displayname attribute of the JspTaglibSubTask object
         *
  -      * @return The Displayname value
  +     * @param new_display_name  The new Displayname value
         */
  -     public String getDisplayname() {
  -             return displayname;
  +    public void setDisplayname(String new_display_name)
  +    {
  +        displayname = new_display_name;
        }
   
   
        /**
  -      * Gets the Smallicon attribute of the JspTaglibSubTask object
  +     * Sets the Smallicon attribute of the JspTaglibSubTask object
         *
  -      * @return The Smallicon value
  +     * @param new_icon  The new Smallicon value
         */
  -     public String getSmallicon() {
  -             return smallicon;
  +    public void setSmallicon(String new_icon)
  +    {
  +        smallicon = new_icon;
        }
   
   
        /**
  -      * Gets the Largeicon attribute of the JspTaglibSubTask object
  +     * Sets the Largeicon attribute of the JspTaglibSubTask object
         *
  -      * @return The Largeicon value
  +     * @param new_icon  The new Largeicon value
         */
  -     public String getLargeicon() {
  -             return largeicon;
  +    public void setLargeicon(String new_icon)
  +    {
  +        largeicon = new_icon;
        }
   
   
        /**
  -      * Gets the Description attribute of the JspTaglibSubTask object
  +     * Sets the Description attribute of the JspTaglibSubTask object
         *
  -      * @return The Description value
  +     * @param new_description  The new Description value
         */
  -     public String getDescription() {
  -             return description;
  +    public void setDescription(String new_description)
  +    {
  +        description = new_description;
        }
   
   
        /**
  -      * Gets the Filename attribute of the JspTaglibSubTask object
  +     * Sets the Filename attribute of the JspTaglibSubTask object
         *
  -      * @return The Filename value
  +     * @param new_filename  The new Filename value
         */
  -     public String getFilename() {
  -             return filename;
  +    public void setFilename(String new_filename)
  +    {
  +        filename = new_filename;
  +        setDestinationFile(filename);
        }
   
   
        /**
         * Called to validate configuration parameters.
         *
  -      * @exception xdoclet.XDocletException Description of Exception
  +     * @exception XDocletException
         */
  -     public void validateOptions() throws XDocletException {
  +    public void validateOptions() throws XDocletException
  +    {
                super.validateOptions();
   
                if (getShortname() == null || getShortname().trim().equals("")) {
  @@ -319,11 +340,12 @@
        /**
         * Describe what the method does
         *
  -      * @exception xdoclet.XDocletException Describe the exception
  +     * @exception XDocletException
         * @todo-javadoc Write javadocs for method
         * @todo-javadoc Write javadocs for exception
         */
  -     public void execute() throws XDocletException {
  +    public void execute() throws XDocletException
  +    {
                if (getJspversion().equals("1.1")) {
                        setPublicId(TLD_PUBLICID_1_1);
                        setSystemId(TLD_SYSTEMID_1_1);
  @@ -342,11 +364,12 @@
        /**
         * Describe what the method does
         *
  -      * @exception xdoclet.XDocletException Describe the exception
  +     * @exception XDocletException
         * @todo-javadoc Write javadocs for method
         * @todo-javadoc Write javadocs for exception
         */
  -     protected void engineStarted() throws XDocletException {
  +    protected void engineStarted() throws XDocletException
  +    {
                System.out.println(Translator.getString("generating_something",
                                new String[]{getDestinationFile().toString()}));
        }
  @@ -356,7 +379,8 @@
         * @author Aslak Helles�y
         * @created July 28, 2001
         */
  -     public static class ContextParam implements java.io.Serializable {
  +    public static class ContextParam implements java.io.Serializable
  +    {
                /**
                 * @todo-javadoc Describe the field
                 */
  @@ -372,62 +396,68 @@
   
   
                /**
  -              * Sets the Name attribute of the ContextParam object
  +         * Gets the Name attribute of the ContextParam object
                 *
  -              * @param name The new Name value
  +         * @return   The Name value
                 */
  -             public void setName(String name) {
  -                     paramName = name;
  +        public String getName()
  +        {
  +            return paramName;
                }
   
   
                /**
  -              * Sets the Value attribute of the ContextParam object
  +         * Gets the Value attribute of the ContextParam object
                 *
  -              * @param value The new Value value
  +         * @return   The Value value
                 */
  -             public void setValue(String value) {
  -                     paramValue = value;
  +        public String getValue()
  +        {
  +            return paramValue;
                }
   
   
                /**
  -              * Sets the Description attribute of the ContextParam object
  +         * Gets the Description attribute of the ContextParam object
                 *
  -              * @param desc The new Description value
  +         * @return   The Description value
                 */
  -             public void setDescription(String desc) {
  -                     description = desc;
  +        public String getDescription()
  +        {
  +            return description;
                }
   
   
                /**
  -              * Gets the Name attribute of the ContextParam object
  +         * Sets the Name attribute of the ContextParam object
                 *
  -              * @return The Name value
  +         * @param name  The new Name value
                 */
  -             public String getName() {
  -                     return paramName;
  +        public void setName(String name)
  +        {
  +            paramName = name;
                }
   
   
                /**
  -              * Gets the Value attribute of the ContextParam object
  +         * Sets the Value attribute of the ContextParam object
                 *
  -              * @return The Value value
  +         * @param value  The new Value value
                 */
  -             public String getValue() {
  -                     return paramValue;
  +        public void setValue(String value)
  +        {
  +            paramValue = value;
                }
   
   
                /**
  -              * Gets the Description attribute of the ContextParam object
  +         * Sets the Description attribute of the ContextParam object
                 *
  -              * @return The Description value
  +         * @param desc  The new Description value
                 */
  -             public String getDescription() {
  -                     return description;
  +        public void setDescription(String desc)
  +        {
  +            description = desc;
                }
        }
   
  @@ -436,7 +466,8 @@
         * @author Aslak Helles�y
         * @created July 28, 2001
         */
  -     public static class TagLib implements java.io.Serializable {
  +    public static class TagLib implements java.io.Serializable
  +    {
                /**
                 * @todo-javadoc Describe the field
                 */
  @@ -448,42 +479,46 @@
   
   
                /**
  -              * Sets the URI attribute of the TagLib object
  +         * Gets the URI attribute of the TagLib object
                 *
  -              * @param uri The new URI value
  +         * @return   The URI value
                 */
  -             public void setURI(String uri) {
  -                     taglibURI = uri;
  +        public String getURI()
  +        {
  +            return taglibURI;
                }
   
   
                /**
  -              * Sets the Location attribute of the TagLib object
  +         * Gets the Location attribute of the TagLib object
                 *
  -              * @param location The new Location value
  +         * @return   The Location value
                 */
  -             public void setLocation(String location) {
  -                     taglibLocation = location;
  +        public String getLocation()
  +        {
  +            return taglibLocation;
                }
   
   
                /**
  -              * Gets the URI attribute of the TagLib object
  +         * Sets the URI attribute of the TagLib object
                 *
  -              * @return The URI value
  +         * @param uri  The new URI value
                 */
  -             public String getURI() {
  -                     return taglibURI;
  +        public void setURI(String uri)
  +        {
  +            taglibURI = uri;
                }
   
   
                /**
  -              * Gets the Location attribute of the TagLib object
  +         * Sets the Location attribute of the TagLib object
                 *
  -              * @return The Location value
  +         * @param location  The new Location value
                 */
  -             public String getLocation() {
  -                     return taglibLocation;
  +        public void setLocation(String location)
  +        {
  +            taglibLocation = location;
                }
        }
   
  @@ -492,13 +527,15 @@
         * @author Ara Abrahamian ([EMAIL PROTECTED])
         * @created July 19, 2001
         */
  -     public static class JspVersionTypes extends 
org.apache.tools.ant.types.EnumeratedAttribute {
  +    public static class JspVersionTypes extends 
org.apache.tools.ant.types.EnumeratedAttribute
  +    {
                /**
                 * Gets the Values attribute of the JspVersionTypes object
                 *
                 * @return The Values value
                 */
  -             public String[] getValues() {
  +        public String[] getValues()
  +        {
                        return (new String[]{"1.1", "1.2"});
                }
        }
  
  
  
  1.1.2.5   +615 -571  
xdoclet/modules/web/src/xdoclet/modules/web/Attic/WebXmlSubTask.java
  
  Index: WebXmlSubTask.java
  ===================================================================
  RCS file: 
/cvsroot/xdoclet/xdoclet/modules/web/src/xdoclet/modules/web/Attic/WebXmlSubTask.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -w -r1.1.2.4 -r1.1.2.5
  --- WebXmlSubTask.java        9 May 2002 16:42:52 -0000       1.1.2.4
  +++ WebXmlSubTask.java        15 May 2002 18:55:43 -0000      1.1.2.5
  @@ -4,108 +4,108 @@
    */
   package xdoclet.modules.web;
   
  +import java.io.File;
  +import java.util.ArrayList;
  +
   import xdoclet.XDocletException;
   import xdoclet.XmlSubTask;
   import xdoclet.util.Translator;
   
  -import java.io.File;
  -import java.util.ArrayList;
  -
   /**
    * Generates web.xml deployment descriptor.
    *
  - * @xdoclet:subtask name="webxml" parent="xdoclet.web.WebDocletTask"
  - *
    * @author Ara Abrahamian ([EMAIL PROTECTED])
    * @created June 19, 2001
  - * @version $Revision: 1.1.2.4 $
  + * @xdoclet:subtask   name="webxml" parent="xdoclet.modules.web.WebDocletTask"
  + * @version           $Revision: 1.1.2.5 $
    */
  -public class WebXmlSubTask extends XmlSubTask {
  +public class WebXmlSubTask extends XmlSubTask
  +{
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String servletspec = "2.3";
  +    public final static String SUBTASK_NAME = "deploymentDescriptor";
   
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String smallicon = "";
  +    private static String DEFAULT_TEMPLATE_FILE = "resources/web_xml.xdt";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String largeicon = "";
  +    private static String GENERATED_FILE_NAME = "web.xml";
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String displayname = "";
  +    private static String WEBXML_PUBLICID_2_3 = "-//Sun Microsystems, Inc.//DTD Web 
Application 2.3//EN";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected String description = "";
  +    private static String WEBXML_PUBLICID_2_2 = "-//Sun Microsystems, Inc.//DTD Web 
Application 2.2//EN";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected boolean distributable = true;
  -
  +    private static String WEBXML_SYSTEMID_2_3 = 
"http://java.sun.com/dtd/web-app_2_3.dtd";;
        /**
         * @todo-javadoc Describe the field
         */
  -     protected ArrayList contextParams = new ArrayList();
  -
  +    private static String WEBXML_SYSTEMID_2_2 = 
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";;
        /**
         * @todo-javadoc Describe the field
         */
  -     protected int sessiontimeout = 0;
  -
  -     //container default
  -
  +    private static String WEBXML_DTD_FILE_NAME_2_3 = "resources/web-jar-23.dtd";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected ArrayList welcomeFiles = new ArrayList();
  -
  +    private static String WEBXML_DTD_FILE_NAME_2_2 = "resources/web-jar-22.dtd";
        /**
         * @todo-javadoc Describe the field
         */
  -     protected ArrayList tagLibs = new ArrayList();
  +    protected String servletspec = "2.3";
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     public final static String SUBTASK_NAME = "deploymentDescriptor";
  -
  +    protected String smallicon = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String DEFAULT_TEMPLATE_FILE = "resources/web_xml.xdt";
  +    protected String largeicon = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String GENERATED_FILE_NAME = "web.xml";
  -
  +    protected String displayname = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String WEBXML_PUBLICID_2_3 = "-//Sun Microsystems, Inc.//DTD 
Web Application 2.3//EN";
  +    protected String description = "";
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String WEBXML_PUBLICID_2_2 = "-//Sun Microsystems, Inc.//DTD 
Web Application 2.2//EN";
  +    protected boolean distributable = true;
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String WEBXML_SYSTEMID_2_3 = 
"http://java.sun.com/dtd/web-app_2_3.dtd";;
  +    protected ArrayList contextParams = new ArrayList();
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String WEBXML_SYSTEMID_2_2 = 
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";;
  +    protected int   sessiontimeout = 0;
  +
  +    //container default
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String WEBXML_DTD_FILE_NAME_2_3 = "resources/web-jar-23.dtd";
  +    protected ArrayList welcomeFiles = new ArrayList();
  +
        /**
         * @todo-javadoc Describe the field
         */
  -     private static String WEBXML_DTD_FILE_NAME_2_2 = "resources/web-jar-22.dtd";
  +    protected ArrayList tagLibs = new ArrayList();
   
   
        /**
  @@ -113,219 +113,241 @@
         *
         * @todo-javadoc Write javadocs for constructor
         */
  -     public WebXmlSubTask() {
  +    public WebXmlSubTask()
  +    {
                setTemplateURL(getClass().getResource(DEFAULT_TEMPLATE_FILE));
                setDestinationFile(GENERATED_FILE_NAME);
        }
   
   
        /**
  -      * Sets the Servletspec attribute of the WebXmlSubTask object
  +     * Gets the SubTaskName attribute of the WebXmlSubTask object
         *
  -      * @param new_servletspec The new Servletspec value
  +     * @return   The SubTaskName value
         */
  -     public void setServletspec(ServletVersionTypes new_servletspec) {
  -             servletspec = new_servletspec.getValue();
  +    public String getSubTaskName()
  +    {
  +        return SUBTASK_NAME;
        }
   
   
        /**
  -      * Sets the Smallicon attribute of the WebXmlSubTask object
  +     * Gets the Servletspec attribute of the WebXmlSubTask object
         *
  -      * @param new_icon The new Smallicon value
  +     * @return   The Servletspec value
         */
  -     public void setSmallicon(String new_icon) {
  -             smallicon = new_icon;
  +    public String getServletspec()
  +    {
  +        return servletspec;
        }
   
   
        /**
  -      * Sets the Largeicon attribute of the WebXmlSubTask object
  +     * Gets the ContextParams attribute of the WebXmlSubTask object
         *
  -      * @param new_icon The new Largeicon value
  +     * @return   The ContextParams value
         */
  -     public void setLargeicon(String new_icon) {
  -             largeicon = new_icon;
  +    public ArrayList getContextParams()
  +    {
  +        return contextParams;
        }
   
   
        /**
  -      * Sets the Displayname attribute of the WebXmlSubTask object
  +     * Gets the Smallicon attribute of the WebXmlSubTask object
         *
  -      * @param new_display_name The new Displayname value
  +     * @return   The Smallicon value
         */
  -     public void setDisplayname(String new_display_name) {
  -             displayname = new_display_name;
  +    public String getSmallicon()
  +    {
  +        return smallicon;
        }
   
   
        /**
  -      * Sets the Description attribute of the WebXmlSubTask object
  +     * Gets the Largeicon attribute of the WebXmlSubTask object
         *
  -      * @param new_description The new Description value
  +     * @return   The Largeicon value
         */
  -     public void setDescription(String new_description) {
  -             description = new_description;
  +    public String getLargeicon()
  +    {
  +        return largeicon;
        }
   
   
        /**
  -      * Sets the Distributable attribute of the WebXmlSubTask object
  +     * Gets the Displayname attribute of the WebXmlSubTask object
         *
  -      * @param distributable The new Distributable value
  +     * @return   The Displayname value
         */
  -     public void setDistributable(boolean distributable) {
  -             this.distributable = distributable;
  +    public String getDisplayname()
  +    {
  +        return displayname;
        }
   
   
        /**
  -      * Sets the Sessiontimeout attribute of the WebXmlSubTask object
  +     * Gets the Description attribute of the WebXmlSubTask object
         *
  -      * @param session_timeout The new Sessiontimeout value
  +     * @return   The Description value
         */
  -     public void setSessiontimeout(int session_timeout) {
  -             sessiontimeout = session_timeout;
  +    public String getDescription()
  +    {
  +        return description;
        }
   
   
        /**
  -      * Sets the TagLibs attribute of the WebXmlSubTask object
  +     * Gets the Distributable attribute of the WebXmlSubTask object
         *
  -      * @param tagLibs The new TagLibs value
  +     * @return   The Distributable value
         */
  -     public void setTagLibs(ArrayList tagLibs) {
  -             this.tagLibs = tagLibs;
  +    public boolean getDistributable()
  +    {
  +        return distributable;
        }
   
   
        /**
  -      * Sets the WelcomeFiles attribute of the WebXmlSubTask object
  +     * Gets the Sessiontimeout attribute of the WebXmlSubTask object
         *
  -      * @param welcomeFiles The new WelcomeFiles value
  +     * @return   The Sessiontimeout value
         */
  -     public void setWelcomeFiles(ArrayList welcomeFiles) {
  -             this.welcomeFiles = welcomeFiles;
  +    public int getSessiontimeout()
  +    {
  +        return sessiontimeout;
        }
   
   
        /**
  -      * Sets the ContextParams attribute of the WebXmlSubTask object
  +     * Gets the WelcomeFiles attribute of the WebXmlSubTask object
         *
  -      * @param contextParams The new ContextParams value
  +     * @return   The WelcomeFiles value
         */
  -     public void setContextParams(ArrayList contextParams) {
  -             this.contextParams = contextParams;
  +    public ArrayList getWelcomeFiles()
  +    {
  +        return welcomeFiles;
        }
   
   
        /**
  -      * Gets the SubTaskName attribute of the WebXmlSubTask object
  +     * Gets the TagLibs attribute of the WebXmlSubTask object
         *
  -      * @return The SubTaskName value
  +     * @return   The TagLibs value
         */
  -     public String getSubTaskName() {
  -             return SUBTASK_NAME;
  +    public ArrayList getTagLibs()
  +    {
  +        return tagLibs;
        }
   
   
        /**
  -      * Gets the Servletspec attribute of the WebXmlSubTask object
  +     * Sets the Servletspec attribute of the WebXmlSubTask object
         *
  -      * @return The Servletspec value
  +     * @param new_servletspec  The new Servletspec value
         */
  -     public String getServletspec() {
  -             return servletspec;
  +    public void setServletspec(ServletVersionTypes new_servletspec)
  +    {
  +        servletspec = new_servletspec.getValue();
        }
   
   
        /**
  -      * Gets the ContextParams attribute of the WebXmlSubTask object
  +     * Sets the Smallicon attribute of the WebXmlSubTask object
         *
  -      * @return The ContextParams value
  +     * @param new_icon  The new Smallicon value
         */
  -     public ArrayList getContextParams() {
  -             return contextParams;
  +    public void setSmallicon(String new_icon)
  +    {
  +        smallicon = new_icon;
        }
   
   
        /**
  -      * Gets the Smallicon attribute of the WebXmlSubTask object
  +     * Sets the Largeicon attribute of the WebXmlSubTask object
         *
  -      * @return The Smallicon value
  +     * @param new_icon  The new Largeicon value
         */
  -     public String getSmallicon() {
  -             return smallicon;
  +    public void setLargeicon(String new_icon)
  +    {
  +        largeicon = new_icon;
        }
   
   
        /**
  -      * Gets the Largeicon attribute of the WebXmlSubTask object
  +     * Sets the Displayname attribute of the WebXmlSubTask object
         *
  -      * @return The Largeicon value
  +     * @param new_display_name  The new Displayname value
         */
  -     public String getLargeicon() {
  -             return largeicon;
  +    public void setDisplayname(String new_display_name)
  +    {
  +        displayname = new_display_name;
        }
   
   
        /**
  -      * Gets the Displayname attribute of the WebXmlSubTask object
  +     * Sets the Description attribute of the WebXmlSubTask object
         *
  -      * @return The Displayname value
  +     * @param new_description  The new Description value
         */
  -     public String getDisplayname() {
  -             return displayname;
  +    public void setDescription(String new_description)
  +    {
  +        description = new_description;
        }
   
   
        /**
  -      * Gets the Description attribute of the WebXmlSubTask object
  +     * Sets the Distributable attribute of the WebXmlSubTask object
         *
  -      * @return The Description value
  +     * @param distributable  The new Distributable value
         */
  -     public String getDescription() {
  -             return description;
  +    public void setDistributable(boolean distributable)
  +    {
  +        this.distributable = distributable;
        }
   
   
        /**
  -      * Gets the Distributable attribute of the WebXmlSubTask object
  +     * Sets the Sessiontimeout attribute of the WebXmlSubTask object
         *
  -      * @return The Distributable value
  +     * @param session_timeout  The new Sessiontimeout value
         */
  -     public boolean getDistributable() {
  -             return distributable;
  +    public void setSessiontimeout(int session_timeout)
  +    {
  +        sessiontimeout = session_timeout;
        }
   
   
        /**
  -      * Gets the Sessiontimeout attribute of the WebXmlSubTask object
  +     * Sets the TagLibs attribute of the WebXmlSubTask object
         *
  -      * @return The Sessiontimeout value
  +     * @param tagLibs  The new TagLibs value
         */
  -     public int getSessiontimeout() {
  -             return sessiontimeout;
  +    public void setTagLibs(ArrayList tagLibs)
  +    {
  +        this.tagLibs = tagLibs;
        }
   
   
        /**
  -      * Gets the WelcomeFiles attribute of the WebXmlSubTask object
  +     * Sets the WelcomeFiles attribute of the WebXmlSubTask object
         *
  -      * @return The WelcomeFiles value
  +     * @param welcomeFiles  The new WelcomeFiles value
         */
  -     public ArrayList getWelcomeFiles() {
  -             return welcomeFiles;
  +    public void setWelcomeFiles(ArrayList welcomeFiles)
  +    {
  +        this.welcomeFiles = welcomeFiles;
        }
   
   
        /**
  -      * Gets the TagLibs attribute of the WebXmlSubTask object
  +     * Sets the ContextParams attribute of the WebXmlSubTask object
         *
  -      * @return The TagLibs value
  +     * @param contextParams  The new ContextParams value
         */
  -     public ArrayList getTagLibs() {
  -             return tagLibs;
  +    public void setContextParams(ArrayList contextParams)
  +    {
  +        this.contextParams = contextParams;
        }
   
   
  @@ -336,7 +358,8 @@
         * @todo-javadoc Describe the method
         * @todo-javadoc Describe the method parameter
         */
  -     public void addContextparam(ContextParam cp) {
  +    public void addContextparam(ContextParam cp)
  +    {
                contextParams.add(cp);
        }
   
  @@ -348,7 +371,8 @@
         * @todo-javadoc Describe the method
         * @todo-javadoc Describe the method parameter
         */
  -     public void addWelcomefile(WelcomeFile file) {
  +    public void addWelcomefile(WelcomeFile file)
  +    {
                welcomeFiles.add(file);
        }
   
  @@ -360,7 +384,8 @@
         * @todo-javadoc Describe the method
         * @todo-javadoc Describe the method parameter
         */
  -     public void addTaglib(TagLib taglib) {
  +    public void addTaglib(TagLib taglib)
  +    {
                tagLibs.add(taglib);
        }
   
  @@ -368,11 +393,12 @@
        /**
         * Describe what the method does
         *
  -      * @exception xdoclet.XDocletException Describe the exception
  +     * @exception XDocletException
         * @todo-javadoc Write javadocs for method
         * @todo-javadoc Write javadocs for exception
         */
  -     public void execute() throws XDocletException {
  +    public void execute() throws XDocletException
  +    {
                if (getServletspec().equals("2.2")) {
                        setPublicId(WEBXML_PUBLICID_2_2);
                        setSystemId(WEBXML_SYSTEMID_2_2);
  @@ -391,11 +417,12 @@
        /**
         * Describe what the method does
         *
  -      * @exception xdoclet.XDocletException Describe the exception
  +     * @exception XDocletException
         * @todo-javadoc Write javadocs for method
         * @todo-javadoc Write javadocs for exception
         */
  -     protected void engineStarted() throws XDocletException {
  +    protected void engineStarted() throws XDocletException
  +    {
                System.out.println(Translator.getString("generating_something", new 
String[]{getDestinationFile()}));
        }
   
  @@ -404,7 +431,8 @@
         * @author Aslak Helles�y
         * @created July 28, 2001
         */
  -     public static class ContextParam implements java.io.Serializable {
  +    public static class ContextParam implements java.io.Serializable
  +    {
                /**
                 * @todo-javadoc Describe the field
                 */
  @@ -420,62 +448,68 @@
   
   
                /**
  -              * Sets the Name attribute of the ContextParam object
  +         * Gets the Name attribute of the ContextParam object
                 *
  -              * @param name The new Name value
  +         * @return   The Name value
                 */
  -             public void setName(String name) {
  -                     paramName = name;
  +        public String getName()
  +        {
  +            return paramName;
                }
   
   
                /**
  -              * Sets the Value attribute of the ContextParam object
  +         * Gets the Value attribute of the ContextParam object
                 *
  -              * @param value The new Value value
  +         * @return   The Value value
                 */
  -             public void setValue(String value) {
  -                     paramValue = value;
  +        public String getValue()
  +        {
  +            return paramValue;
                }
   
   
                /**
  -              * Sets the Description attribute of the ContextParam object
  +         * Gets the Description attribute of the ContextParam object
                 *
  -              * @param desc The new Description value
  +         * @return   The Description value
                 */
  -             public void setDescription(String desc) {
  -                     description = desc;
  +        public String getDescription()
  +        {
  +            return description;
                }
   
   
                /**
  -              * Gets the Name attribute of the ContextParam object
  +         * Sets the Name attribute of the ContextParam object
                 *
  -              * @return The Name value
  +         * @param name  The new Name value
                 */
  -             public String getName() {
  -                     return paramName;
  +        public void setName(String name)
  +        {
  +            paramName = name;
                }
   
   
                /**
  -              * Gets the Value attribute of the ContextParam object
  +         * Sets the Value attribute of the ContextParam object
                 *
  -              * @return The Value value
  +         * @param value  The new Value value
                 */
  -             public String getValue() {
  -                     return paramValue;
  +        public void setValue(String value)
  +        {
  +            paramValue = value;
                }
   
   
                /**
  -              * Gets the Description attribute of the ContextParam object
  +         * Sets the Description attribute of the ContextParam object
                 *
  -              * @return The Description value
  +         * @param desc  The new Description value
                 */
  -             public String getDescription() {
  -                     return description;
  +        public void setDescription(String desc)
  +        {
  +            description = desc;
                }
        }
   
  @@ -484,7 +518,8 @@
         * @author Aslak Helles�y
         * @created July 28, 2001
         */
  -     public static class TagLib implements java.io.Serializable {
  +    public static class TagLib implements java.io.Serializable
  +    {
                /**
                 * @todo-javadoc Describe the field
                 */
  @@ -496,42 +531,46 @@
   
   
                /**
  -              * Sets the Uri attribute of the TagLib object
  +         * Gets the Uri attribute of the TagLib object
                 *
  -              * @param uri The new Uri value
  +         * @return   The Uri value
                 */
  -             public void setUri(String uri) {
  -                     taglibUri = uri;
  +        public String getUri()
  +        {
  +            return taglibUri;
                }
   
   
                /**
  -              * Sets the Location attribute of the TagLib object
  +         * Gets the Location attribute of the TagLib object
                 *
  -              * @param location The new Location value
  +         * @return   The Location value
                 */
  -             public void setLocation(String location) {
  -                     taglibLocation = location;
  +        public String getLocation()
  +        {
  +            return taglibLocation;
                }
   
   
                /**
  -              * Gets the Uri attribute of the TagLib object
  +         * Sets the Uri attribute of the TagLib object
                 *
  -              * @return The Uri value
  +         * @param uri  The new Uri value
                 */
  -             public String getUri() {
  -                     return taglibUri;
  +        public void setUri(String uri)
  +        {
  +            taglibUri = uri;
                }
   
   
                /**
  -              * Gets the Location attribute of the TagLib object
  +         * Sets the Location attribute of the TagLib object
                 *
  -              * @return The Location value
  +         * @param location  The new Location value
                 */
  -             public String getLocation() {
  -                     return taglibLocation;
  +        public void setLocation(String location)
  +        {
  +            taglibLocation = location;
                }
        }
   
  @@ -540,7 +579,8 @@
         * @author Aslak Helles�y
         * @created Sep 18, 2001
         */
  -     public static class WelcomeFile implements java.io.Serializable {
  +    public static class WelcomeFile implements java.io.Serializable
  +    {
                /**
                 * @todo-javadoc Describe the field
                 */
  @@ -548,22 +588,24 @@
   
   
                /**
  -              * Sets the File attribute of the WelcomeFile object
  +         * Gets the File attribute of the WelcomeFile object
                 *
  -              * @param file The new File value
  +         * @return   The File value
                 */
  -             public void setFile(String file) {
  -                     this.file = file;
  +        public String getFile()
  +        {
  +            return file;
                }
   
   
                /**
  -              * Gets the File attribute of the WelcomeFile object
  +         * Sets the File attribute of the WelcomeFile object
                 *
  -              * @return The File value
  +         * @param file  The new File value
                 */
  -             public String getFile() {
  -                     return file;
  +        public void setFile(String file)
  +        {
  +            this.file = file;
                }
        }
   
  @@ -572,13 +614,15 @@
         * @author Ara Abrahamian ([EMAIL PROTECTED])
         * @created October 20, 2001
         */
  -     public static class ServletVersionTypes extends 
org.apache.tools.ant.types.EnumeratedAttribute {
  +    public static class ServletVersionTypes extends 
org.apache.tools.ant.types.EnumeratedAttribute
  +    {
                /**
                 * Gets the Values attribute of the ServletVersionTypes object
                 *
                 * @return The Values value
                 */
  -             public String[] getValues() {
  +        public String[] getValues()
  +        {
                        return (new String[]{"2.2", "2.3"});
                }
        }
  
  
  


_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to