You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2002/04/02 23:23:37 UTC

cvs commit: jakarta-avalon-excalibur/event build.xml

bloritsch    02/04/02 13:23:37

  Modified:    event    Tag: depchecking build.xml
  Added:       baxter/src/xdocs index.xml
               bzip2/src/xdocs index.xml
  Log:
  add a couple xdocs as a starter
  
  Revision  Changes    Path
  1.1                  jakarta-avalon-excalibur/baxter/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <!DOCTYPE document SYSTEM "dtd/document-v10.dtd">
  
  <document>
    <header>
      <title>Avalon Excalibur</title>
      <subtitle>Baxter JMX Utilities</subtitle>
      <authors>
        <person name="Peter Donald" email="peter@apache.org"/>
        <person name="Berin Loritsch" email="bloritsch@apache.org"/>
      </authors>
    </header>
    <body>
      <s1 title="Baxter">
        <warn>
          This package is under development, and the API is not
          guaranteed to be the same when it is ready for release.
          You can find this in the Scratchpad.jar file if you want
          to play with it.  Do not blame us if the next release of
          Excalibur breaks your code if you use this package.
        </warn>
        <p>
          Baxter is a set of base classes and utility classes that are enable
          rapid creation of MBeans via delegation and inheritance. These were
          originally derived from the Phoenix project.
        </p>
      </s1>
    </body>
    <footer>
      <legal>
        Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
        $Revision: 1.1 $ $Date: 2002/04/02 21:23:37 $
      </legal>
    </footer>
  </document>
  
  
  
  1.1                  jakarta-avalon-excalibur/bzip2/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <!DOCTYPE document SYSTEM "dtd/document-v10.dtd">
  
  <document>
    <header>
      <title>Avalon Excalibur</title>
      <subtitle>Bzip2 Utilities</subtitle>
      <authors>
        <person name="Peter Donald" email="peter@apache.org"/>
        <person name="Berin Loritsch" email="bloritsch@apache.org"/>
      </authors>
    </header>
    <body>
      <s1 title="Bzip2 Utils">
        <warn>
          This package is under development, and the API is not
          guaranteed to be the same when it is ready for release.
          You can find this in the Scratchpad.jar file if you want
          to play with it.  Do not blame us if the next release of
          Excalibur breaks your code if you use this package.
        </warn>
        <p>
          Streams that compress and decompress the BZip2 format (without the
          file header chars). Originally derived from code in the ant project.
        </p>
      </s1>
    </body>
    <footer>
      <legal>
        Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
        $Revision: 1.1 $ $Date: 2002/04/02 21:23:37 $
      </legal>
    </footer>
  </document>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.4   +5 -0      jakarta-avalon-excalibur/event/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- build.xml	1 Apr 2002 11:57:27 -0000	1.7.2.3
  +++ build.xml	2 Apr 2002 21:23:37 -0000	1.7.2.4
  @@ -17,9 +17,14 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  +<<<<<<< build.xml
  +	<pathelement location="${checkstyle.jar}"/>
  +	<pathelement location="${excalibur-concurrent.jar}"/>
  +=======
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-concurrent.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  +>>>>>>> 1.7
       </path>
       <property name="cp" refid="project.class.path"/>
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


RE: cvs commit: jakarta-avalon-excalibur/event build.xml

Posted by Berin Loritsch <bl...@apache.org>.
I'm sorry, I wasn't aware that CVS gave me a conflict for this
file.

> -----Original Message-----
> From: Peter Donald [mailto:peter@apache.org] 
> Sent: Tuesday, April 02, 2002 4:22 PM
> To: Avalon Developers List
> Subject: Re: cvs commit: jakarta-avalon-excalibur/event build.xml
> 
> 
> On Wed, 3 Apr 2002 07:23, bloritsch@apache.org wrote:
> >   1.7.2.4   +5 -0      jakarta-avalon-excalibur/event/build.xml
> >
> >   Index: build.xml
> >   
> ===================================================================
> >   RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
> >   retrieving revision 1.7.2.3
> >   retrieving revision 1.7.2.4
> >   diff -u -r1.7.2.3 -r1.7.2.4
> >   --- build.xml	1 Apr 2002 11:57:27 -0000	1.7.2.3
> >   +++ build.xml	2 Apr 2002 21:23:37 -0000	1.7.2.4
> >   @@ -17,9 +17,14 @@
> >            <pathelement path="${java.class.path}"/>
> >            <pathelement location="${build.classes}"/>
> >            <pathelement location="${junit.jar}"/>
> >   +<<<<<<< build.xml
> >   +	<pathelement location="${checkstyle.jar}"/>
> >   +	<pathelement location="${excalibur-concurrent.jar}"/>
> >   +=======
> >            <pathelement location="${excalibur-collections.jar}"/>
> >            <pathelement location="${excalibur-concurrent.jar}"/>
> >            <pathelement location="${checkstyle.jar}"/>
> >   +>>>>>>> 1.7
> >        </path>
> >        <property name="cp" refid="project.class.path"/>
> 
> Theres some bad karma here!
> 
> -- 
> Cheers,
> 
> Pete
> 
> ---------------------------------------
> Be nice to your friends. If it weren't 
> for them, you'd be a complete stranger.
> ---------------------------------------
> 
> --
> To unsubscribe, e-mail:   
> <mailto:avalon-dev-> unsubscribe@jakarta.apache.org>
> For 
> additional commands, 
> e-mail: <ma...@jakarta.apache.org>
> 


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: cvs commit: jakarta-avalon-excalibur/event build.xml

Posted by Peter Donald <pe...@apache.org>.
On Wed, 3 Apr 2002 07:23, bloritsch@apache.org wrote:
>   1.7.2.4   +5 -0      jakarta-avalon-excalibur/event/build.xml
>
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
>   retrieving revision 1.7.2.3
>   retrieving revision 1.7.2.4
>   diff -u -r1.7.2.3 -r1.7.2.4
>   --- build.xml	1 Apr 2002 11:57:27 -0000	1.7.2.3
>   +++ build.xml	2 Apr 2002 21:23:37 -0000	1.7.2.4
>   @@ -17,9 +17,14 @@
>            <pathelement path="${java.class.path}"/>
>            <pathelement location="${build.classes}"/>
>            <pathelement location="${junit.jar}"/>
>   +<<<<<<< build.xml
>   +	<pathelement location="${checkstyle.jar}"/>
>   +	<pathelement location="${excalibur-concurrent.jar}"/>
>   +=======
>            <pathelement location="${excalibur-collections.jar}"/>
>            <pathelement location="${excalibur-concurrent.jar}"/>
>            <pathelement location="${checkstyle.jar}"/>
>   +>>>>>>> 1.7
>        </path>
>        <property name="cp" refid="project.class.path"/>

Theres some bad karma here!

-- 
Cheers,

Pete

---------------------------------------
Be nice to your friends. If it weren't 
for them, you'd be a complete stranger.
---------------------------------------

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>