website forrest-targets.xml,NONE,1.1 forrest-targets.ent,1.1.1.1,1.2 forrest.properties,1.3,1.4

Update of /cvsroot/phpopencounter/website
In directory sc8-pr-cvs1:/tmp/cvs-serv4652

Modified Files:
	forrest-targets.ent forrest.properties 
Added Files:
	forrest-targets.xml 
Log Message:
Apache Forrest 0.6-CVS compatibility update.

Index: forrest.properties
===================================================================
RCS file: /cvsroot/phpopencounter/website/forrest.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** forrest.properties	16 Sep 2003 12:02:10 -0000	1.3
--- forrest.properties	20 Jan 2004 05:29:12 -0000	1.4
***************
*** 12,17 ****
  #project.skin=forrest-site
  #project.skin=forrest-css
- #project.skin=avalon-tigris
  #project.skin=krysalis-site
  project.skin=phpOpenTracker
  
--- 12,17 ----
  #project.skin=forrest-site
  #project.skin=forrest-css
  #project.skin=krysalis-site
+ #project.skin=tigris-style
  project.skin=phpOpenTracker
  
***************
*** 30,36 ****
  
  #project.status=status.xml
! project.content-dir=src/documentation
  #project.conf-dir=${project.content-dir}/conf
  #project.sitemap-dir=${project.content-dir}
  #project.xdocs-dir=${project.content-dir}/content/xdocs
  #project.resources-dir=${project.content-dir}/resources
--- 30,37 ----
  
  #project.status=status.xml
! #project.content-dir=src/documentation
  #project.conf-dir=${project.content-dir}/conf
  #project.sitemap-dir=${project.content-dir}
+ #project.raw-content-dir=${project.content-dir}/content
  #project.xdocs-dir=${project.content-dir}/content/xdocs
  #project.resources-dir=${project.content-dir}/resources
***************
*** 38,42 ****
  #project.images-dir=${project.resources-dir}/images
  #project.schema-dir=${project.resources-dir}/schema
! project.skins-dir=${project.content-dir}/skins
  #project.skinconf=${project.content-dir}/skinconf.xml
  #project.lib-dir=${project.content-dir}/lib
--- 39,43 ----
  #project.images-dir=${project.resources-dir}/images
  #project.schema-dir=${project.resources-dir}/schema
! #project.skins-dir=${project.content-dir}/skins
  #project.skinconf=${project.content-dir}/skinconf.xml
  #project.lib-dir=${project.content-dir}/lib
***************
*** 57,105 ****
  # validation properties
  
! # These props determine if validation is performed at all
! # Values are inherited unless overridden.
! # Eg, if forrest.validate=false, then all others are false unless set to true.
  #forrest.validate=true
- #forrest.validate.xdocs=${forrest.validate}
- #forrest.validate.skinconf=${forrest.validate}
- #forrest.validate.sitemap=${forrest.validate}
- #forrest.validate.stylesheets=${forrest.validate}
- #forrest.validate.skins=${forrest.validate}
- #forrest.validate.skins.stylesheets=${forrest.validate.skins}
- 
  
- # Key:
  # *.failonerror=(true|false)    stop when an XML file is invalid
- # *.includes=(pattern)         Comma-separated list of path patterns to validate
- # *.excludes=(pattern)         Comma-separated list of path patterns to not validate
- 
  #forrest.validate.failonerror=true
! #forrest.validate.includes=**/*
  #forrest.validate.excludes=
! #
! #forrest.validate.xdocs.failonerror=${forrest.validate.failonerror}
! #
! #forrest.validate.xdocs.includes=**/*.x*
! #forrest.validate.xdocs.excludes=site.xml
! #
! #forrest.validate.skinconf.includes=${skinconf-file}
! #forrest.validate.skinconf.excludes=
! #forrest.validate.skinconf.failonerror=${forrest.validate.failonerror}
! #
! #forrest.validate.sitemap.includes=${sitemap-file}
! #forrest.validate.sitemap.excludes=
! #forrest.validate.sitemap.failonerror=${forrest.validate.failonerror}
! #
! #forrest.validate.stylesheets.includes=**/*.xsl
! #forrest.validate.stylesheets.excludes=
! #forrest.validate.stylesheets.failonerror=${forrest.validate.failonerror}
! #
! #forrest.validate.skins.includes=**/*
! #forrest.validate.skins.excludes=**/*.xsl
! #forrest.validate.skins.failonerror=${forrest.validate.failonerror}
! #
! #forrest.validate.skins.stylesheets.includes=**/*.xsl
! #forrest.validate.skins.stylesheets.excludes=
! #forrest.validate.skins.stylesheets.failonerror=${forrest.validate.skins.failonerror}
  
  ##############
--- 58,70 ----
  # validation properties
  
! # Determine if validation is performed
  #forrest.validate=true
  
  # *.failonerror=(true|false)    stop when an XML file is invalid
  #forrest.validate.failonerror=true
! 
! # *.excludes=(pattern)         Comma-separated list of path patterns to not validate
  #forrest.validate.excludes=
! 
  
  ##############
***************
*** 116,118 ****
  # server, set to -Djava.awt.headless=true
  #forrest.jvmargs=
! #project.bugtracking-url=http://sourceforge.net/tracker/?atid=101716&group_id=1716
--- 81,83 ----
  # server, set to -Djava.awt.headless=true
  #forrest.jvmargs=
! #project.bugtracking-url=http://nagoya.apache.org/bugzilla/show_bug.cgi?id=

Index: forrest-targets.ent
===================================================================
RCS file: /cvsroot/phpopencounter/website/forrest-targets.ent,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** forrest-targets.ent	16 Sep 2003 07:15:21 -0000	1.1.1.1
--- forrest-targets.ent	20 Jan 2004 05:29:12 -0000	1.2
***************
*** 2,11 ****
  This build.xml snippet contains Forrest targets for Ant 1.5+.  It checks that
  the user has set ${forrest.home}, either in one of:
!   build.properties
    project.properties
    ant.properties
    .ant.properties
! or with the FORREST_HOME environment variable, and prints an informative error
! message if not found.
  
  Usage:
--- 2,11 ----
  This build.xml snippet contains Forrest targets for Ant 1.5+.  It checks that
  the user has set ${forrest.home}, either in one of:
!   FORREST_HOME environment variable
    project.properties
+   build.properties
    ant.properties
    .ant.properties
! and prints an informative error message if not found.
  
  Usage:
***************
*** 64,68 ****
  
    <target name="forrest.checkenv" if="env.FORREST_HOME">
!     <echo level="verbose">Found $FORREST_HOME..</echo>
      <property name="forrest.home" location="${env.FORREST_HOME}"/>
      <echo level="verbose">forrest.home set to ${forrest.home}</echo>
--- 64,68 ----
  
    <target name="forrest.checkenv" if="env.FORREST_HOME">
!     <echo level="verbose">Found $FORREST_HOME=${env.FORREST_HOME}</echo>
      <property name="forrest.home" location="${env.FORREST_HOME}"/>
      <echo level="verbose">forrest.home set to ${forrest.home}</echo>
***************
*** 162,167 ****
  
        - Set FORREST_HOME as the Forrest build instructions describe
!       - Create a build.properties, with the forrest.home property pointing to
!         the forrest shbat directory, eg:
  
          forrest.home=${winpath}  (Windows)
--- 162,167 ----
  
        - Set FORREST_HOME as the Forrest build instructions describe
!       - Create a project.properties, with the forrest.home property
!         pointing to the forrest shbat directory, e.g.
  
          forrest.home=${winpath}  (Windows)

--- NEW FILE: forrest-targets.xml ---
<!--
This build.xml import contains Forrest targets for Ant 1.6.
See the forrest-targets.ent file in this same dir for more info.

Sample usage:

  <import file="forrest-targets.ent"/>

If you already have in your build targets that are called like the 
forrest ones, you can still call the forrest ones by prepending 
"forrest."

Example:

 <antcall target="forrest.site"/>
-->
<!DOCTYPE project [
<!ENTITY forrest-targets SYSTEM "file:./forrest-targets.ent">
]>

<project name="forrest" default="dist" basedir="."  >
    &forrest-targets;
</project>



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn