You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sl...@apache.org on 2014/05/20 22:58:55 UTC
svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
Author: slaurent
Date: Tue May 20 20:58:55 2014
New Revision: 1596415
URL: http://svn.apache.org/r1596415
Log:
fixed URLs to documentation snapshots
Modified:
tomcat/site/trunk/docs/ci.html
Modified: tomcat/site/trunk/docs/ci.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415&r1=1596414&r2=1596415&view=diff
==============================================================================
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Tue May 20 20:58:55 2014
@@ -263,14 +263,14 @@ prepared and published by ASF Buildbot,
<ul>
<li>
-<a href="http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html" rel="nofollow">Tomcat trunk</a> (8.0.x)</li>
+<a href="http://ci.apache.org/projects/tomcat/tomcat8/index.html" rel="nofollow">Tomcat trunk</a> (8.0.x)</li>
<li>
-<a href="http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html" rel="nofollow">Tomcat 7.0.x</a>
+<a href="http://ci.apache.org/projects/tomcat/tomcat7/index.html" rel="nofollow">Tomcat 7.0.x</a>
</li>
<li>
-<a href="http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html" rel="nofollow">Tomcat 6.0.x</a>
+<a href="http://ci.apache.org/projects/tomcat/tomcat6/index.html" rel="nofollow">Tomcat 6.0.x</a>
</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
Posted by Sylvain Laurent <sl...@apache.org>.
ok, I reverted (r1596664). Sorry, I had not checked the README, everything was explained...
who can fix the buildbot config now ?
Sylvain
On 21 mai 2014, at 00:18, Konstantin Kolinko <kn...@gmail.com> wrote:
> 2014-05-21 1:41 GMT+04:00 Sylvain Laurent <sl...@apache.org>:
>> so, I just have to fix /xdocs/ci.xml ? and the buildbot generates ci.html and commits it ?
>
> 1. No. The tomcat.apache.org web site is authored in XML (just like
> Tomcat documentation). See README.txt and build.xml in the root
> directory of /site.
>
> It is odd that you edited and committed generated HTML file only.
>
> 2. The old links were correct. The buildbot is misconfigured and
> publishes generated documentation snapshots, junit logs and coverage
> reports into a wrong place (all in the same directory instead of
> subdirectories).
>
>>
>>
>>
>> On 20 mai 2014, at 23:14, Konstantin Kolinko <kn...@gmail.com> wrote:
>>
>>> 2014-05-21 0:58 GMT+04:00 <sl...@apache.org>:
>>>> Author: slaurent
>>>> Date: Tue May 20 20:58:55 2014
>>>> New Revision: 1596415
>>>>
>>>> URL: http://svn.apache.org/r1596415
>>>> Log:
>>>> fixed URLs to documentation snapshots
>>>>
>>>
>>> -1.
>>>
>>> 1. This shall be fixed not here, but in Buildbot configuration.
>>> 2. It writes documentation and coverage (and logs) into the same
>>> place. Whether you are seeing docs or coverage depends on whether a
>>> build is running in this very moment.
>>> 3. ci.html only? (Without xml)
>>>
>>>> Modified:
>>>> tomcat/site/trunk/docs/ci.html
>>>>
>>>> Modified: tomcat/site/trunk/docs/ci.html
>>>> URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415&r1=1596414&r2=1596415&view=diff
>>>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
Posted by Konstantin Kolinko <kn...@gmail.com>.
2014-05-21 1:41 GMT+04:00 Sylvain Laurent <sl...@apache.org>:
> so, I just have to fix /xdocs/ci.xml ? and the buildbot generates ci.html and commits it ?
1. No. The tomcat.apache.org web site is authored in XML (just like
Tomcat documentation). See README.txt and build.xml in the root
directory of /site.
It is odd that you edited and committed generated HTML file only.
2. The old links were correct. The buildbot is misconfigured and
publishes generated documentation snapshots, junit logs and coverage
reports into a wrong place (all in the same directory instead of
subdirectories).
>
>
>
> On 20 mai 2014, at 23:14, Konstantin Kolinko <kn...@gmail.com> wrote:
>
>> 2014-05-21 0:58 GMT+04:00 <sl...@apache.org>:
>>> Author: slaurent
>>> Date: Tue May 20 20:58:55 2014
>>> New Revision: 1596415
>>>
>>> URL: http://svn.apache.org/r1596415
>>> Log:
>>> fixed URLs to documentation snapshots
>>>
>>
>> -1.
>>
>> 1. This shall be fixed not here, but in Buildbot configuration.
>> 2. It writes documentation and coverage (and logs) into the same
>> place. Whether you are seeing docs or coverage depends on whether a
>> build is running in this very moment.
>> 3. ci.html only? (Without xml)
>>
>>> Modified:
>>> tomcat/site/trunk/docs/ci.html
>>>
>>> Modified: tomcat/site/trunk/docs/ci.html
>>> URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415&r1=1596414&r2=1596415&view=diff
>>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
Posted by Sylvain Laurent <sl...@apache.org>.
so, I just have to fix /xdocs/ci.xml ? and the buildbot generates ci.html and commits it ?
On 20 mai 2014, at 23:14, Konstantin Kolinko <kn...@gmail.com> wrote:
> 2014-05-21 0:58 GMT+04:00 <sl...@apache.org>:
>> Author: slaurent
>> Date: Tue May 20 20:58:55 2014
>> New Revision: 1596415
>>
>> URL: http://svn.apache.org/r1596415
>> Log:
>> fixed URLs to documentation snapshots
>>
>
> -1.
>
> 1. This shall be fixed not here, but in Buildbot configuration.
> 2. It writes documentation and coverage (and logs) into the same
> place. Whether you are seeing docs or coverage depends on whether a
> build is running in this very moment.
> 3. ci.html only? (Without xml)
>
>> Modified:
>> tomcat/site/trunk/docs/ci.html
>>
>> Modified: tomcat/site/trunk/docs/ci.html
>> URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415&r1=1596414&r2=1596415&view=diff
>> ==============================================================================
>> --- tomcat/site/trunk/docs/ci.html (original)
>> +++ tomcat/site/trunk/docs/ci.html Tue May 20 20:58:55 2014
>> @@ -263,14 +263,14 @@ prepared and published by ASF Buildbot,
>> <ul>
>>
>> <li>
>> -<a href="http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html" rel="nofollow">Tomcat trunk</a> (8.0.x)</li>
>> +<a href="http://ci.apache.org/projects/tomcat/tomcat8/index.html" rel="nofollow">Tomcat trunk</a> (8.0.x)</li>
>>
>> <li>
>> -<a href="http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html" rel="nofollow">Tomcat 7.0.x</a>
>> +<a href="http://ci.apache.org/projects/tomcat/tomcat7/index.html" rel="nofollow">Tomcat 7.0.x</a>
>> </li>
>>
>> <li>
>> -<a href="http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html" rel="nofollow">Tomcat 6.0.x</a>
>> +<a href="http://ci.apache.org/projects/tomcat/tomcat6/index.html" rel="nofollow">Tomcat 6.0.x</a>
>> </li>
>>
>> </ul>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1596415 - /tomcat/site/trunk/docs/ci.html
Posted by Konstantin Kolinko <kn...@gmail.com>.
2014-05-21 0:58 GMT+04:00 <sl...@apache.org>:
> Author: slaurent
> Date: Tue May 20 20:58:55 2014
> New Revision: 1596415
>
> URL: http://svn.apache.org/r1596415
> Log:
> fixed URLs to documentation snapshots
>
-1.
1. This shall be fixed not here, but in Buildbot configuration.
2. It writes documentation and coverage (and logs) into the same
place. Whether you are seeing docs or coverage depends on whether a
build is running in this very moment.
3. ci.html only? (Without xml)
> Modified:
> tomcat/site/trunk/docs/ci.html
>
> Modified: tomcat/site/trunk/docs/ci.html
> URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1596415&r1=1596414&r2=1596415&view=diff
> ==============================================================================
> --- tomcat/site/trunk/docs/ci.html (original)
> +++ tomcat/site/trunk/docs/ci.html Tue May 20 20:58:55 2014
> @@ -263,14 +263,14 @@ prepared and published by ASF Buildbot,
> <ul>
>
> <li>
> -<a href="http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html" rel="nofollow">Tomcat trunk</a> (8.0.x)</li>
> +<a href="http://ci.apache.org/projects/tomcat/tomcat8/index.html" rel="nofollow">Tomcat trunk</a> (8.0.x)</li>
>
> <li>
> -<a href="http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html" rel="nofollow">Tomcat 7.0.x</a>
> +<a href="http://ci.apache.org/projects/tomcat/tomcat7/index.html" rel="nofollow">Tomcat 7.0.x</a>
> </li>
>
> <li>
> -<a href="http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html" rel="nofollow">Tomcat 6.0.x</a>
> +<a href="http://ci.apache.org/projects/tomcat/tomcat6/index.html" rel="nofollow">Tomcat 6.0.x</a>
> </li>
>
> </ul>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org