ceki 2002/06/11 18:29:33
Modified: . Tag: v1_2-branch build.properties.sample build.xml
src/xdocs Tag: v1_2-branch contributors.xml
src/xdocs/stylesheets Tag: v1_2-branch lf5.xml
Removed: build Tag: v1_2-branch siteBuild.sh siteBuild.xml
Log:
The log4j site can now be built from the main build file. The files
build/siteBuild.sh and build/siteBuild.xml are no longer needed.
The "dist" target now depends on "site2" such that a new distribution
can be built in one single step.
Revision Changes Path
No revision
No revision
1.2.2.2 +6 -0 jakarta-log4j/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.properties.sample,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- build.properties.sample 29 May 2002 11:50:17 -0000 1.2.2.1
+++ build.properties.sample 12 Jun 2002 01:29:33 -0000 1.2.2.2
@@ -18,6 +18,12 @@
jmx.jar=/java/jmx/lib/jmxri.jar
jmx-extra.jar=/java/jmx/lib/jmxtools.jar
+
+# jakarta-site2 module is used to transform xml files to html using
+# Anakia. You do not need to worry about this property unless you
+# intend to build the log4j web site yourself.
+jakarta-site2=../jakarta-site2
+
# Required to run Checkstyle. Available from http://checkstyle.sf.net
checkstyle.jar=/java/checkstyle-2.2/checkstyle-all-2.2.jar
1.34.2.5 +60 -5 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.34.2.4
retrieving revision 1.34.2.5
diff -u -r1.34.2.4 -r1.34.2.5
--- build.xml 29 May 2002 11:50:17 -0000 1.34.2.4
+++ build.xml 12 Jun 2002 01:29:33 -0000 1.34.2.5
@@ -35,11 +35,14 @@
<!-- Destination for generated jar files -->
<property name="jar.dest" value="dist/lib"/>
+ <!-- The jar file that the jar task will generate -->
<property name="jar.filename" value="log4j-${version}.jar"/>
+ <!-- Destination for documentation files -->
+ <property name="docs.dest" value="./docs"/>
+ <!-- Source directory for xml docs -->
+ <property name="xdocs.src" value="./src/xdocs"/>
- <!-- Destination for documentation files generated or not -->
- <property name="docs" value="docs"/>
<!-- Destination for javadoc generated files -->
<property name="javadoc.dest" value="docs/api"/>
@@ -75,6 +78,13 @@
<pathelement location="${jmx-extra.jar}"/>
</path>
+ <!-- Construct compile classpath -->
+ <path id="site2.classpath">
+ <fileset dir="${jakarta-site2}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<!-- ================================================================= -->
<!-- Default target -->
@@ -334,6 +344,7 @@
org.apache.log4j.config,
org.apache.log4j.helpers,
org.apache.log4j.jmx,
+ org.apache.log4j.lf5,
org.apache.log4j.net,
org.apache.log4j.nt,
org.apache.log4j.or,
@@ -350,7 +361,7 @@
protected="true"
author="true"
use="true"
- overview="${docs}/overview.html"
+ overview="${docs.dest}/overview.html"
doctitle="log4j version ${version}<br>API Specification"
windowtitle="Log4j Version ${version}"
header="<b>Log4j ${version}</b>"
@@ -363,10 +374,54 @@
</javadoc>
</target>
+ <!-- ============================================== -->
+ <!-- Build the site files using Anakia -->
+ <!-- ============================================== -->
+ <target name="prepareSite2">
+ <available classname="org.apache.velocity.anakia.AnakiaTask"
+ property="AnakiaTask.present">
+ <classpath refid="site2.classpath"/>
+ </available>
+ </target>
+
+ <target name="checkSite2" depends="prepareSite2" unless="AnakiaTask.present">
+ <echo>
+ AnakiaTask is not present! Please check to make sure that
+ velocity.jar is in your classpath.
+ </echo>
+ </target>
+
+ <target name="site2" depends="checkSite2" if="AnakiaTask.present">
+ <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
+ <classpath refid="site2.classpath"/>
+ </taskdef>
+
+ <anakia basedir="${xdocs.src}" destdir="${docs.dest}/"
+ extension=".html"
+ style="site.vsl"
+ projectFile="stylesheets/project.xml"
+ excludes="**/stylesheets/**, empty.xml, lf5/**"
+ includes="**/*.xml"
+ lastModifiedCheck="true"
+ templatePath="../jakarta-site2/xdocs/stylesheets">
+ </anakia>
+
+ <anakia basedir="${xdocs.src}" destdir="${docs.dest}/"
+ extension=".html"
+ style="site.vsl"
+ projectFile="stylesheets/lf5.xml"
+ excludes="**/stylesheets/**, empty.xml"
+ includes="lf5/*.xml"
+ lastModifiedCheck="true"
+ templatePath="../jakarta-site2/xdocs/stylesheets">
+ </anakia>
+ </target>
+
+
<!-- ================================================================= -->
<!-- Build a complete distribution. Results go to ${dist.images} -->
<!-- ================================================================= -->
- <target name="dist" depends="init, clean, javadoc, jar">
+ <target name="dist" depends="init, clean, javadoc, jar, site2">
<delete verbose="true">
<fileset dir=".">
@@ -403,7 +458,7 @@
</delete>
<mkdir dir="${dist.images}" />
-
+
<mkdir dir="${dist.tmp}/jakarta-log4j-${version}" />
<copy todir="${dist.tmp}/jakarta-log4j-${version}">
No revision
No revision
1.7.2.1 +1 -1 jakarta-log4j/src/xdocs/contributors.xml
Index: contributors.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/contributors.xml,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- contributors.xml 2 Apr 2002 09:07:35 -0000 1.7
+++ contributors.xml 12 Jun 2002 01:29:33 -0000 1.7.2.1
@@ -8,7 +8,7 @@
<body>
<section name="Log4j contributors">
-
+
<p>Log4j is the result of contributions from several dozen
developers and hundreds of users across the globe. Some of the
more prominent contributors are listed below in alphabetical
No revision
No revision
1.1.2.2 +1 -0 jakarta-log4j/src/xdocs/stylesheets/Attic/lf5.xml
Index: lf5.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/xdocs/stylesheets/Attic/lf5.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- lf5.xml 11 Jun 2002 21:49:10 -0000 1.1.2.1
+++ lf5.xml 12 Jun 2002 01:29:33 -0000 1.1.2.2
@@ -14,6 +14,7 @@
<item name="Library" href="/lf5/library.html"/>
<item name="Examples" href="/lf5/examples.html"/>
<item name="Troubleshoot" href="/lf5/trouble.html"/>
+ <item name="FAQ" href="/lf5/faq.html"/>
</menu>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
