Update of /cvsroot/xdoclet/xdoclet2
In directory sc8-pr-cvs1:/tmp/cvs-serv10938
Modified Files:
TODO.txt maven.xml project.properties
Log Message:
Updated build
Index: TODO.txt
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/TODO.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** TODO.txt 4 Mar 2003 23:44:27 -0000 1.11
--- TODO.txt 8 Mar 2003 16:44:19 -0000 1.12
***************
*** 10,15 ****
o Contributors often dupliate tags and logic (@jonas.bean). Better documentation!
Searchable? Lucene?
o Make more interfaces so we can use mocks in JUnit tests
- o Make a jelly script for xtag plugin so it can be used to generate docs for other
plugins
- o Verify that the XDoclet <- Plugin <- Generator inheritance works (makes it easier
to use from Ant).
o Use regexp matching in tag validation
o Define a TagMetaData API (for use with IDE plugins)
--- 10,13 ----
Index: maven.xml
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/maven.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** maven.xml 5 Mar 2003 20:59:43 -0000 1.17
--- maven.xml 8 Mar 2003 16:44:19 -0000 1.18
***************
*** 2,5 ****
--- 2,16 ----
xmlns:maven="jelly:maven">
+ <goal name="init">
+ <path id="xdoclet.class.path">
+ <path refid="maven.dependency.classpath"/>
+ <pathelement location="${pom.build.sourceDirectory}"/>
+ <pathelement location="${maven.build.dest}"/>
+ </path>
+
+ <taskdef name="xdoclet" classname="xdoclet.ant.XDocletTask"
classpathref="xdoclet.class.path"/>
+ <taskdef name="antdoclet" classname="xdoclet.sdk.ant.AntDocletTask"
classpathref="xdoclet.class.path"/>
+ </goal>
+
<preGoal name="site">
<!--attainGoal name="pmd"/-->
***************
*** 15,24 ****
<postGoal name="maven-junit-report-plugin:report">
! <mkdir dir="${basedir}/target/docs/junitreport"/>
! <junitreport todir="${basedir}/target/docs/junitreport">
! <fileset dir="${basedir}/target/test-reports">
<include name="TEST-*.xml"/>
</fileset>
! <report format="frames" todir="${basedir}/target/docs/junitreport"/>
</junitreport>
</postGoal>
--- 26,35 ----
<postGoal name="maven-junit-report-plugin:report">
! <mkdir dir="${maven.build.dir}/docs/junitreport"/>
! <junitreport todir="${maven.build.dir}/docs/junitreport">
! <fileset dir="${maven.build.dir}/test-reports">
<include name="TEST-*.xml"/>
</fileset>
! <report format="frames" todir="${maven.build.dir}/docs/junitreport"/>
</junitreport>
</postGoal>
***************
*** 32,41 ****
<postGoal name="java:compile">
! <path id="xdoclet.class.path">
! <path refid="maven.dependency.classpath"/>
! <pathelement location="${pom.build.sourceDirectory}"/>
! <pathelement location="${maven.build.dest}"/>
! </path>
<!-- We want the version of XDoclet to be printed out when XDoclet runs. -->
<mkdir dir="${maven.build.dir}/src"/>
--- 43,50 ----
<postGoal name="java:compile">
! <attainGoal name="post-compile"/>
! </postGoal>
+ <goal name="post-compile" prereqs="init">
<!-- We want the version of XDoclet to be printed out when XDoclet runs. -->
<mkdir dir="${maven.build.dir}/src"/>
***************
*** 48,55 ****
</filterset>
</copy>
! <!-- Recompile the modified class -->
<javac
srcdir="${maven.build.dir}/src"
destdir="${maven.build.dest}"
excludes="**/package.html"
debug="${maven.compile.debug}"
--- 57,66 ----
</filterset>
</copy>
!
! <!-- Recompile the modified xdoclet.XDoclet class plus the generated
BeanInfo classes -->
<javac
srcdir="${maven.build.dir}/src"
destdir="${maven.build.dest}"
+ includes="xdoclet/XDoclet.java"
excludes="**/package.html"
debug="${maven.compile.debug}"
***************
*** 59,71 ****
<!-- Now we're generating meta info to package in the jar -->
- <taskdef name="xdoclet" classname="xdoclet.ant.XDocletTask"
classpathref="xdoclet.class.path"/>
- <taskdef name="antdoclet" classname="xdoclet.sdk.ant.AntDocletTask"
classpathref="xdoclet.class.path"/>
-
<attainGoal name="xdoclet-plugin-xml"/>
<attainGoal name="task-xml"/>
! </postGoal>
! <goal name="xdoclet-plugin-xml">
! <!-- xdoclet-plugin from XDoclet SDK -->
<xdoclet validating="false">
<fileset dir="${pom.build.sourceDirectory}"/>
--- 70,96 ----
<!-- Now we're generating meta info to package in the jar -->
<attainGoal name="xdoclet-plugin-xml"/>
<attainGoal name="task-xml"/>
! <!--
! We want BeanInfo classes generated for all Tasks, Plugins and other sub
elements.
! This is the metadata IDE plugins will use to figure out XDoclet's
configuration
! options.
! -->
! <attainGoal name="BeanInfo"/>
! <attainGoal name="Manifest"/>
!
! <!-- Recompile the modified xdoclet.XDoclet class plus the generated
BeanInfo classes -->
! <javac
! srcdir="${maven.build.dir}/src"
! destdir="${maven.build.dest}"
! excludes="**/package.html,xdoclet/XDoclet.java"
! debug="${maven.compile.debug}"
! deprecation="${maven.compile.deprecation}"
! optimize="${maven.compile.optimize}"
! classpathref="xdoclet.class.path"/>
! </goal>
!
! <goal name="xdoclet-plugin-xml" prereqs="init">
<xdoclet validating="false">
<fileset dir="${pom.build.sourceDirectory}"/>
***************
*** 74,89 ****
</goal>
! <goal name="task-xml">
!
! <!-- xdoclet-plugin from XDoclet SDK -->
<antdoclet validating="false">
<fileset dir="${pom.build.sourceDirectory}"/>
! <task-xml destination="${maven.build.dest}/META-INF">
! <packageSubstitution from="xdoclet" to="jalla"/>
! </task-xml>
</antdoclet>
</goal>
! <!-- Build the test plugin and tag. Needed for the JUnit tests -->
<preGoal name="test:test">
<attainGoal name="build-testplugin"/>
--- 99,124 ----
</goal>
! <goal name="task-xml" prereqs="init">
<antdoclet validating="false">
<fileset dir="${pom.build.sourceDirectory}"/>
! <task-xml destination="${maven.build.dest}/META-INF"/>
</antdoclet>
</goal>
! <goal name="BeanInfo" prereqs="init">
! <xdoclet validating="false">
! <fileset dir="${pom.build.sourceDirectory}"/>
! <BeanInfo destination="${maven.build.dir}/src"/>
! </xdoclet>
! </goal>
!
! <goal name="Manifest" prereqs="init">
! <xdoclet validating="false">
! <fileset dir="${pom.build.sourceDirectory}"/>
! <Manifest destination="${maven.build.dest}/META-INF"/>
! </xdoclet>
! </goal>
!
! <!-- Build the test plugin and tag. This is "test data" needed for the JUnit
tests -->
<preGoal name="test:test">
<attainGoal name="build-testplugin"/>
***************
*** 92,119 ****
<goal name="build-testplugin">
! <mkdir dir="${basedir}/target/testdata/plugin/classes"/>
! <javac destdir="${basedir}/target/testdata/plugin/classes"
srcdir="${basedir}/src/testdata/plugin"
classpath="${maven.build.dir}/classes"/>
! <jar jarfile="${basedir}/target/testdata/plugin/xdoclet-plugin-test.jar"
! basedir="${basedir}/target/testdata/plugin/classes">
<metainf dir="${basedir}/src/testdata/plugin/META-INF"/>
</jar>
</goal>
! <goal name="build-testtag">
!
! <taskdef name="xdoclet"
! classname="xdoclet.ant.XDocletTask"
! classpathref="xdoclet.class.path">
! </taskdef>
!
<xdoclet>
<fileset dir="${maven.src.dir}/testdata/xtag/java"/>
-
<xtag destination="${maven.build.dir}/testdata/xtag/java"/>
-
</xdoclet>
-
</goal>
</project>
--- 127,145 ----
<goal name="build-testplugin">
! <mkdir dir="${maven.build.dir}/testdata/plugin/classes"/>
! <javac destdir="${maven.build.dir}/testdata/plugin/classes"
srcdir="${basedir}/src/testdata/plugin"
classpath="${maven.build.dir}/classes"/>
! <jar jarfile="${maven.build.dir}/testdata/plugin/xdoclet-plugin-test.jar"
! basedir="${maven.build.dir}/testdata/plugin/classes">
<metainf dir="${basedir}/src/testdata/plugin/META-INF"/>
</jar>
</goal>
! <goal name="build-testtag" prereqs="init">
<xdoclet>
<fileset dir="${maven.src.dir}/testdata/xtag/java"/>
<xtag destination="${maven.build.dir}/testdata/xtag/java"/>
</xdoclet>
</goal>
</project>
Index: project.properties
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet2/project.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** project.properties 5 Mar 2003 22:27:09 -0000 1.10
--- project.properties 8 Mar 2003 16:44:19 -0000 1.11
***************
*** 10,15 ****
maven.xdoc.date = left
! # Needed to get castor.properties in the jar
! maven.jarResources.basedir = ${basedir}/src/java
# Provides source compatibility with JDK 1.4 release (supports assert keyword)
--- 10,14 ----
maven.xdoc.date = left
! maven.jarResources.basedir = ${pom.build.sourceDirectory}
# Provides source compatibility with JDK 1.4 release (supports assert keyword)
***************
*** 24,27 ****
--- 23,31 ----
http://jakarta.apache.org/commons/jelly/apidocs/,\
http://nagoya.apache.org/gump/javadoc/ant/build/javadocs/
+
+ # We're specifying our own MANIFEST.MF to be merged with the Manifest created by
Maven.
+ # This MANIFEST.MF is created by the SDK and declares XDoclet classes that are
+ # Java beans. This is in order to support Java bean containers like IDEs.
+ maven.jar.manifest = ${maven.build.dest}/META-INF/MANIFEST.MF
# Declarations of custom tags to keep javadoc quiet. Will only work after the
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger
for complex code. Debugging C/C++ programs can leave you feeling lost and
disoriented. TotalView can help you find your way. Available on major UNIX
and Linux platforms. Try it free. www.etnus.com
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
