You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/11/12 20:43:41 UTC

svn commit: r332829 [3/4] - /jakarta/jmeter/branches/rel-2-1/bin/testfiles/

Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/HeaderManagerTestPlan.jmx
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/HeaderManagerTestPlan.jmx?rev=332829&r1=332828&r2=332829&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/testfiles/HeaderManagerTestPlan.jmx (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/HeaderManagerTestPlan.jmx Sat Nov 12 11:43:23 2005
@@ -1,92 +1,61 @@
-<jmeterTestPlan version="1.1" properties="1.7">
+<jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
-    <TestPlan>
-      <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp>
-      <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments">
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <collectionProp name="TestPlan.thread_groups"/>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments"/>
-        <stringProp name="TestElement.name">User Defined Variables</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
       </elementProp>
-      <collectionProp name="TestPlan.thread_groups"/>
-      <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <stringProp name="TestElement.name">Test Plan</stringProp>
-      <boolProp name="TestElement.enabled">true</boolProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
         <longProp name="ThreadGroup.start_time">0</longProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController">
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <stringProp name="LoopController.loops">1</stringProp>
-          <stringProp name="TestElement.name">Loop Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="LoopController.continue_forever">false</boolProp>
         </elementProp>
-        <stringProp name="TestElement.name">Thread Group</stringProp>
         <longProp name="ThreadGroup.end_time">0</longProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <stringProp name="ThreadGroup.ramp_time">0</stringProp>
       </ThreadGroup>
       <hashTree>
-        <HeaderManager>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HeaderPanel</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.control.HeaderManager</stringProp>
-          <stringProp name="TestElement.name">HTTP Header Manager</stringProp>
+        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
           <collectionProp name="HeaderManager.headers">
-            <elementProp name="User-Agent" elementType="org.apache.jmeter.protocol.http.control.Header">
+            <elementProp name="User-Agent" elementType="Header">
               <stringProp name="Header.value">Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)</stringProp>
               <stringProp name="Header.name">User-Agent</stringProp>
             </elementProp>
           </collectionProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
         </HeaderManager>
         <hashTree/>
-        <HTTPSampler>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="HTTP Request" enabled="true">
           <stringProp name="HTTPSampler.path">/</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="HTTPSampler.image_parser">false</boolProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments"/>
-            <stringProp name="TestElement.name"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
           </elementProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.mimetype"></stringProp>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
           <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-          <stringProp name="TestElement.name">HTTP Request</stringProp>
-          <stringProp name="HTTPSampler.domain">jakarta.apache.org</stringProp>
           <stringProp name="HTTPSampler.monitor">false</stringProp>
+          <stringProp name="HTTPSampler.domain">jakarta.apache.org</stringProp>
           <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
         </HTTPSampler>
         <hashTree/>
-        <ResultCollector>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</stringProp>
-          <stringProp name="TestElement.name">File Reporter</stringProp>
+        <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="File Reporter" enabled="true">
           <objProp>
-            <value class="org.apache.jmeter.samplers.SampleSaveConfiguration">
+            <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
               <timestamp>true</timestamp>
@@ -112,7 +81,6 @@
             </value>
             <name>saveConfig</name>
           </objProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <stringProp name="filename">header-manager.dat</stringProp>
           <boolProp name="ResultCollector.error_logging">false</boolProp>
         </ResultCollector>

Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/HeaderManagerTestPlan.jmx
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sat Nov 12 11:43:23 2005
@@ -1 +1 @@
-native
+LF

Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan.jmx
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan.jmx?rev=332829&r1=332828&r2=332829&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan.jmx (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan.jmx Sat Nov 12 11:43:23 2005
@@ -1,160 +1,105 @@
-<jmeterTestPlan version="1.1" properties="1.7">
+<jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
-    <TestPlan>
-      <collectionProp name="TestPlan.thread_groups"/>
-      <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments">
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments"/>
-        <stringProp name="TestElement.name">User Defined Variables</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
       </elementProp>
-      <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp>
+      <collectionProp name="TestPlan.thread_groups"/>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
-      <stringProp name="TestElement.name">Test Plan</stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestElement.enabled">true</boolProp>
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Jakarta Users" enabled="true">
         <longProp name="ThreadGroup.start_time">0</longProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
         <stringProp name="ThreadGroup.num_threads">2</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController">
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <stringProp name="LoopController.loops">5</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp>
-          <stringProp name="TestElement.name">Loop Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="LoopController.continue_forever">false</boolProp>
         </elementProp>
-        <stringProp name="TestElement.name">Jakarta Users</stringProp>
         <longProp name="ThreadGroup.end_time">0</longProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <stringProp name="ThreadGroup.ramp_time">0</stringProp>
       </ThreadGroup>
       <hashTree>
-        <InterleaveControl>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</stringProp>
+        <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
           <intProp name="InterleaveControl.style">0</intProp>
-          <stringProp name="TestElement.name">Interleave Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
         </InterleaveControl>
         <hashTree>
-          <ConfigTestElement>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui</stringProp>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="Defaults" enabled="true">
             <stringProp name="HTTPSampler.path"></stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</stringProp>
-            <stringProp name="TestElement.name">Defaults</stringProp>
             <stringProp name="HTTPSampler.domain"></stringProp>
             <stringProp name="HTTPSampler.protocol"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
-            <stringProp name="HTTPSampler.port"></stringProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
+            <stringProp name="HTTPSampler.port"></stringProp>
           </ConfigTestElement>
           <hashTree/>
-          <HTTPSampler>
+          <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="News Page" enabled="true">
             <stringProp name="HTTPSampler.path">/site/news.html</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
             <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
             <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
             <boolProp name="HTTPSampler.image_parser">false</boolProp>
             <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
             <stringProp name="HTTPSampler.port"></stringProp>
             <stringProp name="HTTPSampler.mimetype"></stringProp>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
             <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-            <stringProp name="TestElement.name">News Page</stringProp>
-            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.domain"></stringProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
             <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           </HTTPSampler>
           <hashTree/>
-          <HTTPSampler>
+          <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="FAQ Page" enabled="true">
             <stringProp name="HTTPSampler.path">/site/faqs.html</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
             <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
             <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
             <boolProp name="HTTPSampler.image_parser">false</boolProp>
             <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
             <stringProp name="HTTPSampler.port"></stringProp>
             <stringProp name="HTTPSampler.mimetype"></stringProp>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
             <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-            <stringProp name="TestElement.name">FAQ Page</stringProp>
-            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.domain"></stringProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
             <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           </HTTPSampler>
           <hashTree/>
-          <HTTPSampler>
+          <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Gump Page" enabled="true">
             <stringProp name="HTTPSampler.path">/gump</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
             <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
             <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
             <boolProp name="HTTPSampler.image_parser">false</boolProp>
             <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
             <stringProp name="HTTPSampler.port"></stringProp>
             <stringProp name="HTTPSampler.mimetype"></stringProp>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
             <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-            <stringProp name="TestElement.name">Gump Page</stringProp>
-            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.domain"></stringProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
             <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           </HTTPSampler>
           <hashTree/>
         </hashTree>
-        <ResultCollector>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</stringProp>
-          <stringProp name="TestElement.name">File Reporter</stringProp>
+        <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="File Reporter" enabled="true">
           <objProp>
-            <value class="org.apache.jmeter.samplers.SampleSaveConfiguration">
+            <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
               <timestamp>true</timestamp>
@@ -180,7 +125,6 @@
             </value>
             <name>saveConfig</name>
           </objProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <stringProp name="filename">interleave-test.dat</stringProp>
           <boolProp name="ResultCollector.error_logging">false</boolProp>
         </ResultCollector>

Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan.jmx
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sat Nov 12 11:43:23 2005
@@ -1 +1 @@
-native
+LF

Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan2.jmx
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan2.jmx?rev=332829&r1=332828&r2=332829&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan2.jmx (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan2.jmx Sat Nov 12 11:43:23 2005
@@ -1,205 +1,134 @@
-<jmeterTestPlan version="1.1" properties="1.7">
+<jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
-    <TestPlan>
-      <collectionProp name="TestPlan.thread_groups"/>
-      <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments">
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments"/>
-        <stringProp name="TestElement.name">User Defined Variables</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
       </elementProp>
-      <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp>
+      <collectionProp name="TestPlan.thread_groups"/>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
-      <stringProp name="TestElement.name">Test Plan</stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestElement.enabled">true</boolProp>
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Jakarta Users" enabled="true">
         <longProp name="ThreadGroup.start_time">0</longProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController">
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <stringProp name="LoopController.loops">8</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp>
-          <stringProp name="TestElement.name">Loop Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="LoopController.continue_forever">false</boolProp>
         </elementProp>
-        <stringProp name="TestElement.name">Jakarta Users</stringProp>
         <longProp name="ThreadGroup.end_time">0</longProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <stringProp name="ThreadGroup.ramp_time">0</stringProp>
       </ThreadGroup>
       <hashTree>
-        <InterleaveControl>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</stringProp>
+        <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
           <intProp name="InterleaveControl.style">0</intProp>
-          <stringProp name="TestElement.name">Interleave Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
         </InterleaveControl>
         <hashTree>
-          <ConfigTestElement>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui</stringProp>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="Defaults" enabled="true">
             <stringProp name="HTTPSampler.path">/</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</stringProp>
-            <stringProp name="TestElement.name">Defaults</stringProp>
             <stringProp name="HTTPSampler.domain">jakarta.apache.org</stringProp>
             <stringProp name="HTTPSampler.protocol"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
-            <stringProp name="HTTPSampler.port"></stringProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
+            <stringProp name="HTTPSampler.port"></stringProp>
           </ConfigTestElement>
           <hashTree/>
-          <InterleaveControl>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</stringProp>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
             <intProp name="InterleaveControl.style">0</intProp>
-            <stringProp name="TestElement.name">Interleave Controller</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
           </InterleaveControl>
           <hashTree>
-            <HTTPSampler>
+            <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Home Page" enabled="true">
               <stringProp name="HTTPSampler.path">/</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
               <stringProp name="HTTPSampler.method">GET</stringProp>
               <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
               <stringProp name="HTTPSampler.protocol">http</stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
               <boolProp name="HTTPSampler.image_parser">false</boolProp>
               <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-              <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-                <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-                <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+              <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
                 <collectionProp name="Arguments.arguments"/>
-                <stringProp name="TestElement.name"></stringProp>
-                <boolProp name="TestElement.enabled">true</boolProp>
               </elementProp>
               <stringProp name="HTTPSampler.port"></stringProp>
               <stringProp name="HTTPSampler.mimetype"></stringProp>
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
               <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-              <stringProp name="TestElement.name">Home Page</stringProp>
-              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.domain"></stringProp>
+              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
               <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
             </HTTPSampler>
             <hashTree/>
-            <HTTPSampler>
+            <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="CVS Page" enabled="true">
               <stringProp name="HTTPSampler.path">/site/cvsindex.html</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
               <stringProp name="HTTPSampler.method">GET</stringProp>
               <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
               <stringProp name="HTTPSampler.protocol">http</stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
               <boolProp name="HTTPSampler.image_parser">false</boolProp>
               <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-              <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-                <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-                <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+              <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
                 <collectionProp name="Arguments.arguments"/>
-                <stringProp name="TestElement.name"></stringProp>
-                <boolProp name="TestElement.enabled">true</boolProp>
               </elementProp>
               <stringProp name="HTTPSampler.port"></stringProp>
               <stringProp name="HTTPSampler.mimetype"></stringProp>
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
               <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-              <stringProp name="TestElement.name">CVS Page</stringProp>
-              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.domain"></stringProp>
+              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
               <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
             </HTTPSampler>
             <hashTree/>
           </hashTree>
-          <InterleaveControl>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.InterleaveControlGui</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.control.InterleaveControl</stringProp>
+          <InterleaveControl guiclass="InterleaveControlGui" testclass="InterleaveControl" testname="Interleave Controller" enabled="true">
             <intProp name="InterleaveControl.style">0</intProp>
-            <stringProp name="TestElement.name">Interleave Controller</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
           </InterleaveControl>
           <hashTree>
-            <HTTPSampler>
+            <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Bug Page" enabled="true">
               <stringProp name="HTTPSampler.path">/site/bugs.html</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
               <stringProp name="HTTPSampler.method">GET</stringProp>
               <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
               <stringProp name="HTTPSampler.protocol">http</stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
               <boolProp name="HTTPSampler.image_parser">false</boolProp>
               <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-              <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-                <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-                <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+              <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
                 <collectionProp name="Arguments.arguments"/>
-                <stringProp name="TestElement.name"></stringProp>
-                <boolProp name="TestElement.enabled">true</boolProp>
               </elementProp>
               <stringProp name="HTTPSampler.port"></stringProp>
               <stringProp name="HTTPSampler.mimetype"></stringProp>
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
               <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-              <stringProp name="TestElement.name">Bug Page</stringProp>
-              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.domain"></stringProp>
+              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
               <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
             </HTTPSampler>
             <hashTree/>
-            <HTTPSampler>
+            <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="FAQ Page" enabled="true">
               <stringProp name="HTTPSampler.path">/site/faqs.html</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
               <stringProp name="HTTPSampler.method">GET</stringProp>
               <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
               <stringProp name="HTTPSampler.protocol">http</stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
               <boolProp name="HTTPSampler.image_parser">false</boolProp>
               <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-              <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-                <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-                <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+              <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
                 <collectionProp name="Arguments.arguments"/>
-                <stringProp name="TestElement.name"></stringProp>
-                <boolProp name="TestElement.enabled">true</boolProp>
               </elementProp>
               <stringProp name="HTTPSampler.port"></stringProp>
               <stringProp name="HTTPSampler.mimetype"></stringProp>
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
               <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-              <stringProp name="TestElement.name">FAQ Page</stringProp>
-              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.domain"></stringProp>
+              <stringProp name="HTTPSampler.monitor">false</stringProp>
               <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
               <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
             </HTTPSampler>
             <hashTree/>
           </hashTree>
         </hashTree>
-        <ResultCollector>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</stringProp>
-          <stringProp name="TestElement.name">File Reporter</stringProp>
+        <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="File Reporter" enabled="true">
           <objProp>
-            <value class="org.apache.jmeter.samplers.SampleSaveConfiguration">
+            <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
               <timestamp>true</timestamp>
@@ -225,7 +154,6 @@
             </value>
             <name>saveConfig</name>
           </objProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <stringProp name="filename">interleave-test2.dat</stringProp>
           <boolProp name="ResultCollector.error_logging">false</boolProp>
         </ResultCollector>

Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/InterleaveTestPlan2.jmx
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sat Nov 12 11:43:23 2005
@@ -1 +1 @@
-native
+LF

Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/LoopTestPlan.jmx
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/LoopTestPlan.jmx?rev=332829&r1=332828&r2=332829&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/testfiles/LoopTestPlan.jmx (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/LoopTestPlan.jmx Sat Nov 12 11:43:23 2005
@@ -1,134 +1,87 @@
-<jmeterTestPlan version="1.1" properties="1.7">
+<jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
-    <TestPlan>
-      <collectionProp name="TestPlan.thread_groups"/>
-      <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments">
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments"/>
-        <stringProp name="TestElement.name">User Defined Variables</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
       </elementProp>
-      <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp>
+      <collectionProp name="TestPlan.thread_groups"/>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
-      <stringProp name="TestElement.name">Test Plan</stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestElement.enabled">true</boolProp>
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Jakarta Users" enabled="true">
         <longProp name="ThreadGroup.start_time">0</longProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController">
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <stringProp name="LoopController.loops">1</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp>
-          <stringProp name="TestElement.name">Loop Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="LoopController.continue_forever">false</boolProp>
         </elementProp>
-        <stringProp name="TestElement.name">Jakarta Users</stringProp>
         <longProp name="ThreadGroup.end_time">0</longProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <stringProp name="ThreadGroup.ramp_time">0</stringProp>
       </ThreadGroup>
       <hashTree>
-        <ConfigTestElement>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui</stringProp>
+        <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="Defaults" enabled="true">
           <stringProp name="HTTPSampler.path">/</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</stringProp>
-          <stringProp name="TestElement.name">Defaults</stringProp>
           <stringProp name="HTTPSampler.domain">jakarta.apache.org</stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
-          <stringProp name="HTTPSampler.port"></stringProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments"/>
-            <stringProp name="TestElement.name"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
           </elementProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
         </ConfigTestElement>
         <hashTree/>
-        <HTTPSampler>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Home Page" enabled="true">
           <stringProp name="HTTPSampler.path">/</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="HTTPSampler.image_parser">false</boolProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments"/>
-            <stringProp name="TestElement.name"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
           </elementProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.mimetype"></stringProp>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
           <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-          <stringProp name="TestElement.name">Home Page</stringProp>
-          <stringProp name="HTTPSampler.monitor">false</stringProp>
           <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
           <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
         </HTTPSampler>
         <hashTree/>
-        <LoopController>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp>
+        <LoopController guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <stringProp name="LoopController.loops">5</stringProp>
-          <stringProp name="TestElement.name">Loop Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <stringProp name="LoopController.continue_forever">true</stringProp>
         </LoopController>
         <hashTree>
-          <HTTPSampler>
+          <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="News Page" enabled="true">
             <stringProp name="HTTPSampler.path">/site/news.html</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
             <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
             <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
             <boolProp name="HTTPSampler.image_parser">false</boolProp>
             <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
             <stringProp name="HTTPSampler.port"></stringProp>
             <stringProp name="HTTPSampler.mimetype"></stringProp>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
             <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-            <stringProp name="TestElement.name">News Page</stringProp>
-            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.domain"></stringProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
             <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           </HTTPSampler>
           <hashTree/>
         </hashTree>
-        <ResultCollector>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</stringProp>
-          <stringProp name="TestElement.name">File Reporter</stringProp>
+        <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="File Reporter" enabled="true">
           <objProp>
-            <value class="org.apache.jmeter.samplers.SampleSaveConfiguration">
+            <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
               <timestamp>true</timestamp>
@@ -154,7 +107,6 @@
             </value>
             <name>saveConfig</name>
           </objProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <stringProp name="filename">loop-test.dat</stringProp>
           <boolProp name="ResultCollector.error_logging">false</boolProp>
         </ResultCollector>

Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/LoopTestPlan.jmx
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sat Nov 12 11:43:23 2005
@@ -1 +1 @@
-native
+LF

Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/Modification Manager.jmx
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/Modification%20Manager.jmx?rev=332829&r1=332828&r2=332829&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/testfiles/Modification Manager.jmx (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/Modification Manager.jmx Sat Nov 12 11:43:23 2005
@@ -1,99 +1,65 @@
-<jmeterTestPlan version="1.1" properties="1.7">
+<jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
-    <TestPlan>
-      <collectionProp name="TestPlan.thread_groups"/>
-      <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments">
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments"/>
-        <stringProp name="TestElement.name">User Defined Variables</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
       </elementProp>
-      <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp>
+      <collectionProp name="TestPlan.thread_groups"/>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
-      <stringProp name="TestElement.name">Test Plan</stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestElement.enabled">true</boolProp>
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <GenericController>
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.control.GenericController</stringProp>
-        <stringProp name="TestElement.name">Modification Manager</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
-      </GenericController>
+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Modification Manager" enabled="true"/>
       <hashTree>
-        <GenericController>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LogicControllerGui</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.GenericController</stringProp>
-          <stringProp name="TestElement.name">Simple Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
-        </GenericController>
+        <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true"/>
         <hashTree>
-          <HTTPSampler>
+          <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Web Testing" enabled="true">
             <stringProp name="HTTPSampler.path">/xdx/admin/inspect_job.jsp</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
             <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
             <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
             <boolProp name="HTTPSampler.image_parser">false</boolProp>
             <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments">
-                <elementProp name="" elementType="org.apache.jmeter.protocol.http.util.HTTPArgument">
+                <elementProp name="" elementType="HTTPArgument">
                   <stringProp name="Argument.metadata">=</stringProp>
                   <stringProp name="Argument.value">.*</stringProp>
                   <boolProp name="HTTPArgument.use_equals">true</boolProp>
                   <stringProp name="Argument.name">request.job_id</stringProp>
-                  <stringProp name="HTTPArgument.always_encode">true</stringProp>
                   <stringProp name="HTTPArgument.encoded_name">request.job_id</stringProp>
+                  <stringProp name="HTTPArgument.always_encode">true</stringProp>
                   <stringProp name="HTTPArgument.encoded_value">.*</stringProp>
                 </elementProp>
-                <elementProp name="" elementType="org.apache.jmeter.protocol.http.util.HTTPArgument">
+                <elementProp name="" elementType="HTTPArgument">
                   <stringProp name="Argument.metadata">=</stringProp>
                   <stringProp name="Argument.value">opjobadmin.action.inspect</stringProp>
                   <boolProp name="HTTPArgument.use_equals">true</boolProp>
                   <stringProp name="Argument.name">request.action1</stringProp>
-                  <stringProp name="HTTPArgument.always_encode">true</stringProp>
                   <stringProp name="HTTPArgument.encoded_name">request.action1</stringProp>
+                  <stringProp name="HTTPArgument.always_encode">true</stringProp>
                   <stringProp name="HTTPArgument.encoded_value">opjobadmin.action.inspect</stringProp>
                 </elementProp>
               </collectionProp>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
             <stringProp name="HTTPSampler.port">80</stringProp>
             <stringProp name="HTTPSampler.mimetype"></stringProp>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
             <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-            <stringProp name="TestElement.name">Web Testing</stringProp>
-            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.domain"></stringProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
             <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           </HTTPSampler>
           <hashTree/>
-          <ConfigTestElement>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui</stringProp>
+          <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
             <stringProp name="HTTPSampler.path"></stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</stringProp>
-            <stringProp name="TestElement.name">HTTP Request Defaults</stringProp>
             <stringProp name="HTTPSampler.domain">13.231.197.158</stringProp>
             <stringProp name="HTTPSampler.protocol"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
-            <stringProp name="HTTPSampler.port">80</stringProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
+            <stringProp name="HTTPSampler.port">80</stringProp>
           </ConfigTestElement>
           <hashTree/>
         </hashTree>

Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/Modification Manager.jmx
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sat Nov 12 11:43:23 2005
@@ -1 +1 @@
-native
+LF

Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/OnceOnlyTestPlan.jmx
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/OnceOnlyTestPlan.jmx?rev=332829&r1=332828&r2=332829&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/testfiles/OnceOnlyTestPlan.jmx (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/OnceOnlyTestPlan.jmx Sat Nov 12 11:43:23 2005
@@ -1,132 +1,84 @@
-<jmeterTestPlan version="1.1" properties="1.7">
+<jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
-    <TestPlan>
-      <collectionProp name="TestPlan.thread_groups"/>
-      <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments">
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments"/>
-        <stringProp name="TestElement.name">User Defined Variables</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
       </elementProp>
-      <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp>
+      <collectionProp name="TestPlan.thread_groups"/>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
-      <stringProp name="TestElement.name">Test Plan</stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestElement.enabled">true</boolProp>
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Jakarta Users" enabled="true">
         <longProp name="ThreadGroup.start_time">0</longProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
         <stringProp name="ThreadGroup.num_threads">2</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController">
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <stringProp name="LoopController.loops">3</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp>
-          <stringProp name="TestElement.name">Loop Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="LoopController.continue_forever">false</boolProp>
         </elementProp>
-        <stringProp name="TestElement.name">Jakarta Users</stringProp>
         <longProp name="ThreadGroup.end_time">0</longProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <stringProp name="ThreadGroup.ramp_time">0</stringProp>
       </ThreadGroup>
       <hashTree>
-        <ConfigTestElement>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui</stringProp>
+        <ConfigTestElement guiclass="HttpDefaultsGui" testclass="ConfigTestElement" testname="Defaults" enabled="true">
           <stringProp name="HTTPSampler.path">/</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.config.ConfigTestElement</stringProp>
-          <stringProp name="TestElement.name">Defaults</stringProp>
           <stringProp name="HTTPSampler.domain">jakarta.apache.org</stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
-          <stringProp name="HTTPSampler.port"></stringProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments"/>
-            <stringProp name="TestElement.name"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
           </elementProp>
+          <stringProp name="HTTPSampler.port"></stringProp>
         </ConfigTestElement>
         <hashTree/>
-        <OnceOnlyController>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.OnceOnlyControllerGui</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.OnceOnlyController</stringProp>
-          <stringProp name="TestElement.name">Once Only Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
-        </OnceOnlyController>
+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Once Only Controller" enabled="true"/>
         <hashTree>
-          <HTTPSampler>
+          <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Home Page" enabled="true">
             <stringProp name="HTTPSampler.path">/</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
             <stringProp name="HTTPSampler.method">GET</stringProp>
             <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
             <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
             <boolProp name="HTTPSampler.image_parser">false</boolProp>
             <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-              <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-              <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
               <collectionProp name="Arguments.arguments"/>
-              <stringProp name="TestElement.name"></stringProp>
-              <boolProp name="TestElement.enabled">true</boolProp>
             </elementProp>
             <stringProp name="HTTPSampler.port"></stringProp>
             <stringProp name="HTTPSampler.mimetype"></stringProp>
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
             <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-            <stringProp name="TestElement.name">Home Page</stringProp>
-            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.domain"></stringProp>
+            <stringProp name="HTTPSampler.monitor">false</stringProp>
             <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
             <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           </HTTPSampler>
           <hashTree/>
         </hashTree>
-        <HTTPSampler>
+        <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="Bug Page" enabled="true">
           <stringProp name="HTTPSampler.path">/site/bugs.html</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="HTTPSampler.image_parser">false</boolProp>
           <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="org.apache.jmeter.config.Arguments">
-            <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel</stringProp>
-            <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments"/>
-            <stringProp name="TestElement.name"></stringProp>
-            <boolProp name="TestElement.enabled">true</boolProp>
           </elementProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.mimetype"></stringProp>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui</stringProp>
           <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
-          <stringProp name="TestElement.name">Bug Page</stringProp>
-          <stringProp name="HTTPSampler.monitor">false</stringProp>
           <stringProp name="HTTPSampler.domain"></stringProp>
+          <stringProp name="HTTPSampler.monitor">false</stringProp>
           <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
         </HTTPSampler>
         <hashTree/>
-        <ResultCollector>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.visualizers.GraphVisualizer</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.reporters.ResultCollector</stringProp>
-          <stringProp name="TestElement.name">File Reporter</stringProp>
+        <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="File Reporter" enabled="true">
           <objProp>
-            <value class="org.apache.jmeter.samplers.SampleSaveConfiguration">
+            <value class="SampleSaveConfiguration">
               <time>true</time>
               <latency>true</latency>
               <timestamp>true</timestamp>
@@ -152,7 +104,6 @@
             </value>
             <name>saveConfig</name>
           </objProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <stringProp name="filename">once-only-test.dat</stringProp>
           <boolProp name="ResultCollector.error_logging">false</boolProp>
         </ResultCollector>

Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/OnceOnlyTestPlan.jmx
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sat Nov 12 11:43:23 2005
@@ -1 +1 @@
-native
+LF

Modified: jakarta/jmeter/branches/rel-2-1/bin/testfiles/ProxyServerTestPlan.jmx
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/testfiles/ProxyServerTestPlan.jmx?rev=332829&r1=332828&r2=332829&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/testfiles/ProxyServerTestPlan.jmx (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/testfiles/ProxyServerTestPlan.jmx Sat Nov 12 11:43:23 2005
@@ -1,61 +1,41 @@
-<jmeterTestPlan version="1.1" properties="1.7">
+<jmeterTestPlan version="1.2" properties="1.8">
   <hashTree>
-    <TestPlan>
-      <collectionProp name="TestPlan.thread_groups"/>
-      <elementProp name="TestPlan.user_defined_variables" elementType="org.apache.jmeter.config.Arguments">
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.config.gui.ArgumentsPanel</stringProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.config.Arguments</stringProp>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
         <collectionProp name="Arguments.arguments"/>
-        <stringProp name="TestElement.name">User Defined Variables</stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
       </elementProp>
-      <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.TestPlanGui</stringProp>
+      <collectionProp name="TestPlan.thread_groups"/>
       <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
-      <stringProp name="TestElement.test_class">org.apache.jmeter.testelement.TestPlan</stringProp>
-      <stringProp name="TestElement.name">Test Plan</stringProp>
       <boolProp name="TestPlan.functional_mode">false</boolProp>
-      <boolProp name="TestElement.enabled">true</boolProp>
       <stringProp name="TestPlan.comments"></stringProp>
     </TestPlan>
     <hashTree>
-      <ThreadGroup>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
         <longProp name="ThreadGroup.start_time">0</longProp>
-        <stringProp name="TestElement.test_class">org.apache.jmeter.threads.ThreadGroup</stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
-        <boolProp name="TestElement.enabled">true</boolProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
-        <stringProp name="TestElement.gui_class">org.apache.jmeter.threads.gui.ThreadGroupGui</stringProp>
-        <elementProp name="ThreadGroup.main_controller" elementType="org.apache.jmeter.control.LoopController">
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.control.gui.LoopControlPanel</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <stringProp name="LoopController.loops">1</stringProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.control.LoopController</stringProp>
-          <stringProp name="TestElement.name">Loop Controller</stringProp>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <boolProp name="LoopController.continue_forever">false</boolProp>
         </elementProp>
-        <stringProp name="TestElement.name">Thread Group</stringProp>
         <longProp name="ThreadGroup.end_time">0</longProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <stringProp name="ThreadGroup.ramp_time">0</stringProp>
       </ThreadGroup>
       <hashTree>
-        <org.apache.jmeter.protocol.http.proxy.ProxyControl>
-          <stringProp name="TestElement.gui_class">org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui</stringProp>
+        <ProxyControl guiclass="ProxyControlGui" testclass="ProxyControl" testname="HTTP Proxy Server" enabled="true">
           <intProp name="ProxyControlGui.grouping_mode">0</intProp>
           <boolProp name="ProxyControlGui.capture_http_headers">true</boolProp>
-          <stringProp name="TestElement.test_class">org.apache.jmeter.protocol.http.proxy.ProxyControl</stringProp>
-          <stringProp name="TestElement.name">HTTP Proxy Server</stringProp>
           <boolProp name="ProxyControlGui.use_keepalive">true</boolProp>
           <collectionProp name="ProxyControlGui.include_list">
             <stringProp name="58624487">&lt;html</stringProp>
           </collectionProp>
           <collectionProp name="ProxyControlGui.exclude_list"/>
-          <boolProp name="TestElement.enabled">true</boolProp>
           <stringProp name="ProxyControlGui.port">8080</stringProp>
           <boolProp name="ProxyControlGui.add_assertion">false</boolProp>
-        </org.apache.jmeter.protocol.http.proxy.ProxyControl>
+        </ProxyControl>
         <hashTree/>
       </hashTree>
     </hashTree>

Propchange: jakarta/jmeter/branches/rel-2-1/bin/testfiles/ProxyServerTestPlan.jmx
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sat Nov 12 11:43:23 2005
@@ -1 +1 @@
-native
+LF



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org