vgritsenko 2003/02/01 10:13:47
Modified: . build.xml
src/documentation cocoon.xconf
Log:
Fix build docs. Why CLI does not fit into 64 Mb as before?
Revision Changes Path
1.315 +13 -9 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- build.xml 31 Jan 2003 18:08:41 -0000 1.314
+++ build.xml 1 Feb 2003 18:13:47 -0000 1.315
@@ -1285,10 +1285,14 @@
<!-- Add changes and todo -->
<copy file="changes.xml" tofile="${build.context}/xdocs/changes.xml"
filtering="on"/>
<copy file="todo.xml" tofile="${build.context}/xdocs/todo.xml"
filtering="on"/>
- <replace file="${build.context}/xdocs/changes.xml"
token="src/documentation/xdocs/dtd/" value="dtd/"/>
- <replace file="${build.context}/xdocs/todo.xml"
token="src/documentation/xdocs/dtd/" value="dtd/"/>
- <copy file="${build.dir}/jars.xml"
tofile="${build.context}/xdocs/installing/jars.xml" filtering="off" overwrite="yes"/>
+ <replace file="${build.context}/xdocs/changes.xml"
+ token="src/documentation/xdocs/dtd/" value="dtd/"/>
+ <replace file="${build.context}/xdocs/todo.xml"
+ token="src/documentation/xdocs/dtd/" value="dtd/"/>
+
+ <copy file="${build.dir}/jars.xml"
+ tofile="${build.context}/xdocs/installing/jars.xml" filtering="off"
overwrite="yes"/>
<!-- Copy images -->
<copy todir="${build.context}/images" filtering="off">
@@ -1303,7 +1307,6 @@
<fileset dir="${webapp.dir}/WEB-INF/classes"/>
</copy>
<copy todir="${build.context}" filtering="on"
file="${webapp.dir}/WEB-INF/logkit.xconf">
-
</copy>
</target>
@@ -1311,7 +1314,7 @@
<!-- =================================================================== -->
<!-- Set a variable if the generated docs are already up-to-date. -->
<!-- =================================================================== -->
- <target name="docs_check" depends="init">
+ <target name="docs_check" depends="prepare-docs">
<uptodate property="docs.notrequired" targetfile="${build.docs}/index.html" >
<srcfiles dir="." includes="changes.xml,todo.xml"/>
<srcfiles dir="${build.dir}" includes="jars.xml"/>
@@ -1322,7 +1325,7 @@
<!-- =================================================================== -->
<!-- If generated docs is already up-to-date, print a message saying so. -->
<!-- =================================================================== -->
- <target name="docs_done" if="docs.notrequired">
+ <target name="docs_done" depends="docs_check" if="docs.notrequired">
<echo message="-------------------------------------------------------------"/>
<echo message="Not rebuilding docs, as they are up-to-date:"/>
<echo message=" ${build.docs}/index.html is more recent than"/>
@@ -1334,11 +1337,12 @@
<!-- The documentation system -->
<!-- =================================================================== -->
<target name="docs"
- depends="compile, prepare-docs, validate-xdocs, docs_check, docs_done"
+ depends="compile, prepare-docs, validate-xdocs, docs_done"
unless="docs.notrequired"
description="Builds the documentation">
- <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context}"
failonerror="true">
+ <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context}"
+ failonerror="true" maxmemory="128m">
<arg value="-c."/>
<arg value="-d../docs"/>
<arg value="-w../work"/>
1.21 +30 -28 xml-cocoon2/src/documentation/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/cocoon.xconf,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cocoon.xconf 22 Jan 2003 05:19:17 -0000 1.20
+++ cocoon.xconf 1 Feb 2003 18:13:47 -0000 1.21
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<cocoon version="2.0">
<!-- ================ Apache Cocoon configuration file ================== -->
<!-- For full description of the components and their parameters ...
- Apache Cocoon User Documentation at /userdocs/
- - webapp/cocoon.xconf (this file) - describes each core component
+ - webapp/WEB-INF/cocoon.xconf (this file) - describes each core component
- each optional component/.../*.xconf - these describe the parameters
for each component and are automatically included at build-time.
@@ -21,24 +21,22 @@
<!-- ============================ STORE ============================ -->
<persistent-store logger="core.store.persistent">
<parameter name="use-cache-directory" value="true"/>
- <parameter name="datafile" value="cocoon-cache.dat"/>
- <parameter name="indexfile" value="cocoon-cache.idx"/>
<parameter name="order" value="1701"/>
</persistent-store>
<!-- Memory Storing -->
<transient-store logger="core.store.transient">
- <parameter name="maxobjects" value="10000"/>
+ <parameter name="maxobjects" value="5000"/>
<parameter name="use-persistent-cache" value="false"/>
</transient-store>
<!-- Store Janitor -->
<store-janitor logger="core.store.janitor">
- <parameter name="freememory" value="1000000"/>
+ <parameter name="freememory" value="1024768"/>
<parameter name="heapsize" value="67108864"/>
- <parameter name="cleanupthreadinterval" value="10"/>
+ <parameter name="cleanupthreadinterval" value="5"/>
<parameter name="threadpriority" value="5"/>
- <parameter name="percent_to_free" value="10"/>
+ <parameter name="percent_to_free" value="15"/>
</store-janitor>
<!-- ============================ STORE END ========================= -->
@@ -47,57 +45,61 @@
<parameter name="use-store" value="true"/>
</xslt-processor>
- <!-- URL Factory:
- THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE
- -->
+ <!-- URL Factory: THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE -->
<url-factory logger="core.url-factory">
<protocol name="resource"
class="org.apache.cocoon.components.url.ResourceURLFactory"/>
<protocol name="context"
class="org.apache.cocoon.components.url.ContextURLFactory"/>
</url-factory>
- <!-- Source Factories
- Each source factory adds a special uri protocol to the system.
- This will replace the source-handler and url-factory components.
- -->
+ <!-- Source Handler: THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE
-->
+ <source-handler logger="core.source-handler">
+ <protocol class="org.apache.cocoon.components.source.FileSourceFactory"
name="file"/>
+ <protocol class="org.apache.cocoon.components.source.ContextSourceFactory"
name="context"/>
+ </source-handler>
+
+ <!-- Source Factories -->
<source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.cocoon.components.source.impl.ContextSourceFactory" name="context"/>
- <component-instance
class="org.apache.cocoon.components.source.impl.SitemapSourceFactory" name="cocoon"/>
- </source-factories>
+ <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
+ <component-instance
class="org.apache.cocoon.components.source.impl.ContextSourceFactory" name="context"/>
+ <component-instance
class="org.apache.cocoon.components.source.impl.SitemapSourceFactory" name="cocoon"/>
+ <component-instance
class="org.apache.cocoon.components.source.impl.FileSourceFactory" name="file"/>
+ <component-instance class="org.apache.excalibur.source.impl.URLSourceFactory"
name="*"/>
+ </source-factories>
<!-- The XMLizer converts different mime-types to XML -->
<xmlizer>
- <parser role="org.apache.excalibur.xml.sax.SAXParser/HTML"
mime-type="text/html"/>
- <parser role="org.apache.excalibur.xml.sax.SAXParser"
mime-type="text/xml"/>
+ <parser mime-type="text/html"
role="org.apache.excalibur.xml.sax.SAXParser/HTML"/>
+ <parser mime-type="text/xml" role="org.apache.excalibur.xml.sax.SAXParser"/>
</xmlizer>
<!-- Program Generator -->
<program-generator logger="core.program-generator">
<parameter name="auto-reload" value="true"/>
- <parameter name="root-package" value="org_apache_cocoon_www"/>
+ <parameter name="root-package" value="org.apache.cocoon.www"/>
<parameter name="preload" value="true"/>
</program-generator>
<!-- Programming Languages -->
<programming-languages>
- <java-language name="java" logger="core.language.java">
- <parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Javac"/>
+ <java-language logger="core.language.java" name="java">
<parameter name="class-loader"
value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
+ <parameter name="compiler"
value="org.apache.cocoon.components.language.programming.java.Pizza"/>
</java-language>
</programming-languages>
<!-- Class loader -->
- <classloader
class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"
- logger="core.classloader"/>
+ <classloader
class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"
logger="core.classloader"/>
<!-- Entity resolution catalogs -->
<entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
- logger="core.resolver">
+ logger="core.resolver">
<parameter name="catalog" value="/WEB-INF/entities/catalog"/>
<parameter name="verbosity" value="1"/>
</entity-resolver>
+
+
<!-- ======================== The sitemap ============================== -->
-
+
<sitemap file="sitemap.xmap" check-reload="yes" logger="sitemap"/>
</cocoon>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
