You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by "Gav...." <br...@brightontown.com.au> on 2006/07/30 06:47:43 UTC
Publish site from site-author (was : RE: svn commit: r426852...)
> -----Original Message-----
> From: gmcdonald@apache.org [mailto:gmcdonald@apache.org]
> Sent: Sunday, 30 July 2006 7:54 AM
> To: svn@forrest.apache.org
> Subject: svn commit: r426852 - /forrest/trunk/site-
> author/content/xdocs/who.xml
>
> Author: gmcdonald
> Date: Sat Jul 29 16:53:38 2006
> New Revision: 426852
>
> URL: http://svn.apache.org/viewvc?rev=426852&view=rev
> Log:
> Putting entry in alphabetical order
>
> Modified:
> forrest/trunk/site-author/content/xdocs/who.xml
>
> Modified: forrest/trunk/site-author/content/xdocs/who.xml
> URL: http://svn.apache.org/viewvc/forrest/trunk/site-
> author/content/xdocs/who.xml?rev=426852&r1=426851&r2=426852&view=diff
> ==========================================================================
> ====
> --- forrest/trunk/site-author/content/xdocs/who.xml (original)
> +++ forrest/trunk/site-author/content/xdocs/who.xml Sat Jul 29 16:53:38
> 2006
> @@ -51,7 +51,8 @@
> <li><strong>[AG] - Antonio Gallardo
> (antonio.at.apache.org)</strong></li>
> <li><strong>[RG] - Ross Gardler
> (rgardler.at.apache.org)</strong></li>
> <li><strong>[DG] - Diwaker Gupta
> (diwaker.at.apache.org)</strong></li>
> - <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
> + <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
I NEVER touched that line above, will check Vim settings again!
> + <li><strong>[GM] - Gavin McDonald
> (gmcdonald.at.apache.org)</strong></li>
> <li>[JM] - John Morrison (morrijr.at.apache.org)</li>
> <li>[SN] - Steven Noels (stevenn.at.apache.org)</li>
> <li><strong>[JJP] - Juan Jose Pablos
> (cheche.at.apache.org)</strong></li>
> @@ -64,7 +65,6 @@
> <li><strong>[RFT] - Rick F. Tessner
> (rick.at.apache.org)</strong></li>
> <li>[JT] - Jeff Turner (jefft.at.apache.org)</li>
> <li><strong>[TW] - Tim Williams
> (twilliams.at.apache.org)</strong></li>
> - <li><strong>[GM] - Gavin McDonald
> (gmcdonald.at.apache.org)</strong></li>
> </ul>
> </section>
> <section id="notes">
>
>
Ok, do we need to deploy the whole site every time a small change like this
Is made, or will it happen eventually anyway?
I am trying the deploy again for practice and to ensure my config is working
- it isn't, the first time I used forrestbot to deploy it seemed ok from my
End but never occurred at the other - the commit never came through.
I tried again a second time to update the site from my above minor change
And now I get errors :-
\forrest\site-author\work\svn-deploy\forrest-docs\skin\print.css has
inconsistent new lines.
... which it has, I check and get the ^M at the end of each and every line.
Also, I get complaints of svn: warning: 'blah blah' is already under version
control. I get about 30 of these complaints.
Have I missed a step somewhere. I did svn up and all that before I committed
The change.
This is all from following
http://forrest.apache.org/procedures/How_to_publish_docs.html
Gav...
Re: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by David Crossley <cr...@apache.org>.
Gav.... wrote:
> > From: David Crossley:
> > >
> > > > Then tell us the differences:
> > > > diff build/forrest-docs/index.html work/svn-deploy/forrest-
> > > > docs/index.html
> > >
> > > Erk,
> > >
> > > D:\Apache2\forrest\site-author>svn diff build\forrest-docs\index.html
> > > work\svn-deploy\forrest-docs\index.html
> > > svn: 'build\forrest-docs\index.html' is not a working copy
> >
> > Don't use 'svn diff' but plain 'diff'.
>
> Yes, sorry I got that, we Windows folk don't have that.
> I downloaded a windows diff program here is a apparently
> Unix outpt diff of those files.
>
> 293c293
> < can scale up to large projects. !!Adding an inline change here!!
> ---
> > can scale up to large projects.
> 306,310c306
> < </p>
> < <p>
> < Making a change. I noticed vim just moved the closing p from the
> < paragraph above, annoying!
> < </p>
> ---
> > </p>
> 313c309
> < <a name="N1007E"></a><a name="Powerful"></a>
> ---
> > <a name="N1007B"></a><a name="Powerful"></a>
[ snip similar changes ]
So apart from configuration of your editor, there is this
issue about @name fragment identifiers changing on different
computing platforms. We have seen this sometimes before.
Not yet sure what causes it.
Are there any differences to other files?
diff -r build/forrest-docs work/svn-deploy/forrest-docs | grep -v "\.svn"
-David
RE: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Thursday, 3 August 2006 7:37 AM
> To: dev@forrest.apache.org
> Subject: Re: Publish site from site-author (was : RE: svn
> commit:r426852...)
>
> Gav.... wrote:
> > > From: David Crossley
> > >
> > > Do both steps again:
> > >
> > > forrest -f publish.xml build
> > > forrest -f publish.xml deploy
> > >
> > > If you still have the line-endings problem then that is
> > > some different issue.
> >
> > Not done that yet, need a genuine change to try it.
> >
> > > Try making a little change to one of the source xdocs, e.g. index.xml
> > > but no need to commit it.
> >
> > Done that.
> >
> > > Then build as normal:
> > > forrest -f publish.xml build
> >
> > Done that.
> >
> > >
> > > Then get your forrestbot's site svn up-to-date, You don't
> > > normally need to do this step:
> > > svn update work/svn-deploy/forrest-docs
> >
> > Done that, very big amount of updates and adds happened.
>
> I presume that that would be recent changes deployed
> by Thorsten and me.
>
> > > Then tell us the differences:
> > > diff build/forrest-docs/index.html work/svn-deploy/forrest-
> docs/index.html
> >
> > Erk,
> >
> > D:\Apache2\forrest\site-author>svn diff build\forrest-docs\index.html
> > work\svn-d
> > eploy\forrest-docs\index.html
> > svn: 'build\forrest-docs\index.html' is not a working copy
>
> Don't use 'svn diff' but plain 'diff'.
Yes, sorry I got that, we Windows folk don't have that.
I downloaded a windows diff program here is a apparently
Unix outpt diff of those files.
293c293
< can scale up to large projects. !!Adding an inline change here!!
---
> can scale up to large projects.
306,310c306
< </p>
< <p>
< Making a change. I noticed vim just moved the closing p from the
< paragraph above, annoying!
< </p>
---
> </p>
313c309
< <a name="N1007E"></a><a name="Powerful"></a>
---
> <a name="N1007B"></a><a name="Powerful"></a>
362c358
< <a name="N100CA"></a><a name="Static+or+Dynamic"></a>
---
> <a name="N100C7"></a><a name="Static+or+Dynamic"></a>
386c382
< <a name="N100E2"></a><a name="History"></a>
---
> <a name="N100DF"></a><a name="History"></a>
406c402
< <a name="N100F7"></a><a name="status"></a>
---
> <a name="N100F4"></a><a name="status"></a>
436c432
< <a name="N10113"></a><a name="news"></a>
---
> <a name="N10110"></a><a name="news"></a>
468c464
< <a name="N10132"></a><a name="help"></a>
---
> <a name="N1012F"></a><a name="help"></a>
Gav...
>
> -David
>
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.394 / Virus Database: 268.10.5/406 - Release Date: 8/2/2006
Re: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by David Crossley <cr...@apache.org>.
Gav.... wrote:
> > From: David Crossley
> >
> > Do both steps again:
> >
> > forrest -f publish.xml build
> > forrest -f publish.xml deploy
> >
> > If you still have the line-endings problem then that is
> > some different issue.
>
> Not done that yet, need a genuine change to try it.
>
> > Try making a little change to one of the source xdocs, e.g. index.xml
> > but no need to commit it.
>
> Done that.
>
> > Then build as normal:
> > forrest -f publish.xml build
>
> Done that.
>
> >
> > Then get your forrestbot's site svn up-to-date, You don't
> > normally need to do this step:
> > svn update work/svn-deploy/forrest-docs
>
> Done that, very big amount of updates and adds happened.
I presume that that would be recent changes deployed
by Thorsten and me.
> > Then tell us the differences:
> > diff build/forrest-docs/index.html work/svn-deploy/forrest-docs/index.html
>
> Erk,
>
> D:\Apache2\forrest\site-author>svn diff build\forrest-docs\index.html
> work\svn-d
> eploy\forrest-docs\index.html
> svn: 'build\forrest-docs\index.html' is not a working copy
Don't use 'svn diff' but plain 'diff'.
-David
RE: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by "Gav...." <br...@brightontown.com.au>.
> > Then tell us the differences:
> > diff build/forrest-docs/index.html work/svn-deploy/forrest-
> docs/index.html
>
>
> Erk,
>
> D:\Apache2\forrest\site-author>svn diff build\forrest-docs\index.html
> work\svn-d
> eploy\forrest-docs\index.html
> svn: 'build\forrest-docs\index.html' is not a working copy
>
I looked manually at the two files and the changes were in the build version
But were not in the work version.
Gav...
RE: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Wednesday, 2 August 2006 2:15 PM
> To: dev@forrest.apache.org
> Subject: Re: Publish site from site-author (was : RE: svn
> commit:r426852...)
>
> Gav.... wrote:
> >
> > Well, the normal svn cleanup did not work. I deleted the main/* and
> > site-author/* directories and svn up to get them again.
> >
> > Forrest -f publish.xml build succeeded fine as usual.
> >
> > Forrest -f publish.xml deploy did what it did the first time :-
> >
> > D:\Apache2\forrest\site-author>forrest -f publish.xml deploy
> >
> > Apache Forrest. Run 'forrest -projecthelp' to list options
> >
> >
> > Buildfile: publish.xml
> >
> > deploy.svn:
> > add: Put files and directories under version control, scheduling
> > them for addition to repository. They will be added in next commit.
> > usage: add PATH...
> > Valid options:
> > --targets arg : pass contents of file ARG as additional
> args
> > -N [--non-recursive] : operate on single directory only
> > -q [--quiet] : print as little as possible
> > --config-dir arg : read user configuration files from
> directory
> > ARG
> > --force : force operation to run
> > --no-ignore : disregard default and svn:ignore property
> > ignores
> > --auto-props : enable automatic properties
> > --no-auto-props : disable automatic properties
> > Result: 1
> >
> > BUILD SUCCESSFUL
> > Total time: 11 minutes 11 seconds
> >
> > ---------------
> >
> > However , no commit log has appeared so yet again this actually did
> nothing.
>
> That is normal for the first deploy.
Ok thanks.
> Do both steps again:
>
> forrest -f publish.xml build
> forrest -f publish.xml deploy
>
> If you still have the line-endings problem then that is
> some different issue.
Not done that yet, need a genuine change to try it.
>
> Try making a little change to one of the source xdocs, e.g. index.xml
> but no need to commit it.
Done that.
>
> Then build as normal:
> forrest -f publish.xml build
Done that.
>
> Then get your forrestbot's site svn up-to-date, You don't
> normally need to do this step:
> svn update work/svn-deploy/forrest-docs
Done that, very big amount of updates and adds happened.
>
> Then tell us the differences:
> diff build/forrest-docs/index.html work/svn-deploy/forrest-docs/index.html
Erk,
D:\Apache2\forrest\site-author>svn diff build\forrest-docs\index.html
work\svn-d
eploy\forrest-docs\index.html
svn: 'build\forrest-docs\index.html' is not a working copy
>
> > > > Thanks for your help so far, cheers.
> > >
> > > If we get you to deploy the site once in while then the project is
> > > getting stronger.
> > >
> > > You are very welcome.
> > >
> > > We are all here to learn and help each other, or?
> >
> > Absolutely, it is frustrating though that I can not get over this hurdle
> > Quickly so I can move on and close some issues.
>
> Please don't rush, there are probably more "hurdles".
No doubt !
:)
Gav...
>
> -David
>
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.394 / Virus Database: 268.10.5/405 - Release Date: 8/1/2006
Re: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by David Crossley <cr...@apache.org>.
Gav.... wrote:
>
> Well, the normal svn cleanup did not work. I deleted the main/* and
> site-author/* directories and svn up to get them again.
>
> Forrest -f publish.xml build succeeded fine as usual.
>
> Forrest -f publish.xml deploy did what it did the first time :-
>
> D:\Apache2\forrest\site-author>forrest -f publish.xml deploy
>
> Apache Forrest. Run 'forrest -projecthelp' to list options
>
>
> Buildfile: publish.xml
>
> deploy.svn:
> add: Put files and directories under version control, scheduling
> them for addition to repository. They will be added in next commit.
> usage: add PATH...
> Valid options:
> --targets arg : pass contents of file ARG as additional args
> -N [--non-recursive] : operate on single directory only
> -q [--quiet] : print as little as possible
> --config-dir arg : read user configuration files from directory
> ARG
> --force : force operation to run
> --no-ignore : disregard default and svn:ignore property
> ignores
> --auto-props : enable automatic properties
> --no-auto-props : disable automatic properties
> Result: 1
>
> BUILD SUCCESSFUL
> Total time: 11 minutes 11 seconds
>
> ---------------
>
> However , no commit log has appeared so yet again this actually did nothing.
That is normal for the first deploy.
Do both steps again:
forrest -f publish.xml build
forrest -f publish.xml deploy
If you still have the line-endings problem then that is
some different issue.
Try making a little change to one of the source xdocs, e.g. index.xml
but no need to commit it.
Then build as normal:
forrest -f publish.xml build
Then get your forrestbot's site svn up-to-date, You don't
normally need to do this step:
svn update work/svn-deploy/forrest-docs
Then tell us the differences:
diff build/forrest-docs/index.html work/svn-deploy/forrest-docs/index.html
> > > Thanks for your help so far, cheers.
> >
> > If we get you to deploy the site once in while then the project is
> > getting stronger.
> >
> > You are very welcome.
> >
> > We are all here to learn and help each other, or?
>
> Absolutely, it is frustrating though that I can not get over this hurdle
> Quickly so I can move on and close some issues.
Please don't rush, there are probably more "hurdles".
-David
when to deploy the published site from site-author
Posted by David Crossley <cr...@apache.org>.
Thorsten Scherler wrote:
> Gav.... escribi??:
> > > From: Thorsten Scherler
> > > Gav.... escribi??:
> > > >
> > <snip>
> >
> > >... do we need to deploy the whole site every time a small change like
> > > this
> > > > Is made, or will it happen eventually anyway?
> > >
> > > No, only someone is building and deploying the site.
> >
> > Ok, but it does not matter that any changes someone does make are not
> > Deployed before someone else makes changes, as long as the changed files
> > Are committed in site-author?
>
> Not sure whether I understood correctly. ;) Assuming you have committed
> your changes to site-author.
>
> a) if I do an update (what we always have to) before I deploy my
> changes, then yes your changes will be deployed as well.
> b) if I forget to update (what can happen), then no I will not deploy
> your changes.
>
> ...I have seen it in different projects that people commit to the source
> of the documentation and do not deploy to "site". The problem is that in
> some projects only one or two actually ever have done a commit to site
> but projects should not depend on one or two.
Gav, it is quite okay to make the changes to the sources,
be satisfied locally that all is okay, then commit the
source changes. Someone else can deploy the site later.
This approach also allows people time to be happy with
the changes before they are published. Don't get too
concerned about "approval" ... even if you published
them immediately then another committer can always
change and re-publish if there is an issue.
I have been trying to publish the site once per week.
This keeps the changes.html up-to-date and also collects
any source changes that committers have done during the week.
Of course it is far better that others do this role too.
-David
RE: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: Thorsten Scherler [mailto:thorsten.scherler@wyona.com]
> Sent: Monday, 31 July 2006 11:22 PM
> To: dev@forrest.apache.org
> Subject: RE: Publish site from site-author (was : RE: svn
> commit:r426852...)
>
> El lun, 31-07-2006 a las 20:52 +0800, Gav.... escribió:
> >
> > > -----Original Message-----
> > > From: Thorsten Scherler [mailto:thorsten@apache.org]
> > > Sent: Monday, 31 July 2006 5:40 AM
> > > To: dev@forrest.apache.org
> > > Subject: Re: Publish site from site-author (was : RE: svn
> > > commit:r426852...)
> > >
> > > El dom, 30-07-2006 a las 12:47 +0800, Gav.... escribió:
> > > >
> > <snip>
> >
> > >... do we need to deploy the whole site every time a small change like
> > > this
> > > > Is made, or will it happen eventually anyway?
> > >
> > > No, only someone is building and deploying the site.
> >
> > Ok, but it does not matter that any changes someone does make are not
> > Deployed before someone else makes changes, as long as the changed files
> > Are committed in site-author?
>
> Not sure whether I understood correctly. ;) Assuming you have committed
> your changes to site-author.
>
> a) if I do an update (what we always have to) before I deploy my
> changes, then yes your changes will be deployed as well.
> b) if I forget to update (what can happen), then no I will not deploy
> your changes.
>
> ...I have seen it in different projects that people commit to the source
> of the documentation and do not deploy to "site". The problem is that in
> some projects only one or two actually ever have done a commit to site
> but projects should not depend on one or two.
>
> >
> > >
> > > >
> > > > I am trying the deploy again for practice and to ensure my config is
> > > working
> > > >
> > > > - it isn't, the first time I used forrestbot to deploy it seemed ok
> from
> > > my
> > > > End but never occurred at the other - the commit never came through.
> > >
> > > That is weird.
> > >
> > > Please do a
> > >
> > > svn up on $FORREST_HOME
> > >
> > > I did some changes to the skins that you need to deploy the page.
> >
> > Done that thanks, changes are good, well spotted on them too.
>
> jeje, yeah, a forgotten update will cause a *lot* of unreleated changes.
> I talk from experience. ;)
>
> >
> > >
> > > Further make sure you have followed
> > > http://forrest.apache.org/docs_0_80/faq.html#pdf_images. If you have
> > > read the lenya website update document carefully you already did. If
> you
> > > do not the PDF have no images.
> >
> > Done yes, thanks.
>
> good.
>
> >
> > >
> > > >
> > > > I tried again a second time to update the site from my above minor
> > > change
> > > > And now I get errors :-
> > > >
> > > > \forrest\site-author\work\svn-deploy\forrest-docs\skin\print.css has
> > > > inconsistent new lines.
> > > >
> > > > ... which it has, I check and get the ^M at the end of each and
> every
> > > line.
> > >
> > > This can be ignored.
> >
> > Can it, I thought this eol:native was supposed to cure that, besides
> which
> > I have not touched print.css so there should not be any - and having
> checked
> > There are none in the pelt skin version of the file.
>
> I cannot recall the issue but the *.css is the windows vs. linux deploy
> issue I think.
>
> I found
> http://www.svnforum.org/2017/viewtopic.php?p=665&sid=90844d341821ac7198182
> af4c9ec4550
> but that is not a nice solution and further should not be.
> http://lists.ofbiz.org/pipermail/dev/2006-June/011549.html see as well
> more answers in the thread.
>
> The real question is why does your deploy has produced "inconsistent new
> lines"?
>
>
> >
> > >
> > > >
> > > > Also, I get complaints of svn: warning: 'blah blah' is already under
> > > version
> > > > control. I get about 30 of these complaints.
> > >
> > > That are the changes that you made. The bot does svn add on all
> changed
> > > files even if theri have M.
> >
> > Not in this case, 30 odd files it talks about that I have not touched
> either
> > For a while or even ever on some.
>
> I have seen this as well, especially when there have been a linux -
> windows (or vice versa) deployment. We have an issue but I cannot search
> the number ATM.
>
> >
> > >
> > > >
> > > > Have I missed a step somewhere. I did svn up and all that before I
> > > committed
> > > > The change.
> > >
> > > No, I assume an svn error on the end with a message what failed. What
> > > does the log say?
> >
> > The error message was as described above, here is the output:-
> >
> >
> > D:\Apache2\Forrest\tools\forrestbot\core\deploy.xml:195:
> > com.alternatecomputing.
> > jsvn.command.CommandException: svn: Commit failed (details follow):
> > svn: File
> > 'D:\Apache2\forrest\site-author\work\svn-deploy\forrest-docs\skin\prin
> > t.css' has inconsistent newlines
> > svn: Inconsistent line ending style
> >
> > So, apart from the complaints of some files aready being under version
> > Control, the main reason for failing is this line endings of print.css.
>
> Hmmm, weird.
>
> Please, do
> svn diff
> D:\Apache2\forrest\site-author\work\svn-deploy\forrest-docs\skin
> \print.css
> and post the diff.
>
>
> >
> > >
> > > My shot in the dark would be something related to the svn credentials.
> >
> > Meaning ?
>
> Nupp, it was wrong.
>
> >
> > >
> > > ...what gives
> > > svn st forrest\site-author\work\svn-deploy\forrest-docs
> >
> > Just lists about 30 modified files - I only touched one since my
> > Initial https fresh checkout of trunk. (who.xml)
>
> In such cases I would do the trip described in lenya and only commit the
> who.* files to /forrest/site.
>
> >
> > >
> > > >
> > > > This is all from following
> > > > http://forrest.apache.org/procedures/How_to_publish_docs.html
> > > >
> > > > Gav...
> > >
> > > Hmm, it is working for a charm for me.
> >
> > Ok, I might do a svn cleanup and try again.
>
> Yeah do a svn cleanup on site-author and D:\Apache2\forrest\site-author
> \work\svn-deploy\forrest-docs. After the cleanup you should be able to
> commit the who.* from there. Like
> svn ci -m "MyMessage" forrest\site-author\work\svn-deploy\forrest-docs
> \who.html forrest\site-author\work\svn-deploy\forrest-docs\who.pdf
>
> > If not, no harm at this stage of deleting the lot
> > And re-downloading it all again. Would this have any
> > Implications for my account ?
Well, the normal svn cleanup did not work. I deleted the main/* and
site-author/* directories and svn up to get them again.
Forrest -f publish.xml build succeeded fine as usual.
Forrest -f publish.xml deploy did what it did the first time :-
D:\Apache2\forrest\site-author>forrest -f publish.xml deploy
Apache Forrest. Run 'forrest -projecthelp' to list options
Buildfile: publish.xml
deploy.svn:
add: Put files and directories under version control, scheduling
them for addition to repository. They will be added in next commit.
usage: add PATH...
Valid options:
--targets arg : pass contents of file ARG as additional args
-N [--non-recursive] : operate on single directory only
-q [--quiet] : print as little as possible
--config-dir arg : read user configuration files from directory
ARG
--force : force operation to run
--no-ignore : disregard default and svn:ignore property
ignores
--auto-props : enable automatic properties
--no-auto-props : disable automatic properties
Result: 1
BUILD SUCCESSFUL
Total time: 11 minutes 11 seconds
---------------
However , no commit log has appeared so yet again this actually did nothing.
>
> The server account does not get influenced if you delete
> forrest. ...but, not sure what you mean.
>
> I have a couple of different forrest/trunk versions on my PC's. I prefer
> to add then delete (you never know). ;)
>
> >
> > Thanks for your help so far, cheers.
>
> If we get you to deploy the site once in while then the project is
> getting stronger.
>
> You are very welcome.
>
> We are all here to learn and help each other, or?
Absolutely, it is frustrating though that I can not get over this hurdle
Quickly so I can move on and close some issues.
Will do as you say with the lenya docs and try with 'only' who.*
Gav...
>
> salu2
> --
> Thorsten Scherler
> COO Spain
> Wyona Inc. - Open Source Content Management - Apache Lenya
> http://www.wyona.com http://lenya.apache.org
> thorsten.scherler@wyona.com thorsten@apache.org
>
>
>
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.394 / Virus Database: 268.10.5 - Release Date: 7/28/2006
RE: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by Thorsten Scherler <th...@wyona.com>.
El lun, 31-07-2006 a las 20:52 +0800, Gav.... escribió:
>
> > -----Original Message-----
> > From: Thorsten Scherler [mailto:thorsten@apache.org]
> > Sent: Monday, 31 July 2006 5:40 AM
> > To: dev@forrest.apache.org
> > Subject: Re: Publish site from site-author (was : RE: svn
> > commit:r426852...)
> >
> > El dom, 30-07-2006 a las 12:47 +0800, Gav.... escribió:
> > >
> <snip>
>
> >... do we need to deploy the whole site every time a small change like
> > this
> > > Is made, or will it happen eventually anyway?
> >
> > No, only someone is building and deploying the site.
>
> Ok, but it does not matter that any changes someone does make are not
> Deployed before someone else makes changes, as long as the changed files
> Are committed in site-author?
Not sure whether I understood correctly. ;) Assuming you have committed
your changes to site-author.
a) if I do an update (what we always have to) before I deploy my
changes, then yes your changes will be deployed as well.
b) if I forget to update (what can happen), then no I will not deploy
your changes.
...I have seen it in different projects that people commit to the source
of the documentation and do not deploy to "site". The problem is that in
some projects only one or two actually ever have done a commit to site
but projects should not depend on one or two.
>
> >
> > >
> > > I am trying the deploy again for practice and to ensure my config is
> > working
> > >
> > > - it isn't, the first time I used forrestbot to deploy it seemed ok from
> > my
> > > End but never occurred at the other - the commit never came through.
> >
> > That is weird.
> >
> > Please do a
> >
> > svn up on $FORREST_HOME
> >
> > I did some changes to the skins that you need to deploy the page.
>
> Done that thanks, changes are good, well spotted on them too.
jeje, yeah, a forgotten update will cause a *lot* of unreleated changes.
I talk from experience. ;)
>
> >
> > Further make sure you have followed
> > http://forrest.apache.org/docs_0_80/faq.html#pdf_images. If you have
> > read the lenya website update document carefully you already did. If you
> > do not the PDF have no images.
>
> Done yes, thanks.
good.
>
> >
> > >
> > > I tried again a second time to update the site from my above minor
> > change
> > > And now I get errors :-
> > >
> > > \forrest\site-author\work\svn-deploy\forrest-docs\skin\print.css has
> > > inconsistent new lines.
> > >
> > > ... which it has, I check and get the ^M at the end of each and every
> > line.
> >
> > This can be ignored.
>
> Can it, I thought this eol:native was supposed to cure that, besides which
> I have not touched print.css so there should not be any - and having checked
> There are none in the pelt skin version of the file.
I cannot recall the issue but the *.css is the windows vs. linux deploy
issue I think.
I found
http://www.svnforum.org/2017/viewtopic.php?p=665&sid=90844d341821ac7198182af4c9ec4550
but that is not a nice solution and further should not be.
http://lists.ofbiz.org/pipermail/dev/2006-June/011549.html see as well
more answers in the thread.
The real question is why does your deploy has produced "inconsistent new
lines"?
>
> >
> > >
> > > Also, I get complaints of svn: warning: 'blah blah' is already under
> > version
> > > control. I get about 30 of these complaints.
> >
> > That are the changes that you made. The bot does svn add on all changed
> > files even if theri have M.
>
> Not in this case, 30 odd files it talks about that I have not touched either
> For a while or even ever on some.
I have seen this as well, especially when there have been a linux -
windows (or vice versa) deployment. We have an issue but I cannot search
the number ATM.
>
> >
> > >
> > > Have I missed a step somewhere. I did svn up and all that before I
> > committed
> > > The change.
> >
> > No, I assume an svn error on the end with a message what failed. What
> > does the log say?
>
> The error message was as described above, here is the output:-
>
>
> D:\Apache2\Forrest\tools\forrestbot\core\deploy.xml:195:
> com.alternatecomputing.
> jsvn.command.CommandException: svn: Commit failed (details follow):
> svn: File
> 'D:\Apache2\forrest\site-author\work\svn-deploy\forrest-docs\skin\prin
> t.css' has inconsistent newlines
> svn: Inconsistent line ending style
>
> So, apart from the complaints of some files aready being under version
> Control, the main reason for failing is this line endings of print.css.
Hmmm, weird.
Please, do
svn diff
D:\Apache2\forrest\site-author\work\svn-deploy\forrest-docs\skin
\print.css
and post the diff.
>
> >
> > My shot in the dark would be something related to the svn credentials.
>
> Meaning ?
Nupp, it was wrong.
>
> >
> > ...what gives
> > svn st forrest\site-author\work\svn-deploy\forrest-docs
>
> Just lists about 30 modified files - I only touched one since my
> Initial https fresh checkout of trunk. (who.xml)
In such cases I would do the trip described in lenya and only commit the
who.* files to /forrest/site.
>
> >
> > >
> > > This is all from following
> > > http://forrest.apache.org/procedures/How_to_publish_docs.html
> > >
> > > Gav...
> >
> > Hmm, it is working for a charm for me.
>
> Ok, I might do a svn cleanup and try again.
Yeah do a svn cleanup on site-author and D:\Apache2\forrest\site-author
\work\svn-deploy\forrest-docs. After the cleanup you should be able to
commit the who.* from there. Like
svn ci -m "MyMessage" forrest\site-author\work\svn-deploy\forrest-docs
\who.html forrest\site-author\work\svn-deploy\forrest-docs\who.pdf
> If not, no harm at this stage of deleting the lot
> And re-downloading it all again. Would this have any
> Implications for my account ?
The server account does not get influenced if you delete
forrest. ...but, not sure what you mean.
I have a couple of different forrest/trunk versions on my PC's. I prefer
to add then delete (you never know). ;)
>
> Thanks for your help so far, cheers.
If we get you to deploy the site once in while then the project is
getting stronger.
You are very welcome.
We are all here to learn and help each other, or?
salu2
--
Thorsten Scherler
COO Spain
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
thorsten.scherler@wyona.com thorsten@apache.org
RE: Publish site from site-author (was : RE: svn commit:r426852...)
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: Thorsten Scherler [mailto:thorsten@apache.org]
> Sent: Monday, 31 July 2006 5:40 AM
> To: dev@forrest.apache.org
> Subject: Re: Publish site from site-author (was : RE: svn
> commit:r426852...)
>
> El dom, 30-07-2006 a las 12:47 +0800, Gav.... escribió:
> >
<snip>
>... do we need to deploy the whole site every time a small change like
> this
> > Is made, or will it happen eventually anyway?
>
> No, only someone is building and deploying the site.
Ok, but it does not matter that any changes someone does make are not
Deployed before someone else makes changes, as long as the changed files
Are committed in site-author?
>
> >
> > I am trying the deploy again for practice and to ensure my config is
> working
> >
> > - it isn't, the first time I used forrestbot to deploy it seemed ok from
> my
> > End but never occurred at the other - the commit never came through.
>
> That is weird.
>
> Please do a
>
> svn up on $FORREST_HOME
>
> I did some changes to the skins that you need to deploy the page.
Done that thanks, changes are good, well spotted on them too.
>
> Further make sure you have followed
> http://forrest.apache.org/docs_0_80/faq.html#pdf_images. If you have
> read the lenya website update document carefully you already did. If you
> do not the PDF have no images.
Done yes, thanks.
>
> >
> > I tried again a second time to update the site from my above minor
> change
> > And now I get errors :-
> >
> > \forrest\site-author\work\svn-deploy\forrest-docs\skin\print.css has
> > inconsistent new lines.
> >
> > ... which it has, I check and get the ^M at the end of each and every
> line.
>
> This can be ignored.
Can it, I thought this eol:native was supposed to cure that, besides which
I have not touched print.css so there should not be any - and having checked
There are none in the pelt skin version of the file.
>
> >
> > Also, I get complaints of svn: warning: 'blah blah' is already under
> version
> > control. I get about 30 of these complaints.
>
> That are the changes that you made. The bot does svn add on all changed
> files even if theri have M.
Not in this case, 30 odd files it talks about that I have not touched either
For a while or even ever on some.
>
> >
> > Have I missed a step somewhere. I did svn up and all that before I
> committed
> > The change.
>
> No, I assume an svn error on the end with a message what failed. What
> does the log say?
The error message was as described above, here is the output:-
D:\Apache2\Forrest\tools\forrestbot\core\deploy.xml:195:
com.alternatecomputing.
jsvn.command.CommandException: svn: Commit failed (details follow):
svn: File
'D:\Apache2\forrest\site-author\work\svn-deploy\forrest-docs\skin\prin
t.css' has inconsistent newlines
svn: Inconsistent line ending style
So, apart from the complaints of some files aready being under version
Control, the main reason for failing is this line endings of print.css.
>
> My shot in the dark would be something related to the svn credentials.
Meaning ?
>
> ...what gives
> svn st forrest\site-author\work\svn-deploy\forrest-docs
Just lists about 30 modified files - I only touched one since my
Initial https fresh checkout of trunk. (who.xml)
>
> >
> > This is all from following
> > http://forrest.apache.org/procedures/How_to_publish_docs.html
> >
> > Gav...
>
> Hmm, it is working for a charm for me.
Ok, I might do a svn cleanup and try again.
If not, no harm at this stage of deleting the lot
And re-downloading it all again. Would this have any
Implications for my account ?
Thanks for your help so far, cheers.
Gav...
>
> salu2
> --
> thorsten
>
> "Together we stand, divided we fall!"
> Hey you (Pink Floyd)
>
>
>
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.394 / Virus Database: 268.10.5 - Release Date: 7/28/2006
Re: Publish site from site-author (was : RE: svn commit:
r426852...)
Posted by Thorsten Scherler <th...@apache.org>.
El dom, 30-07-2006 a las 12:47 +0800, Gav.... escribió:
>
> > -----Original Message-----
> > From: gmcdonald@apache.org [mailto:gmcdonald@apache.org]
> > Sent: Sunday, 30 July 2006 7:54 AM
> > To: svn@forrest.apache.org
> > Subject: svn commit: r426852 - /forrest/trunk/site-
> > author/content/xdocs/who.xml
> >
> > Author: gmcdonald
> > Date: Sat Jul 29 16:53:38 2006
> > New Revision: 426852
> >
> > URL: http://svn.apache.org/viewvc?rev=426852&view=rev
> > Log:
> > Putting entry in alphabetical order
> >
> > Modified:
> > forrest/trunk/site-author/content/xdocs/who.xml
> >
> > Modified: forrest/trunk/site-author/content/xdocs/who.xml
> > URL: http://svn.apache.org/viewvc/forrest/trunk/site-
> > author/content/xdocs/who.xml?rev=426852&r1=426851&r2=426852&view=diff
> > ==========================================================================
> > ====
> > --- forrest/trunk/site-author/content/xdocs/who.xml (original)
> > +++ forrest/trunk/site-author/content/xdocs/who.xml Sat Jul 29 16:53:38
> > 2006
> > @@ -51,7 +51,8 @@
> > <li><strong>[AG] - Antonio Gallardo
> > (antonio.at.apache.org)</strong></li>
> > <li><strong>[RG] - Ross Gardler
> > (rgardler.at.apache.org)</strong></li>
> > <li><strong>[DG] - Diwaker Gupta
> > (diwaker.at.apache.org)</strong></li>
> > - <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
> > + <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
>
>
> I NEVER touched that line above, will check Vim settings again!
>
>
> > + <li><strong>[GM] - Gavin McDonald
> > (gmcdonald.at.apache.org)</strong></li>
> > <li>[JM] - John Morrison (morrijr.at.apache.org)</li>
> > <li>[SN] - Steven Noels (stevenn.at.apache.org)</li>
> > <li><strong>[JJP] - Juan Jose Pablos
> > (cheche.at.apache.org)</strong></li>
> > @@ -64,7 +65,6 @@
> > <li><strong>[RFT] - Rick F. Tessner
> > (rick.at.apache.org)</strong></li>
> > <li>[JT] - Jeff Turner (jefft.at.apache.org)</li>
> > <li><strong>[TW] - Tim Williams
> > (twilliams.at.apache.org)</strong></li>
> > - <li><strong>[GM] - Gavin McDonald
> > (gmcdonald.at.apache.org)</strong></li>
> > </ul>
> > </section>
> > <section id="notes">
> >
> >
>
>
> Ok, do we need to deploy the whole site every time a small change like this
> Is made, or will it happen eventually anyway?
No, only someone is building and deploying the site.
>
> I am trying the deploy again for practice and to ensure my config is working
>
> - it isn't, the first time I used forrestbot to deploy it seemed ok from my
> End but never occurred at the other - the commit never came through.
That is weird.
Please do a
svn up on $FORREST_HOME
I did some changes to the skins that you need to deploy the page.
Further make sure you have followed
http://forrest.apache.org/docs_0_80/faq.html#pdf_images. If you have
read the lenya website update document carefully you already did. If you
do not the PDF have no images.
>
> I tried again a second time to update the site from my above minor change
> And now I get errors :-
>
> \forrest\site-author\work\svn-deploy\forrest-docs\skin\print.css has
> inconsistent new lines.
>
> ... which it has, I check and get the ^M at the end of each and every line.
This can be ignored.
>
> Also, I get complaints of svn: warning: 'blah blah' is already under version
> control. I get about 30 of these complaints.
That are the changes that you made. The bot does svn add on all changed
files even if theri have M.
>
> Have I missed a step somewhere. I did svn up and all that before I committed
> The change.
No, I assume an svn error on the end with a message what failed. What
does the log say?
My shot in the dark would be something related to the svn credentials.
...what gives
svn st forrest\site-author\work\svn-deploy\forrest-docs
>
> This is all from following
> http://forrest.apache.org/procedures/How_to_publish_docs.html
>
> Gav...
Hmm, it is working for a charm for me.
salu2
--
thorsten
"Together we stand, divided we fall!"
Hey you (Pink Floyd)
RE: Publish site from site-author (was : RE: svn commit: r426852...)
Posted by "Gav...." <br...@brightontown.com.au>.
> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> Sent: Wednesday, 2 August 2006 12:16 PM
> To: dev@forrest.apache.org
> Subject: Re: Publish site from site-author (was : RE: svn commit:
> r426852...)
>
> Gav.... wrote:
> >
> > > Date: Sat Jul 29 16:53:38 2006
> > > New Revision: 426852
> > >
> > > URL: http://svn.apache.org/viewvc?rev=426852&view=rev
> > > Log:
> > > Putting entry in alphabetical order
> > >
> > > Modified:
> > > forrest/trunk/site-author/content/xdocs/who.xml
> > >
> > > Modified: forrest/trunk/site-author/content/xdocs/who.xml
> > > URL: http://svn.apache.org/viewvc/forrest/trunk/site-
> > > author/content/xdocs/who.xml?rev=426852&r1=426851&r2=426852&view=diff
> > >
> ==========================================================================
> > > ====
> > > --- forrest/trunk/site-author/content/xdocs/who.xml (original)
> > > +++ forrest/trunk/site-author/content/xdocs/who.xml Sat Jul 29
> 16:53:38
> > > 2006
> > > @@ -51,7 +51,8 @@
> > > <li><strong>[AG] - Antonio Gallardo
> > > (antonio.at.apache.org)</strong></li>
> > > <li><strong>[RG] - Ross Gardler
> > > (rgardler.at.apache.org)</strong></li>
> > > <li><strong>[DG] - Diwaker Gupta
> > > (diwaker.at.apache.org)</strong></li>
> > > - <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
> > > + <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
> >
> >
> > I NEVER touched that line above, will check Vim settings again!
>
> I updated my SVN and checked your changes. In vi using
> :set invlist
> will show that some extra control characters have been inserted
> at the beginning of the lines.
>
> Sorry, i don't know what is ^I ...
It's set: list in my version of vim (which means vi improved and so is not
As standard fully compatible with vi - but I'll change it)
^I is a Tab.
I'll find how to stop this - something to do with insert mode.
Gav...
>
> ------
> <li><strong>[DG] - Diwaker Gupta (diwaker.at.apache.org)</strong></li>$
> ^I<li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>$
> ^I<li><strong>[GM] - Gavin McDonald
> (gmcdonald.at.apache.org)</strong></li>$
> <li>[JM] - John Morrison (morrijr.at.apache.org)</li>$
> ------
>
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.394 / Virus Database: 268.10.5/405 - Release Date: 8/1/2006
Re: Publish site from site-author (was : RE: svn commit: r426852...)
Posted by David Crossley <cr...@apache.org>.
Gav.... wrote:
>
> > Date: Sat Jul 29 16:53:38 2006
> > New Revision: 426852
> >
> > URL: http://svn.apache.org/viewvc?rev=426852&view=rev
> > Log:
> > Putting entry in alphabetical order
> >
> > Modified:
> > forrest/trunk/site-author/content/xdocs/who.xml
> >
> > Modified: forrest/trunk/site-author/content/xdocs/who.xml
> > URL: http://svn.apache.org/viewvc/forrest/trunk/site-
> > author/content/xdocs/who.xml?rev=426852&r1=426851&r2=426852&view=diff
> > ==========================================================================
> > ====
> > --- forrest/trunk/site-author/content/xdocs/who.xml (original)
> > +++ forrest/trunk/site-author/content/xdocs/who.xml Sat Jul 29 16:53:38
> > 2006
> > @@ -51,7 +51,8 @@
> > <li><strong>[AG] - Antonio Gallardo
> > (antonio.at.apache.org)</strong></li>
> > <li><strong>[RG] - Ross Gardler
> > (rgardler.at.apache.org)</strong></li>
> > <li><strong>[DG] - Diwaker Gupta
> > (diwaker.at.apache.org)</strong></li>
> > - <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
> > + <li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>
>
>
> I NEVER touched that line above, will check Vim settings again!
I updated my SVN and checked your changes. In vi using
:set invlist
will show that some extra control characters have been inserted
at the beginning of the lines.
Sorry, i don't know what is ^I ...
------
<li><strong>[DG] - Diwaker Gupta (diwaker.at.apache.org)</strong></li>$
^I<li>[SM] - Stefano Mazzocchi (stefano.at.apache.org)</li>$
^I<li><strong>[GM] - Gavin McDonald (gmcdonald.at.apache.org)</strong></li>$
<li>[JM] - John Morrison (morrijr.at.apache.org)</li>$
------