svn commit: r1700113 - in /jmeter/trunk: bin/ src/components/org/apache/jmeter/timers/ src/components/org/apache/jmeter/timers/gui/ src/core/org/apache/jmeter/resources/ xdocs/ xdocs/images/screenshots/timers/ xdocs/usermanual/

[se...@apache.org]

Author: sebb
Date: Sun Aug 30 12:51:42 2015
New Revision: 1700113

URL: http://svn.apache.org/r1700113
Log:
Remove all InterruptTimer changes
Using a branch instead

Removed:
    jmeter/trunk/src/components/org/apache/jmeter/timers/InterruptTimer.java
    jmeter/trunk/src/components/org/apache/jmeter/timers/gui/InterruptTimerGui.java
    jmeter/trunk/xdocs/images/screenshots/timers/interrupt_timer.png
Modified:
    jmeter/trunk/bin/saveservice.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/bin/saveservice.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/saveservice.properties?rev=1700113&r1=1700112&r2=1700113&view=diff
==============================================================================
--- jmeter/trunk/bin/saveservice.properties (original)
+++ jmeter/trunk/bin/saveservice.properties Sun Aug 30 12:51:42 2015
@@ -165,8 +165,6 @@ IncludeController=org.apache.jmeter.cont
 IncludeControllerGui=org.apache.jmeter.control.gui.IncludeControllerGui
 InterleaveControl=org.apache.jmeter.control.InterleaveControl
 InterleaveControlGui=org.apache.jmeter.control.gui.InterleaveControlGui
-InterruptTimer=org.apache.jmeter.timers.InterruptTimer
-InterruptTimerGui=org.apache.jmeter.timers.gui.InterruptTimerGui
 JavaConfig=org.apache.jmeter.protocol.java.config.JavaConfig
 JavaConfigGui=org.apache.jmeter.protocol.java.config.gui.JavaConfigGui
 JavaSampler=org.apache.jmeter.protocol.java.sampler.JavaSampler

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1700113&r1=1700112&r2=1700113&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Aug 30 12:51:42 2015
@@ -423,9 +423,6 @@ insert_after=Insert After
 insert_before=Insert Before
 insert_parent=Insert Parent
 interleave_control_title=Interleave Controller
-interrupt_timer_memo=Interrupt the sampler if it times out
-interrupt_timer_timeout=Sampler timeout (in milliseconds)\:
-interrupt_timer_title=Interrupt Timer
 intsum_param_1=First int to add.
 intsum_param_2=Second int to add - further ints can be summed by adding further arguments.
 invalid_data=Invalid data

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1700113&r1=1700112&r2=1700113&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Sun Aug 30 12:51:42 2015
@@ -416,9 +416,6 @@ insert_after=Ins\u00E9rer apr\u00E8s
 insert_before=Ins\u00E9rer avant
 insert_parent=Ins\u00E9rer en tant que parent
 interleave_control_title=Contr\u00F4leur Interleave
-interrupt_timer_memo=Interrompre l'\u00E9chantillon si le d\u00E9lai est d\u00E9pass\u00E9
-interrupt_timer_timeout=D\u00E9lai d'attente avant interruption (en millisecondes) \: 
-interrupt_timer_title=Compteur Interruption
 intsum_param_1=Premier entier \u00E0 ajouter
 intsum_param_2=Deuxi\u00E8me entier \u00E0 ajouter - les entier(s) suivants peuvent \u00EAtre ajout\u00E9(s) avec les arguments suivants.
 invalid_data=Donn\u00E9e invalide

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1700113&r1=1700112&r2=1700113&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Aug 30 12:51:42 2015
@@ -104,7 +104,6 @@ Summary
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
-<li><bug>58299</bug>Add interrupt Timer</li>
 </ul>
 
 <h3>Functions</h3>

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1700113&r1=1700112&r2=1700113&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Aug 30 12:51:42 2015
@@ -5236,23 +5236,6 @@ to the random delay.</property>
 
 </component>
 
-<component name="Interrupt Timer" index="&sect-num;.6.1" anchor="interrupt" width="336" height="148" screenshot="timers/interrupt_timer.png">
-<description>
-<p>This is not strictly a timer, as it does not cause a delay before a sampler.
-Instead it interrupts the sampler if that has taken longer than the timeout.
-The timeout is ignored if it is zero or negative.
-For this to work, the sampler must implement Interruptible. 
-The following samplers are known to do so:<br></br>
-AJP, BeanShell, FTP, HTTP, Soap, AccessLog, MailReader, JMS Subscriber, TCPSampler, TestAction
-</p></description>
-
-<properties>
-        <property name="Name" required="No">Descriptive name for this timer that is shown in the tree.</property>
-        <property name="Sampler Timeout" required="Yes">If the sampler takes longer to complete, it will be interrupted.</property>
-</properties>
-</component>
-
-
 <a href="#">^</a>
 
 </section>