Return-Path: 
 <cvs-return-22650-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 59039 invoked from network); 19 Mar 2005 10:57:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Mar 2005 10:57:36 -0000
Received: (qmail 62501 invoked by uid 500); 19 Mar 2005 10:57:35 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 62459 invoked by uid 500); 19 Mar 2005 10:57:35 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 62444 invoked by uid 99); 19 Mar 2005 10:57:35 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sat, 19 Mar 2005 02:57:34 -0800
Received: (qmail 58957 invoked by uid 65534); 19 Mar 2005 10:57:33 -0000
Message-ID: <20050319105733.58956.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Sat, 19 Mar 2005 10:57:33 -0000
Subject: svn commit: r158228 - cocoon/trunk/tools/targets/docs-build.xml
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: reinhard
Date: Sat Mar 19 02:57:33 2005
New Revision: 158228

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D158228
Log:
formatting

Modified:
    cocoon/trunk/tools/targets/docs-build.xml

Modified: cocoon/trunk/tools/targets/docs-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/docs-build.xm=
l?view=3Ddiff&r1=3D158227&r2=3D158228
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/tools/targets/docs-build.xml (original)
+++ cocoon/trunk/tools/targets/docs-build.xml Sat Mar 19 02:57:33 2005
@@ -16,61 +16,51 @@
 -->
 <!-- $Id$ -->
 <project name=3D"docs">
-
-  <description>
-    Documentation Targets
-  </description>
+  <description> Documentation Targets </description>
  =20
-  <target name=3D"docs" depends=3D"prepare-docs" unless=3D"exclude.documen=
tation"=20
-  	description=3D"Test documentation target">
-  =09
-  	<!-- check whether Forrest bin directory ist set -->
+  <target name=3D"docs" depends=3D"prepare-docs" unless=3D"exclude.documen=
tation" description=3D"Test documentation target">
+    <!-- check whether Forrest bin directory ist set -->
     <condition property=3D"cond.forrest.bin.exists">
       <available file=3D"${forrest.bin}/forrest.bat" property=3D"blaaaa"/>
-    </condition>  =09
-  	<fail unless=3D"cond.forrest.bin.exists"=20
-      message=3D"Set the variable 'forrest.bin' to the directory that cont=
ains the Forrest start scripts!"/>
+    </condition>
+    <fail unless=3D"cond.forrest.bin.exists"
    =20
+      message=3D"Set the variable 'forrest.bin' to the directory that cont=
ains the Forrest start scripts!"/>
     <!-- run Forrest using exec task - depending on the operating system e=
ither choose=20
          forrest.sh or forrest.bat -->
-  	<dirname file=3D"${forrest.bin}/blaaaa" property=3D"forrest.bin.absolut=
e"/>
-  	<if>
-  	  <contains string=3D"${os.name}" substring=3D"win" casesensitive=3D"fa=
lse"/>
-  	  <then>
-  	    <exec dir=3D"./src/documentation" executable=3D"${forrest.bin.absol=
ute}/forrest.bat"/>
+    <dirname file=3D"${forrest.bin}/blaaaa" property=3D"forrest.bin.absolu=
te"/>
+    <if>
+      <contains string=3D"${os.name}" substring=3D"win" casesensitive=3D"f=
alse"/>
+      <then>
+        <exec dir=3D"./src/documentation" executable=3D"${forrest.bin.abso=
lute}/forrest.bat"/>
       </then>
       <else>
-  	    <exec dir=3D"./src/documentation" executable=3D"${forrest.bin.absol=
ute}/forrest.sh"/>  	=09
+        <exec dir=3D"./src/documentation" executable=3D"${forrest.bin.abso=
lute}/forrest.sh"/>
       </else>
-  	</if>
-  =09
-  	<!-- create Javadocs -->
-      <!-- tbd -->
-  =09
+    </if>
+    <!-- create Javadocs -->
+    <!-- tbd -->
   </target>
-
-  <target name=3D"prepare-docs" unless=3D"exclude.documentation" depends=
=3D"init-tasks" description=3D"Test documentation target">
-  	<!-- create sitemap components: Task has to be rewritten -->
-      <!--sitemap-components docDir=3D"build/xdocs/userdocs" source=3D"./s=
rc/java"/-->
-  	<!-- create jar information -->
-  	  <!-- TBD -->
-  	<!-- create Block status information -->
-  	  <!-- create block structure -->
-  =09
-  </target>
-=09
-  <target name=3D"javadocs" depends=3D"prepare-blocks"
-          description=3D"Builds the API documentation (javadocs)"
-          unless=3D"internal.exclude.javadocs">
-    <ant antfile=3D"${build.temp}/blocks-build.xml"
-         inheritAll=3D"true"
-         inheritRefs=3D"false"
-         target=3D"javadocs"/>
+ =20
+  <target name=3D"prepare-docs" unless=3D"exclude.documentation" depends=
=3D"init-tasks"
+    description=3D"Test documentation target">
+    <!-- create sitemap components: Task has to be rewritten -->
+    <!--sitemap-components docDir=3D"build/xdocs/userdocs" source=3D"./src=
/java"/-->
+   =20
+    <!-- create jar information -->
+    <!-- create block status information -->
+    <!-- create block structure -->
   </target>
-
-
+ =20
+  <target name=3D"javadocs" depends=3D"prepare-blocks" description=3D"Buil=
ds the API documentation (javadocs)"
+    unless=3D"internal.exclude.javadocs">
+    <ant antfile=3D"${build.temp}/blocks-build.xml" inheritAll=3D"true" in=
heritRefs=3D"false" target=3D"javadocs"/>
+  </target>
+ =20
+ =20
+  <!-- ******************************* old targets ***********************=
********************** -->
+  <!-- (RP) I don't delete them for now as it is easier this way to find o=
ut what the old version did -->
   <target name=3D"OLD_prepare-docs" unless=3D"exclude.documentation" depen=
ds=3D"blocks">
-
     <!-- Set classpath for documentation -->
     <path id=3D"documentation.classpath">
       <path refid=3D"classpath"/>
@@ -83,38 +73,29 @@
       <path location=3D"${tools.jar}"/>
       <path location=3D"${build.context}/WEB-INF/classes"/>
     </path>
-
     <mkdir dir=3D"${build.context}"/>
     <mkdir dir=3D"${build.context}/images"/>
-
     <!-- make filtered copy of XML docs -->
     <copy todir=3D"${build.context}" filtering=3D"on">
       <fileset dir=3D"${documentation}">
         <exclude name=3D"images/**"/>
       </fileset>
     </copy>
-
     <!-- Add some other documents -->
-    <copy file=3D"status.xml"
-      tofile=3D"${build.context}/xdocs/status.xml" filtering=3D"on"/>
-
-	<!-- generate sitemap components docs using SitemapTask -->
+    <copy file=3D"status.xml" tofile=3D"${build.context}/xdocs/status.xml"=
 filtering=3D"on"/>
+    <!-- generate sitemap components docs using SitemapTask -->
     <sitemap-components docDir=3D"${build.context}/xdocs/userdocs" source=
=3D"${java}"/>
     <echo message=3D"Building component docs from blocks."/>
     <sitemap-components docDir=3D"${build.context}/xdocs/userdocs" source=
=3D"${blocks}"/>
     <!--
     -->
-
     <!-- Forrest needs its own file at src/documentation/sitemap.xmap, so =
we
     overwrite it with the old Cocoon-specific sitemap here -->
-    <move file=3D"${build.context}/sitemap-localdocs.xmap"
-      tofile=3D"${build.context}/sitemap.xmap"/>
-
+    <move file=3D"${build.context}/sitemap-localdocs.xmap" tofile=3D"${bui=
ld.context}/sitemap.xmap"/>
     <!-- Copy images -->
     <copy todir=3D"${build.context}/images" filtering=3D"off">
       <fileset dir=3D"${documentation}/images"/>
     </copy>
-
     <!-- Copy entity catalog and entities -->
     <copy todir=3D"${build.context}/WEB-INF/entities" filtering=3D"on">
       <fileset dir=3D"${webapp}/WEB-INF/entities"/>
@@ -122,45 +103,34 @@
     <copy todir=3D"${build.context}/WEB-INF/classes" filtering=3D"on">
       <fileset dir=3D"${webapp}/WEB-INF/classes"/>
     </copy>
-
     <!-- Copy the logkit configuration -->
     <copy todir=3D"${build.context}" filtering=3D"on" file=3D"${webapp}/WE=
B-INF/logkit.xconf"/>
-
   </target>
-
   <!-- Set a variable if the generated docs are already up-to-date. -->
   <target name=3D"OLD_docs_check" depends=3D"OLD_prepare-docs">
-    <uptodate property=3D"docs.notrequired" targetfile=3D"${build.docs}/in=
dex.html" >
+    <uptodate property=3D"docs.notrequired" targetfile=3D"${build.docs}/in=
dex.html">
       <srcfiles dir=3D"." includes=3D"status.xml"/>
       <srcfiles dir=3D"${build}" includes=3D"jars.xml"/>
       <srcfiles dir=3D"${documentation}/xdocs" includes=3D"**/*.xml"/>
     </uptodate>
   </target>
-
   <!-- If generated docs are already up-to-date, print a message saying so=
. -->
   <target name=3D"OLD_docs_done" depends=3D"OLD_docs_check" if=3D"docs.not=
required">
-    <echo>-------------------------------------------------------------
-Not rebuilding docs, as they are up-to-date:
-  ${build.docs}/index.html is more recent than
-  status.xml, ${documentation}/xdocs/*.xml
--------------------------------------------------------------
-</echo>
+    <echo>------------------------------------------------------------- No=
t rebuilding docs, as they are up-to-date:
+      ${build.docs}/index.html is more recent than status.xml, ${documenta=
tion}/xdocs/*.xml
+      -------------------------------------------------------------</echo>
   </target>
-
   <!-- Create docs -->
-<!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and co=
coon version number conflict=20
+  <!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and =
cocoon version number conflict=20
       depends=3D"validate-jars, prepare-docs, cocoon-validate-xdocs, docs_=
done, javadocs, do-forrest"
 -->
-  <target name=3D"OLD_docs"
-      depends=3D"validate-jars, prepare-docs, cocoon-validate-xdocs, OLD_d=
ocs_done, javadocs"
-      unless=3D"docs.notrequired" description=3D"Builds the documentation">
+  <target name=3D"OLD_docs" depends=3D"validate-jars, prepare-docs, cocoon=
-validate-xdocs, OLD_docs_done, javadocs"
+    unless=3D"docs.notrequired" description=3D"Builds the documentation">
     <!-- The docs are created using forrest, so we simply copy them for no=
w -->
     <mkdir dir=3D"${build.docs}"/>
-
-<echo message=3D"
-FIXME: Not copying the forrest-built docs to ${build.docs}
-because you now need to run forrest manually and copy them yourself."/>
-<!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 and co=
coon version number conflict=20
+    <echo
+      message=3D" FIXME: Not copying the forrest-built docs to ${build.doc=
s} because you now need to run forrest manually and copy them yourself."/>
+    <!-- FIXME: Temporarily disable forrest until we fix the 0.6 vs 0.5 an=
d cocoon version number conflict=20
     <copy todir=3D"${build.docs}" filtering=3D"off">
       <fileset dir=3D"${build.site}"/>
     </copy>
@@ -168,31 +138,30 @@
     <copy todir=3D"${build.docs}/apidocs" filtering=3D"off">
       <fileset dir=3D"${build.javadocs}"/>
     </copy>
-<echo message=3D"
-NOTE: Now that the docs are prepared, run 'forrest' from the command-line.
-It will generate docs into ${build.site}"/>
+    <echo
+      message=3D" NOTE: Now that the docs are prepared, run 'forrest' from=
 the command-line. It will generate docs into ${build.site}"
+    />
   </target>
-
   <!-- Prepares the printer-docs -->
-<!--
+  <!--
   <target name=3D"prepare-printer-docs" depends=3D"prepare-docs">
     <mkdir dir=3D"${build.context.printer}"/>
 -->
-    <!-- copy prepared docs -->
-<!--
+  <!-- copy prepared docs -->
+  <!--
     <copy todir=3D"${build.context.printer}" filtering=3D"off">
       <fileset dir=3D"${build.context}"/>
     </copy>
 -->
-    <!-- copy printer skin -->
-<!--
+  <!-- copy printer skin -->
+  <!--
     <copy todir=3D"${build.context.printer}/stylesheets" filtering=3D"off"=
 overwrite=3D"yes">
       <fileset dir=3D"${build.context}/stylesheets/printer_skin"/>
     </copy>
   </target>
 -->
   <!-- Set a variable if the generated printer docs are already up-to-date=
. -->
-<!--
+  <!--
   <target name=3D"printer-docs_check" depends=3D"prepare">
     <uptodate property=3D"printer-docs.notrequired" targetfile=3D"${build.=
docs.printer}/index.html" >
       <srcfiles dir=3D"." includes=3D"status.xml"/>
@@ -201,7 +170,7 @@
   </target>
 -->
   <!-- If generated printer docs are already up-to-date, print a message s=
aying so. -->
-<!--
+  <!--
   <target name=3D"printer-docs_done" depends=3D"printer-docs_check" if=3D"=
printer-docs.notrequired">
     <echo message=3D"Not rebuilding printer docs, as they are up-to-date:"=
/>
     <echo message=3D"  ${build.docs.printer}/index.html is more recent tha=
n"/>
@@ -209,7 +178,7 @@
   </target>
 -->
   <!-- Create printer friendly docs -->
-<!--
+  <!--
   <target name=3D"printer-docs" depends=3D"prepare-printer-docs, cocoon-va=
lidate-xdocs, printer-docs_done" description=3D"Builds printer-friendly doc=
umentation">
     <mkdir dir=3D"${build.docs.printer}"/>
=20
@@ -228,8 +197,7 @@
     </java>
   </target>
 -->
-<!-- =3D=3D=3D Javadoc =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
+  <!-- =3D=3D=3D Javadoc =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
   <!-- Check if javadocs have to be generated -->
   <!-- Obsolete:
   <target name=3D"javadocs-check">
@@ -295,6 +263,4 @@
=20
   </target>
   -->
-
-
 </project>