adammurdoch 02/05/29 03:50:36
Modified: buildtools/src/java/org/apache/myrmidon/build
AntlibDescriptorTask.java ant-descriptor.j
tools/xsl build.xsl
Added: tools/xdoclet commons-logging.jar xdoclet-20020529.jar
xjavadoc-20020529.jar
Removed: tools/xdoclet bcel.jar xdoclet.jar xjavadoc-20020502.jar
Log:
Xdoclet was hanging trying to generate descriptors for container. Upgraded
xdoclet to latest, problem seems to be gone.
Revision Changes Path
1.4 +27 -30
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntlibDescriptorTask.java 2 May 2002 13:21:16 -0000 1.3
+++ AntlibDescriptorTask.java 29 May 2002 10:50:35 -0000 1.4
@@ -58,46 +58,43 @@
public void addAntdoc( final AntDocSubTask antDocs )
{
- m_antDocs = antDocs;
+ addTemplate( antDocs );
}
- public void execute()
- throws BuildException
+// public void execute()
+// throws BuildException
+// {
+// File tmpFile;
+// try
+// {
+// tmpFile = File.createTempFile( "antlib", "tmp" );
+// setXdoclettempfile( tmpFile );
+// }
+// catch( final IOException ioe )
+// {
+// throw new BuildException( ioe.getMessage(), ioe );
+// }
+//
+// super.execute();
+// tmpFile.delete();
+// }
+ /**
+ * Describe what the method does
+ *
+ * @exception BuildException Describe the exception
+ */
+ protected void validateSubTasks() throws BuildException
{
- File tmpFile;
- try
- {
- tmpFile = File.createTempFile( "antlib", "tmp" );
- setXdoclettempfile( tmpFile );
- }
- catch( final IOException ioe )
- {
- throw new BuildException( ioe.getMessage(), ioe );
- }
-
- super.execute();
- tmpFile.delete();
- }
-
- protected List getSubTasks()
- {
- final List subtasks = super.getSubTasks();
-
- if( null != m_antDocs )
- {
- subtasks.add( m_antDocs );
- }
-
// Add template subtasks.
final TemplateSubTask descriptorTemplate =
makeTemplateSubTask( DESCRIPTOR_TEMPLATE,
getDescriptorFileName() );
- subtasks.add( descriptorTemplate );
+ addTemplate( descriptorTemplate );
final TemplateSubTask rolesTemplate =
makeTemplateSubTask( ROLES_TEMPLATE, getRolesFileName() );
- subtasks.add( rolesTemplate );
+ addTemplate( rolesTemplate );
- return subtasks;
+ super.validateSubTasks();
}
/**
1.4 +14 -21
jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-descriptor.j
Index: ant-descriptor.j
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/buildtools/src/java/org/apache/myrmidon/build/ant-descriptor.j,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant-descriptor.j 26 Apr 2002 03:22:24 -0000 1.3
+++ ant-descriptor.j 29 May 2002 10:50:35 -0000 1.4
@@ -2,41 +2,34 @@
<types>
- <XDtClass:forAllClasses type="org.apache.myrmidon.api.Task"
extent="hierarchy">
- <XDtClass:ifHasClassTag tagName="ant.task" superclasses="false">
+ <XDtClass:forAllClasses extent="concrete-type">
+
+ <XDtClass:forAllClassTags tagName="ant.task" superclasses="false">
<task name="<XDtClass:classTagValue tagName="ant.task"
paramName="name"/>"
classname="<XDtClass:fullClassName/>"/>
- </XDtClass:ifHasClassTag>
- </XDtClass:forAllClasses>
+ </XDtClass:forAllClassTags>
- <XDtClass:forAllClasses type="org.apache.myrmidon.framework.DataType"
extent="hierarchy">
- <XDtClass:ifHasClassTag tagName="ant.data-type" superclasses="false">
+ <XDtClass:forAllClassTags tagName="ant.data-type" superclasses="false">
<data-type name="<XDtClass:classTagValue tagName="ant.data-type"
paramName="name"/>"
classname="<XDtClass:fullClassName/>"/>
- </XDtClass:ifHasClassTag>
- </XDtClass:forAllClasses>
+ </XDtClass:forAllClassTags>
- <XDtClass:forAllClasses
type="org.apache.myrmidon.interfaces.service.ServiceFactory" extent="hierarchy">
- <XDtClass:ifHasClassTag tagName="ant.service-factory"
superclasses="false">
+ <XDtClass:forAllClassTags tagName="ant.service-factory"
superclasses="false">
<service-factory name="<XDtClass:classTagValue
tagName="ant.service-factory" paramName="role"/>"
classname="<XDtClass:fullClassName/>"/>
- </XDtClass:ifHasClassTag>
- </XDtClass:forAllClasses>
+ </XDtClass:forAllClassTags>
+
+ <XDtClass:forAllClassTags tagName="ant.converter" superclasses="false">
+ <converter classname="<XDtClass:fullClassName/>"
+ source="<XDtClass:classTagValue tagName="ant.converter"
paramName="source"/>"
+ destination="<XDtClass:classTagValue
tagName="ant.converter" paramName="destination"/>"/>
+ </XDtClass:forAllClassTags>
- <XDtClass:forAllClasses extent="concrete-type">
<XDtClass:forAllClassTags tagName="ant.type" superclasses="false">
<<XDtClass:classTagValue tagName="ant.type" paramName="type"
superclasses="false"/>
name="<XDtClass:classTagValue tagName="ant.type" paramName="name"
superclasses="false"/>"
classname="<XDtClass:fullClassName/>" />
</XDtClass:forAllClassTags>
- </XDtClass:forAllClasses>
-
- <XDtClass:forAllClasses type="org.apache.aut.converter.Converter">
- <XDtClass:ifHasClassTag tagName="ant.converter" superclasses="false">
- <converter classname="<XDtClass:fullClassName/>"
- source="<XDtClass:classTagValue tagName="ant.converter"
paramName="source"/>"
- destination="<XDtClass:classTagValue
tagName="ant.converter" paramName="destination"/>"/>
- </XDtClass:ifHasClassTag>
</XDtClass:forAllClasses>
</types>
1.1 jakarta-ant-myrmidon/tools/xdoclet/commons-logging.jar
<<Binary file>>
1.1 jakarta-ant-myrmidon/tools/xdoclet/xdoclet-20020529.jar
<<Binary file>>
1.1 jakarta-ant-myrmidon/tools/xdoclet/xjavadoc-20020529.jar
<<Binary file>>
1.23 +0 -7 jakarta-ant-myrmidon/tools/xsl/build.xsl
Index: build.xsl
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/tools/xsl/build.xsl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xsl 27 May 2002 13:47:47 -0000 1.22
+++ build.xsl 29 May 2002 10:50:36 -0000 1.23
@@ -201,10 +201,6 @@
<fileset dir="{unitTest/sourceDirectory}">
<patternset
refid="project.test.patternset"/>
</fileset>
- <classpath refid="xdoclet.class.path"/>
- <classpath location="${{build.classes}}"/>
- <classpath refid="test.class.path"/>
- <classpath path="${{java.class.path}}"/>
</antlib-descriptor>
</xsl:if>
@@ -436,9 +432,6 @@
<xsl:copy-of select="$patterns"/>
</fileset>
</xsl:for-each>
- <classpath refid="xdoclet.class.path"/>
- <classpath refid="{$build-id}.class.path"/>
- <classpath path="${{java.class.path}}"/>
</antlib-descriptor>
</xsl:if>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
