Re: cvs commit: ant/proposal/xdocs/src/org/apache/tools/ant/xdoclet AntXDocletTask.java DatatypeSubTask.java DatatypeTagsHandler.java IndexGen.java

2003-04-30 Thread Stefan Bodewig
On Tue, 29 Apr 2003, Erik Hatcher [EMAIL PROTECTED]
wrote:

 Will Gump be ok with this change?

Not sure.  We'll see 8-)

You will probably need some work tags in the Gump descriptor
(probably mkdir as well).

 I get an eerie feeling that it won't like trying to use a JAR that
 is built during the build.

It will do, if you tell it to.

 XDoclet needs to have a JAR to look at though, as it needs to get at
 META-INF/xdoclet.xml

I think it will work with directories as well, as long as the
directory mirrors the jar file structure.

Stefan


cvs commit: ant/proposal/xdocs/src/org/apache/tools/ant/xdoclet AntXDocletTask.java DatatypeSubTask.java DatatypeTagsHandler.java IndexGen.java

2003-04-29 Thread ehatcher
ehatcher2003/04/29 12:42:00

  Modified:proposal/xdocs build.xml
  Added:   proposal/xdocs/metadata xdoclet.xml
   proposal/xdocs/src/org/apache/ant/xdoclet AntDocletTask.java
AntSubTask.java IndexGen.java
TaskDefPropertiesSubTask.java
TaskDescriptorSubTask.java TaskTagsHandler.java
   proposal/xdocs/src/org/apache/ant/xdoclet/resources
task_xml.xdt taskdef_properties.xdt
  Removed: proposal/xdocs/lib xdoclet-apache-module-1.2b3-dev.jar
   proposal/xdocs/src/org/apache/tools/ant/xdoclet
AntXDocletTask.java DatatypeSubTask.java
DatatypeTagsHandler.java IndexGen.java
  Log:
  migrated Ant XDoclet code here, to maintain it easier
  
  Revision  ChangesPath
  1.22  +18 -5 ant/proposal/xdocs/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/ant/proposal/xdocs/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build.xml 16 Mar 2003 02:33:59 -  1.21
  +++ build.xml 29 Apr 2003 19:41:59 -  1.22
  @@ -384,10 +384,14 @@
   delete dir=${gen.dir}/
 /target
   
  -  target name=gen depends=init
  +  target name=gen depends=jar
   taskdef name=antdoclet
  - classname=xdoclet.modules.apache.ant.AntDocletTask
  - classpathref=xdoclet.classpath/
  + classname=org.apache.ant.xdoclet.AntDocletTask
  +  classpath
  +path refid=xdoclet.classpath/
  +pathelement location=${build.dir}/xdoclet-ant.jar/
  +  /classpath
  +/taskdef
   antdoclet destdir=${gen.dir}
  excludedtags=@version,@author
  force=${xdoclet.force}
  @@ -462,15 +466,24 @@
   mkdir dir=${build.dir}/classes/
   javac destdir=${build.dir}/classes
  srcdir=src
  +   deprecation=on
  debug=true
  -   includes=**/IndexGen.java
  +   classpathref=xdoclet.classpath
   /
 /target
   
  +  target name=jar depends=compile
  +jar destfile=${build.dir}/xdoclet-ant.jar
  +  fileset dir=${build.dir}/classes/
  +  metainf dir=metadata includes=xdoclet.xml/
  +  fileset dir=src includes=**/*.xdt/
  +/jar
  +  /target
  +
 target name=indexgen depends=compile
   taskdef name=indexgen
classpath=${build.dir}/classes
  - classname=org.apache.tools.ant.xdoclet.IndexGen
  + classname=org.apache.ant.xdoclet.IndexGen
   /
   indexgen rootdir=${build.dir}/docs/manual/
 /target
  
  
  
  1.1  ant/proposal/xdocs/metadata/xdoclet.xml
  
  Index: xdoclet.xml
  ===
  ?xml version=1.0 encoding=UTF-8?
  
  !--
  !DOCTYPE xdoclet-module PUBLIC -//XDoclet Team//DTD XDoclet Module 1.0//EN 
http://xdoclet.sourceforge.net/dtd/xdoclet-module_1_0.dtd;
  --
  
  xdoclet-module
  taghandler
  namespace=Ant
  class=org.apache.ant.xdoclet.TaskTagsHandler
  /
  
  subtask
  name=taskdescriptor
  implementation-class=org.apache.ant.xdoclet.TaskDescriptorSubTask
  parent-task-class=org.apache.ant.xdoclet.AntDocletTask
  /
  subtask
  name=taskdefproperties
  implementation-class=org.apache.ant.xdoclet.TaskDefPropertiesSubTask
  parent-task-class=org.apache.ant.xdoclet.AntDocletTask
  /
  /xdoclet-module
  
  
  
  1.1  
ant/proposal/xdocs/src/org/apache/ant/xdoclet/AntDocletTask.java
  
  Index: AntDocletTask.java
  ===
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/).
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names The Jakarta Project, Ant, and Apache Software
   *

Re: cvs commit: ant/proposal/xdocs/src/org/apache/tools/ant/xdoclet AntXDocletTask.java DatatypeSubTask.java DatatypeTagsHandler.java IndexGen.java

2003-04-29 Thread Erik Hatcher
Stefan,
On Tuesday, April 29, 2003, at 03:42  PM, [EMAIL PROTECTED] wrote:
  +  target name=gen depends=jar
   taskdef name=antdoclet
  - classname=xdoclet.modules.apache.ant.AntDocletTask
  - classpathref=xdoclet.classpath/
  + classname=org.apache.ant.xdoclet.AntDocletTask
  +  classpath
  +path refid=xdoclet.classpath/
  +pathelement location=${build.dir}/xdoclet-ant.jar/
  +  /classpath
  +/taskdef

Will Gump be ok with this change?  I get an eerie feeling that it won't 
like trying to use a JAR that is built during the build.  XDoclet needs 
to have a JAR to look at though, as it needs to get at 
META-INF/xdoclet.xml

Thanks,
Erik


Re: cvs commit: ant/proposal/xdocs/src/org/apache/tools/ant/xdoclet AntXDocletTask.java DatatypeSubTask.java DatatypeTagsHandler.java IndexGen.java

2003-04-29 Thread Jesse Stockall
On Tue, 2003-04-29 at 15:42, [EMAIL PROTECTED] wrote:
   migrated Ant XDoclet code here, to maintain it easier
   

Cool, everything seems to be working after the move.

Aslak just committed a fix for XJavaDoc so EnumeratedAttributes are
being resolved correctly. XJavaDoc still has problems resolving types
used in inner classes, but so far they haven't been a problem.

I'm also working out the semantics of 'notes' and links in the manual
(see the Javac task), but I think I have a workable solution.

There are a few minor details that should be discussed before I go to
much further. I'll get them together in an email soon.

-- 
Jesse Stockall [EMAIL PROTECTED]



Re: cvs commit: ant/proposal/xdocs/src/org/apache/tools/ant/xdoclet AntXDocletTask.java DatatypeSubTask.java DatatypeTagsHandler.java IndexGen.java

2003-04-29 Thread Jesse Stockall
On Tue, 2003-04-29 at 16:56, Erik Hatcher wrote:
 
 Hmmm... didn't realize EnumeratedAttributes were an issue.  The 
 IntrospectionHelper stuff was dealing with it fine - what was going 
 wrong?
 

The IntrospectionHelper stuff was working as designed when it had all
the required info, but XJavaDoc was unable to resolve inner classes that
lived in the super class hierarchy. Tasks like the vss family and
jar use EnumeratedAttributes that live in their parent class. 

 I just saw some commits from Aslak that was changing XJavaDoc from 
 being a singleton - that might break our stuff until we refactor it - 
 at least it is likely to break Gump, and then we should upgrade.
 

I'll get rid the the deprecated XCollections and see if other changes
are required.

-- 
Jesse Stockall [EMAIL PROTECTED]