The deploy.svn.settings file

- As explained in the above document, each committer needs a - deploy.svn.settings file to provide their credentials. + As explained in the above document, + if your "svn username" is different from your local system username + create $FORREST_HOME/deploy.svn.settings file like:

- ]]>

Modified: forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml?rev=952121&r1=952120&r2=952121&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml (original) +++ forrest/trunk/site-author/content/xdocs/procedures/How_to_publish_docs.xml Mon Jun 7 07:18:14 2010 @@ -47,19 +47,6 @@

Updating the site with a local forrestbot

- Do once, create $FORREST_HOME/deploy.svn.settings file. These - credentials are needed by forrestbot so that it can do your 'svn add' - and 'svn commit' etc. to the forrest/site/ repository. The - deploy.svn.settings file looks like: -

- - - - - -]]> - -

Generating and publishing the main docs is very easy using a local forrestbot:

@@ -67,6 +54,11 @@ forrest -f publish.xml build forrest -f publish.xml deploy

+ Note: if your system username is not the same as your "svn username" + then provide a "deploy.svn.settings" file as explained at + $FORREST_HOME/etc/publishing_our_site.txt +

This builds the documentation locally then deploys it by committing it to the forrest/site @@ -106,21 +98,7 @@ $FORREST_HOME/tools/ant/bin/ant deploy-d - - - - - - # Make changes to sources, and then test, then commit. - # Best to wait on committing the source changes until - # you have built and reviewed the docs. # Please, please, ensure valid xml docs. Errors will be # reported during the 'build' phase if you don't. @@ -146,10 +124,6 @@ $FORREST_HOME/tools/ant/bin/ant deploy-d ---------------------- Note: The first time that you deploy, it will need to do a long svn checkout first. - - FIXME: That commit message technique does not work. - The second word is treated as an ant target to be called. - Just leave it out and forrestbot will use a default message. ]]>

Modified: forrest/trunk/site-author/content/xdocs/tools/forrestbot.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/tools/forrestbot.xml?rev=952121&r1=952120&r2=952121&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/tools/forrestbot.xml (original) +++ forrest/trunk/site-author/content/xdocs/tools/forrestbot.xml Mon Jun 7 07:18:14 2010 @@ -513,15 +513,13 @@ deploy.svn.user - SVN username to use when committing changes - - Yes - - - deploy.svn.password - SVN password - - Yes + + SVN username to use when committing changes. + If your "svn username" is not the same as your local system + username, then see explanation below. + + Local system username. + No deploy.svn.url @@ -537,6 +535,18 @@ No +

+ This uses the "svn" executable expected to be present, and its + authorisation mechanism. +

+ If your "svn username" is different from your local system username + create $FORREST_HOME/deploy.svn.settings file like: +

+ + + +]]>

deploy.ftp Modified: forrest/trunk/site-author/publish.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/publish.xml?rev=952121&r1=952120&r2=952121&view=diff ============================================================================== --- forrest/trunk/site-author/publish.xml (original) +++ forrest/trunk/site-author/publish.xml Mon Jun 7 07:18:14 2010 @@ -18,10 +18,6 @@ - Modified: forrest/trunk/tools/forrestbot/forrest.xml URL: http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/forrest.xml?rev=952121&r1=952120&r2=952121&view=diff ============================================================================== --- forrest/trunk/tools/forrestbot/forrest.xml (original) +++ forrest/trunk/tools/forrestbot/forrest.xml Mon Jun 7 07:18:14 2010 @@ -18,8 +18,6 @@ -