cziegeler 2002/07/03 23:33:26
Modified: . build.xml
Added: src/webapp/WEB-INF/classes CatalogManager.properties
Removed: src/webapp/WEB-INF/entities CatalogManager.properties
Log:
Simplified build a little bit
Revision Changes Path
1.239 +2 -22 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- build.xml 4 Jul 2002 06:08:02 -0000 1.238
+++ build.xml 4 Jul 2002 06:33:26 -0000 1.239
@@ -1002,16 +1002,10 @@
<!-- Copy entity catalog and entities -->
<copy todir="${build.context}/WEB-INF/entities" filtering="on">
- <fileset dir="${webapp.dir}/WEB-INF/entities">
- <include name="**"/>
- <exclude name="CatalogManager.properties"/>
- </fileset>
+ <fileset dir="${webapp.dir}/WEB-INF/entities"/>
</copy>
- <mkdir dir="${build.context}/WEB-INF/classes"/>
<copy todir="${build.context}/WEB-INF/classes" filtering="on">
- <fileset dir="${webapp.dir}/WEB-INF/entities">
- <include name="CatalogManager.properties"/>
- </fileset>
+ <fileset dir="${webapp.dir}/WEB-INF/classes"/>
</copy>
</target>
@@ -1076,12 +1070,6 @@
<fileset dir="${build.src}" includes="org/apache/cocoon/samples/**"/>
</copy>
- <copy todir="${build.war}/WEB-INF/classes" filtering="on">
- <fileset dir="${webapp.dir}/WEB-INF/entities">
- <include name="CatalogManager.properties"/>
- </fileset>
- </copy>
-
<copy todir="${build.war}" filtering="on">
<fileset dir="${webapp.dir}">
<exclude name="**/*.gif"/>
@@ -1089,7 +1077,6 @@
<exclude name="**/*.png"/>
<exclude name="**/i18n/**"/>
<exclude name="**/db/*"/>
- <exclude name="**/CatalogManager.properties"/>
</fileset>
</copy>
@@ -1672,13 +1659,6 @@
<exclude name="servlet*.jar"/>
</fileset>
</copy>
- <mkdir dir="${dist.bin.dir}/webapp/WEB-INF/classes"/>
-
- <move todir="${dist.bin.dir}/webapp/WEB-INF/classes">
- <fileset dir="${dist.bin.dir}/webapp/WEB-INF/entities">
- <include name="CatalogManager.properties"/>
- </fileset>
- </move>
<copy file="${build.dir}/${name}.jar"
tofile="${dist.bin.dir}/webapp/WEB-INF/lib/${name}-${version}.jar"/>
1.1 xml-cocoon2/src/webapp/WEB-INF/classes/CatalogManager.properties
Index: CatalogManager.properties
===================================================================
# CatalogManager.properties
#
# This is the default properties file for Apache Cocoon. This facilitates local
# configuration of application-specific catalogs. You can also use cocoon.xconf
# to over-ride or supplement these settings.
#
# Note: The filesystem directory that contains this properties file must be
# available on the Java classpath. Cocoon automatically does this.
#
# See the Apache Cocoon documentation userdocs/concepts/catalog.html
# and thence the Resolver API and accompanying documentation.
# verbosity ... level of messages for status/debug (messages go to STDOUT)
# The following messages are provided ...
# 0 = none
# 1 = ?
# 2 = 1+, Loading catalog, Resolved public, Resolved system
# 3 = 2+, Catalog does not exist, resolvePublic, resolveSystem
# 10 = 3+, List all catalog entries when loading a catalog
# (Cocoon also logs the "Resolved public" messages.)
# TODO: determine all messages at each level
#
verbosity=1
# catalogs ... list of additional catalogs to load
# Note that Apache Cocoon will automatically load its own default catalog
# from webapps/cocoon/WEB-INF/entities/catalog
# use full pathnames
# pathname separator is always semi-colon (;) regardless of operating system
# directory separator is always slash (/) regardless of operating system
#
#catalogs=/path/to/local/catalog
catalogs=
# prefer ... we prefer to use Public Identifiers for entity resolution
#
prefer=public
# static-catalog ... see the Sun doco
# TODO: ? what impact does this setting have for Apache Cocoon
#
static-catalog=yes
# allow-oasis-xml-catalog-pi ... see the Sun doco
# TODO: ? what impact does this setting have for Apache Cocoon
#
allow-oasis-xml-catalog-pi=yes
# catalog-class-name ... specify an alternate class name to use
# Apache Cocoon does not need this setting - we already have a named class
#
# catalog-class-name=com.sun.resolver.Resolver
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
