mstover1 01/10/02 19:22:15
Modified: . build.xml
src/org/apache/jmeter/protocol/http/control
CookieManager.java
src/org/apache/jmeter/util JMeterUtils.java
Log:
Automating version info into build
Revision Changes Path
1.37 +11 -5 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.xml 2001/09/24 13:16:59 1.36
+++ build.xml 2001/10/03 02:22:14 1.37
@@ -6,7 +6,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.7Beta"/>
+ <property name="version" value="1.7Beta"/>
<property name="docs.src" value="./xdocs"/>
<property name="docs.dest" value="./docs"/>
<property name="printable_docs.dest" value="./printable_docs"/>
@@ -74,6 +74,10 @@
-->
<target name="compile" depends="mail.message,ssl.message">
<mkdir dir="${classes.dest.dir}"/>
+ <copy
tofile="${sources.src.dir}/org/apache/jmeter/util/JMeterUtils.java_temp"
+ file="${sources.src.dir}/org/apache/jmeter/util/JMeterUtils.java"
overwrite="yes"/>
+ <replace
file="${sources.src.dir}/org/apache/jmeter/util/JMeterUtils.java"
+ token="@VERSION@" value="${version}"/>
<javac srcdir="${sources.src.dir}"
destdir="${classes.dest.dir}"
optimize="${optimize}">
@@ -91,6 +95,8 @@
<exclude
name="org/apache/jmeter/reporters/MailerResultCollector.java"
unless="javamail.complete"/>
<classpath refid="classpath"/>
</javac>
+ <copy
tofile="${sources.src.dir}/org/apache/jmeter/util/JMeterUtils.java"
+
file="${sources.src.dir}/org/apache/jmeter/util/JMeterUtils.java_temp"
overwrite="yes"/>
</target>
<target name="rmi" depends="compile">
<rmic classpath="bin/classes" base="bin/classes"
classname="org.apache.jmeter.engine.RemoteJMeterEngineImpl"/>
@@ -155,10 +161,10 @@
- Creates the distribution packages
-->
<target name="dist" depends="install">
- <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" />
+ <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>
<!--
1.13 +3 -1
jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/CookieManager.java
Index: CookieManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/CookieManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CookieManager.java 2001/08/30 17:19:02 1.12
+++ CookieManager.java 2001/10/03 02:22:15 1.13
@@ -73,7 +73,7 @@
* pass cookies along with a request.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Dowd</a>
- * @version $Revision: 1.12 $ $Date: 2001/08/30 17:19:02 $
+ * @version $Revision: 1.13 $ $Date: 2001/10/03 02:22:15 $
*/
public class CookieManager implements ConfigElement,JMeterComponentModel,Saveable,
Serializable
@@ -347,7 +347,9 @@
}
if (newCookie.getExpires() >= System.currentTimeMillis())
+ {
cookies.add(newCookie);
+ }
}
public void removeCookieNamed(String name) {
1.16 +3 -54 jakarta-jmeter/src/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JMeterUtils.java 2001/10/01 12:19:30 1.15
+++ JMeterUtils.java 2001/10/03 02:22:15 1.16
@@ -80,7 +80,7 @@
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
*@created June 28, 2001
- *@version $Revision: 1.15 $ $Date: 2001/10/01 12:19:30 $
+ *@version $Revision: 1.16 $ $Date: 2001/10/03 02:22:15 $
*/
public class JMeterUtils
@@ -714,58 +714,37 @@
public static String[] split(String splittee, String splitChar)
{
-
if (splittee == null || splitChar == null)
{
-
return new String[0];
}
-
StringTokenizer tokens;
-
String temp;
-
int spot;
-
while ((spot = splittee.indexOf(splitChar + splitChar)) != -1)
{
-
splittee = splittee.substring(0, spot + splitChar.length()) +
splittee.substring(spot + 2 *
splitChar.length(),
splittee.length());
}
-
Vector returns = new Vector();
-
int start = 0;
-
int length = splittee.length();
-
spot = 0;
-
while (start < length && (spot = splittee.indexOf(splitChar, start)) >
-1)
{
-
if (spot > 0)
{
-
returns.addElement(splittee.substring(start, spot));
}
-
start = spot + splitChar.length();
-
}
-
if (start < length)
{
-
returns.add(splittee.substring(start));
}
-
String[] values = new String[returns.size()];
-
returns.copyInto(values);
-
return values;
}
// End Method
@@ -784,58 +763,37 @@
public static String[] split(String splittee, String splitChar, String def)
{
-
if (splittee == null || splitChar == null)
{
-
return new String[0];
}
-
StringTokenizer tokens;
-
String temp;
-
int spot;
-
while ((spot = splittee.indexOf(splitChar + splitChar)) != -1)
{
-
splittee = splittee.substring(0, spot + splitChar.length()) +
def +
splittee.substring(spot + 1 *
splitChar.length(),
splittee.length());
}
-
Vector returns = new Vector();
-
int start = 0;
-
int length = splittee.length();
-
spot = 0;
-
while (start < length && (spot = splittee.indexOf(splitChar, start)) >
-1)
{
-
if (spot > 0)
{
-
returns.addElement(splittee.substring(start, spot));
}
-
start = spot + splitChar.length();
-
}
-
if (start < length)
{
-
returns.add(splittee.substring(start));
}
-
String[] values = new String[returns.size()];
-
returns.copyInto(values);
-
return values;
}
@@ -937,29 +895,19 @@
public static int findInArray(String[] array, String value)
{
-
int count = -1;
-
int index = -1;
-
if (array != null && value != null)
{
-
while (++count < array.length)
{
-
if (array[count] != null && array[count].equals(value))
{
-
index = count;
-
break;
}
-
}
-
}
-
return index;
}
@@ -1048,12 +996,13 @@
}
// End Method
+
/**
* Gets the JMeter Version.
* @returns the JMeter version.
*/
public static String getJMeterVersion()
{
- return "1.7Beta";
+ return "@VERSION@";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
