You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/08/25 05:43:25 UTC
cvs commit: jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build ant-roles.xdt ant-types.xdt role.xdt type.xdt types.xdt AntDocNestedTypeSubTask.java AntDocRoleSubTask.java AntDocTypeSubTask.java AntlibDescriptorTask.java ant-roles.j ant-types.j role.j type.j types.j
donaldp 2002/08/24 20:43:25
Modified: buildtools/src/java/org/apache/myrmidon/build
AntDocNestedTypeSubTask.java AntDocRoleSubTask.java
AntDocTypeSubTask.java AntlibDescriptorTask.java
Added: buildtools/src/java/org/apache/myrmidon/build ant-roles.xdt
ant-types.xdt role.xdt type.xdt types.xdt
Removed: buildtools/src/java/org/apache/myrmidon/build ant-roles.j
ant-types.j role.j type.j types.j
Log:
Update template files to be named Foo.xdt from Foo.j
This is the naming convention the rest of xdoclet uses.
Revision Changes Path
1.4 +2 -2 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocNestedTypeSubTask.java
Index: AntDocNestedTypeSubTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocNestedTypeSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntDocNestedTypeSubTask.java 5 Jul 2002 03:21:55 -0000 1.3
+++ AntDocNestedTypeSubTask.java 25 Aug 2002 03:43:24 -0000 1.4
@@ -27,7 +27,7 @@
{
m_nestedElements = nestedElements;
setDestinationFile( "{0}.xml" );
- final URL resource = getClass().getResource( "/org/apache/myrmidon/build/type.j" );
+ final URL resource = getClass().getResource( "/org/apache/myrmidon/build/type.xdt" );
setTemplateURL( resource );
setSubTaskName( "nested-type-antdoc" );
}
1.4 +2 -2 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocRoleSubTask.java
Index: AntDocRoleSubTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocRoleSubTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntDocRoleSubTask.java 25 Jun 2002 00:40:25 -0000 1.3
+++ AntDocRoleSubTask.java 25 Aug 2002 03:43:24 -0000 1.4
@@ -23,7 +23,7 @@
public AntDocRoleSubTask()
{
setDestinationFile( "{0}.xml" );
- final URL resource = getClass().getResource( "/org/apache/myrmidon/build/role.j" );
+ final URL resource = getClass().getResource( "/org/apache/myrmidon/build/role.xdt" );
setTemplateURL( resource );
setSubTaskName( "role-antdoc" );
}
1.5 +2 -2 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocTypeSubTask.java
Index: AntDocTypeSubTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntDocTypeSubTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AntDocTypeSubTask.java 5 Jul 2002 03:21:55 -0000 1.4
+++ AntDocTypeSubTask.java 25 Aug 2002 03:43:24 -0000 1.5
@@ -27,7 +27,7 @@
public AntDocTypeSubTask()
{
setDestinationFile( "{0}.xml" );
- final URL resource = getClass().getResource( "/org/apache/myrmidon/build/type.j" );
+ final URL resource = getClass().getResource( "/org/apache/myrmidon/build/type.xdt" );
setTemplateURL( resource );
setSubTaskName( "type-antdoc" );
}
1.12 +3 -3 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntlibDescriptorTask.java
Index: AntlibDescriptorTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/AntlibDescriptorTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AntlibDescriptorTask.java 25 Jun 2002 00:40:25 -0000 1.11
+++ AntlibDescriptorTask.java 25 Aug 2002 03:43:24 -0000 1.12
@@ -20,9 +20,9 @@
public class AntlibDescriptorTask
extends DocletTask
{
- private static final String DESCRIPTOR_TEMPLATE = "/org/apache/myrmidon/build/ant-types.j";
- private static final String ROLES_TEMPLATE = "/org/apache/myrmidon/build/ant-roles.j";
- private static final String TYPES_TEMPLATE = "/org/apache/myrmidon/build/types.j";
+ private static final String DESCRIPTOR_TEMPLATE = "/org/apache/myrmidon/build/ant-types.xdt";
+ private static final String ROLES_TEMPLATE = "/org/apache/myrmidon/build/ant-roles.xdt";
+ private static final String TYPES_TEMPLATE = "/org/apache/myrmidon/build/types.xdt";
/**
* Specifies the name of the file for the antlib types descriptor (optional).
1.1 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-roles.xdt
Index: ant-roles.xdt
===================================================================
<roles version="1.0">
<XDtMerge:merge file="ant-roles.txt"></XDtMerge:merge>
<XDtClass:forAllClasses abstract="true">
<XDtAnt:ifHasRoleTag>
<role name="<XDtAnt:roleName/>"
interface="<XDtClass:fullClassName/>"
<XDtAnt:forAllRoleParams>
<XDtAnt:roleParamName/>="<XDtAnt:roleParamValue/>"
</XDtAnt:forAllRoleParams>
/>
</XDtAnt:ifHasRoleTag>
</XDtClass:forAllClasses>
</roles>
1.1 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-types.xdt
Index: ant-types.xdt
===================================================================
<ant-lib version="1.0">
<types>
<XDtClass:forAllClasses extent="concrete-type">
<XDtAnt:forAllTypeTags>
<<XDtAnt:typeTagRoleName/> name="<XDtAnt:typeTagTypeName/>"
impl="<XDtClass:fullClassName/>"/>
</XDtAnt:forAllTypeTags>
<XDtClass:forAllClassTags tagName="ant.service-factory" superclasses="false">
<service-factory name="<XDtClass:classTagValue tagName="ant.service-factory" paramName="role"/>"
impl="<XDtClass:fullClassName/>"/>
</XDtClass:forAllClassTags>
<XDtClass:forAllClassTags tagName="ant.converter" superclasses="false">
<converter impl="<XDtClass:fullClassName/>"
source="<XDtClass:classTagValue tagName="ant.converter" paramName="source"/>"
destination="<XDtClass:classTagValue tagName="ant.converter" paramName="destination"/>"/>
</XDtClass:forAllClassTags>
</XDtClass:forAllClasses>
</types>
</ant-lib>
1.1 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/role.xdt
Index: role.xdt
===================================================================
<role classname="<XDtClass:fullClassName/>" name="<XDtAnt:roleName/>">
<display-name>
<![CDATA[<XDtAnt:roleDisplayName/>]]>
</display-name>
<short-description>
<![CDATA[<XDtClass:firstSentenceDescription/>]]>
</short-description>
<long-description>
<![CDATA[<XDtClass:classComment no-comment-signs="true"/>]]>
</long-description>
</role>
1.1 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/type.xdt
Index: type.xdt
===================================================================
<type classname="<XDtClass:fullClassName/>">
<XDtAnt:collectNestedClasses/>
<names>
<XDtAnt:forAllTypeTags>
<name role="<XDtAnt:typeTagRoleName/>" name="<XDtAnt:typeTagTypeName/>"/>
</XDtAnt:forAllTypeTags>
</names>
<short-description>
<![CDATA[<XDtClass:firstSentenceDescription/>]]>
</short-description>
<long-description>
<![CDATA[<XDtClass:classComment no-comment-signs="true"/>]]>
</long-description>
<structure>
<attributes>
<XDtAnt:forAllAttributes>
<attribute name="<XDtAnt:propertyName/>" type="<XDtAnt:propertyType/>">
<description>
<![CDATA[<XDtMethod:methodComment no-comment-signs="true"/>]]></description>
</attribute>
</XDtAnt:forAllAttributes>
</attributes>
<elements>
<XDtAnt:forAllElements>
<element name="<XDtAnt:propertyName/>" type="<XDtAnt:propertyType/>">
<description>
<![CDATA[<XDtMethod:methodComment no-comment-signs="true"/>]]>
</description>
</element>
</XDtAnt:forAllElements>
</elements>
<XDtAnt:ifHasContent>
<body type="<XDtAnt:propertyType/>">
<description>
<![CDATA[<XDtMethod:methodComment no-comment-signs="true"/>]]>
</description>
</body>
</XDtAnt:ifHasContent>
</structure>
</type>
1.1 jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/types.xdt
Index: types.xdt
===================================================================
<types>
<XDtClass:forAllClasses extent="concrete-type">
<XDtAnt:forAllTypeTags>
<type role="<XDtAnt:typeTagRoleName/>"
name="<XDtAnt:typeTagTypeName/>"
classname="<XDtClass:fullClassName/>">
<short-description>
<![CDATA[<XDtClass:firstSentenceDescription/>]]>
</short-description>
</type>
</XDtAnt:forAllTypeTags>
<XDtAnt:ifHasRoleTag>
<role name="<XDtAnt:roleName/>"
classname="<XDtClass:fullClassName/>">
<display-name>
<![CDATA[<XDtAnt:roleDisplayName/>]]>
</display-name>
<short-description>
<![CDATA[<XDtClass:firstSentenceDescription/>]]>
</short-description>
</role>
</XDtAnt:ifHasRoleTag>
</XDtClass:forAllClasses>
</types>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>