Return-Path: 
 <svn-return-1642-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 50500 invoked from network); 14 Mar 2005 23:51:25 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 14 Mar 2005 23:51:25 -0000
Received: (qmail 20045 invoked by uid 500); 14 Mar 2005 23:51:25 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 20005 invoked by uid 500); 14 Mar 2005 23:51:24 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 19992 invoked by uid 99); 14 Mar 2005 23:51:24 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 14 Mar 2005 15:51:24 -0800
Received: (qmail 50459 invoked by uid 65534); 14 Mar 2005 23:51:22 -0000
Message-ID: <20050314235122.50458.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Mon, 14 Mar 2005 23:51:22 -0000
Subject: svn commit: r157484 - in forrest/trunk: docs-author/content/xdocs/
 docs-author/content/xdocs/howto/ docs-author/content/xdocs/plugins/
 tools/forrestbot/webapp/src/conf/
To: svn@forrest.apache.org
From: crossley@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: crossley
Date: Mon Mar 14 15:51:19 2005
New Revision: 157484

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157484
Log:
Change pathnames from /src/core etc. to /main/

Modified:
    forrest/trunk/docs-author/content/xdocs/dtd-docs.xml
    forrest/trunk/docs-author/content/xdocs/faq.xml
    forrest/trunk/docs-author/content/xdocs/howto/howto-corner-images.xml
    forrest/trunk/docs-author/content/xdocs/plugins/usingPlugins.xml
    forrest/trunk/docs-author/content/xdocs/skins.xml
    forrest/trunk/docs-author/content/xdocs/your-project.xml
    forrest/trunk/tools/forrestbot/webapp/src/conf/settings.properties

Modified: forrest/trunk/docs-author/content/xdocs/dtd-docs.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/content/xdocs/=
dtd-docs.xml?view=3Ddiff&r1=3D157483&r2=3D157484
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/docs-author/content/xdocs/dtd-docs.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/dtd-docs.xml Mon Mar 14 15:51:1=
9 2005
@@ -1,6 +1,6 @@
 <?xml version=3D"1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
   as applicable.
=20
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,7 @@
   references. Note that these references do not reflect the modularity of =
our
   DTDs, they are primarily "user-oriented help" documentation.</p>
   <p>The actual DTDs are located in the Forrest distribution at
-    <code>src/core/context/resources/schema/</code></p>
+    <code>main/webapp/resources/schema/</code></p>
   <p>Generated documentation for Apache Forrest document-v13 ...</p>
   <ul>
     <li><link href=3D"document-v13.dtdx.html">document-v13</link></li>

Modified: forrest/trunk/docs-author/content/xdocs/faq.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/content/xdocs/=
faq.xml?view=3Ddiff&r1=3D157483&r2=3D157484
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/docs-author/content/xdocs/faq.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/faq.xml Mon Mar 14 15:51:19 2005
@@ -1,6 +1,6 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
   as applicable.
=20
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -128,7 +128,7 @@
         <p>
          The <code>maxmemory</code> property in the <code>forrest.properti=
es</code> file controls how much
          memory Cocoon uses. Like many other properties you can copy them =
from the default configuration at
-         <code>src/core/fresh-site/forrest.properties</code>
+         <code>main/fresh-site/forrest.properties</code>
         </p>
         <p>
          Set the <code>ANT_OPTS</code> environment variable before you run=
 forrest.  The exact value you set
@@ -191,7 +191,7 @@
       'clickable' email-address (of the author-element)?</question>
        <answer>
        <p>You would override <code>
-       src/core/context/skins/common/xslt/html/document2html.xsl</code>
+       main/webapp/skins/common/xslt/html/document2html.xsl</code>
        and edit the "headers/authors" template.
        </p>
        </answer>
@@ -558,7 +558,7 @@
       <question>How do I make <code>forrest run</code> listen on a differe=
nt port?</question>
       <answer>
       <p><code>forrest run -Dforrest.jvmargs=3D"-Djetty.port=3D80"</code><=
/p>
-      <p>Or copy Forrest's src/core/context/jettyconf.xml file to your pro=
ject's src/documentation
+      <p>Or copy Forrest's main/webapp/jettyconf.xml file to your project'=
s src/documentation
       directory and set the port number in that file.  Then do <code>forre=
st run</code>
       </p>
       </answer>

Modified: forrest/trunk/docs-author/content/xdocs/howto/howto-corner-images=
.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/content/xdocs/=
howto/howto-corner-images.xml?view=3Ddiff&r1=3D157483&r2=3D157484
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/docs-author/content/xdocs/howto/howto-corner-images.xml (=
original)
+++ forrest/trunk/docs-author/content/xdocs/howto/howto-corner-images.xml M=
on Mar 14 15:51:19 2005
@@ -1,6 +1,6 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
   as applicable.
=20
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -109,7 +109,7 @@
         <dd>
           Path to the xslt that creates the corner.
           <br/>
-          <code>images/ =3D {$FORREST_HOME}/src/core/context/skins/common/=
images/</code>
+          <code>images/ =3D {$FORREST_HOME}/main/webapp/skins/common/image=
s/</code>
         </dd>
         <dt><code>{$name}</code></dt>
         <dd>

Modified: forrest/trunk/docs-author/content/xdocs/plugins/usingPlugins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/content/xdocs/=
plugins/usingPlugins.xml?view=3Ddiff&r1=3D157483&r2=3D157484
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/docs-author/content/xdocs/plugins/usingPlugins.xml (origi=
nal)
+++ forrest/trunk/docs-author/content/xdocs/plugins/usingPlugins.xml Mon Ma=
r 14 15:51:19 2005
@@ -1,6 +1,6 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
   as applicable.
=20
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,9 +70,9 @@
        =20
         <p>If you do require additional plugin functionality, be sure to
         include all required plugins in the=20
-        <code>project.required.plugins</code> property in the projects=20
-        <code>forrest.properties</code>. You can view=20
-        <code>forrestcore/src/core/context/default.forrest.properties</cod=
e>
+        <code>project.required.plugins</code> property in the project's
+        <code>forrest.properties</code>. You can view
+        <code>main/webapp/default.forrest.properties</code>
         to see the names of plugins that provide previously core=20
         functionality.</p>
        =20
@@ -80,8 +80,8 @@
         improvement if you remove plugins that are not in use. Therefore,
         if you do not use one or more of the plugins named in the=20
         <code>project.required.plugins</code> property of=20
-        <code>forrestcore/src/core/context/default.forrest.properties</cod=
e>
-        it is recomended that you override this value in your projects
+        <code>main/webapp/default.forrest.properties</code>
+        it is recomended that you override this value in your project's
         <code>forrest.properties</code> file.</p>
       </section>
     </section>

Modified: forrest/trunk/docs-author/content/xdocs/skins.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/content/xdocs/=
skins.xml?view=3Ddiff&r1=3D157483&r2=3D157484
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/docs-author/content/xdocs/skins.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/skins.xml Mon Mar 14 15:51:19 2=
005
@@ -1,6 +1,6 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
   as applicable.
=20
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,7 @@
       <p>
         The skin names are based on playing with the word "skin". See our
         technique for
-        <a href=3D"http://svn.apache.org/repos/asf/forrest/trunk/src/core/=
context/skins/new-skin-names.txt">choosing skin names</a>.
+        <a href=3D"http://svn.apache.org/repos/asf/forrest/trunk/main/weba=
pp/skins/new-skin-names.txt">choosing skin names</a>.
         A name with "-dev" extension signifies that it is under developmen=
t=2E
         There is no concept of versions of default skins.
         New skins have new names.

Modified: forrest/trunk/docs-author/content/xdocs/your-project.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/content/xdocs/=
your-project.xml?view=3Ddiff&r1=3D157483&r2=3D157484
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/docs-author/content/xdocs/your-project.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/your-project.xml Mon Mar 14 15:=
51:19 2005
@@ -627,7 +627,7 @@
       </ul>
       <p>
         The Forrest sitemaps are at
-        <code>forrest/src/core/context/*.xmap</code>
+        <code>main/webapp/*.xmap</code>
       </p>
=20
       <p>
@@ -868,7 +868,7 @@
 ]]></source>
             <p>
               This is the type of processing that happens in the main
-              <code>src/core/context/forrest.xmap</code> sitemap. We have
+              <code>main/webapp/forrest.xmap</code> sitemap. We have
               added similar handling to our project sitemap. Basically, th=
is
               uses the <link href=3D"site:cap">SourceTypeAction (content a=
ware pipelines)</link>
               to detect the doctype. The new document-v11.dtd needs to be =
also
@@ -955,7 +955,7 @@
             <code>${project.skins-dir}</code> points). The default sitemap=
 assumes a
             certain skin layout, so the easiest way to create a new skin i=
s by
             copying an existing Forrest skin.  For example, copy
-            <code>forrest/src/core/context/skins/pelt</code>
+            <code>main/webapp/skins/pelt</code>
             to your project area at
             <code>src/documentation/skins/my-fancy-skin</code> and add
             <code>project.skin=3Dmy-fancy-skin</code> to forrest.properties
@@ -991,7 +991,7 @@
=20
           <p>In order to use this feature in your custom skins you must co=
py
           the common skin from the forrest distribution into your custom s=
kins=20
-          directory (from <code>forrest/src/core/context/skins/common</cod=
e>).
+          directory (from <code>main/webapp/skins/common</code>).
           This will protect your skin from changes in the Forrest common s=
kin,
           but you must remember to update this skin in order to take advan=
tage
           of new features added over time by the Forrest team.</p>

Modified: forrest/trunk/tools/forrestbot/webapp/src/conf/settings.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/forrestbot/webapp/sr=
c/conf/settings.properties?view=3Ddiff&r1=3D157483&r2=3D157484
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/tools/forrestbot/webapp/src/conf/settings.properties (ori=
ginal)
+++ forrest/trunk/tools/forrestbot/webapp/src/conf/settings.properties Mon =
Mar 14 15:51:19 2005
@@ -1,4 +1,4 @@
-# Copyright 2002-2004 The Apache Software Foundation or its licensors,
+# Copyright 2002-2005 The Apache Software Foundation or its licensors,
 # as applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,8 +19,8 @@
 # all of the following should be absolute
 #
 # forrest executable
-#forrest-exec=3D/path/to/forrest/src/core/bin/forrest
-#forrest-exec=3Dd:/path/to/forrest/src/core/bin/forrest.bat
+#forrest-exec=3D/path/to/forrest/bin/forrest
+#forrest-exec=3Dd:/path/to/forrest/bin/forrest.bat
 #
 # directory that contains the forrestbot buildfiles for each site
 #config-dir=3D/path/to/somewhere/conf
@@ -42,7 +42,7 @@
 #targets.build=3Dbuild
 #targets.deploy=3Ddeploy
=20
-forrest-exec=3Dc:/path/to/forrest/src/core/bin/forrest.bat
+forrest-exec=3Dc:/path/to/forrest/bin/forrest.bat
=20
 config-dir=3Dc:/path/to/forrestbot/projects
 logs-dir=3Dc:/some/path/to/build/logs
@@ -53,4 +53,4 @@
 refreshrate=3D60
=20
 targets.build=3Dbuild
-targets.deploy=3Ddeploy
\ No newline at end of file
+targets.deploy=3Ddeploy