User: rinkrank
Date: 02/03/24 09:44:19
Modified: core/src/xdoclet/web JspTaglibSubTask.java
WebDocletTask.java WebXmlSubTask.java
Log:
Merging changes from XJAVADOC_REFACTORING branch back to main branch
Revision Changes Path
1.13 +3 -3 xdoclet/core/src/xdoclet/web/JspTaglibSubTask.java
Index: JspTaglibSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/web/JspTaglibSubTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- JspTaglibSubTask.java 22 Feb 2002 16:28:19 -0000 1.12
+++ JspTaglibSubTask.java 24 Mar 2002 17:44:19 -0000 1.13
@@ -11,15 +11,15 @@
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created July 12, 2001
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class JspTaglibSubTask extends XmlSubTask
{
public final static String SUBTASK_NAME = "jspTagLib";
private static String DEFAULT_TEMPLATE_FILE = "/xdoclet/web/taglib_tld.j";
- private static String TLD_PUBLICID_1_2 = "-//Sun Microsystems, Inc.//DTD JSP
Tag Library 1.2//EN";
- private static String TLD_PUBLICID_1_1 = "-//Sun Microsystems, Inc.//DTD JSP
Tag Library 1.1//EN";
+ private static String TLD_PUBLICID_1_2 = "-//Sun Microsystems, Inc.//DTD JSP
XTag Library 1.2//EN";
+ private static String TLD_PUBLICID_1_1 = "-//Sun Microsystems, Inc.//DTD JSP
XTag Library 1.1//EN";
private static String TLD_SYSTEMID_1_2 =
"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";;
private static String TLD_SYSTEMID_1_1 =
"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";;
private static String TLD_DTD_FILE_NAME_1_2 =
"/xdoclet/web/web-jsptaglibrary_1_2.dtd";
1.16 +12 -12 xdoclet/core/src/xdoclet/web/WebDocletTask.java
Index: WebDocletTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/web/WebDocletTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- WebDocletTask.java 21 Feb 2002 17:13:05 -0000 1.15
+++ WebDocletTask.java 24 Mar 2002 17:44:19 -0000 1.16
@@ -9,12 +9,12 @@
import xdoclet.web.vendor.webwork.WebWorkActionDocsSubTask;
import xdoclet.web.vendor.webwork.WebWorkConfigPropertiesSubTask;
-import java.util.Vector;
+import java.util.ArrayList;
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created July 2, 2001
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class WebDocletTask extends DocletTask
{
@@ -75,18 +75,18 @@
return jrunwebxml;
}
- protected Vector getSubTasks()
+ protected ArrayList getSubTasks()
{
- Vector subtasks = super.getSubTasks();
+ ArrayList subtasks = super.getSubTasks();
- subtasks.addElement( this.deploymentdescriptor );
- subtasks.addElement( this.jsptaglib );
- subtasks.addElement( this.jbosswebxml );
- subtasks.addElement( this.weblogicwebxml );
- subtasks.addElement( this.strutsconfigxml );
- subtasks.addElement( this.webworkconfig );
- subtasks.addElement( this.webworkdocs );
- subtasks.addElement( this.jrunwebxml );
+ subtasks.add( this.deploymentdescriptor );
+ subtasks.add( this.jsptaglib );
+ subtasks.add( this.jbosswebxml );
+ subtasks.add( this.weblogicwebxml );
+ subtasks.add( this.strutsconfigxml );
+ subtasks.add( this.webworkconfig );
+ subtasks.add( this.webworkdocs );
+ subtasks.add( this.jrunwebxml );
return subtasks;
}
1.16 +14 -14 xdoclet/core/src/xdoclet/web/WebXmlSubTask.java
Index: WebXmlSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/web/WebXmlSubTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- WebXmlSubTask.java 22 Feb 2002 16:28:19 -0000 1.15
+++ WebXmlSubTask.java 24 Mar 2002 17:44:19 -0000 1.16
@@ -6,14 +6,14 @@
import xdoclet.util.Translator;
import java.io.File;
-import java.util.Vector;
+import java.util.ArrayList;
/**
* Generates web.xml deployment descriptor.
*
* @author Ara Abrahamian ([EMAIL PROTECTED])
* @created June 19, 2001
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class WebXmlSubTask extends XmlSubTask
{
@@ -36,15 +36,15 @@
protected String description = "";
protected boolean distributable = true;
- protected Vector contextParams = new Vector();
+ protected ArrayList contextParams = new ArrayList();
protected int sessiontimeout = 0;
//container default
- protected Vector welcomeFiles = new Vector();
+ protected ArrayList welcomeFiles = new ArrayList();
- protected Vector tagLibs = new Vector();
+ protected ArrayList tagLibs = new ArrayList();
public WebXmlSubTask()
{
@@ -62,7 +62,7 @@
return servletspec;
}
- public Vector getContextParams()
+ public ArrayList getContextParams()
{
return contextParams;
}
@@ -97,12 +97,12 @@
return sessiontimeout;
}
- public Vector getWelcomeFiles()
+ public ArrayList getWelcomeFiles()
{
return welcomeFiles;
}
- public Vector getTagLibs()
+ public ArrayList getTagLibs()
{
return tagLibs;
}
@@ -142,34 +142,34 @@
sessiontimeout = session_timeout;
}
- public void setTagLibs( Vector tagLibs )
+ public void setTagLibs( ArrayList tagLibs )
{
this.tagLibs = tagLibs;
}
- public void setWelcomeFiles( Vector welcomeFiles )
+ public void setWelcomeFiles( ArrayList welcomeFiles )
{
this.welcomeFiles = welcomeFiles;
}
- public void setContextParams( Vector contextParams )
+ public void setContextParams( ArrayList contextParams )
{
this.contextParams = contextParams;
}
public void addContextparam( ContextParam cp )
{
- contextParams.addElement( cp );
+ contextParams.add( cp );
}
public void addWelcomefile( WelcomeFile file )
{
- welcomeFiles.addElement( file );
+ welcomeFiles.add( file );
}
public void addTaglib( TagLib taglib )
{
- tagLibs.addElement( taglib );
+ tagLibs.add( taglib );
}
public void execute() throws XDocletException
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
