Crap.... against the main branch. Here's a patch against the refactor
branch.
-Dave
On Mon, Oct 22, 2001 at 04:42:56PM +1000, Dmitri Colebatch wrote:
> Dave - are these patches against main branch or the refactor branch?
>
> cheers, and thanks
> dim
>
> On Mon, 22 Oct 2001, Dave Dribin wrote:
>
> > Hello,
> >
> > I've attached a patch for a couple issues. First, I've added a
> > filename attribute to the <jsptaglib> tag so that you can specify a
> > name other than "taglib.tld". Second, I've updated taglib_tld.j to
> > work with JSP version 1.2. Some things changed in the DTD like
> > <tagclass> is now <tag-class>.
> >
> > -Dave
> >
>
Index: core/resources/xdoclet/web/taglib_tld.j
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/resources/xdoclet/web/taglib_tld.j,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 taglib_tld.j
--- core/resources/xdoclet/web/taglib_tld.j 2001/10/17 16:08:52 1.7.2.1
+++ core/resources/xdoclet/web/taglib_tld.j 2001/10/22 07:07:52
@@ -59,6 +59,7 @@
<XDtClass:forAllClasses
type="javax.servlet.jsp.tagext.Tag,javax.servlet.jsp.tagext.TagSupport">
<tag>
+ <XDtConfig:ifConfigParamEquals paramName="Jspversion" value="1.1">
<name><XDtClass:classTagValue tagName="jsp:tag" paramName="name"/></name>
<tagclass><XDtClass:fullClassName/></tagclass>
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tei-class">
@@ -67,6 +68,17 @@
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="body-content"
values="JSP,empty,tagdependent">
<bodycontent><XDtClass:classTagValue tagName="jsp:tag"
paramName="body-content"/></bodycontent>
</XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamEquals>
+ <XDtConfig:ifConfigParamGreaterOrEquals paramName="Jspversion" value="1.2">
+ <name><XDtClass:classTagValue tagName="jsp:tag" paramName="name"/></name>
+ <tag-class><XDtClass:fullClassName/></tag-class>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="tei-class">
+ <tei-class><XDtClass:classTagValue tagName="jsp:tag"
+paramName="tei-class"/></tei-class>
+ </XDtClass:ifHasClassTag>
+ <XDtClass:ifHasClassTag tagName="jsp:tag" paramName="body-content"
+values="JSP,empty,tagdependent">
+ <body-content><XDtClass:classTagValue tagName="jsp:tag"
+paramName="body-content"/></body-content>
+ </XDtClass:ifHasClassTag>
+ </XDtConfig:ifConfigParamGreaterOrEquals>
<XDtClass:ifHasClassTag tagName="jsp:tag" paramName="display-name">
<display-name><XDtClass:classTagValue tagName="jsp:tag"
paramName="display-name"/></display-name>
</XDtClass:ifHasClassTag>
Index: core/src/xdoclet/web/JspTaglibSubTask.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/web/JspTaglibSubTask.java,v
retrieving revision 1.6.2.3
diff -u -r1.6.2.3 JspTaglibSubTask.java
--- core/src/xdoclet/web/JspTaglibSubTask.java 2001/10/20 19:37:38 1.6.2.3
+++ core/src/xdoclet/web/JspTaglibSubTask.java 2001/10/22 07:07:52
@@ -25,10 +25,9 @@
protected String smallicon = "";
protected String largeicon = "";
protected String description = "";
+ protected String filename = "taglib.tld";
private static String DEFAULT_TEMPLATE_FILE = "/xdoclet/web/taglib_tld.j";
- private static String GENERATED_FILE_NAME = "taglib.tld";
-
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_DTD_FILE_NAME_1_2 =
"/xdoclet/web/web-jsptaglibrary_1_2.dtd";
@@ -37,7 +36,7 @@
public JspTaglibSubTask()
{
setTemplateFile( new File( DEFAULT_TEMPLATE_FILE ) );
- setDestinationFile( GENERATED_FILE_NAME );
+ setDestinationFile( filename );
jspversion = "1.2";
setPublicId( TLD_PUBLICID_1_2 );
@@ -84,6 +83,12 @@
description = new_description;
}
+ public void setFilename( String new_filename )
+ {
+ filename = new_filename;
+ setDestinationFile( filename );
+ }
+
public String getSubTaskName()
{
return "<jspTagLib/>";
@@ -127,6 +132,11 @@
public String getDescription()
{
return description;
+ }
+
+ public String getFilename()
+ {
+ return filename;
}
/**
