mstover1    01/03/29 15:56:28

  Modified:    docs     license.html running.html
  Added:       xdocs    license.xml
  Log:
  updated license.xml
  
  Revision  Changes    Path
  1.4       +134 -79   jakarta-jmeter/docs/license.html
  
  Index: license.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/license.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- license.html      2000/06/24 21:23:34     1.3
  +++ license.html      2001/03/29 23:56:26     1.4
  @@ -1,79 +1,134 @@
  -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
  -<html>
  -
  -<head>
  -<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
  -<meta NAME="Author" CONTENT="Stefano Mazzocchi">
  -<title>Apache JMeter Public Licence</title>
  -</head>
  -
  -<body BGCOLOR="#FFFFFF">
  -
  -<h2 align="center"><img SRC="images/java-apache-project.gif" BORDER="0" 
HEIGHT="100"
  -WIDTH="609"></h2>
  -
  -<h1 align="center">Apache JMeter Public Licence</h1>
  -<div align="center"><center>
  -
  -<table border="0" width="80%" cellspacing="0" cellpadding="0">
  -  <tr>
  -    <td width="100%"><pre>
  - Copyright (c) 1998-99 The Java Apache Project.  All rights reserved.
  -
  - Redistribution and use in source and binary forms, with or without
  - modification, are permitted provided that the following conditions
  - are met:
  -
  - 1. Redistributions of source code must retain the above copyright
  -    notice, this list of conditions and the following disclaimer.
  -
  - 2. Redistributions in binary form must reproduce the above copyright
  -    notice, this list of conditions and the following disclaimer in
  -    the documentation and/or other materials provided with the
  -    distribution.
  -
  - 3. All advertising materials mentioning features or use of this
  -    software must display the following acknowledgment:
  -    &quot;This product includes software developed by the Java Apache 
  -    Project (http://java.apache.org/).&quot;
  -
  - 4. The names &quot;Apache JMeter&quot; and &quot;Java Apache Project&quot; must 
  -    not be used to endorse or promote products derived from this software 
  -    without prior written permission.
  -
  - 5. Products derived from this software may not be called &quot;Apache JMeter&quot;
  -    nor may &quot;Java Apache Project&quot; appear in their names without 
  -    prior written permission of the Java Apache Project.
  -
  - 6. Redistributions of any form whatsoever must retain the following
  -    acknowledgment:
  -    &quot;This product includes software developed by the Java Apache 
  -    Project (http://java.apache.org/).&quot;
  -    
  - THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT &quot;AS IS&quot; AND ANY
  - EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
  - ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  - OF THE POSSIBILITY OF SUCH DAMAGE.
  -
  - This software consists of voluntary contributions made by many
  - individuals on behalf of the Java Apache Project. For more information
  - on the Java Apache Project please see &lt;http://java.apache.org/&gt;.</pre>
  -    </td>
  -  </tr>
  -</table>
  -</center></div><font SIZE="-1">
  -
  -<p align="center">Copyright (c) 1998-99 <a HREF="http://java.apache.org">The Java 
Apache
  -Project</a>.<br>
  -$Id: license.html,v 1.3 2000/06/24 21:23:34 mstover Exp $<br>
  -All rights reserved.</font></p>
  -</body>
  -</html>
  +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd">
  +
  +<!-- Content Stylesheet for Site -->
  +
  +        
  +<!-- start the processing -->
  +    <!-- ====================================================================== -->
  +    <!-- Main Page Section -->
  +    <!-- ====================================================================== -->
  +    <html>
  +        <head>
  +            <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1"/>
  +
  +                                                    <meta name="author" 
value="Michael Stover, Brendan Burns, et al.">
  +            <meta name="email" value="[EMAIL PROTECTED]">
  +            
  +            <title>JMeter - License</title>
  +        </head>
  +
  +        <body bgcolor="#ffffff" text="#000000" link="#525D76">        
  +            <table border="0" width="100%" cellspacing="0">
  +                <!-- TOP IMAGE -->
  +                <tr>
  +                    <td colspan="2">
  +<a href="http://jakarta.apache.org"><img 
src="http://jakarta.apache.org/images/jakarta-logo.gif" align="left" border="0"/></a>
  +</td>
  +                </tr>
  +            </table>
  +            <table border="0" width="100%" cellspacing="4">
  +                <tr><td colspan="2">
  +                    <hr noshade="" size="1"/>
  +                </td></tr>
  +                
  +                <tr>
  +                    <!-- LEFT SIDE NAVIGATION -->
  +                    <td valign="top" nowrap="true">
  +                                <p><strong>About</strong></p>
  +        <ul>
  +                    <li>    <a href="./index.html">Overview</a>
  +</li>
  +                    <li>    <a href="./user_manual/index.html">Usage</a>
  +</li>
  +                    <li>    <a 
href="http://jakarta.apache.org/builds/jakarta-jmeter/">Download</a>
  +</li>
  +                    <li>    <a href="./installing.html">Install</a>
  +</li>
  +                    <li>    <a href="./running.html">Running</a>
  +</li>
  +                    <li>    <a href="./extending/index.html">Extending</a>
  +</li>
  +                    <li>    <a href="./changes.html">Changes</a>
  +</li>
  +                    <li>    <a href="./bugs.html">Known Bugs</a>
  +</li>
  +                    <li>    <a href="./license.html">License</a>
  +</li>
  +                    <li>    <a href="./todo.html">TODO</a>
  +</li>
  +                </ul>
  +            <p><strong>Community</strong></p>
  +        <ul>
  +                    <li>    <a 
href="http://jakarta.apache.org/site/getinvolved.html">Get Involved</a>
  +</li>
  +                    <li>    <a 
href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
  +</li>
  +                    <li>    <a 
href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
  +</li>
  +                </ul>
  +                        </td>
  +                    <td align="left" valign="top">
  +                                                                    <table 
border="0" cellspacing="0" cellpadding="2" width="100%">
  +      <tr><td bgcolor="#525D76">
  +        <font color="#ffffff" face="arial,helvetica,sanserif">
  +          <strong>Apache License</strong>
  +        </font>
  +      </td></tr>
  +      <tr><td>
  +        <blockquote>
  +                                    <pre>
  +
  +The Apache Software License, Version 1.1
  +
  + Copyright (c) 2001 The Apache Software Foundation.  All rights reserved.
  +
  + Redistribution and use in source and binary forms, with or without modification, 
are permitted provided that the following conditions are met:
  +
  + 1. Redistributions of source code must retain the above copyright notice, this 
list of conditions and the following disclaimer.
  +
  + 2. Redistributions in binary form must reproduce the above copyright notice, this 
list of conditions and the following disclaimer in the documentation and/or other 
materials provided with the distribution.
  +
  + 3. The end-user documentation included with the redistribution, if any, must 
include the following acknowledgment: "This product includes software developed by the 
Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment 
may appear in the software itself, if and wherever such third-party acknowledgments 
normally appear.
  +
  + 4. The names "Apache" and "Apache Software Foundation" and "Apache JMeter" must 
not be used to endorse or promote products derived from this software without prior 
written permission. For written permission, please contact [EMAIL PROTECTED]
  +
  + 5. Products derived from this software may not be called "Apache", "Apache 
JMeter", nor may "Apache" appear in their name, without prior written permission of 
the Apache Software Foundation.
  +
  + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, 
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE 
FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY 
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + =================================================================
  +
  + This software consists of voluntary contributions made by many individuals on 
behalf of the Apache Software Foundation.  For more information on the Apache Software 
Foundation, please see &lt;http://www.apache.org/&gt;.</pre>
  +                            </blockquote>
  +      </td></tr>
  +    </table>
  +                                        </td>
  +                </tr>
  +
  +                <!-- FOOTER -->
  +                <tr><td colspan="2">
  +                    <hr noshade="" size="1"/>
  +                </td></tr>
  +                <tr><td colspan="2">
  +                    <div align="center"><font color="#525D76" size="-1"><em>
  +                    Copyright &#169; 1999-2001, Apache Software Foundation
  +                    </em></font></div>
  +                </td></tr>
  +            </table>
  +        </body>
  +    </html>
  +<!-- end the processing -->
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  +
  
  
  
  1.12      +1 -1      jakarta-jmeter/docs/running.html
  
  Index: running.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/docs/running.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- running.html      2001/03/29 13:03:43     1.11
  +++ running.html      2001/03/29 23:56:26     1.12
  @@ -151,7 +151,7 @@
   </blockquote>
                                                   <p align="center"><font 
size="-1">Copyright (c) 1998-99 <a href="http://java.apache.org">The Java Apache
   Project</a>.<br />
  -$Id: running.html,v 1.11 2001/03/29 13:03:43 mstover1 Exp $</font> <br />
  +$Id: running.html,v 1.12 2001/03/29 23:56:26 mstover1 Exp $</font> <br />
   <font size="-1">All rights reserved.</font></p>
                               </blockquote>
         </td></tr>
  
  
  
  1.1                  jakarta-jmeter/xdocs/license.xml
  
  Index: license.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
    <properties>
         <author email="[EMAIL PROTECTED]">Michael Stover, Brendan Burns, et 
al.</author>
         <title>License</title>
    </properties>
  <body>
  <section name="Apache License">
  
  <pre>
  
  The Apache Software License, Version 1.1
  
   Copyright (c) 2001 The Apache Software Foundation.  All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modification, 
are permitted provided that the following conditions are met:
  
   1. Redistributions of source code must retain the above copyright notice, this list 
of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice, this 
list of conditions and the following disclaimer in the documentation and/or other 
materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must 
include the following acknowledgment: "This product includes software developed by the 
Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment 
may appear in the software itself, if and wherever such third-party acknowledgments 
normally appear.
  
   4. The names "Apache" and "Apache Software Foundation" and "Apache JMeter" must not 
be used to endorse or promote products derived from this software without prior 
written permission. For written permission, please contact [EMAIL PROTECTED]
  
   5. Products derived from this software may not be called "Apache", "Apache JMeter", 
nor may "Apache" appear in their name, without prior written permission of the Apache 
Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, 
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE 
FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY 
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   =================================================================
  
   This software consists of voluntary contributions made by many individuals on 
behalf of the Apache Software Foundation.  For more information on the Apache Software 
Foundation, please see &lt;http://www.apache.org/&gt;.</pre>
  
  </section>
  </body>
  </document>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to