adammurdoch 2002/06/24 17:40:25
Modified: buildtools/src/java/org/apache/myrmidon/build
AntDocNestedTypeSubTask.java AntDocRoleSubTask.java
AntDocTypeSubTask.java AntlibDescriptorTask.java
Added: tools/xdoclet xdoclet-20020625.jar xjavadoc-20020625.jar
Removed: tools/xdoclet xdoclet-20020529.jar xjavadoc-20020529.jar
Log:
Updated to latest xdoclet.
Revision Changes Path
1.2 +2 -6
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AntDocNestedTypeSubTask.java 12 Jun 2002 06:51:04 -0000 1.1
+++ AntDocNestedTypeSubTask.java 25 Jun 2002 00:40:25 -0000 1.2
@@ -29,11 +29,7 @@
setDestinationFile( "{0}.xml" );
final URL resource = getClass().getResource(
"/org/apache/myrmidon/build/type.j" );
setTemplateURL( resource );
- }
-
- public String getSubTaskName()
- {
- return "nested-type-antdoc";
+ setSubTaskName( "nested-type-antdoc" );
}
protected boolean matchesGenerationRules( XClass clazz )
1.3 +2 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntDocRoleSubTask.java 12 Jun 2002 06:51:04 -0000 1.2
+++ AntDocRoleSubTask.java 25 Jun 2002 00:40:25 -0000 1.3
@@ -25,11 +25,7 @@
setDestinationFile( "{0}.xml" );
final URL resource = getClass().getResource(
"/org/apache/myrmidon/build/role.j" );
setTemplateURL( resource );
- }
-
- public String getSubTaskName()
- {
- return "role-antdoc";
+ setSubTaskName( "role-antdoc" );
}
protected boolean matchesGenerationRules( final XClass clazz )
1.3 +2 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntDocTypeSubTask.java 12 Jun 2002 06:51:04 -0000 1.2
+++ AntDocTypeSubTask.java 25 Jun 2002 00:40:25 -0000 1.3
@@ -29,11 +29,7 @@
setDestinationFile( "{0}.xml" );
final URL resource = getClass().getResource(
"/org/apache/myrmidon/build/type.j" );
setTemplateURL( resource );
- }
-
- public String getSubTaskName()
- {
- return "type-antdoc";
+ setSubTaskName( "type-antdoc" );
}
/**
1.11 +6 -4
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AntlibDescriptorTask.java 23 Jun 2002 08:26:31 -0000 1.10
+++ AntlibDescriptorTask.java 25 Jun 2002 00:40:25 -0000 1.11
@@ -30,7 +30,7 @@
public void setDescriptorName( final String descriptorFileName )
{
final TemplateSubTask descriptorTemplate =
- makeTemplateSubTask( DESCRIPTOR_TEMPLATE, descriptorFileName );
+ makeTemplateSubTask( DESCRIPTOR_TEMPLATE, descriptorFileName,
"type-descriptor" );
addTemplate( descriptorTemplate );
}
@@ -40,7 +40,7 @@
public void setRolesDescriptorName( final String rolesFileName )
{
final TemplateSubTask rolesTemplate =
- makeTemplateSubTask( ROLES_TEMPLATE, rolesFileName );
+ makeTemplateSubTask( ROLES_TEMPLATE, rolesFileName,
"role-descriptor" );
addTemplate( rolesTemplate );
}
@@ -55,7 +55,7 @@
addTemplate( typeSubtask );
addTemplate( new AntDocNestedTypeSubTask(
typeSubtask.getNestedElementMap() ) );
addTemplate( new AntDocRoleSubTask() );
- final TemplateSubTask typesTemplate = makeTemplateSubTask(
TYPES_TEMPLATE, "types.xml" );
+ final TemplateSubTask typesTemplate = makeTemplateSubTask(
TYPES_TEMPLATE, "types.xml", "type-summary" );
addTemplate( typesTemplate );
}
}
@@ -65,12 +65,14 @@
* as a resource.
*/
private TemplateSubTask makeTemplateSubTask( final String
templateLocation,
- final String
destinationFile )
+ final String
destinationFile,
+ final String subtaskName )
{
final TemplateSubTask templateSubTask = new AntTypeSubTask();
final URL resource = getClass().getResource( templateLocation );
templateSubTask.setTemplateURL( resource );
templateSubTask.setDestinationFile( destinationFile );
+ templateSubTask.setSubTaskName( subtaskName );
return templateSubTask;
}
}
1.1 jakarta-ant-myrmidon/tools/xdoclet/xdoclet-20020625.jar
<<Binary file>>
1.1 jakarta-ant-myrmidon/tools/xdoclet/xjavadoc-20020625.jar
<<Binary file>>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
