mstover1 01/03/28 19:01:48
Modified: . LICENSE build.xml
bin jmeter.properties
Log:
new build.xml changes to reflect new release and move to Jakarta-JMeter
Revision Changes Path
1.3 +49 -47 jakarta-jmeter/LICENSE
Index: LICENSE
===================================================================
RCS file: /home/cvs/jakarta-jmeter/LICENSE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LICENSE 1999/02/24 15:29:39 1.2
+++ LICENSE 2001/03/29 03:01:48 1.3
@@ -1,49 +1,51 @@
+The Apache Software License, Version 1.1
- Copyright (c) 1998-99 The Java Apache Project. All rights reserved.
+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. All advertising materials mentioning features or use of this
- software must display the following acknowledgment:
- "This product includes software developed by the Java Apache
- Project (http://java.apache.org/)."
-
- 4. The names "Apache JMeter" and "Java Apache Project" 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 "Apache JMeter"
- nor may "Java Apache Project" appear in their names without
- prior written permission of the Java Apache Project.
-
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes software developed by the Java Apache
- Project (http://java.apache.org/)."
-
- THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "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 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 <http://java.apache.org/>.
\ No newline at end of file
+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
+<http://www.apache.org/>.
\ No newline at end of file
1.25 +5 -5 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 2001/03/12 23:57:37 1.24
+++ build.xml 2001/03/29 03:01:48 1.25
@@ -7,7 +7,7 @@
<property name="sources.src.dir" value="src"/>
<!-- Where the API documentation lives -->
<property name="docs.api.dest.dir" value="docs/api"/>
- <property name="version" value="_1.6.0Beta"/>
+ <property name="version" value="_1.6Alpha"/>
<property name="docs.src" value="./xdocs"/>
<property name="docs.dest" value="./docs"/>
@@ -143,11 +143,11 @@
- Creates the distribution packages
-->
<target name="dist" depends="install">
- <jar jarfile="../ApacheJMeter${version}.jar" basedir="../"
includes="jmeter/**" excludes="**/classes/**"/>
- <zip zipfile="../ApacheJMeter${version}.zip" basedir="../"
includes="jmeter/**" excludes="**/classes/**"/>
- <tar tarfile="../ApacheJMeter${version}.tar" basedir="../"
excludes="**/classes/**" includes="jmeter/**" />
+ <jar jarfile="../ApacheJMeter${version}.jar" basedir="../"
includes="jakarta-jmeter/**" excludes="**/classes/**,**/xdocs/**"/>
+ <zip zipfile="../ApacheJMeter${version}.zip" basedir="../"
includes="jakarta-jmeter/**" excludes="**/classes/**,**/xdocs/**"/>
+ <tar tarfile="../ApacheJMeter${version}.tar" basedir="../"
excludes="**/classes/**,**/xdocs/**" includes="jakarta-jmeter/**" />
<gzip zipfile="$../ApacheJMeter${version}.tar.gz"
src="../ApacheJMeter${version}.tar" />
- </target>
+ </target>
<!--
- Deletes old build files.
1.19 +2 -2 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jmeter.properties 2001/03/13 03:23:46 1.18
+++ jmeter.properties 2001/03/29 03:01:48 1.19
@@ -11,7 +11,7 @@
authorization=authorization
#Working directory
-user.dir=c:\\development\\saved_samples
+user.dir=.
# XML Reader(Parser) - Must implement SAX 2 specs
xml.parser=org.apache.xerces.parsers.SAXParser
@@ -28,7 +28,7 @@
plan.tree.icon=beaker.gif
# Remote Hosts
-remote_hosts=127.0.0.1
+#remote_hosts=127.0.0.1
not_in_menu=org.apache.jmeter.control.GenericController,org.apache.jmeter.control.DynamicController,org.apache.jmeter.protocol.http.control.Cookie,org.apache.jmeter.protocol.http.control.Authorization,org.apache.jmeter.config.LoginConfig
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
