forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 76110 - in forrest/trunk: docs-author docs-author/content/xdocs main/fresh-site/src/documentation/content main/fresh-site/src/documentation/content/samples main/fresh-site/src/documentation/content/xdocs main/fresh-site/src/documentation/content/xdocs/samples main/fresh-site/src/documentation/content/xdocs/samples/subdir main/var main/webapp
Date Wed, 17 Nov 2004 11:19:06 GMT
Author: cheche
Date: Wed Nov 17 03:19:02 2004
New Revision: 76110

Added:
   forrest/trunk/main/fresh-site/src/documentation/content/xdocs/hello.pdf
      - copied unchanged from rev 76109, forrest/trunk/main/fresh-site/src/documentation/content/hello.pdf
   forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/subdir/test4.html
      - copied unchanged from rev 76109, forrest/trunk/main/fresh-site/src/documentation/content/samples/subdir/test4.html
   forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/test3.html
      - copied unchanged from rev 76109, forrest/trunk/main/fresh-site/src/documentation/content/samples/test3.html
   forrest/trunk/main/fresh-site/src/documentation/content/xdocs/test1.html
      - copied unchanged from rev 76109, forrest/trunk/main/fresh-site/src/documentation/content/test1.html
   forrest/trunk/main/fresh-site/src/documentation/content/xdocs/test2.html
      - copied unchanged from rev 76109, forrest/trunk/main/fresh-site/src/documentation/content/test2.html
Removed:
   forrest/trunk/main/fresh-site/src/documentation/content/hello.pdf
   forrest/trunk/main/fresh-site/src/documentation/content/samples/
   forrest/trunk/main/fresh-site/src/documentation/content/test1.html
   forrest/trunk/main/fresh-site/src/documentation/content/test2.html
Modified:
   forrest/trunk/docs-author/content/xdocs/sitemap-ref.xml
   forrest/trunk/docs-author/content/xdocs/your-project.xml
   forrest/trunk/docs-author/status.xml
   forrest/trunk/main/var/template-project-created-message.txt
   forrest/trunk/main/webapp/raw.xmap
   forrest/trunk/main/webapp/sitemap.xmap
Log:
Merge static content and xml content under src/documentation/content/xdocs


Modified: forrest/trunk/docs-author/content/xdocs/sitemap-ref.xml
==============================================================================
--- forrest/trunk/docs-author/content/xdocs/sitemap-ref.xml	(original)
+++ forrest/trunk/docs-author/content/xdocs/sitemap-ref.xml	Wed Nov 17 03:19:02 2004
@@ -111,7 +111,7 @@
         </tr>
         <tr>
           <th>raw.xmap</th>
-          <td>Serves files located in <code>src/documentation/content/</code>
+          <td>Serves files located in <code>src/documentation/content/xdocs</code>
             that are not to be modified by Forrest.</td>
         </tr>
         <tr>

Modified: forrest/trunk/docs-author/content/xdocs/your-project.xml
==============================================================================
--- forrest/trunk/docs-author/content/xdocs/your-project.xml	(original)
+++ forrest/trunk/docs-author/content/xdocs/your-project.xml	Wed Nov 17 03:19:02 2004
@@ -147,12 +147,12 @@
 /forrest.properties      # Optional file describing your site layout
 /src/documentation/      # Doc-specific files
 /src/documentation/skinconf.xml    # Info about your project used by the skin
-/src/documentation/content/        # Site content.
+/src/documentation/content/xdocs   # Site content.
 /src/documentation/content/xdocs   # XML content.
 /src/documentation/content/xdocs/index.xml # Home page
 /src/documentation/content/xdocs/site.xml  # Navigation file for site structure
 /src/documentation/content/xdocs/tabs.xml  # Skin-specific 'tabs' file.
-/src/documentation/content/*.html,pdf # Static content files, may have subdirs
+/src/documentation/content/xdocs/*.html,pdf # Static content files, may have subdirs
 /src/documentation/resources/images   # Project images (logos, etc)
 # you can create other directories as needed (see forrest.properties)
 

Modified: forrest/trunk/docs-author/status.xml
==============================================================================
--- forrest/trunk/docs-author/status.xml	(original)
+++ forrest/trunk/docs-author/status.xml	Wed Nov 17 03:19:02 2004
@@ -44,6 +44,9 @@
 
   <changes>
     <release version="0.7-dev" date="not yet released">
+      <action dev="JJP" type="remove" context="core"> 
+      Merge xdocs and raw files in the same directory src/document/content/xdocs
+      </action>
       <action dev="RDG" type="add" context="docs" 
         due-to="Ian P. Springer" fixes-bug="FOR-369">
       Added <link href="site:howto/maven">How-To Run Forrest from Maven</link>


Modified: forrest/trunk/main/var/template-project-created-message.txt
==============================================================================
--- forrest/trunk/main/var/template-project-created-message.txt	(original)
+++ forrest/trunk/main/var/template-project-created-message.txt	Wed Nov 17 03:19:02 2004
@@ -9,12 +9,12 @@
 /forrest.properties      # Optional file describing your site layout
 /src/documentation/      # Doc-specific files
 /src/documentation/skinconf.xml    # Info about your project used by the skin
-/src/documentation/content/        # Site content.
+/src/documentation/content         # Site content.
 /src/documentation/content/xdocs   # XML content.
 /src/documentation/content/xdocs/index.xml # Home page
 /src/documentation/content/xdocs/site.xml  # Navigation file for site structure
 /src/documentation/content/xdocs/tabs.xml  # Skin-specific 'tabs' file.
-/src/documentation/content/*.html,pdf # Static content files, may have subdirs
+/src/documentation/content/xdocs/*.html,pdf # Static content files, may have subdirs
 /src/documentation/resources/images   # Project images (logos, etc)
 # you can create other directories as needed (see forrest.properties)
 

Modified: forrest/trunk/main/webapp/raw.xmap
==============================================================================
--- forrest/trunk/main/webapp/raw.xmap	(original)
+++ forrest/trunk/main/webapp/raw.xmap	Wed Nov 17 03:19:02 2004
@@ -15,16 +15,16 @@
   limitations under the License.
 -->
 <!-- ===============================================
-Serves 'raw' content from files in src/documentation/content/
+Serves 'raw' content from files in src/documentation/content/xdocs
 This allows the inclusion of binary content (*.doc, *.pdf etc) in Forrest sites.
 
-This pipeline *relies* on the caller checking if the {project:content}/ actually exists!
+This pipeline *relies* on the caller checking if the {project:content.xdocs}/ actually exists!
 If the caller doesn't do this, this sitemap's '**' pipeline will match everything.
 
-Generates  :  Exact bytes read from {project:content}/**
+Generates  :  Exact bytes read from {project:content.xdocs}/**
 Example URL:  http://localhost:8888/blah.doc
 Used by    :  sitemap.xmap
-Uses       :  {project:content}/**
+Uses       :  {project:content.xdocs}/**
 
 $Revision: 1.2 $
 ==================================================== -->
@@ -51,51 +51,51 @@
         <map:match pattern="**.html">
           <!--
           Use this instead if you want JTidy to clean up your HTML
-          <map:generate type="html" src="{project:content}/{0}" />
+          <map:generate type="html" src="{project:content.xdocs}/{0}" />
           <map:serialize type="html"/>
           -->
-          <map:read src="{project:content}/{0}" mime-type="text/html"/>
+          <map:read src="{project:content.xdocs}/{0}" mime-type="text/html"/>
         </map:match>
 
         <map:match pattern="**.xml">
-          <map:generate type="file" src="{project:content}/{0}" />
+          <map:generate type="file" src="{project:content.xdocs}/{0}" />
           <map:serialize type="xml" />
         </map:match>
 
         <map:match pattern="skin/**.css">
-          <map:read src="{project:content}/{1}.css" mime-type="text/css" />
+          <map:read src="{project:content.xdocs}/{1}.css" mime-type="text/css" />
         </map:match>
 
         <map:match pattern="**.js">
-          <map:read src="{project:content}/{0}" mime-type="application/javascript" />
+          <map:read src="{project:content.xdocs}/{0}" mime-type="application/javascript"
/>
         </map:match>
 
         <map:match pattern="**.gif">
-          <map:read src="{project:content}/{0}" mime-type="image/gif" />
+          <map:read src="{project:content.xdocs}/{0}" mime-type="image/gif" />
         </map:match>
 
         <map:match pattern="**.jpg">
-          <map:read src="{project:content}/{0}" mime-type="image/jpeg" />
+          <map:read src="{project:content.xdocs}/{0}" mime-type="image/jpeg" />
         </map:match>
 
         <map:match pattern="**.jpeg">
-          <map:read src="{project:content}/{0}" mime-type="image/jpeg" />
+          <map:read src="{project:content.xdocs}/{0}" mime-type="image/jpeg" />
         </map:match>
 
         <map:match pattern="**.pdf">
-          <map:read src="{project:content}/{0}" mime-type="application/pdf" />
+          <map:read src="{project:content.xdocs}/{0}" mime-type="application/pdf" />
         </map:match>
 
         <map:match pattern="**.swf">
-          <map:read src="{project:content}/{0}" mime-type="application/x-shockwave-flash"
/>
+          <map:read src="{project:content.xdocs}/{0}" mime-type="application/x-shockwave-flash"
/>
         </map:match>
 
         <map:match pattern="**.txt">
-          <map:read src="{project:content}/{0}" mime-type="text/plain" />
+          <map:read src="{project:content.xdocs}/{0}" mime-type="text/plain" />
         </map:match>
 
         <map:match pattern="**">
-          <map:read src="{project:content}/{1}"/>
+          <map:read src="{project:content.xdocs}/{1}"/>
         </map:match>
 
       </map:match>

Modified: forrest/trunk/main/webapp/sitemap.xmap
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap	(original)
+++ forrest/trunk/main/webapp/sitemap.xmap	Wed Nov 17 03:19:02 2004
@@ -521,7 +521,7 @@
 
       <map:match type="regexp" pattern="^.+$">
         <map:select type="exists">
-          <map:when test="{project:content}/{0}">
+          <map:when test="{project:content.xdocs}/{0}">
             <map:mount uri-prefix="" src="raw.xmap" check-reload="yes" />
           </map:when>
         </map:select>

Mime
View raw message