Upgrade to JMeter 1.8.

4 files changed, 682 insertions, 575 deletions

diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index ddf97936596c..64ed36eadd51 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jmeter
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-jmeter/release/v${PORTVERSION}/ \
 		http://www.metaverse.nl/~ernst/ \
@@ -17,20 +17,13 @@ DISTNAME=	ApacheJMeter_${PORTVERSION}
 
 MAINTAINER=	znerd@FreeBSD.org
 
-BUILD_DEPENDS=	${DOS2UNIX}:${PORTSDIR}/converters/unix2dos
-
 USE_JAVA=	1.2+
 NO_BUILD=	yes
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${PORTVERSION}
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
-DOS2UNIX=	${LOCALBASE}/bin/dos2unix
-REPLACE_FILES=	${WRKSRC}/bin/jmeter \
-		${WRKSRC}/bin/jmeter-cl \
-		${WRKSRC}/bin/jmeter-client \
-		${WRKSRC}/bin/jmeter-server \
-		${WRKSRC}/bin/nongui.sh
+REPLACE_FILES=	${WRKSRC}/bin/jmeter
 
 post-patch:
 	@${ECHO_CMD} -n ">> Removing unneeded files..."
@@ -41,9 +34,7 @@ post-patch:
 	@${ECHO_CMD} -n ">> Customizing `basename $f`..."
 	@${SED} \
 	-e "/%%JAVA%%/s//${JAVA:S/\//\\\//g}/g" \
-	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	$f > ${WRKDIR}/`basename $f`
-	@${DOS2UNIX} ${WRKDIR}/`basename $f`
 	@${ECHO_CMD} " [ DONE ]"
 .endfor
 
@@ -59,11 +50,6 @@ do-install:
 .endfor
 	@${ECHO_CMD} " [ DONE ]"
 
-	@${ECHO_CMD} -n ">> Fixing permissions..."
-	@${CHMOD} 755 `find ${APP_HOME} -type d`
-	@${CHMOD} 755 ${APP_HOME}/bin/ ${APP_HOME}/bin/jmeter ${APP_HOME}/bin/jmeter-cl ${APP_HOME}/bin/jmeter-client ${APP_HOME}/bin/jmeter-server
-	@${ECHO_CMD} " [ DONE ]"
-
 	@${ECHO_CMD} -n ">> Creating symlink ${PREFIX}/bin/jmeter..."
 	@${LN} -s ${APP_HOME}/bin/jmeter ${PREFIX}/bin/jmeter
 	@${ECHO_CMD} " [ DONE ]"
diff --git a/www/jakarta-jmeter/distinfo b/www/jakarta-jmeter/distinfo
index b275ca4df1f0..12fb9dd2555e 100644
--- a/www/jakarta-jmeter/distinfo
+++ b/www/jakarta-jmeter/distinfo
@@ -1 +1 @@
-MD5 (ApacheJMeter_1.7.tar.gz) = 57912995cd1e64096ea2a855427fe902
+MD5 (ApacheJMeter_1.8.tar.gz) = 8f828c7b0e62ec2cbdb2960e7ce97a0d
diff --git a/www/jakarta-jmeter/files/patch-aa b/www/jakarta-jmeter/files/patch-aa
index 7457cc5dbed8..a51f322237c9 100644
--- a/www/jakarta-jmeter/files/patch-aa
+++ b/www/jakarta-jmeter/files/patch-aa
@@ -1,29 +1,7 @@
---- bin/jmeter.orig	Sat Jul 28 02:14:04 2001
-+++ bin/jmeter	Fri Aug 16 09:16:07 2002
-@@ -2,7 +2,7 @@
- USAGE=$0" [-h proxyHost] [-p proxyPort] [-f property-file]"

- LOG4JCONFIG=log4j.configuration=log4j.conf

- 

--PROPERTIES=`dirname $0`/jmeter.properties

-+PROPERTIES=%%APP_HOME%%/bin/jmeter.properties

- 

- while getopts h:p:f: x; do

- 	 case $x in

-@@ -13,14 +13,14 @@
- 	 esac;

- done

- 

--for i in `dirname $0`/../lib/*.jar

-+for i in %%APP_HOME%%/lib/*.jar

- do

-     CLASSPATH=${CLASSPATH}:$i

- done

- 

--for i in `dirname $0`/../ext/*.jar

-+for i in %%APP_HOME%%/*.jar

- do

-     CLASSPATH=${CLASSPATH}:$i

- done

- 

--java -classpath $CLASSPATH:`dirname $0`/ApacheJMeter.jar $JAVA_PROPS -D$LOG4JCONFIG org.apache.jmeter.NewDriver $PROPERTIES

-+%%JAVA%% -classpath $CLASSPATH:%%APP_HOME%%/bin/ApacheJMeter.jar $JAVA_PROPS -D$LOG4JCONFIG org.apache.jmeter.NewDriver $PROPERTIES

+--- bin/jmeter.old	Wed Nov 13 11:03:46 2002
++++ bin/jmeter	Wed Nov 13 11:04:14 2002
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+ 
+-java -Xincgc -jar `dirname $0`/ApacheJMeter.jar "$@"
++%%JAVA%% -jar `dirname $0`/ApacheJMeter.jar "$@"
diff --git a/www/jakarta-jmeter/pkg-plist b/www/jakarta-jmeter/pkg-plist
index 429da3b4d9fb..f7623d9a4aab 100644
--- a/www/jakarta-jmeter/pkg-plist
+++ b/www/jakarta-jmeter/pkg-plist
@@ -1,37 +1,475 @@
 bin/jmeter
+%%T%%/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
+%%T%%/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
+%%T%%/src/components/org/apache/jmeter/modifiers/UserParameters.java
+%%T%%/src/components/org/apache/jmeter/modifiers/CounterConfig.java
+%%T%%/src/components/org/apache/jmeter/config/gui/ArgumentsPanel.java
+%%T%%/src/components/org/apache/jmeter/config/gui/LoginConfigGui.java
+%%T%%/src/components/org/apache/jmeter/config/Argument.java
+%%T%%/src/components/org/apache/jmeter/config/Arguments.java
+%%T%%/src/components/org/apache/jmeter/config/LoginConfig.java
+%%T%%/src/components/org/apache/jmeter/control/gui/LoopControlPanel.java
+%%T%%/src/components/org/apache/jmeter/control/gui/InterleaveControlGui.java
+%%T%%/src/components/org/apache/jmeter/control/gui/LogicControllerGui.java
+%%T%%/src/components/org/apache/jmeter/control/gui/RecordController.java
+%%T%%/src/components/org/apache/jmeter/control/gui/ModifyControllerGui.java
+%%T%%/src/components/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
+%%T%%/src/components/org/apache/jmeter/control/gui/RandomControlGui.java
+%%T%%/src/components/org/apache/jmeter/control/GenericController.java
+%%T%%/src/components/org/apache/jmeter/control/InterleaveControl.java
+%%T%%/src/components/org/apache/jmeter/control/OnceOnlyController.java
+%%T%%/src/components/org/apache/jmeter/control/RandomController.java
+%%T%%/src/components/org/apache/jmeter/control/ModifyController.java
+%%T%%/src/components/org/apache/jmeter/control/LoopController.java
+%%T%%/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
+%%T%%/src/components/org/apache/jmeter/assertions/gui/DurationAssertionGui.java
+%%T%%/src/components/org/apache/jmeter/assertions/DurationAssertion.java
+%%T%%/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
+%%T%%/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
+%%T%%/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
+%%T%%/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
+%%T%%/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
+%%T%%/src/components/org/apache/jmeter/timers/ConstantTimer.java
+%%T%%/src/components/org/apache/jmeter/timers/GaussianRandomTimer.java
+%%T%%/src/components/org/apache/jmeter/timers/RandomTimer.java
+%%T%%/src/components/org/apache/jmeter/timers/UniformRandomTimer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/WindowedVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/BarVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/Graph.java
+%%T%%/src/components/org/apache/jmeter/visualizers/GraphAccum.java
+%%T%%/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
+%%T%%/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/GraphModel.java
+%%T%%/src/components/org/apache/jmeter/visualizers/AssertionVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/ModelListener.java
+%%T%%/src/components/org/apache/jmeter/visualizers/RunningSample.java
+%%T%%/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/Sample.java
+%%T%%/src/components/org/apache/jmeter/visualizers/Spline3.java
+%%T%%/src/components/org/apache/jmeter/visualizers/SplineModel.java
+%%T%%/src/components/org/apache/jmeter/visualizers/StatVisualizerModel.java
+%%T%%/src/components/org/apache/jmeter/visualizers/TableDataModel.java
+%%T%%/src/components/org/apache/jmeter/visualizers/TreeVisualizer.java
+%%T%%/src/components/org/apache/jmeter/visualizers/MailerModel.java
+%%T%%/src/core/org/apache/jmeter/samplers/gui/AbstractSamplerGui.java
+%%T%%/src/core/org/apache/jmeter/samplers/AbstractSampler.java
+%%T%%/src/core/org/apache/jmeter/samplers/Clearable.java
+%%T%%/src/core/org/apache/jmeter/samplers/CycleEntry.java
+%%T%%/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
+%%T%%/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
+%%T%%/src/core/org/apache/jmeter/samplers/RemoteSampleListenerWrapper.java
+%%T%%/src/core/org/apache/jmeter/samplers/RemoteTestListenerWrapper.java
+%%T%%/src/core/org/apache/jmeter/samplers/Remoteable.java
+%%T%%/src/core/org/apache/jmeter/samplers/SampleEvent.java
+%%T%%/src/core/org/apache/jmeter/samplers/SampleListener.java
+%%T%%/src/core/org/apache/jmeter/samplers/Sampler.java
+%%T%%/src/core/org/apache/jmeter/samplers/Entry.java
+%%T%%/src/core/org/apache/jmeter/samplers/SampleResult.java
+%%T%%/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
+%%T%%/src/core/org/apache/jmeter/config/gui/AbstractConfigGui.java
+%%T%%/src/core/org/apache/jmeter/config/gui/AbstractModifierGui.java
+%%T%%/src/core/org/apache/jmeter/config/gui/AbstractResponseBasedModifierGui.java
+%%T%%/src/core/org/apache/jmeter/config/ConfigElement.java
+%%T%%/src/core/org/apache/jmeter/config/ConfigTestElement.java
+%%T%%/src/core/org/apache/jmeter/config/ExtensionsFileFilter.java
+%%T%%/src/core/org/apache/jmeter/config/Modifier.java
+%%T%%/src/core/org/apache/jmeter/config/ResponseBasedModifier.java
+%%T%%/src/core/org/apache/jmeter/control/gui/AbstractControllerGui.java
+%%T%%/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
+%%T%%/src/core/org/apache/jmeter/control/gui/WorkBenchGui.java
+%%T%%/src/core/org/apache/jmeter/control/Controller.java
+%%T%%/src/core/org/apache/jmeter/control/NoEntryException.java
+%%T%%/src/core/org/apache/jmeter/engine/TreeCloner.java
+%%T%%/src/core/org/apache/jmeter/engine/ConvertListeners.java
+%%T%%/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
+%%T%%/src/core/org/apache/jmeter/engine/JMeterEngine.java
+%%T%%/src/core/org/apache/jmeter/engine/JMeterEngineException.java
+%%T%%/src/core/org/apache/jmeter/engine/LagDetector.java
+%%T%%/src/core/org/apache/jmeter/engine/PreCompiler.java
+%%T%%/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
+%%T%%/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
+%%T%%/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
+%%T%%/src/core/org/apache/jmeter/exceptions/IllegalUserActionException.java
+%%T%%/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
+%%T%%/src/core/org/apache/jmeter/functions/AbstractFunction.java
+%%T%%/src/core/org/apache/jmeter/functions/CompoundFunction.java
+%%T%%/src/core/org/apache/jmeter/functions/InvalidVariableException.java
+%%T%%/src/core/org/apache/jmeter/functions/UnknownFunction.java
+%%T%%/src/core/org/apache/jmeter/functions/ValueReplacer.java
+%%T%%/src/core/org/apache/jmeter/functions/Function.java
+%%T%%/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
+%%T%%/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
+%%T%%/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
+%%T%%/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
+%%T%%/src/core/org/apache/jmeter/gui/util/MenuFactory.java
+%%T%%/src/core/org/apache/jmeter/gui/util/FilePanel.java
+%%T%%/src/core/org/apache/jmeter/gui/util/FocusRequester.java
+%%T%%/src/core/org/apache/jmeter/gui/util/JLabeledTextField.java_old
+%%T%%/src/core/org/apache/jmeter/gui/util/JMeterColor.java
+%%T%%/src/core/org/apache/jmeter/gui/util/MenuInfo.java
+%%T%%/src/core/org/apache/jmeter/gui/util/NumberFieldErrorListener.java
+%%T%%/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
+%%T%%/src/core/org/apache/jmeter/gui/util/TextAreaCellRenderer.java
+%%T%%/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java
+%%T%%/src/core/org/apache/jmeter/gui/util/FileDialoger.java
+%%T%%/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
+%%T%%/src/core/org/apache/jmeter/gui/util/ButtonPanel.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Clear.java
+%%T%%/src/core/org/apache/jmeter/gui/action/AbstractAction.java
+%%T%%/src/core/org/apache/jmeter/gui/action/ActionRouter.java
+%%T%%/src/core/org/apache/jmeter/gui/action/AddParent.java
+%%T%%/src/core/org/apache/jmeter/gui/action/AddToTree.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Analyze.java
+%%T%%/src/core/org/apache/jmeter/gui/action/CheckDirty.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Load.java
+%%T%%/src/core/org/apache/jmeter/gui/action/GlobalMouseListener.java
+%%T%%/src/core/org/apache/jmeter/gui/action/RemoteStart.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Command.java
+%%T%%/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java
+%%T%%/src/core/org/apache/jmeter/gui/action/DragNDrop.java
+%%T%%/src/core/org/apache/jmeter/gui/action/EnableComponent.java
+%%T%%/src/core/org/apache/jmeter/gui/action/ExitCommand.java
+%%T%%/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+%%T%%/src/core/org/apache/jmeter/gui/action/New.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Remove.java
+%%T%%/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Save.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Start.java
+%%T%%/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
+%%T%%/src/core/org/apache/jmeter/gui/action/EditCommand.java
+%%T%%/src/core/org/apache/jmeter/gui/action/Help.java
+%%T%%/src/core/org/apache/jmeter/gui/action/AboutCommand.java
+%%T%%/src/core/org/apache/jmeter/gui/GuiPackage.java
+%%T%%/src/core/org/apache/jmeter/gui/GuiReady.java
+%%T%%/src/core/org/apache/jmeter/gui/JMeterComponentModel.java
+%%T%%/src/core/org/apache/jmeter/gui/JMeterFileFilter.java
+%%T%%/src/core/org/apache/jmeter/gui/JMeterGUIComponent.java
+%%T%%/src/core/org/apache/jmeter/gui/JMeterJListModel.java
+%%T%%/src/core/org/apache/jmeter/gui/NamePanel.java
+%%T%%/src/core/org/apache/jmeter/gui/ListDialog.java
+%%T%%/src/core/org/apache/jmeter/gui/MainFrame.java
+%%T%%/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
+%%T%%/src/core/org/apache/jmeter/gui/GuiFactory.java
+%%T%%/src/core/org/apache/jmeter/images/timer.gif
+%%T%%/src/core/org/apache/jmeter/images/clear.on.gif
+%%T%%/src/core/org/apache/jmeter/images/feather.gif
+%%T%%/src/core/org/apache/jmeter/images/Delete24.gif
+%%T%%/src/core/org/apache/jmeter/images/Delete24.off.gif
+%%T%%/src/core/org/apache/jmeter/images/Delete24.on.gif
+%%T%%/src/core/org/apache/jmeter/images/Delete24.over.gif
+%%T%%/src/core/org/apache/jmeter/images/Edit24.down.gif
+%%T%%/src/core/org/apache/jmeter/images/clear.over.gif
+%%T%%/src/core/org/apache/jmeter/images/Edit24.gif
+%%T%%/src/core/org/apache/jmeter/images/Edit24.off.gif
+%%T%%/src/core/org/apache/jmeter/images/leafnode.gif
+%%T%%/src/core/org/apache/jmeter/images/knob.gif
+%%T%%/src/core/org/apache/jmeter/images/Edit24.on.gif
+%%T%%/src/core/org/apache/jmeter/images/Edit24.over.gif
+%%T%%/src/core/org/apache/jmeter/images/New24.down.gif
+%%T%%/src/core/org/apache/jmeter/images/clipboard.gif
+%%T%%/src/core/org/apache/jmeter/images/jmeter.jpg
+%%T%%/src/core/org/apache/jmeter/images/New24.gif
+%%T%%/src/core/org/apache/jmeter/images/New24.off.gif
+%%T%%/src/core/org/apache/jmeter/images/ear.gif
+%%T%%/src/core/org/apache/jmeter/images/New24.on.gif
+%%T%%/src/core/org/apache/jmeter/images/New24.over.gif
+%%T%%/src/core/org/apache/jmeter/images/Open24.down.gif
+%%T%%/src/core/org/apache/jmeter/images/Open24.gif
+%%T%%/src/core/org/apache/jmeter/images/Open24.off.gif
+%%T%%/src/core/org/apache/jmeter/images/Open24.on.gif
+%%T%%/src/core/org/apache/jmeter/images/Open24.over.gif
+%%T%%/src/core/org/apache/jmeter/images/SaveAll24.down.gif
+%%T%%/src/core/org/apache/jmeter/images/SaveAll24.gif
+%%T%%/src/core/org/apache/jmeter/images/SaveAll24.off.gif
+%%T%%/src/core/org/apache/jmeter/images/SaveAll24.on.gif
+%%T%%/src/core/org/apache/jmeter/images/SaveAll24.over.gif
+%%T%%/src/core/org/apache/jmeter/images/about.down.gif
+%%T%%/src/core/org/apache/jmeter/images/about.off.gif
+%%T%%/src/core/org/apache/jmeter/images/about.on.gif
+%%T%%/src/core/org/apache/jmeter/images/about.over.gif
+%%T%%/src/core/org/apache/jmeter/images/beaker.gif
+%%T%%/src/core/org/apache/jmeter/images/clear.down.gif
+%%T%%/src/core/org/apache/jmeter/images/clear.off.gif
+%%T%%/src/core/org/apache/jmeter/images/smallthread.disabled.gif
+%%T%%/src/core/org/apache/jmeter/images/smallthread.enabled.gif
+%%T%%/src/core/org/apache/jmeter/images/smallthread.idle.gif
+%%T%%/src/core/org/apache/jmeter/images/start.down.gif
+%%T%%/src/core/org/apache/jmeter/images/start.off.gif
+%%T%%/src/core/org/apache/jmeter/images/start.on.gif
+%%T%%/src/core/org/apache/jmeter/images/start.over.gif
+%%T%%/src/core/org/apache/jmeter/images/stop.down.gif
+%%T%%/src/core/org/apache/jmeter/images/stop.off.gif
+%%T%%/src/core/org/apache/jmeter/images/stop.on.gif
+%%T%%/src/core/org/apache/jmeter/images/stop.over.gif
+%%T%%/src/core/org/apache/jmeter/images/thread.disabled.gif
+%%T%%/src/core/org/apache/jmeter/images/thread.enabled.gif
+%%T%%/src/core/org/apache/jmeter/images/thread.gif
+%%T%%/src/core/org/apache/jmeter/images/thread.idle.gif
+%%T%%/src/core/org/apache/jmeter/images/Delete24.down.gif
+%%T%%/src/core/org/apache/jmeter/junit/JMeterTest.java
+%%T%%/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
+%%T%%/src/core/org/apache/jmeter/reporters/FileReporter.java
+%%T%%/src/core/org/apache/jmeter/reporters/ResultCollector.java
+%%T%%/src/core/org/apache/jmeter/resources/messages.properties
+%%T%%/src/core/org/apache/jmeter/resources/messages_de.properties
+%%T%%/src/core/org/apache/jmeter/resources/messages_ja.properties
+%%T%%/src/core/org/apache/jmeter/resources/messages_no.properties
+%%T%%/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
+%%T%%/src/core/org/apache/jmeter/assertions/Assertion.java
+%%T%%/src/core/org/apache/jmeter/assertions/AssertionResult.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/JdbcTestSampleHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/ArgumentsHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/AssertionHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/AuthManagerHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/CookieManagerHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/FilerHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/FtpTestHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/GenericControllerHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/HeaderManagerHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/HttpTestSampleHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/JMeterComponentHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/JMeterHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/LoopControlHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/ParamMaskHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/ProxyControlHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/TestPlanHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/ThreadGroupHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/TimerHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/handlers/AbstractConfigElementHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/xml/NameSpaceHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/xml/NoCurrentHandlerException.java
+%%T%%/src/core/org/apache/jmeter/save/old/xml/TagHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/xml/XmlHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/BadHandlerException.java
+%%T%%/src/core/org/apache/jmeter/save/old/JMeterNameSpaceHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/SaveHandler.java
+%%T%%/src/core/org/apache/jmeter/save/old/Saveable.java
+%%T%%/src/core/org/apache/jmeter/save/SaveService.java
+%%T%%/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
+%%T%%/src/core/org/apache/jmeter/testelement/PerThreadClonable.java
+%%T%%/src/core/org/apache/jmeter/testelement/TestElement.java
+%%T%%/src/core/org/apache/jmeter/testelement/TestListener.java
+%%T%%/src/core/org/apache/jmeter/testelement/TestPlan.java
+%%T%%/src/core/org/apache/jmeter/testelement/ThreadListener.java
+%%T%%/src/core/org/apache/jmeter/testelement/VariablesCollection.java
+%%T%%/src/core/org/apache/jmeter/testelement/WorkBench.java
+%%T%%/src/core/org/apache/jmeter/testelement/PerSampleClonable.java
+%%T%%/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
+%%T%%/src/core/org/apache/jmeter/threads/JMeterThreadMonitor.java
+%%T%%/src/core/org/apache/jmeter/threads/JMeterVariables.java
+%%T%%/src/core/org/apache/jmeter/threads/ReflectionThreadGroup.java
+%%T%%/src/core/org/apache/jmeter/threads/SamplePackage.java
+%%T%%/src/core/org/apache/jmeter/threads/ListenerNotifier.java
+%%T%%/src/core/org/apache/jmeter/threads/ThreadGroup.java
+%%T%%/src/core/org/apache/jmeter/threads/JMeterThread.java
+%%T%%/src/core/org/apache/jmeter/threads/TestCompiler.java
+%%T%%/src/core/org/apache/jmeter/timers/gui/AbstractTimerGui.java
+%%T%%/src/core/org/apache/jmeter/timers/Timer.java
+%%T%%/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java
+%%T%%/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
+%%T%%/src/core/org/apache/jmeter/util/keystore/PKCS12KeyStore.java
+%%T%%/src/core/org/apache/jmeter/util/SSLManager.java
+%%T%%/src/core/org/apache/jmeter/util/ColorHelper.java
+%%T%%/src/core/org/apache/jmeter/util/JsseSSLManager.java
+%%T%%/src/core/org/apache/jmeter/util/StringUtilities.java
+%%T%%/src/core/org/apache/jmeter/util/NamedObject.java
+%%T%%/src/core/org/apache/jmeter/util/JMeterUtils.java
+%%T%%/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
+%%T%%/src/core/org/apache/jmeter/visualizers/GraphAccumListener.java
+%%T%%/src/core/org/apache/jmeter/visualizers/GraphListener.java
+%%T%%/src/core/org/apache/jmeter/visualizers/ImageVisualizer.java
+%%T%%/src/core/org/apache/jmeter/visualizers/Visualizer.java
+%%T%%/src/core/org/apache/jmeter/visualizers/AccumListener.java
+%%T%%/src/core/org/apache/jmeter/swing/HtmlPane.java
+%%T%%/src/core/org/apache/jmeter/JMeter.java
+%%T%%/src/core/org/apache/jmeter/NewDriver.java
+%%T%%/src/core/org/apache/jmeter/ProxyAuthenticator.java
+%%T%%/src/core/org/apache/jmeter/help.txt
+%%T%%/src/core/MANIFEST
+%%T%%/src/functions/org/apache/jmeter/functions/IterationCounter.java
+%%T%%/src/functions/org/apache/jmeter/functions/RegexFunction.java
+%%T%%/src/functions/org/apache/jmeter/functions/ThreadNumber.java
+%%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
+%%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/FtpConfig.java
+%%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
+%%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FtpClient.java
+%%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
+%%T%%/src/protocol/http/org/apache/jmeter/junit/protocol/http/config/HttpConfigSuite.java
+%%T%%/src/protocol/http/org/apache/jmeter/junit/protocol/http/config/UrlConfigTest.java
+%%T%%/src/protocol/http/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/parser/FormElement.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlForm.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParser.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/SoapSamplerGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamModifier.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterModifier.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLErrorHandler.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Admin.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Cache.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Config.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/util/Base64Encoder.java
+%%T%%/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java
+%%T%%/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
+%%T%%/src/protocol/java/org/apache/jmeter/protocol/java/config/JavaConfig.java
+%%T%%/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
+%%T%%/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
+%%T%%/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerClient.java
+%%T%%/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DbConfig.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/control/gui/JdbcTestSampleGui.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/ConnectionObject.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/DBConnectionManager.java
+%%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/DBKey.java
+%%T%%/src/protocol/jndi/config/gui/JndiConfigGui.java
+%%T%%/src/protocol/jndi/config/gui/LookupConfigGui.java
+%%T%%/src/protocol/jndi/config/gui/MethodConfigDialog.java
+%%T%%/src/protocol/jndi/config/gui/MethodConfigGui.java
+%%T%%/src/protocol/jndi/config/JndiConfig.java
+%%T%%/src/protocol/jndi/config/LookupConfig.java
+%%T%%/src/protocol/jndi/config/MethodConfig.java
+%%T%%/src/protocol/jndi/config/MethodConfigUserObject.java
+%%T%%/src/protocol/jndi/config/MethodConfigUserObjectException.java
+%%T%%/src/protocol/jndi/control/gui/JndiTestSampleGui.java
+%%T%%/src/protocol/jndi/control/JndiTestSample.java
+%%T%%/src/protocol/jndi/sampler/JNDISampler.java
+%%T%%/src/jorphan/org/apache/jorphan/io/TextFile.java
+%%T%%/src/jorphan/org/apache/jorphan/collections/HashTree.java
+%%T%%/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
+%%T%%/src/jorphan/org/apache/jorphan/collections/Data.java
+%%T%%/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
+%%T%%/src/jorphan/org/apache/jorphan/collections/HashTreeTraverser.java
+%%T%%/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
+%%T%%/src/jorphan/org/apache/jorphan/logging/LoggingManager.java
+%%T%%/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
+%%T%%/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java
+%%T%%/src/jorphan/org/apache/jorphan/gui/ComponentUtil.java
+%%T%%/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
+%%T%%/src/jorphan/org/apache/jorphan/gui/JLabeledPasswordField.java
+%%T%%/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
+%%T%%/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
+%%T%%/src/jorphan/org/apache/jorphan/gui/JLabeledField.java
+%%T%%/src/jorphan/org/apache/jorphan/test/AllTests.java
+%%T%%/src/jorphan/org/apache/jorphan/test/UnitTestManager.java
+%%T%%/src/MANIFEST
+%%T%%/bin/testfiles/proxy.jmx
+%%T%%/bin/testfiles/AuthManagerTestPlan.jmx
+%%T%%/bin/testfiles/HeaderManagerTestPlan.jmx
+%%T%%/bin/testfiles/InterleaveTestPlan.jmx
+%%T%%/bin/testfiles/InterleaveTestPlan2.jmx
+%%T%%/bin/testfiles/LoopTestPlan.jmx
 %%T%%/bin/testfiles/Modification Manager.jmx
+%%T%%/bin/testfiles/OnceOnlyTestPlan.jmx
+%%T%%/bin/testfiles/ProxyServerTestPlan.jmx
+%%T%%/bin/testfiles/SimpleTestPlan.jmx
 %%T%%/bin/testfiles/Test Plan.jmx
-%%T%%/bin/testfiles/spider_jakarta.jmx
-%%T%%/bin/testfiles/start.jmx
-%%T%%/bin/testfiles/spider_from_yahoo.jmx
-%%T%%/bin/testfiles/proxy.jmx
-%%T%%/bin/jmeter-cl
-%%T%%/bin/jmeter
-%%T%%/bin/jmeter-client
-%%T%%/bin/jmeter-server
-%%T%%/bin/jmeter.properties
+%%T%%/bin/testfiles/URLRewritingExample.jmx
+%%T%%/bin/testfiles/assertion.jmx
+%%T%%/bin/testfiles/AssertionTestPlan.jmx
 %%T%%/bin/log4j.conf
-%%T%%/bin/nongui.sh
-%%T%%/bin/log.txt
+%%T%%/bin/jmeter.properties
+%%T%%/bin/jmeter.properties.bak
+%%T%%/bin/root.log
+%%T%%/bin/jmeter.log
 %%T%%/bin/ApacheJMeter.jar
-%%T%%/docs/images/screenshots/jdbc-config/jdbc-db-conn-pool.gif
-%%T%%/docs/images/screenshots/jdbc-config/jdbc-db-login.gif
-%%T%%/docs/images/screenshots/jdbc-config/jdbc-sql-query.gif
-%%T%%/docs/images/screenshots/ftp-config/ftp-request-defaults.gif
-%%T%%/docs/images/screenshots/gen-controller/ftp-request.gif
-%%T%%/docs/images/screenshots/gen-controller/http-request.gif
-%%T%%/docs/images/screenshots/gen-controller/jdbc-request.gif
-%%T%%/docs/images/screenshots/http-config/http-config-example.gif
+%%T%%/bin/jmeter.bat.bak
+%%T%%/bin/users.dtd
+%%T%%/bin/jmeter.log.bak
+%%T%%/bin/users.xml
+%%T%%/bin/testing.log
+%%T%%/bin/jmeter
+%%T%%/bin/jmeter-server
+%%T%%/bin/testresults.txt
+%%T%%/bin/HTTPSamplerFullTestFile.txt
+%%T%%/bin/testlog.log
+%%T%%/bin/log4j.conf.bak
+%%T%%/bin/interleave-test2.dat
+%%T%%/lib/ext/ApacheJMeter_http.jar
+%%T%%/lib/ext/ApacheJMeter_components.jar
+%%T%%/lib/ext/ApacheJMeter_functions.jar
+%%T%%/lib/ext/ApacheJMeter_core.jar
+%%T%%/lib/ext/ApacheJMeter_ftp.jar
+%%T%%/lib/ext/ApacheJMeter_jdbc.jar
+%%T%%/lib/ext/ApacheJMeter_java.jar
+%%T%%/lib/Tidy.jar
+%%T%%/lib/avalon-framework.jar
+%%T%%/lib/logkit-1.0.1.jar
+%%T%%/lib/jorphan.jar
+%%T%%/lib/avalon-excalibur-4.1.jar
+%%T%%/lib/jakarta-oro-2.0.1.jar
+%%T%%/lib/junit.jar
+%%T%%/lib/junit_license.html
+%%T%%/lib/util.jar
+%%T%%/lib/xalan.jar
+%%T%%/lib/xerces.jar
+%%T%%/lib/xml-apis.jar
+%%T%%/lib/ant-1.5.jar
+%%T%%/lib/ant-1.5-optional.jar
+%%T%%/docs/images/screenshots/.xvpics/aggregate_report.png
+%%T%%/docs/images/screenshots/.xvpics/user_params.png
+%%T%%/docs/images/screenshots/.xvpics/counter.png
+%%T%%/docs/images/screenshots/http-config/proxy-server-example1a.gif
 %%T%%/docs/images/screenshots/http-config/auth-manager-example1b.gif
 %%T%%/docs/images/screenshots/http-config/header-manager-example1a.gif
 %%T%%/docs/images/screenshots/http-config/header-manager-example1b.gif
 %%T%%/docs/images/screenshots/http-config/http-auth-manager.gif
+%%T%%/docs/images/screenshots/http-config/http-config-example.gif
 %%T%%/docs/images/screenshots/http-config/http-cookie-manager.gif
 %%T%%/docs/images/screenshots/http-config/http-header-manager.gif
 %%T%%/docs/images/screenshots/http-config/http-proxy-server.gif
 %%T%%/docs/images/screenshots/http-config/http-request-defaults.gif
-%%T%%/docs/images/screenshots/http-config/proxy-server-example1a.gif
 %%T%%/docs/images/screenshots/http-config/auth-manager-example1a.gif
+%%T%%/docs/images/screenshots/timers/constant_timer.gif
+%%T%%/docs/images/screenshots/timers/gauss_random_timer.gif
+%%T%%/docs/images/screenshots/timers/uniform_random_timer.gif
+%%T%%/docs/images/screenshots/jdbc-config/jdbc-db-conn-pool.gif
+%%T%%/docs/images/screenshots/jdbc-config/jdbc-db-login.gif
+%%T%%/docs/images/screenshots/jdbc-config/jdbc-sql-query.gif
 %%T%%/docs/images/screenshots/webtest/threadgroup2.gif
 %%T%%/docs/images/screenshots/webtest/file-reporter.gif
 %%T%%/docs/images/screenshots/webtest/http-defaults1.gif
@@ -50,41 +488,70 @@ bin/jmeter
 %%T%%/docs/images/screenshots/logic-controller/simple-controller.gif
 %%T%%/docs/images/screenshots/logic-controller/interleave-controller.gif
 %%T%%/docs/images/screenshots/remote/run-menu00.gif
-%%T%%/docs/images/screenshots/timers/gauss_random_timer.gif
-%%T%%/docs/images/screenshots/timers/constant_timer.gif
-%%T%%/docs/images/screenshots/timers/uniform_random_timer.gif
+%%T%%/docs/images/screenshots/jdbctest/JDBCRequest.png
+%%T%%/docs/images/screenshots/jdbctest/JDBCRequest2.png
+%%T%%/docs/images/screenshots/jdbctest/JDBCRequest3.png
+%%T%%/docs/images/screenshots/jdbctest/graph-results.png
+%%T%%/docs/images/screenshots/jdbctest/threadgroup.png
+%%T%%/docs/images/screenshots/jdbctest/threadgroup2.png
 %%T%%/docs/images/screenshots/assertion/assertion.gif
 %%T%%/docs/images/screenshots/assertion/example1a.gif
 %%T%%/docs/images/screenshots/assertion/example1b.gif
 %%T%%/docs/images/screenshots/assertion/example1c-fail.gif
 %%T%%/docs/images/screenshots/assertion/example1c-pass.gif
+%%T%%/docs/images/screenshots/ftp-config/ftp-request-defaults.gif
+%%T%%/docs/images/screenshots/gen-controller/.xvpics/http-request.png
+%%T%%/docs/images/screenshots/gen-controller/ftp-request.gif
+%%T%%/docs/images/screenshots/gen-controller/jdbc-request.gif
+%%T%%/docs/images/screenshots/gen-controller/http-request.png
+%%T%%/docs/images/screenshots/ftptest/ftp-request2.png
+%%T%%/docs/images/screenshots/ftptest/ftp-defaults2.png
+%%T%%/docs/images/screenshots/ftptest/ftp-request.png
+%%T%%/docs/images/screenshots/ftptest/ftp-defaults.png
+%%T%%/docs/images/screenshots/ftptest/spline-results.png
+%%T%%/docs/images/screenshots/ftptest/threadgroup.png
+%%T%%/docs/images/screenshots/ftptest/threadgroup2.png
+%%T%%/docs/images/screenshots/duration_assertion.png
+%%T%%/docs/images/screenshots/file_reporter.gif
+%%T%%/docs/images/screenshots/user_param_modifier.gif
+%%T%%/docs/images/screenshots/ftptest.gif
+%%T%%/docs/images/screenshots/view_results_tree.png
+%%T%%/docs/images/screenshots/function_helper_dialog.png
+%%T%%/docs/images/screenshots/gauss_random_timer.gif
 %%T%%/docs/images/screenshots/graph_full_results.gif
+%%T%%/docs/images/screenshots/graph_results.gif
+%%T%%/docs/images/screenshots/html_param_mask.gif
 %%T%%/docs/images/screenshots/interleave.gif
+%%T%%/docs/images/screenshots/java_request.gif
 %%T%%/docs/images/screenshots/jdbctest.gif
 %%T%%/docs/images/screenshots/loop_controller.gif
-%%T%%/docs/images/screenshots/modification.gif
+%%T%%/docs/images/screenshots/mailer_vis.png
 %%T%%/docs/images/screenshots/once_only.gif
-%%T%%/docs/images/screenshots/proxy_control.gif
+%%T%%/docs/images/screenshots/modification.png
+%%T%%/docs/images/screenshots/parameter_mask.png
+%%T%%/docs/images/screenshots/proxy_control.png
+%%T%%/docs/images/screenshots/soap_sampler.png
+%%T%%/docs/images/screenshots/spline_visualizer.gif
+%%T%%/docs/images/screenshots/table_results.gif
+%%T%%/docs/images/screenshots/test_plan.gif
+%%T%%/docs/images/screenshots/aggregate_report.png
+%%T%%/docs/images/screenshots/counter.png
 %%T%%/docs/images/screenshots/uniform_random_timer.gif
-%%T%%/docs/images/screenshots/view_result_tree.gif
-%%T%%/docs/images/screenshots/view_results.gif
 %%T%%/docs/images/screenshots/webtest.gif
-%%T%%/docs/images/screenshots/spline_visualizer.gif
-%%T%%/docs/images/screenshots/graph_results.gif
 %%T%%/docs/images/screenshots/url_rewrite_example_a.gif
-%%T%%/docs/images/screenshots/data_analyzer.gif
-%%T%%/docs/images/screenshots/url_rewrite_example_b.gif
+%%T%%/docs/images/screenshots/url_rewriter.gif
 %%T%%/docs/images/screenshots/adding_threadgroup.gif
+%%T%%/docs/images/screenshots/user_params.png
 %%T%%/docs/images/screenshots/assertion_results.gif
 %%T%%/docs/images/screenshots/assertions.gif
+%%T%%/docs/images/screenshots/url_rewrite_example_b.gif
 %%T%%/docs/images/screenshots/base_ui.gif
 %%T%%/docs/images/screenshots/constant_timer.gif
-%%T%%/docs/images/screenshots/file_reporter.gif
-%%T%%/docs/images/screenshots/ftptest.gif
-%%T%%/docs/images/screenshots/gauss_random_timer.gif
-%%T%%/docs/images/java-apache-project.gif
+%%T%%/docs/images/screenshots/data_analyzer.gif
+%%T%%/docs/images/screenshots/view_result_tree.gif
 %%T%%/docs/images/httpcontroller.jpg
 %%T%%/docs/images/httptestsample.jpg
+%%T%%/docs/images/java-apache-project.gif
 %%T%%/docs/images/jdbc_controller.jpg
 %%T%%/docs/images/jmeter.jpg
 %%T%%/docs/images/jmeter2.jpg
@@ -94,44 +561,45 @@ bin/jmeter
 %%T%%/docs/images/snapshot.gif
 %%T%%/docs/images/test_sample.jpg
 %%T%%/docs/user_manual/web_test.html
-%%T%%/docs/user_manual/assertions.html
 %%T%%/docs/user_manual/ftp_test.html
 %%T%%/docs/user_manual/index.html
 %%T%%/docs/user_manual/interleave.html
 %%T%%/docs/user_manual/jdbc_test.html
-%%T%%/docs/user_manual/running.html
-%%T%%/docs/user_manual/rmi.html
+%%T%%/docs/user_manual/logical_controllers.html
 %%T%%/docs/user_manual/loop_controller.html
 %%T%%/docs/user_manual/modification_manager.html
 %%T%%/docs/user_manual/once_only.html
 %%T%%/docs/user_manual/proxy_server.html
 %%T%%/docs/user_manual/ready_components.html
+%%T%%/docs/user_manual/rmi.html
+%%T%%/docs/user_manual/running.html
 %%T%%/docs/user_manual/saving.html
 %%T%%/docs/user_manual/sslmanager.html
 %%T%%/docs/user_manual/test_samples.html
 %%T%%/docs/user_manual/threadgroups.html
 %%T%%/docs/user_manual/timers.html
 %%T%%/docs/user_manual/visualizers.html
-%%T%%/docs/user_manual/logical_controllers.html
-%%T%%/docs/usermanual/build-jndi-test-plan.html
-%%T%%/docs/usermanual/best-practices.html
+%%T%%/docs/user_manual/assertions.html
+%%T%%/docs/usermanual/component_reference.html
 %%T%%/docs/usermanual/boss.html
 %%T%%/docs/usermanual/build-adv-web-test-plan.html
+%%T%%/docs/usermanual/build-db-test-plan.html
 %%T%%/docs/usermanual/build-ftp-test-plan.html
+%%T%%/docs/usermanual/build-jndi-test-plan.html
 %%T%%/docs/usermanual/build-test-plan.html
 %%T%%/docs/usermanual/build-web-test-plan.html
-%%T%%/docs/usermanual/component_reference.html
+%%T%%/docs/usermanual/functions.html
 %%T%%/docs/usermanual/glossary.html
 %%T%%/docs/usermanual/index.html
 %%T%%/docs/usermanual/intro.html
 %%T%%/docs/usermanual/remote-test.html
-%%T%%/docs/usermanual/get-started.html
 %%T%%/docs/usermanual/test_plan.html
-%%T%%/docs/usermanual/build-db-test-plan.html
-%%T%%/docs/extending/index.html
+%%T%%/docs/usermanual/get-started.html
+%%T%%/docs/usermanual/best-practices.html
 %%T%%/docs/extending/JMeter Extension Scenario.html
+%%T%%/docs/extending/index.html
 %%T%%/docs/demos/URLRewritingExample.jmx
-%%T%%/docs/demos/AssertionTestPlan.jmx
+%%T%%/docs/demos/AuthManagerTestPlan.jmx
 %%T%%/docs/demos/HeaderManagerTestPlan.jmx
 %%T%%/docs/demos/InterleaveTestPlan.jmx
 %%T%%/docs/demos/InterleaveTestPlan2.jmx
@@ -139,434 +607,184 @@ bin/jmeter
 %%T%%/docs/demos/OnceOnlyTestPlan.jmx
 %%T%%/docs/demos/ProxyServerTestPlan.jmx
 %%T%%/docs/demos/SimpleTestPlan.jmx
-%%T%%/docs/demos/AuthManagerTestPlan.jmx
-%%T%%/docs/running.html
+%%T%%/docs/demos/AssertionTestPlan.jmx
 %%T%%/docs/index.html
 %%T%%/docs/installing.html
 %%T%%/docs/license.html
 %%T%%/docs/todo.html
 %%T%%/docs/how_to_use_jmeter.html
+%%T%%/docs/running.html
 %%T%%/docs/bugs.html
 %%T%%/docs/changes.html
 %%T%%/docs/contributing.html
 %%T%%/docs/extending.html
-%%T%%/src/org/apache/jmeter/reporters/SULTCOLLECTORINDGRAPH.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/FileReporter.java
-%%T%%/src/org/apache/jmeter/reporters/Filer.java
-%%T%%/src/org/apache/jmeter/reporters/MailerResultCollector.java
-%%T%%/src/org/apache/jmeter/reporters/ResultCollector.java
-%%T%%/src/org/apache/jmeter/reporters/ResultCollectorFull.java
-%%T%%/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java
-%%T%%/src/org/apache/jmeter/reporters/AILERRESULTCOLLECTOR.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/AssertionReporter.java.rej
-%%T%%/src/org/apache/jmeter/reporters/ESULTCOLLECTOR.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/ESULTCOLLECTORFULL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/ESULTCOLLECTORINDGRAPH.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/Filer.java.rej
-%%T%%/src/org/apache/jmeter/reporters/ILER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/ILERRESULTCOLLECTOR.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/LER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/MailerResultCollector.java.rej
-%%T%%/src/org/apache/jmeter/reporters/ResultCollector.java.rej
-%%T%%/src/org/apache/jmeter/reporters/ResultCollectorFull.java.rej
-%%T%%/src/org/apache/jmeter/reporters/ResultCollectorIndGraph.java.rej
-%%T%%/src/org/apache/jmeter/reporters/SERTIONREPORTER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/SSERTIONREPORTER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/SULTCOLLECTOR.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/SULTCOLLECTORFULL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/reporters/AssertionReporter.java
-%%T%%/src/org/apache/jmeter/config/gui/AbstractConfigGui.java
-%%T%%/src/org/apache/jmeter/config/gui/ArgumentsPanel.java
-%%T%%/src/org/apache/jmeter/config/gui/GuiElement.java
-%%T%%/src/org/apache/jmeter/config/gui/LoginConfigGui.java
-%%T%%/src/org/apache/jmeter/config/AbstractConfigElement.java
-%%T%%/src/org/apache/jmeter/config/Argument.java
-%%T%%/src/org/apache/jmeter/config/Arguments.java
-%%T%%/src/org/apache/jmeter/config/ConfigElement.java
-%%T%%/src/org/apache/jmeter/config/ExtensionsFileFilter.java
-%%T%%/src/org/apache/jmeter/config/LoginConfig.java
-%%T%%/src/org/apache/jmeter/config/Modifier.java
-%%T%%/src/org/apache/jmeter/config/ResponseBasedModifier.java
-%%T%%/src/org/apache/jmeter/control/gui/InterleaveControlGui.java
-%%T%%/src/org/apache/jmeter/control/gui/LogicControllerGui.java
-%%T%%/src/org/apache/jmeter/control/gui/ModifyControllerGui.java
-%%T%%/src/org/apache/jmeter/control/gui/OnceOnlyControllerGui.java
-%%T%%/src/org/apache/jmeter/control/gui/WorkBenchGui.java
-%%T%%/src/org/apache/jmeter/control/AbstractGenerativeController.java
-%%T%%/src/org/apache/jmeter/control/DynamicController.java
-%%T%%/src/org/apache/jmeter/control/GenericController.java
-%%T%%/src/org/apache/jmeter/control/InterleaveControl.java
-%%T%%/src/org/apache/jmeter/control/LogicController.java
-%%T%%/src/org/apache/jmeter/control/LoopController.java
-%%T%%/src/org/apache/jmeter/control/ModifyController.java
-%%T%%/src/org/apache/jmeter/control/NoEntryException.java
-%%T%%/src/org/apache/jmeter/control/OnceOnlyController.java
-%%T%%/src/org/apache/jmeter/control/ResponseParser.java
-%%T%%/src/org/apache/jmeter/control/SamplerController.java
-%%T%%/src/org/apache/jmeter/control/TestPlan.java
-%%T%%/src/org/apache/jmeter/control/WorkBench.java
-%%T%%/src/org/apache/jmeter/control/CEONLYCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/DIFYCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/ESTPLAN.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/GICCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/InterleaveControl.java.rej
-%%T%%/src/org/apache/jmeter/control/LogicController.java.rej
-%%T%%/src/org/apache/jmeter/control/LoopController.java.rej
-%%T%%/src/org/apache/jmeter/control/ModifyController.java.rej
-%%T%%/src/org/apache/jmeter/control/NCEONLYCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/NTERLEAVECONTROL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/ODIFYCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/OGICCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/OnceOnlyController.java.rej
-%%T%%/src/org/apache/jmeter/control/OOPCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/OPCONTROLLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/STPLAN.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/TERLEAVECONTROL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/control/TestPlan.java.rej
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/gui/MethodConfigDialog.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/gui/JndiConfigGui.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/gui/LookupConfigGui.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/gui/MethodConfigGui.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/JndiConfig.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/LookupConfig.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/MethodConfig.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/MethodConfigUserObjectException.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/config/MethodConfigUserObject.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/control/gui/JndiTestSampleGui.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/control/JndiTestSample.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/sampler/JNDISampler.java
-%%T%%/src/org/apache/jmeter/ejb/jndi/save/JndiTestSampleHandler.java
-%%T%%/src/org/apache/jmeter/engine/StandardJMeterEngine.java
-%%T%%/src/org/apache/jmeter/engine/IncrementalJMeterEngine.java
-%%T%%/src/org/apache/jmeter/engine/JMeterEngine.java
-%%T%%/src/org/apache/jmeter/engine/LagDetector.java
-%%T%%/src/org/apache/jmeter/engine/ReflectionJMeterEngine.java
-%%T%%/src/org/apache/jmeter/engine/RemoteJMeterEngine.java
-%%T%%/src/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
-%%T%%/src/org/apache/jmeter/engine/ClientJMeterEngine.java
-%%T%%/src/org/apache/jmeter/exceptions/IllegalUserActionException.java
-%%T%%/src/org/apache/jmeter/gui/util/ComponentUtil.java
-%%T%%/src/org/apache/jmeter/gui/popup/EditCommand.java
-%%T%%/src/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
-%%T%%/src/org/apache/jmeter/gui/tree/JMeterTreeListener.java
-%%T%%/src/org/apache/jmeter/gui/tree/JMeterTreeModel.java
-%%T%%/src/org/apache/jmeter/gui/tree/JMeterTreeNode.java
-%%T%%/src/org/apache/jmeter/gui/tree/NonGuiTree.java
-%%T%%/src/org/apache/jmeter/gui/tree/NonGuiTreeNode.java
-%%T%%/src/org/apache/jmeter/gui/action/Analyze.java
-%%T%%/src/org/apache/jmeter/gui/action/AboutCommand.java
-%%T%%/src/org/apache/jmeter/gui/action/ActionRouter.java
-%%T%%/src/org/apache/jmeter/gui/action/AddToTree.java
-%%T%%/src/org/apache/jmeter/gui/action/Clear.java
-%%T%%/src/org/apache/jmeter/gui/action/Command.java
-%%T%%/src/org/apache/jmeter/gui/action/ExitCommand.java
-%%T%%/src/org/apache/jmeter/gui/action/Load.java
-%%T%%/src/org/apache/jmeter/gui/action/RemoteStart.java
-%%T%%/src/org/apache/jmeter/gui/action/Remove.java
-%%T%%/src/org/apache/jmeter/gui/action/SSLManagerCommand.java
-%%T%%/src/org/apache/jmeter/gui/action/Save.java
-%%T%%/src/org/apache/jmeter/gui/action/Start.java
-%%T%%/src/org/apache/jmeter/gui/action/LookAndFeelCommand.java
-%%T%%/src/org/apache/jmeter/gui/FocusRequester.java
-%%T%%/src/org/apache/jmeter/gui/GuiFactory.java
-%%T%%/src/org/apache/jmeter/gui/GuiPackage.java
-%%T%%/src/org/apache/jmeter/gui/GuiReady.java
-%%T%%/src/org/apache/jmeter/gui/JMeterComponentModel.java
-%%T%%/src/org/apache/jmeter/gui/JMeterFileFilter.java
-%%T%%/src/org/apache/jmeter/gui/JMeterJListModel.java
-%%T%%/src/org/apache/jmeter/gui/JMeterMenuBar.java
-%%T%%/src/org/apache/jmeter/gui/ListDialog.java
-%%T%%/src/org/apache/jmeter/gui/LoopControlPanel.java
-%%T%%/src/org/apache/jmeter/gui/MainFrame.java
-%%T%%/src/org/apache/jmeter/gui/MenuFactory.java
-%%T%%/src/org/apache/jmeter/gui/ModelSupported.java
-%%T%%/src/org/apache/jmeter/gui/NamePanel.java
-%%T%%/src/org/apache/jmeter/gui/VerticalLayout.java
-%%T%%/src/org/apache/jmeter/gui/ENUFACTORY.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/gui/MenuFactory.java.rej
-%%T%%/src/org/apache/jmeter/gui/NUFACTORY.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/gui/JLabeledTextField.java
-%%T%%/src/org/apache/jmeter/gui/ButtonPanel.java
-%%T%%/src/org/apache/jmeter/gui/FileDialoger.java
-%%T%%/src/org/apache/jmeter/images/timer.gif
-%%T%%/src/org/apache/jmeter/images/Delete24.down.gif
-%%T%%/src/org/apache/jmeter/images/Delete24.gif
-%%T%%/src/org/apache/jmeter/images/Delete24.off.gif
-%%T%%/src/org/apache/jmeter/images/Delete24.on.gif
-%%T%%/src/org/apache/jmeter/images/Delete24.over.gif
-%%T%%/src/org/apache/jmeter/images/Edit24.down.gif
-%%T%%/src/org/apache/jmeter/images/Edit24.gif
-%%T%%/src/org/apache/jmeter/images/Edit24.off.gif
-%%T%%/src/org/apache/jmeter/images/Edit24.on.gif
-%%T%%/src/org/apache/jmeter/images/Edit24.over.gif
-%%T%%/src/org/apache/jmeter/images/New24.down.gif
-%%T%%/src/org/apache/jmeter/images/New24.gif
-%%T%%/src/org/apache/jmeter/images/New24.off.gif
-%%T%%/src/org/apache/jmeter/images/New24.on.gif
-%%T%%/src/org/apache/jmeter/images/New24.over.gif
-%%T%%/src/org/apache/jmeter/images/Open24.down.gif
-%%T%%/src/org/apache/jmeter/images/Open24.gif
-%%T%%/src/org/apache/jmeter/images/Open24.off.gif
-%%T%%/src/org/apache/jmeter/images/beaker.gif
-%%T%%/src/org/apache/jmeter/images/ear.gif
-%%T%%/src/org/apache/jmeter/images/Open24.on.gif
-%%T%%/src/org/apache/jmeter/images/Open24.over.gif
-%%T%%/src/org/apache/jmeter/images/SaveAll24.down.gif
-%%T%%/src/org/apache/jmeter/images/SaveAll24.gif
-%%T%%/src/org/apache/jmeter/images/SaveAll24.off.gif
-%%T%%/src/org/apache/jmeter/images/SaveAll24.on.gif
-%%T%%/src/org/apache/jmeter/images/SaveAll24.over.gif
-%%T%%/src/org/apache/jmeter/images/about.down.gif
-%%T%%/src/org/apache/jmeter/images/about.off.gif
-%%T%%/src/org/apache/jmeter/images/about.on.gif
-%%T%%/src/org/apache/jmeter/images/about.over.gif
-%%T%%/src/org/apache/jmeter/images/clear.down.gif
-%%T%%/src/org/apache/jmeter/images/clear.off.gif
-%%T%%/src/org/apache/jmeter/images/clear.on.gif
-%%T%%/src/org/apache/jmeter/images/clear.over.gif
-%%T%%/src/org/apache/jmeter/images/clipboard.gif
-%%T%%/src/org/apache/jmeter/images/feather.gif
-%%T%%/src/org/apache/jmeter/images/jmeter.jpg
-%%T%%/src/org/apache/jmeter/images/knob.gif
-%%T%%/src/org/apache/jmeter/images/leafnode.gif
-%%T%%/src/org/apache/jmeter/images/start.down.gif
-%%T%%/src/org/apache/jmeter/images/smallthread.enabled.gif
-%%T%%/src/org/apache/jmeter/images/smallthread.idle.gif
-%%T%%/src/org/apache/jmeter/images/start.off.gif
-%%T%%/src/org/apache/jmeter/images/start.on.gif
-%%T%%/src/org/apache/jmeter/images/start.over.gif
-%%T%%/src/org/apache/jmeter/images/stop.down.gif
-%%T%%/src/org/apache/jmeter/images/stop.off.gif
-%%T%%/src/org/apache/jmeter/images/stop.on.gif
-%%T%%/src/org/apache/jmeter/images/stop.over.gif
-%%T%%/src/org/apache/jmeter/images/thread.disabled.gif
-%%T%%/src/org/apache/jmeter/images/thread.enabled.gif
-%%T%%/src/org/apache/jmeter/images/thread.gif
-%%T%%/src/org/apache/jmeter/images/thread.idle.gif
-%%T%%/src/org/apache/jmeter/images/smallthread.disabled.gif
-%%T%%/src/org/apache/jmeter/junit/protocol/http/config/HttpConfigSuite.java
-%%T%%/src/org/apache/jmeter/junit/protocol/http/config/UrlConfigTest.java
-%%T%%/src/org/apache/jmeter/junit/protocol/http/control/HttpTestSampleTest.java
-%%T%%/src/org/apache/jmeter/junit/protocol/http/control/HttpControlSuite.java
-%%T%%/src/org/apache/jmeter/junit/protocol/http/parser/HtmlParserTester.java
-%%T%%/src/org/apache/jmeter/junit/AllTests.java
-%%T%%/src/org/apache/jmeter/protocol/ftp/config/gui/FtpConfigGui.java
-%%T%%/src/org/apache/jmeter/protocol/ftp/config/FtpConfig.java
-%%T%%/src/org/apache/jmeter/protocol/ftp/control/gui/FtpTestSamplerGui.java
-%%T%%/src/org/apache/jmeter/protocol/ftp/control/FtpTestSampler.java
-%%T%%/src/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
-%%T%%/src/org/apache/jmeter/protocol/ftp/sampler/FtpClient.java
-%%T%%/src/org/apache/jmeter/protocol/ftp/save/FtpTestHandler.java
-%%T%%/src/org/apache/jmeter/protocol/http/parser/FormElement.java
-%%T%%/src/org/apache/jmeter/protocol/http/parser/HtmlForm.java
-%%T%%/src/org/apache/jmeter/protocol/http/parser/HtmlParser.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/AuthManager.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/Authorization.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/Cookie.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/CookieManager.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/Header.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/HeaderManager.java
-%%T%%/src/org/apache/jmeter/protocol/http/control/HttpTestSample.java
-%%T%%/src/org/apache/jmeter/protocol/http/gui/AuthPanel.java
-%%T%%/src/org/apache/jmeter/protocol/http/gui/CookiePanel.java
-%%T%%/src/org/apache/jmeter/protocol/http/gui/HeaderPanel.java
-%%T%%/src/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java
-%%T%%/src/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
-%%T%%/src/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
-%%T%%/src/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
-%%T%%/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
-%%T%%/src/org/apache/jmeter/protocol/http/config/UrlConfig.java
-%%T%%/src/org/apache/jmeter/protocol/http/config/UrlConfigFull.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/Admin.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/Cache.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/Config.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/Daemon.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/Proxy.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
-%%T%%/src/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java.0
-%%T%%/src/org/apache/jmeter/protocol/http/sampler/MultipartFormSampler.java
-%%T%%/src/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
-%%T%%/src/org/apache/jmeter/protocol/http/sampler/HTTPSamplerFull.java
-%%T%%/src/org/apache/jmeter/protocol/http/sampler/MultipartFormSamplerFull.java
-%%T%%/src/org/apache/jmeter/protocol/http/save/AuthManagerHandler.java
-%%T%%/src/org/apache/jmeter/protocol/http/save/CookieManagerHandler.java
-%%T%%/src/org/apache/jmeter/protocol/http/save/HeaderManagerHandler.java
-%%T%%/src/org/apache/jmeter/protocol/http/save/ProxyControlHandler.java
-%%T%%/src/org/apache/jmeter/protocol/http/util/Base64Encoder.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/config/gui/DbConfigGui.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/config/gui/PoolConfigGui.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/config/gui/SqlConfigGui.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/config/DbConfig.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/control/gui/JdbcTestSampleGui.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/control/JdbcTestSample.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/save/JdbcTestSampleHandler.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/util/DBConnectionManager.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/util/ConnectionObject.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/util/DBKey.java
-%%T%%/src/org/apache/jmeter/protocol/jdbc/util/Data.java
-%%T%%/src/org/apache/jmeter/assertions/gui/AssertionGui.java
-%%T%%/src/org/apache/jmeter/assertions/Assertion.java
-%%T%%/src/org/apache/jmeter/assertions/AssertionResult.java
-%%T%%/src/org/apache/jmeter/resources/messages_no.properties
-%%T%%/src/org/apache/jmeter/resources/messages.properties
-%%T%%/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties
-%%T%%/src/org/apache/jmeter/resources/messages_ja_JP.eucJP.properties.rej
-%%T%%/src/org/apache/jmeter/resources/ESSAGES.PROPERTIES.ORIG
-%%T%%/src/org/apache/jmeter/resources/ESSAGES_JA.PROPERTIES.ORIG
-%%T%%/src/org/apache/jmeter/resources/ESSAGES_JA_JP.EUCJP.PROPERTIES.ORIG
-%%T%%/src/org/apache/jmeter/resources/messages.properties.rej
-%%T%%/src/org/apache/jmeter/resources/messages_ja.properties.rej
-%%T%%/src/org/apache/jmeter/resources/SSAGES.PROPERTIES.ORIG
-%%T%%/src/org/apache/jmeter/resources/SSAGES_JA.PROPERTIES.ORIG
-%%T%%/src/org/apache/jmeter/resources/SSAGES_JA_JP.EUCJP.PROPERTIES.ORIG
-%%T%%/src/org/apache/jmeter/resources/messages_ja.properties
-%%T%%/src/org/apache/jmeter/samplers/Sampler.java
-%%T%%/src/org/apache/jmeter/samplers/Clearable.java
-%%T%%/src/org/apache/jmeter/samplers/CycleEntry.java
-%%T%%/src/org/apache/jmeter/samplers/Entry.java
-%%T%%/src/org/apache/jmeter/samplers/HttpSampleResult.java
-%%T%%/src/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
-%%T%%/src/org/apache/jmeter/samplers/SampleEvent.java
-%%T%%/src/org/apache/jmeter/samplers/SampleListener.java
-%%T%%/src/org/apache/jmeter/samplers/SampleResult.java
-%%T%%/src/org/apache/jmeter/samplers/RemoteSampleListener.java
-%%T%%/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java.rej
-%%T%%/src/org/apache/jmeter/save/handlers/ArgumentsHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/AssertionHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/FilerHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/GenericControllerHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/HttpTestSampleHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/JMeterComponentHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/JMeterHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/LoopControlHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/TestPlanHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/ThreadGroupHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/TimerHandler.java
-%%T%%/src/org/apache/jmeter/save/handlers/HREADGROUPHANDLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/save/handlers/READGROUPHANDLER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/save/handlers/AbstractConfigElementHandler.java
-%%T%%/src/org/apache/jmeter/save/xml/NameSpaceHandler.java
-%%T%%/src/org/apache/jmeter/save/xml/TagHandler.java
-%%T%%/src/org/apache/jmeter/save/xml/NoCurrentHandlerException.java
-%%T%%/src/org/apache/jmeter/save/xml/XmlHandler.java
-%%T%%/src/org/apache/jmeter/save/BadHandlerException.java
-%%T%%/src/org/apache/jmeter/save/JMeterNameSpaceHandler.java
-%%T%%/src/org/apache/jmeter/save/SaveHandler.java
-%%T%%/src/org/apache/jmeter/save/Saveable.java
-%%T%%/src/org/apache/jmeter/threads/gui/ThreadGroupGui.java
-%%T%%/src/org/apache/jmeter/threads/JMeterThread.java
-%%T%%/src/org/apache/jmeter/threads/ThreadGroup.java
-%%T%%/src/org/apache/jmeter/threads/HREADGROUP.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/threads/READGROUP.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/threads/ThreadGroup.java.rej
-%%T%%/src/org/apache/jmeter/threads/ReflectionThreadGroup.java
-%%T%%/src/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
-%%T%%/src/org/apache/jmeter/timers/gui/ConstantTimerGui.java
-%%T%%/src/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
-%%T%%/src/org/apache/jmeter/timers/GaussianRandomTimer.java
-%%T%%/src/org/apache/jmeter/timers/ConstantTimer.java
-%%T%%/src/org/apache/jmeter/timers/RandomTimer.java
-%%T%%/src/org/apache/jmeter/timers/Timer.java
-%%T%%/src/org/apache/jmeter/timers/UniformRandomTimer.java
-%%T%%/src/org/apache/jmeter/timers/AUSSIANRANDOMTIMER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/timers/ConstantTimer.java.rej
-%%T%%/src/org/apache/jmeter/timers/GaussianRandomTimer.java.rej
-%%T%%/src/org/apache/jmeter/timers/IFORMRANDOMTIMER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/timers/NSTANTTIMER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/timers/NIFORMRANDOMTIMER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/timers/ONSTANTTIMER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/timers/UniformRandomTimer.java.rej
-%%T%%/src/org/apache/jmeter/timers/USSIANRANDOMTIMER.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/util/keystore/DefaultKeyStore.java
-%%T%%/src/org/apache/jmeter/util/keystore/JmeterKeyStore.java
-%%T%%/src/org/apache/jmeter/util/keystore/PKCS12KeyStore.java
-%%T%%/src/org/apache/jmeter/util/ClassFinder.java
-%%T%%/src/org/apache/jmeter/util/ColorHelper.java
-%%T%%/src/org/apache/jmeter/util/HashTree.java
-%%T%%/src/org/apache/jmeter/util/IaikSSLManager.java
-%%T%%/src/org/apache/jmeter/util/JMeterUtils.java
-%%T%%/src/org/apache/jmeter/util/JsseSSLManager.java
-%%T%%/src/org/apache/jmeter/util/ListedHashTree.java
-%%T%%/src/org/apache/jmeter/util/NamedObject.java
-%%T%%/src/org/apache/jmeter/util/SSLManager.java
-%%T%%/src/org/apache/jmeter/util/SortedHashTree.java
-%%T%%/src/org/apache/jmeter/util/JMeterUtils.java_temp
-%%T%%/src/org/apache/jmeter/visualizers/SplineModel.java.rej
-%%T%%/src/org/apache/jmeter/visualizers/BarVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/FileVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/GenericGraphListener.java
-%%T%%/src/org/apache/jmeter/visualizers/Graph.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphAccum.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphAccumListener.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphAccumModel.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphListener.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphModel.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/GraphVisualizerModel.java
-%%T%%/src/org/apache/jmeter/visualizers/ImageVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/IndGraphTreeVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/Sample.java
-%%T%%/src/org/apache/jmeter/visualizers/MailerVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/Spline3.java
-%%T%%/src/org/apache/jmeter/visualizers/SplineModel.java
-%%T%%/src/org/apache/jmeter/visualizers/SplineVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/TreeVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/ViewResultsVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/Visualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/WindowedVisualizer.java
-%%T%%/src/org/apache/jmeter/visualizers/APHACCUMMODEL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/visualizers/APHMODEL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/visualizers/GraphAccumModel.java.rej
-%%T%%/src/org/apache/jmeter/visualizers/GraphModel.java.rej
-%%T%%/src/org/apache/jmeter/visualizers/LINEMODEL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/visualizers/PLINEMODEL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/visualizers/RAPHACCUMMODEL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/visualizers/RAPHMODEL.JAVA.ORIG
-%%T%%/src/org/apache/jmeter/visualizers/AssertionVisualizer.java
-%%T%%/src/org/apache/jmeter/NewDriver.java
-%%T%%/src/org/apache/jmeter/NonGuiDriver.java
-%%T%%/src/org/apache/jmeter/TextDriver.java
-%%T%%/src/MANIFEST
-%%T%%/src/Makefile
-%%T%%/src/jmeter-i18n-20020216.patch
-%%T%%/src/jmeter.patch
-%%T%%/lib/jakarta-ant-1.4.1-optional.jar
-%%T%%/lib/Tidy.jar
-%%T%%/lib/jakarta-oro-2.0.1.jar
-%%T%%/lib/junit.jar
-%%T%%/lib/junit_license.html
-%%T%%/lib/log4j-core.jar
-%%T%%/lib/log4j.jar
-%%T%%/lib/util.jar
-%%T%%/lib/xerces.jar
-%%T%%/lib/ant-1.4.1.jar
+%%T%%/ptch_src/MailerVisualizer.java
+%%T%%/ptch_src/MailerModel.java
+%%T%%/ptch_src/ModelListener.java
+%%T%%/Thumbs.db
 %%T%%/README
+%%T%%/velocity.log.1
 %%T%%/LICENSE
 %%T%%/velocity.log
-%%T%%/HTTPSamplerFullTestFile.txt
-%%T%%/testresults.txt
+%%T%%/mailer.patch
 %%T%%/build.xml
 %%T%%/build.sh
+@dirrm %%T%%/src/components/org/apache/jmeter/modifiers/gui
+@dirrm %%T%%/src/components/org/apache/jmeter/modifiers
+@dirrm %%T%%/src/components/org/apache/jmeter/config/gui
+@dirrm %%T%%/src/components/org/apache/jmeter/config
+@dirrm %%T%%/src/components/org/apache/jmeter/control/gui
+@dirrm %%T%%/src/components/org/apache/jmeter/control
+@dirrm %%T%%/src/components/org/apache/jmeter/assertions/gui
+@dirrm %%T%%/src/components/org/apache/jmeter/assertions
+@dirrm %%T%%/src/components/org/apache/jmeter/reporters
+@dirrm %%T%%/src/components/org/apache/jmeter/timers/gui
+@dirrm %%T%%/src/components/org/apache/jmeter/timers
+@dirrm %%T%%/src/components/org/apache/jmeter/visualizers
+@dirrm %%T%%/src/components/org/apache/jmeter
+@dirrm %%T%%/src/components/org/apache
+@dirrm %%T%%/src/components/org
+@dirrm %%T%%/src/components
+@dirrm %%T%%/src/core/org/apache/jmeter/samplers/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/samplers
+@dirrm %%T%%/src/core/org/apache/jmeter/config/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/config
+@dirrm %%T%%/src/core/org/apache/jmeter/control/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/control
+@dirrm %%T%%/src/core/org/apache/jmeter/engine
+@dirrm %%T%%/src/core/org/apache/jmeter/exceptions
+@dirrm %%T%%/src/core/org/apache/jmeter/functions/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/functions
+@dirrm %%T%%/src/core/org/apache/jmeter/gui/tree
+@dirrm %%T%%/src/core/org/apache/jmeter/gui/util
+@dirrm %%T%%/src/core/org/apache/jmeter/gui/action
+@dirrm %%T%%/src/core/org/apache/jmeter/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/images
+@dirrm %%T%%/src/core/org/apache/jmeter/junit
+@dirrm %%T%%/src/core/org/apache/jmeter/reporters
+@dirrm %%T%%/src/core/org/apache/jmeter/resources
+@dirrm %%T%%/src/core/org/apache/jmeter/assertions/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/assertions
+@dirrm %%T%%/src/core/org/apache/jmeter/save/old/handlers
+@dirrm %%T%%/src/core/org/apache/jmeter/save/old/xml
+@dirrm %%T%%/src/core/org/apache/jmeter/save/old
+@dirrm %%T%%/src/core/org/apache/jmeter/save
+@dirrm %%T%%/src/core/org/apache/jmeter/testelement
+@dirrm %%T%%/src/core/org/apache/jmeter/threads/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/threads
+@dirrm %%T%%/src/core/org/apache/jmeter/timers/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/timers
+@dirrm %%T%%/src/core/org/apache/jmeter/util/keystore
+@dirrm %%T%%/src/core/org/apache/jmeter/util
+@dirrm %%T%%/src/core/org/apache/jmeter/visualizers/gui
+@dirrm %%T%%/src/core/org/apache/jmeter/visualizers
+@dirrm %%T%%/src/core/org/apache/jmeter/swing
+@dirrm %%T%%/src/core/org/apache/jmeter
+@dirrm %%T%%/src/core/org/apache
+@dirrm %%T%%/src/core/org
+@dirrm %%T%%/src/core
+@dirrm %%T%%/src/functions/org/apache/jmeter/functions
+@dirrm %%T%%/src/functions/org/apache/jmeter
+@dirrm %%T%%/src/functions/org/apache
+@dirrm %%T%%/src/functions/org
+@dirrm %%T%%/src/functions
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config/gui
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/config
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control/gui
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/control
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter/protocol/ftp
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter/protocol
+@dirrm %%T%%/src/protocol/ftp/org/apache/jmeter
+@dirrm %%T%%/src/protocol/ftp/org/apache
+@dirrm %%T%%/src/protocol/ftp/org
+@dirrm %%T%%/src/protocol/ftp
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/junit/protocol/http/config
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/junit/protocol/http/parser
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/junit/protocol/http
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/junit/protocol
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/junit
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/parser
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control/gui
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/control
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/gui
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/modifier
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/config/gui
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/config
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/proxy
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/sampler
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http/util
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol/http
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter/protocol
+@dirrm %%T%%/src/protocol/http/org/apache/jmeter
+@dirrm %%T%%/src/protocol/http/org/apache
+@dirrm %%T%%/src/protocol/http/org
+@dirrm %%T%%/src/protocol/http
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol/java/config/gui
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol/java/config
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol/java/control/gui
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol/java/control
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol/java/sampler
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol/java/test
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol/java
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter/protocol
+@dirrm %%T%%/src/protocol/java/org/apache/jmeter
+@dirrm %%T%%/src/protocol/java/org/apache
+@dirrm %%T%%/src/protocol/java/org
+@dirrm %%T%%/src/protocol/java
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/gui
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/control/gui
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/control
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter/protocol
+@dirrm %%T%%/src/protocol/jdbc/org/apache/jmeter
+@dirrm %%T%%/src/protocol/jdbc/org/apache
+@dirrm %%T%%/src/protocol/jdbc/org
+@dirrm %%T%%/src/protocol/jdbc
+@dirrm %%T%%/src/protocol/jndi/config/gui
+@dirrm %%T%%/src/protocol/jndi/config
+@dirrm %%T%%/src/protocol/jndi/control/gui
+@dirrm %%T%%/src/protocol/jndi/control
+@dirrm %%T%%/src/protocol/jndi/sampler
+@dirrm %%T%%/src/protocol/jndi
+@dirrm %%T%%/src/protocol
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/io
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/collections
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/logging
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/reflect
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/string
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/gui/layout
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/gui
+@dirrm %%T%%/src/jorphan/org/apache/jorphan/test
+@dirrm %%T%%/src/jorphan/org/apache/jorphan
+@dirrm %%T%%/src/jorphan/org/apache
+@dirrm %%T%%/src/jorphan/org
+@dirrm %%T%%/src/jorphan
+@dirrm %%T%%/src
+@dirrm %%T%%/bin/Cache
+@dirrm %%T%%/bin/proxy_script
 @dirrm %%T%%/bin/testfiles
 @dirrm %%T%%/bin
-@dirrm %%T%%/docs/images/screenshots/jdbc-config
-@dirrm %%T%%/docs/images/screenshots/ftp-config
-@dirrm %%T%%/docs/images/screenshots/gen-controller
+@dirrm %%T%%/lib/ext
+@dirrm %%T%%/lib
+@dirrm %%T%%/docs/images/screenshots/.xvpics
 @dirrm %%T%%/docs/images/screenshots/http-config
+@dirrm %%T%%/docs/images/screenshots/timers
+@dirrm %%T%%/docs/images/screenshots/jdbc-config
 @dirrm %%T%%/docs/images/screenshots/webtest
 @dirrm %%T%%/docs/images/screenshots/logic-controller
 @dirrm %%T%%/docs/images/screenshots/remote
-@dirrm %%T%%/docs/images/screenshots/timers
+@dirrm %%T%%/docs/images/screenshots/jdbctest
 @dirrm %%T%%/docs/images/screenshots/assertion
+@dirrm %%T%%/docs/images/screenshots/ftp-config
+@dirrm %%T%%/docs/images/screenshots/gen-controller/.xvpics
+@dirrm %%T%%/docs/images/screenshots/gen-controller
+@dirrm %%T%%/docs/images/screenshots/ftptest
 @dirrm %%T%%/docs/images/screenshots
 @dirrm %%T%%/docs/images
 @dirrm %%T%%/docs/user_manual
@@ -574,80 +792,5 @@ bin/jmeter
 @dirrm %%T%%/docs/extending
 @dirrm %%T%%/docs/demos
 @dirrm %%T%%/docs
-@dirrm %%T%%/src/org/apache/jmeter/reporters
-@dirrm %%T%%/src/org/apache/jmeter/config/gui
-@dirrm %%T%%/src/org/apache/jmeter/config
-@dirrm %%T%%/src/org/apache/jmeter/control/gui
-@dirrm %%T%%/src/org/apache/jmeter/control
-@dirrm %%T%%/src/org/apache/jmeter/ejb/jndi/config/gui
-@dirrm %%T%%/src/org/apache/jmeter/ejb/jndi/config
-@dirrm %%T%%/src/org/apache/jmeter/ejb/jndi/control/gui
-@dirrm %%T%%/src/org/apache/jmeter/ejb/jndi/control
-@dirrm %%T%%/src/org/apache/jmeter/ejb/jndi/sampler
-@dirrm %%T%%/src/org/apache/jmeter/ejb/jndi/save
-@dirrm %%T%%/src/org/apache/jmeter/ejb/jndi
-@dirrm %%T%%/src/org/apache/jmeter/ejb
-@dirrm %%T%%/src/org/apache/jmeter/engine
-@dirrm %%T%%/src/org/apache/jmeter/exceptions
-@dirrm %%T%%/src/org/apache/jmeter/gui/util
-@dirrm %%T%%/src/org/apache/jmeter/gui/popup
-@dirrm %%T%%/src/org/apache/jmeter/gui/tree
-@dirrm %%T%%/src/org/apache/jmeter/gui/action
-@dirrm %%T%%/src/org/apache/jmeter/gui
-@dirrm %%T%%/src/org/apache/jmeter/images
-@dirrm %%T%%/src/org/apache/jmeter/junit/protocol/http/config
-@dirrm %%T%%/src/org/apache/jmeter/junit/protocol/http/control
-@dirrm %%T%%/src/org/apache/jmeter/junit/protocol/http/parser
-@dirrm %%T%%/src/org/apache/jmeter/junit/protocol/http
-@dirrm %%T%%/src/org/apache/jmeter/junit/protocol
-@dirrm %%T%%/src/org/apache/jmeter/junit
-@dirrm %%T%%/src/org/apache/jmeter/protocol/ftp/config/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/ftp/config
-@dirrm %%T%%/src/org/apache/jmeter/protocol/ftp/control/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/ftp/control
-@dirrm %%T%%/src/org/apache/jmeter/protocol/ftp/sampler
-@dirrm %%T%%/src/org/apache/jmeter/protocol/ftp/save
-@dirrm %%T%%/src/org/apache/jmeter/protocol/ftp
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/parser
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/control/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/control
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/modifier/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/modifier
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/config/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/config
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/proxy/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/proxy
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/sampler
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/save
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http/util
-@dirrm %%T%%/src/org/apache/jmeter/protocol/http
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc/config/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc/config
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc/control/gui
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc/control
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc/sampler
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc/save
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc/util
-@dirrm %%T%%/src/org/apache/jmeter/protocol/jdbc
-@dirrm %%T%%/src/org/apache/jmeter/protocol
-@dirrm %%T%%/src/org/apache/jmeter/assertions/gui
-@dirrm %%T%%/src/org/apache/jmeter/assertions
-@dirrm %%T%%/src/org/apache/jmeter/resources
-@dirrm %%T%%/src/org/apache/jmeter/samplers
-@dirrm %%T%%/src/org/apache/jmeter/save/handlers
-@dirrm %%T%%/src/org/apache/jmeter/save/xml
-@dirrm %%T%%/src/org/apache/jmeter/save
-@dirrm %%T%%/src/org/apache/jmeter/threads/gui
-@dirrm %%T%%/src/org/apache/jmeter/threads
-@dirrm %%T%%/src/org/apache/jmeter/timers/gui
-@dirrm %%T%%/src/org/apache/jmeter/timers
-@dirrm %%T%%/src/org/apache/jmeter/util/keystore
-@dirrm %%T%%/src/org/apache/jmeter/util
-@dirrm %%T%%/src/org/apache/jmeter/visualizers
-@dirrm %%T%%/src/org/apache/jmeter
-@dirrm %%T%%/src/org/apache
-@dirrm %%T%%/src/org
-@dirrm %%T%%/src
-@dirrm %%T%%/lib
+@dirrm %%T%%/ptch_src
 @dirrm %%T%%