You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2005/03/15 00:51:22 UTC
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/
Author: crossley
Date: Mon Mar 14 15:51:19 2005
New Revision: 157484
URL: http://svn.apache.org/viewcvs?view=rev&rev=157484
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=diff&r1=157483&r2=157484
==============================================================================
--- forrest/trunk/docs-author/content/xdocs/dtd-docs.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/dtd-docs.xml Mon Mar 14 15:51:19 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- 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");
@@ -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="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=diff&r1=157483&r2=157484
==============================================================================
--- 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="1.0" encoding="UTF-8"?>
<!--
- 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");
@@ -128,7 +128,7 @@
<p>
The <code>maxmemory</code> property in the <code>forrest.properties</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 different port?</question>
<answer>
<p><code>forrest run -Dforrest.jvmargs="-Djetty.port=80"</code></p>
- <p>Or copy Forrest's src/core/context/jettyconf.xml file to your project'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>forrest 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=diff&r1=157483&r2=157484
==============================================================================
--- forrest/trunk/docs-author/content/xdocs/howto/howto-corner-images.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/howto/howto-corner-images.xml Mon Mar 14 15:51:19 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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");
@@ -109,7 +109,7 @@
<dd>
Path to the xslt that creates the corner.
<br/>
- <code>images/ = {$FORREST_HOME}/src/core/context/skins/common/images/</code>
+ <code>images/ = {$FORREST_HOME}/main/webapp/skins/common/images/</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=diff&r1=157483&r2=157484
==============================================================================
--- forrest/trunk/docs-author/content/xdocs/plugins/usingPlugins.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/plugins/usingPlugins.xml Mon Mar 14 15:51:19 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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");
@@ -70,9 +70,9 @@
<p>If you do require additional plugin functionality, be sure to
include all required plugins in the
- <code>project.required.plugins</code> property in the projects
- <code>forrest.properties</code>. You can view
- <code>forrestcore/src/core/context/default.forrest.properties</code>
+ <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
functionality.</p>
@@ -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
<code>project.required.plugins</code> property of
- <code>forrestcore/src/core/context/default.forrest.properties</code>
- 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=diff&r1=157483&r2=157484
==============================================================================
--- forrest/trunk/docs-author/content/xdocs/skins.xml (original)
+++ forrest/trunk/docs-author/content/xdocs/skins.xml Mon Mar 14 15:51:19 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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");
@@ -35,7 +35,7 @@
<p>
The skin names are based on playing with the word "skin". See our
technique for
- <a href="http://svn.apache.org/repos/asf/forrest/trunk/src/core/context/skins/new-skin-names.txt">choosing skin names</a>.
+ <a href="http://svn.apache.org/repos/asf/forrest/trunk/main/webapp/skins/new-skin-names.txt">choosing skin names</a>.
A name with "-dev" extension signifies that it is under development.
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=diff&r1=157483&r2=157484
==============================================================================
--- 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>
<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, this
uses the <link href="site:cap">SourceTypeAction (content aware 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 is 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=my-fancy-skin</code> to forrest.properties
@@ -991,7 +991,7 @@
<p>In order to use this feature in your custom skins you must copy
the common skin from the forrest distribution into your custom skins
- directory (from <code>forrest/src/core/context/skins/common</code>).
+ directory (from <code>main/webapp/skins/common</code>).
This will protect your skin from changes in the Forrest common skin,
but you must remember to update this skin in order to take advantage
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/src/conf/settings.properties?view=diff&r1=157483&r2=157484
==============================================================================
--- forrest/trunk/tools/forrestbot/webapp/src/conf/settings.properties (original)
+++ 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=/path/to/forrest/src/core/bin/forrest
-#forrest-exec=d:/path/to/forrest/src/core/bin/forrest.bat
+#forrest-exec=/path/to/forrest/bin/forrest
+#forrest-exec=d:/path/to/forrest/bin/forrest.bat
#
# directory that contains the forrestbot buildfiles for each site
#config-dir=/path/to/somewhere/conf
@@ -42,7 +42,7 @@
#targets.build=build
#targets.deploy=deploy
-forrest-exec=c:/path/to/forrest/src/core/bin/forrest.bat
+forrest-exec=c:/path/to/forrest/bin/forrest.bat
config-dir=c:/path/to/forrestbot/projects
logs-dir=c:/some/path/to/build/logs
@@ -53,4 +53,4 @@
refreshrate=60
targets.build=build
-targets.deploy=deploy
\ No newline at end of file
+targets.deploy=deploy