db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/forrest/src/documentation/content/xdocs/docu repository.xml
Date Fri, 14 May 2004 21:32:14 GMT
arminw      2004/05/14 14:32:14

  Modified:    forrest  forrest.properties
               forrest/src/documentation skinconfig-v06.dtd skinconf.xml
               forrest/src/documentation/content/xdocs site.xml
               forrest/src/documentation/content/xdocs/docu repository.xml
  Log:
  - update to new forrest snapshot
  - fix problem with "whole html/pdf generation"
  
  Revision  Changes    Path
  1.2       +1 -1      db-ojb/forrest/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/db-ojb/forrest/forrest.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest.properties	22 Apr 2004 19:31:01 -0000	1.1
  +++ forrest.properties	14 May 2004 21:32:14 -0000	1.2
  @@ -94,7 +94,7 @@
   # (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
   project.debuglevel=DEBUG
   # Max memory to allocate to Java
  -#forrest.maxmemory=64m
  +forrest.maxmemory=128m
   # 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=
  
  
  
  1.2       +37 -45    db-ojb/forrest/src/documentation/skinconfig-v06.dtd
  
  Index: skinconfig-v06.dtd
  ===================================================================
  RCS file: /home/cvs/db-ojb/forrest/src/documentation/skinconfig-v06.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- skinconfig-v06.dtd	22 Apr 2004 19:31:59 -0000	1.1
  +++ skinconfig-v06.dtd	14 May 2004 21:32:14 -0000	1.2
  @@ -1,68 +1,60 @@
  -<!-- ===================================================================
  -
  -COPYRIGHT:
  -  Copyright (c) 2004 The Apache Software Foundation.
  -
  -  Permission to copy in any form is granted provided this notice is
  -  included in all copies. Permission to redistribute is granted
  -  provided this file is distributed untouched in all its parts and
  -  included files.
  +<!--
  +  Copyright 2002-2004 The Apache Software Foundation
   
  -==================================================================== -->
  +  Licensed under the Apache License, Version 2.0 (the "License");
  +  you may not use this file except in compliance with the License.
  +  You may obtain a copy of the License at
  +
  +      http://www.apache.org/licenses/LICENSE-2.0
  +
  +  Unless required by applicable law or agreed to in writing, software
  +  distributed under the License is distributed on an "AS IS" BASIS,
  +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +  See the License for the specific language governing permissions and
  +  limitations under the License.
  +-->
   <!-- ===================================================================
  -                                                                                      
            
  +
        Forrest Skinconf DTD (Version 0.6)
  -                                                                                      
            
  +
   PURPOSE:
  -  This DTD was developed to create a simple Skin configuration 
  +  This DTD was developed to create a simple Skin configuration
     for the Forrest skins.
  -  It is an XML-compliant DTD and is maintained by the Apache XML project.
  -                                                                                      
            
  +
   TYPICAL INVOCATION:
  -                   
  -                                                                                
  +
     <!DOCTYPE skinconfig PUBLIC
          "-//APACHE//DTD Skin Configuration Vx.y//EN"
  -       "howto-vxy.dtd">
  -                                                                                      
            
  +       "skinconf-vxy.dtd">
     where
  -                                                                                      
            
       x := major version
       y := minor version
  -                                                                                      
            
  +
   NOTES:
  - 
  -FIXME:
  - 
  -CHANGE HISTORY:
  -  20040406 Initial version. (JJP) 
  - 
  +
   ==================================================================== -->
   
  +  <!ENTITY % links.att 'name CDATA #REQUIRED
  +                        href CDATA #REQUIRED' >
   
  -  <!ENTITY % links.att 'name CDATA #REQUIRED 
  -                        href CDATA #REQUIRED' >  
  - 
  -
  -  <!ELEMENT skinconfig (disable-lucene?, disable-search?,
  -   disable-print-link?, disable-pdf-link?, disable-xml-link?,
  -   disable-external-link-image?, disable-compliance-links?,
  -   obfuscate-mail-links?, searchsite-domain?, searchsite-name?,
  +  <!ELEMENT skinconfig (search?, disable-print-link?, disable-pdf-link?,
  +   disable-xml-link?, disable-external-link-image?,
  +   disable-compliance-links?, obfuscate-mail-links?,
      project-name?, project-description?, project-url?, project-logo,
  -   group-name?, group-description?, group-url?, group-logo,
  -   host-url?, host-logo, favicon-url?, year?, vendor?, trail?, 
  -   toc?, headings?, extra-css?, colors?, credits?, pdf?)>
  -
  -  <!ELEMENT disable-lucene (#PCDATA)>
  -  <!ELEMENT disable-search (#PCDATA)>
  +   group-name?, group-description?, group-url?, group-logo?,
  +   host-url?, host-logo?, favicon-url?, year?, vendor?, trail?,
  +   toc?, headings?, extra-css?, colors?, pdf?, credits?)>
  +
  +  <!ELEMENT search EMPTY>
  +  <!ATTLIST search name     CDATA #IMPLIED
  +                   domain   CDATA #IMPLIED
  +                   provider CDATA #IMPLIED>
     <!ELEMENT disable-print-link (#PCDATA)>
     <!ELEMENT disable-pdf-link (#PCDATA)>
     <!ELEMENT disable-xml-link (#PCDATA)>
     <!ELEMENT disable-external-link-image (#PCDATA)>
     <!ELEMENT disable-compliance-links (#PCDATA)>
     <!ELEMENT obfuscate-mail-links (#PCDATA)>
  -  <!ELEMENT searchsite-domain (#PCDATA)>
  -  <!ELEMENT searchsite-name (#PCDATA)>
     <!ELEMENT project-name (#PCDATA)>
     <!ELEMENT project-description (#PCDATA)>
     <!ELEMENT project-url (#PCDATA)>
  @@ -83,7 +75,7 @@
     <!ATTLIST link2 %links.att;>
     <!ELEMENT link3 EMPTY>
     <!ATTLIST link3 %links.att;>
  -  
  +
     <!ELEMENT credits (credit*)>
      <!ELEMENT credit (name, url, image?, width?, height?)>
     <!-- id uniquely identifies the tool, and role indicates its function -->
  @@ -118,4 +110,4 @@
     <!ELEMENT top (#PCDATA)>
     <!ELEMENT bottom (#PCDATA)>
     <!ELEMENT inner (#PCDATA)>
  -  <!ELEMENT outer (#PCDATA)>
  +  <!ELEMENT outer (#PCDATA)>
  \ No newline at end of file
  
  
  
  1.2       +41 -40    db-ojb/forrest/src/documentation/skinconf.xml
  
  Index: skinconf.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/forrest/src/documentation/skinconf.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- skinconf.xml	22 Apr 2004 19:31:59 -0000	1.1
  +++ skinconf.xml	14 May 2004 21:32:14 -0000	1.2
  @@ -20,16 +20,13 @@
   be used to configure the chosen Forrest skin.
   -->
   
  -<!DOCTYPE skinconfig PUBLIC
  + <!DOCTYPE skinconfig PUBLIC
           "-//APACHE//DTD Skin Configuration V0.6//EN"
           "skinconfig-v06.dtd">
  +
   <skinconfig>
  -    <!-- Do we want to disable the Lucene search box? -->
  -    <disable-lucene>true</disable-lucene>
  -    <!-- Do we want to disable the Google search box? -->
  -    <!-- Ensure not both 'false' -->
  -    <!-- To show search box in an alternative location use 'alt' -->
  -    <disable-search>true</disable-search>
  +    <!-- To enable lucene search add provider="lucene" -->
  +    <search name="Apache DB" domain="db.apache.org"/>
   
       <!-- Do we want to disable the print link? If enabled, invalid HTML 4.0.1 -->
       <disable-print-link>true</disable-print-link>
  @@ -49,10 +46,7 @@
       <!-- Do we want to disable w3c compliance links? -->
       <disable-compliance-links>false</disable-compliance-links>
       <!-- Whether to render mailto: links unrecognisable by spam harvesters -->
  -    <obfuscate-mail-links>false</obfuscate-mail-links>
  -
  -    <searchsite-domain>db.apache.org</searchsite-domain>
  -    <searchsite-name>Apache DB</searchsite-name>
  +    <obfuscate-mail-links>true</obfuscate-mail-links>
   
       <!-- mandatory project logo
            skin: forrest-site renders it at the top -->
  @@ -61,12 +55,17 @@
           for Java Objects against relational databases.</project-description>
       <project-url>http://db.apache.org/ojb/</project-url>
       <project-logo>images/ojb-400-white.png</project-logo>
  +    <!-- Alternative static image:
  +    <project-logo>images/project-logo.gif</project-logo> -->
   
       <!-- optional group logo
            skin: forrest-site renders it at the top-left corner -->
       <group-name>Apache DB</group-name>
  +    <group-description>Apache DB</group-description>
       <group-url>http://db.apache.org/</group-url>
       <group-logo>images/db-logo.png</group-logo>
  +    <!-- Alternative static image:
  +    <group-logo>images/group-logo.gif</group-logo> -->
   
       <!-- optional host logo (e.g. sourceforge logo)
            skin: forrest-site renders it at the bottom-left corner -->
  @@ -74,7 +73,7 @@
       <host-logo></host-logo>
   
       <!-- relative url of a favicon file, normally favicon.ico -->
  -    <favicon-url></favicon-url>
  +    <favicon-url>favicon.ico</favicon-url>
   
       <!-- The following are used to construct a copyright statement -->
       <year>2002-2004</year>
  @@ -103,6 +102,9 @@
       <!-- Heading types can be clean|underlined|boxed  -->
       <headings type="boxed"/>
   
  +    <extra-css>
  +    </extra-css>
  +
       <colors>
   
           <!-- Krysalis -->
  @@ -202,36 +204,32 @@
           -->
   
       </colors>
  -    <!-- FIXME: this element does not validate (JJP)
  -    <extra-css>
  -    </extra-css>
  -    -->
   
       <!-- Settings specific to PDF output.  -->
  -    <!-- FIXME: this element does not validate (JJP)
  -  <pdf>
  -       Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
  -       folio, legal, ledger, letter, quarto, tabloid (default letter).
  -       Supported page orientations are portrait, landscape (default
  -       portrait).
  -    <page size="letter" orientation="portrait"/>
  -    -->
  +    <pdf>
  +        <!--
  +           Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
  +           folio, legal, ledger, letter, quarto, tabloid (default letter).
  +           Supported page orientations are portrait, landscape (default
  +           portrait).
  +        -->
  +        <page size="letter" orientation="portrait"/>
   
  -    <!--
  -       Margins can be specified for top, bottom, inner, and outer
  -       edges. If double-sided="false", the inner edge is always left
  -       and the outer is always right. If double-sided="true", the
  -       inner edge will be left on odd pages, right on even pages,
  -       the outer edge vice versa.
  -       Specified below are the default settings.
  -    <margins double-sided="false">
  -      <top>1in</top>
  -      <bottom>1in</bottom>
  -      <inner>1.25in</inner>
  -      <outer>1in</outer>
  -    </margins>
  -  </pdf>
  -    -->
  +        <!--
  +           Margins can be specified for top, bottom, inner, and outer
  +           edges. If double-sided="false", the inner edge is always left
  +           and the outer is always right. If double-sided="true", the
  +           inner edge will be left on odd pages, right on even pages,
  +           the outer edge vice versa.
  +           Specified below are the default settings.
  +        -->
  +        <margins double-sided="false">
  +            <top>1in</top>
  +            <bottom>1in</bottom>
  +            <inner>1.25in</inner>
  +            <outer>1in</outer>
  +        </margins>
  +    </pdf>
   
       <!-- Credits are typically rendered as a set of small clickable images in the
       page footer -->
  @@ -275,5 +273,8 @@
               <width>80</width>
               <height>30</height>
           </credit>
  +        <!-- A credit with @role='pdf' will have its name and url displayed in the
  +        PDF page's footer. -->
       </credits>
  -</skinconfig>
  +
  +</skinconfig>
  \ No newline at end of file
  
  
  
  1.15      +9 -11     db-ojb/forrest/src/documentation/content/xdocs/site.xml
  
  Index: site.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/forrest/src/documentation/content/xdocs/site.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- site.xml	14 May 2004 11:05:15 -0000	1.14
  +++ site.xml	14 May 2004 21:32:14 -0000	1.15
  @@ -33,7 +33,7 @@
       <ojb label="OJB">
           <index label="Home" href="index.html" description="OJB index page"/>
           <features label="Features" href="features.html" description="OJB features"/>
  -        <faq label="FAQ's" href="docu/faq.html" description="Frequently Asked Questions"/>
  +        <!-- faq label="FAQ's" href="site:documentation/start/faq" description="Frequently
Asked Questions"/ -->
           <status label="Status" href="status.html" description="Project status page"/>
           <release-notes label="Release-Notes" href="ext:release-notes" description="Project
release-notes"/>
           <wiki label="Wiki" href="ext:ojb/wiki-page"/>
  @@ -64,18 +64,16 @@
   
       <documentation label="Documentation" href="docu/" tab="documentation">
           <index label="Summary" href="index.html"/>
  -        <start label="Start">
  -            <getting-started label="Getting started" href="getting-started.html" description="summary
of docs"/>
  -            <faq label="FAQ's" href="faq.html" description="Frequently Asked Questions">
  +        <faq label="FAQ's" href="faq.html" description="Frequently Asked Questions">
                   <apis href="#apis"/>
                   <optimistic-locking href="#optimisticLocking"/>
                   <performSQL href="#performSQL"/>
                   <multiple-databases href="#multipleDB"/>
                   <lookup-pb href="#lookupPB"/>
                   <lookup-odmg href="#lookupODMG"/>
  -            </faq>
  -            <javadoc label="Javadoc" href="ext:javadoc" description=""/>
  -        </start>
  +        </faq>
  +        <javadoc label="Javadoc" href="ext:javadoc" description=""/>
  +        <getting-started label="Getting started" href="getting-started.html" description="summary
of docs"/>
   
           <tutorials label="Tutorials">
               <mapping-tutorial label="Mapping Tutorial" href="mapping-tutorial.html"
description="Mapping tutorial">
  @@ -94,7 +92,7 @@
                   <jdbc-mapping href="#jdbc-mapping"/>
                   <field-conversion href="#field-conversion"/>
               </jdbc-types>
  -            <repository label="Repository Metadata" href="repository.html" description="">
  +            <repository label="Repository File" href="repository.html" description="">
                   <descriptor-repository href="#descriptor-repository"/>
                   <jdbc-connection-descriptor href="#jdbc-connection-descriptor"/>
                   <connection-pool href="#connection-pool"/>
  @@ -174,10 +172,10 @@
       </documentation>
   
   
  -    <!-- all label="All">
  +    <all label="All">
           <whole_site_html label="Whole Site HTML" href="site.html"/>
           <whole_site_pdf label="Whole Site PDF" href="site.pdf"/>
  -    </all -->
  +    </all>
   
       <!-- Usage example: <link href="ext:jakarta/tomcat">XXX</link> -->
       <external-refs>
  
  
  
  1.7       +2 -2      db-ojb/forrest/src/documentation/content/xdocs/docu/repository.xml
  
  Index: repository.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/forrest/src/documentation/content/xdocs/docu/repository.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- repository.xml	12 May 2004 00:47:35 -0000	1.6
  +++ repository.xml	14 May 2004 21:32:14 -0000	1.7
  @@ -19,7 +19,7 @@
   
   <document>
       <header>
  -        <title>OJB - Repository Documentation</title>
  +        <title>Repository File</title>
           <authors>
               <person name="Thomas Mahler" email="thma@apache.org"/>
               <person name="Daren Drummond" email="daren@softwarearena.com"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message