You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Larry Isaacs <La...@sas.com> on 2000/10/07 22:01:44 UTC
RE: Dir structure, WAS - Re: cvs commit: jakarta-tomcat/src/doc i
ndex.html
Hi Rob,
I don't believe you can commit changes to two different branches in the
same commit. Thus, you have to apply the changes to each branch
separately. I plan to concentrate on tomcat_32 until it is released.
Then I plan to review the changes I have made just in tomcat_32 and
port the appropriate ones to the MAIN branch. Dual maintenance is a
pain, but there isn't a choice.
I think Alex is assuming that my commits are against the MAIN branch
where my "tomcat_32" adjustments would in fact be doing harm. Since
they are going against the "tomcat_32" branch, no harm is being done
to the MAIN branch.
At this late date, IMHO, I think it would be more trouble than it's
worth to have the tomcat_32 branch "doc" directory structure changed
to match the MAIN branch. I don't have a problem making the
adjustments needed to make a "Tomcat 3.3" document work in the "Tomcat 3.2" directory structure.
I'll go ahead and change the "Tomcat 3.2" to "Tomcat 3.3" and commit
your changes as it to index.html to the MAIN branch so it will be visible
there as well.
Cheers,
Larry
-----Original Message-----
From: Rob S.
To: tomcat-dev@jakarta.apache.org
Cc: Larry.Isaacs@sas.com; guru@edamame.stinky.com
Sent: 10/7/00 1:49 PM
Subject: Dir structure, WAS - Re: cvs commit: jakarta-tomcat/src/doc index.html
Since I'm using CVS, it's most definitely slifka.isBoneHead() again, so
please bear with me.
When I used WinCVS to pull down jakarta-tomcat and then jakarta-tomcat /
tomcat_32 branch, here's what I have in /src/doc
+ appdev
+ uguide
- ... lots of files
I was wondering why I didn't have tomcat-ug or styles.css in /src/doc,
but
then I checked and they're all under uguide. That's not how I thought
it
should be, at least according to the current CVS on the web which does
have
the "correct" structure:
+ appdev
(no uguide subdir anymore)
- tomcat-ug.html
- styles.css
etc... "Strange things are afoot at the Circle K."
Larry, I think this is what Alex was talking about. I remember seeing
his
"commits" for lots of changes to the repository and I saw those up on
the
web. I think because it's documentation changes that should be seen by
everyone and not just the 3.2 branch?
Alex?
- r
> -----Original Message-----
> From: Larry Isaacs [mailto:Larry.Isaacs@sas.com]
> Sent: October 7, 2000 5:42 AM
> To: 'tomcat-dev@jakarta.apache.org'
> Cc: 'Alex Chaffee '
> Subject: RE: cvs commit: jakarta-tomcat/src/doc index.html
>
>
> This file is being added to the "tomcat_32" branch, i.e.
>
> > Added: src/doc Tag: tomcat_32 index.html
> ^^^^^^^^^
> Since the file already existed in the MAIN branch, it did a diff
instead
> of simply adding the file. Note the the added file has a special
> revision number, i.e.
>
> > 1.5.2.1 +60 -21 jakarta-tomcat/src/doc/index.html
> ^^^^^^^
>
> This confirms that is it not modifying the MAIN branch, or the
revision
> number would have been 1.6. In WinCvs, if I do a "Graph selection",
it
> clearly shows the new index.html (revision 1.5.2.1) only in the
> "tomcat_32" branch. Doing an update to my MAIN branch leaves my 1.5
> revision index.html intact.
>
> I still don't see any harm being done to CVS. It seems to be doing
what
> it should. From what I can tell, your changes are untouched in the
MAIN
> branch. Are you seeing something different when when you do an
update?
>
> Larry
>
>
> -----Original Message-----
> From: Alex Chaffee
> To: tomcat-dev@jakarta.apache.org
> Cc: jakarta-tomcat-cvs@apache.org; Larry.Isaacs@sas.com
> Sent: 10/6/00 11:17 PM
> Subject: Re: cvs commit: jakarta-tomcat/src/doc index.html
>
> Stop! Please!
>
> Larry, you have an out-of-date copy of the repository! You're
> reverting changes I made months ago!
>
> The directory structure for doc and native has been changed. The
> files have been significantly altered. E.g. "uguide" and "jk" are no
> longer relevant. Please revert these latest changes and sync ASAP.
>
> Thanks -
>
> - Alex
>
>
> On Sat, Oct 07, 2000 at 02:16:00AM -0000, larryi@locus.apache.org
wrote:
> > larryi 00/10/06 19:16:00
> >
> > Added: src/doc Tag: tomcat_32 index.html
> > Log:
> > Adding index.html from Tomcat 3.3, improved by Rob Slifka.
> >
> > Small adjustments were made for Tomcat 3.2 differences.
> >
> > Revision Changes Path
> > No revision
> >
> >
> > No revision
> >
> >
> > 1.5.2.1 +60 -21 jakarta-tomcat/src/doc/index.html
> >
> > Index: index.html
> >
===================================================================
> > RCS file: /home/cvs/jakarta-tomcat/src/doc/index.html,v
> > retrieving revision 1.5
> > retrieving revision 1.5.2.1
> > diff -u -r1.5 -r1.5.2.1
> > --- index.html 2000/09/01 22:44:45 1.5
> > +++ index.html 2000/10/07 02:15:59 1.5.2.1
> > @@ -1,7 +1,7 @@
> >
> > <html>
> > <head>
> > - <!-- $Id: index.html,v 1.5 2000/09/01 22:44:45 nacho Exp $
-->
> > + <!-- $Id: index.html,v 1.5.2.1 2000/10/07 02:15:59 larryi Exp
$
> -->
> > <!-- Copyright 1999, Apache Software Foundation -->
> > <meta http-equiv="Content-Type" content="text/html;
> charset=iso-8859-1">
> > <link rel="stylesheet" href="style.css">
> > @@ -14,14 +14,14 @@
> > <td width="50%">
> > <p align="left">
> > <a href="http://jakarta.apache.org/index.html">
> > - <img src="images/banner.gif"
> > + <img src="uguide/images/banner.gif"
> > width="350"
> > height="100"
> > alt="The Jakarta Project"
> > border="0"></a>
> > </td>
> > <td width="50%">
> > - <p align="right"><img border="0"
src="images/tomcat.gif"
> width="100" height="71" alt="The mighty Tomcat - Meow!"></p>
> > + <p align="right"><img border="0"
> src="uguide/images/tomcat.gif" width="100" height="71" alt="The mighty
> Tomcat - Meow!"></p>
> > </td>
> > </tr>
> > </table>
> > @@ -29,30 +29,69 @@
> > <h1>Tomcat Documentation</h1>
> > <ul>
> >
> > -<li> <A HREF="tomcat-ug.html">Tomcat User's Guide</A>
> > +<li> <a href="readme">Tomcat 3.2 Release Notes</a><br>
> > +
> > </li>
> > -<li> <A HREF="appdev/contents.html">Application Development
> manual</A> -
> > - an alternative to the User's Guide, by Craig McClanahan,
somewhat
> > - out of date
> > -</li>
> >
> > -<li> <A HREF="faq">faq</A> [obsolete?]
> > +<li> Using Tomcat
> > + <ul>
> > + <li> <A HREF="uguide/tomcat_ug.html">Tomcat User's Guide</A>
-
> How to install,
> > + configure, and deploy Tomcat.</li>
> > + <li><a href="JDBCRealm.howto">JDBC Realms</a> - Use a set of
> > + configurable tables inside an RDBMS to store validation
> data.</li>
> > + <li><a href="Tomcat-Workers-HowTo.html">Tomcat Workers</a> -
> How to work
> > + with "Tomcat workers," and the worker.properties
> file.<br>
> > + </li>
> > + </ul>
> > </li>
> > -<li> <A HREF="readme">Tomcat 3.1 readme</A> [obsolete?]
> > +<li>Using Tomcat in Windows - documentation specific to running
> Tomcat in a
> > + Win32 environment
> > + <ul>
> > + <li><a href="NT-Service-howto.html">The Jakarta NT
Service</a>
> - Wrapping an
> > + NT Service around Tomcat.</li>
> > + <li><a href="in-process-howto.html">In-process HOWTO</a> -
How
> to set up
> > + Netscape/IIS web servers so that Tomcat will run inside the
> web server
> > + process.<br>
> > + </li>
> > + </ul>
> > </li>
> > -
> > -<li><a href="tomcat-apache-howto.html">Tomcat-Apache
HOWTO</a></li>
> > -<li><a href="mod_jk-howto.html">mod_jk HOWTO</a> [??? should be
> rolled into tomcat-apache howto]</li>
> > -<li><a href="tomcat-iis-howto.html">Tomcat-IIS HOWTO</a></li>
> > -<li><a href="tomcat-netscape-howto.html">Tomcat-Netscape
> HOWTO</a></li>
> > -<li><a href="tomcat-security.html">Using the Java SecurityManager
> with Tomcat</a></li>
> > -<li><a href="JDBCRealm-howto.html">JDBC Realm HOWTO</a></li>
> > -<li><a href="NT-Service-howto.html">NT Service HOWTO</a></li>
> > -<li><a href="Tomcat-Workers-HowTo.html">Tomcat Workers
> HOWTO</a></li>
> > -<li><a href="in-process-howto.html">In-process HOWTO</a></li>
> > -<li><a href="internal.html">Tomcat Internals
documentation</a></li>
> > +<li>Integrating Tomcat with a Web Server
> > + <ul>
> > + <li><a href="tomcat-apache-howto.html">Apache</a>
> > + <ul>
> > + <li><a href="mod_jk-howto.html">mod_jk</a> -
Installation
> and
> > + configuration</li>
> > + </ul>
> > + </li>
> > + <li><a href="tomcat-iis-howto.html">Internet Information
> Server</a></li>
> > + <li><a href="tomcat-netscape-howto.html">Netscape<br>
> > + </a> </li>
> > + </ul>
> > +</li>
> > +<li> <A HREF="appdev/contents.html">Application Development
> manual</A> - The
> > + steps required to build and deploy web applications within
Tomcat
> ( somewhat
> > + out of date).<br>
> > +</li>
> > +<li>Other Resources
> > + <ul>
> > + <li><a href="faq">Frequently Asked Questions</a></li>
> > + <li><a
> href="http://jakarta.apache.org/getinvolved/mail.html">Mailing
lists<br>
> > + </a> </li>
> > + </ul>
> > +</li>
> >
> > </ul>
> > +
> > + <table width="100%" border="0" cellpadding="10"
> cellspacing="0">
> > + <tr>
> > + <td>
> > + <p class="fineprint">
> > + Copyright ©1999-2000 The Apache Software
> Foundation<br>
> > + <a href="http://jakarta.apache.org/legal.html">Legal
> Stuff They Make Us Say</a><br>
> > + <a
> href="http://jakarta.apache.org/contact.html">Contact Information</a>
> </p>
> > + </td>
> > + </tr>
> > + </table>
> >
> > </body>
> > </html>
> >
> >
> >
> >
> >
---------------------------------------------------------------------
> > To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>
> --
> Alex Chaffee mailto:alex@jguru.com
> jGuru - Java News and FAQs http://www.jguru.com/alex/
> Creator of Gamelan http://www.gamelan.com/
> Founder of Purple Technology http://www.purpletech.com/
> Curator of Stinky Art Collective http://www.stinky.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org