You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by br...@apache.org on 2003/12/21 01:31:57 UTC
cvs commit: xml-forrest/src/core default-forrest.properties forrest.build.xml
brondsem 2003/12/20 16:31:57
Modified: src/core default-forrest.properties forrest.build.xml
Log:
look for forrest.properties in user home before going to default values; clean seperation of properties in default-forrest.properties from properties set for internal use in forrest.build.xml
Revision Changes Path
1.4 +10 -9 xml-forrest/src/core/default-forrest.properties
Index: default-forrest.properties
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/default-forrest.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default-forrest.properties 21 Oct 2003 11:57:11 -0000 1.3
+++ default-forrest.properties 21 Dec 2003 00:31:56 -0000 1.4
@@ -6,18 +6,17 @@
#forrest.echo=true
# Project name (used to name .war file)
-#project.name=my-project
+project.name=my-project
# Specifies name of Forrest skin to use
-#project.skin=forrest-site
+project.skin=forrest-site
#project.skin=forrest-css
#project.skin=avalon-tigris
#project.skin=krysalis-site
-
##############
# behavioural properties
-#project.menu-scheme=tab_attributes
+project.menu-scheme=tab_attributes
#project.menu-scheme=directories
##############
@@ -53,7 +52,7 @@
project.catalog=${project.schema-dir}/catalog.xcat
# The verbosity level for the entity resolver (1..10)
-#forrest.catalog.verbosity=1
+forrest.catalog.verbosity=1
##############
@@ -109,13 +108,15 @@
# General Forrest properties
# The URL to start crawling from
-#project.start-uri=index.html
+project.start-uri=index.html
# Set logging level for messages printed to the console
# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
-#project.debuglevel=ERROR
+project.debuglevel=ERROR
# Max memory to allocate to Java
-#forrest.maxmemory=64m
+forrest.maxmemory=64m
# Any other arguments to pass to the JVM. For example, to run on an X-less
# server, set to -Djava.awt.headless=true
-#forrest.jvmargs=
+forrest.jvmargs=
+project.bugtracking-url=
#project.bugtracking-url=http://nagoya.apache.org/bugzilla/show_bug.cgi?id=
+project.i18n=false
1.15 +4 -12 xml-forrest/src/core/forrest.build.xml
Index: forrest.build.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- forrest.build.xml 11 Dec 2003 15:30:39 -0000 1.14
+++ forrest.build.xml 21 Dec 2003 00:31:56 -0000 1.15
@@ -54,12 +54,14 @@
<property name="/" value="${file.separator}"/>
<echo message="Loading project specific properties from ${project.home}${/}forrest.properties" />
<property file="${project.home}/forrest.properties" />
+ <echo message="Loading user specific properties from ${user.home}${/}forrest.properties" />
+ <property file="${user.home}/forrest.properties" />
+ <echo message="Loading default properties from ${forrest.home}${/}default-forrest.properties" />
<property file="${forrest.home}/default-forrest.properties" />
<!-- people should use forrest.properties to override following defaults -->
<property name="forrest.home" location="." />
<property name="forrest.skins-dir" location="${forrest.home}/context/skins"/>
- <property name="project.name" value="my-project" />
<property name="project.build-dir" location="${project.home}/build" />
<property name="project.site-dir" location="${project.build-dir}/site" />
<property name="project.war" location="${project.build-dir}/${project.name}.war" />
@@ -70,18 +72,11 @@
<property name="project.cocoon-work-dir" location="${project.temp-dir}/cocoon-work" />
<property name="project.brokenlinkfile" location="${project.build-dir}/brokenlinks.xml"/>
- <property name="project.debuglevel" value="ERROR" />
- <property name="project.start-uri" value="index.html" />
<property name="project.configfile" value="${project.webapp}/WEB-INF/cli.xconf" />
<property name="project.logkitfile" value="${project.webapp}/WEB-INF/logkit.xconf" />
<property name="project.logger" value="" />
- <property name="project.i18n" value="false" />
- <!-- use of these property should be removed when the siteplan becomes active -->
- <property name="project.skin" value="forrest-site" />
- <property name="project.menu-scheme" value="tab_attributes" />
<property name="status" location="${project.home}/${project.status}" />
- <property name="project.bugtracking-url" value="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=" />
<!-- FIXME: rename project.content-dir to project.documentation-dir -->
<property name="content-dir" location="${project.home}/${project.content-dir}" />
@@ -89,9 +84,6 @@
<property name="sitemap-dir" location="${project.home}/${project.sitemap-dir}" />
<property name="xdocs-dir" location="${project.home}/${project.xdocs-dir}" />
<property name="catalog" location="${project.home}/${project.catalog}" />
- <property name="forrest.catalog.verbosity" value="1" />
- <property name="forrest.maxmemory" value="64m" />
- <property name="forrest.jvmargs" value="" />
<property name="skins-dir" location="${project.home}/${project.skins-dir}" />
<property name="skinconf" location="${project.home}/${project.skinconf}" />
<property name="conf-dir" location="${project.home}/${project.conf-dir}" />
Re: [BUG] Re: cvs commit: xml-forrest/src/core default-forrest.properties forrest.build.xml
Posted by Dave Brondsema <da...@brondsema.net>.
Quoting Nicola Ken Barozzi <ni...@apache.org>:
> brondsem@apache.org wrote:
>
> > brondsem 2003/12/20 16:31:57
> >
> > Modified: src/core default-forrest.properties forrest.build.xml
> > Log:
> > look for forrest.properties in user home before going to default values;
> clean seperation of properties in default-forrest.properties from properties
> set for internal use in forrest.build.xml
>
> I have just tried to regen a fresh site from a new seed, and it fails
> because it ays that the bugtracking-url property in cocoon.xconf is empty.
>
> I have seen that with this commit you have changed how this is
> generated, so I suppose that this is the reason.
>
> Could you please look into it? TIA
>
I don't know why, but it breaks if project.bugtracking-url is set to no value,
but it works if it isn't set at all or if it's set to a value. It is now set to
the apache bugzilla.
--
Dave Brondsema
dave@brondsema.net
http://www.brondsema.net - personal
http://www.splike.com - programming
http://csx.calvin.edu - student org
[BUG] Re: cvs commit: xml-forrest/src/core default-forrest.properties
forrest.build.xml
Posted by Nicola Ken Barozzi <ni...@apache.org>.
brondsem@apache.org wrote:
> brondsem 2003/12/20 16:31:57
>
> Modified: src/core default-forrest.properties forrest.build.xml
> Log:
> look for forrest.properties in user home before going to default values; clean seperation of properties in default-forrest.properties from properties set for internal use in forrest.build.xml
I have just tried to regen a fresh site from a new seed, and it fails
because it ays that the bugtracking-url property in cocoon.xconf is empty.
I have seen that with this commit you have changed how this is
generated, so I suppose that this is the reason.
Could you please look into it? TIA
--
Nicola Ken Barozzi nicolaken@apache.org
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------