Author: sebb
Date: Wed May 5 14:04:22 2010
New Revision: 941297
URL: http://svn.apache.org/viewvc?rev=941297&view=rev
Log:
Tab police
Modified:
jakarta/jmeter/trunk/bin/logkit.xml
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Modified: jakarta/jmeter/trunk/bin/logkit.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/logkit.xml?rev=941297&r1=941296&r2=941297&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/logkit.xml (original)
+++ jakarta/jmeter/trunk/bin/logkit.xml Wed May 5 14:04:22 2010
@@ -18,9 +18,9 @@
<logkit logger="system.logkit" log-level="INFO"
manager-class="org.apache.avalon.excalibur.logger.LogKitLoggerManager">
<!--
- The manager-class is what determines the underlying log implementation
- In this case, it is Avalon LogKit.
- Not sure what logger and log-level are for.
+ The manager-class is what determines the underlying log implementation
+ In this case, it is Avalon LogKit.
+ Not sure what logger and log-level are for.
-->
<factories>
@@ -35,7 +35,7 @@
<filename>format.log</filename>
<format type="pattern">
AT: %{time:yyyy/MM/dd HH:mm:ss} PRI: %5.5{priority} CAT: %{category} TEXT:
%{message} EX: %{throwable}\n
- </format>
+ </format>
</file>
<!-- Sample entry showing unique names. SSS = milliseconds -->
@@ -43,20 +43,20 @@ AT: %{time:yyyy/MM/dd HH:mm:ss} PRI: %5.
<append>false</append>
<filename>prefix</filename>
<rotation type="unique" pattern="yyyy-MM-dd-hh-mm-ss-SSS"
suffix=".log">
- <size>1000000</size>
+ <size>1000000</size>
</rotation>
<!-- can also add a format here -->
</file>
<!--
- Sample entry showing how to rotate files, i.e. my_log.000001 etc
- -->
+ Sample entry showing how to rotate files, i.e. my_log.000001 etc
+ -->
<file id="logRevolve" >
<append>false</append>
<filename>my_log</filename>
<rotation type="revolving" init="1" max="10">
- <size>1000000</size>
- </rotation>
+ <size>1000000</size>
+ </rotation>
<!-- can also add a format here -->
</file>
@@ -66,18 +66,18 @@ AT: %{time:yyyy/MM/dd HH:mm:ss} PRI: %5.
<categories>
<!--
- Notes:
- * must define the default category, i.e. where name = ""
- * each log-target id-ref must refer to a valid file entry
- -->
+ Notes:
+ * must define the default category, i.e. where name = ""
+ * each log-target id-ref must refer to a valid file entry
+ -->
<category name="" log-level="INFO">
<log-target id-ref="logFile"/>
</category>
<!--
- Further categories can be defined if required; they can have
- the same or different targets, but the targets must exist
- -->
+ Further categories can be defined if required; they can have
+ the same or different targets, but the targets must exist
+ -->
<category name="jorphan" log-level="WARN">
<log-target id-ref="logRevolver"/>
</category>
@@ -107,36 +107,36 @@ This factory is able to create different
Some explanations about the Elements used in the configuration:
<filename>
- This denotes the name of the file to log to. It can be constructed out
of entries in the
- passed Context object as ${context-key}. This element is required.
+ This denotes the name of the file to log to. It can be constructed out of
entries in the
+ passed Context object as ${context-key}. This element is required.
<format>
- The type attribute of the pattern element denotes the type of
Formatter to be used and
- according to it the pattern to use for. This elements defaults to:
+ The type attribute of the pattern element denotes the type of Formatter
to be used and
+ according to it the pattern to use for. This elements defaults to:
%7.7{priority} %5.5{time} [%8.8{category}] (%{context}):
%{message}\\n%{throwable}
-<append> If the log file should be deleted every time the logger is
creates (normally at the
+<append> If the log file should be deleted every time the logger is
creates (normally at the
start of the applcation) or not and thus the log entries will be appended.
This elements defaults to
false.
<rotation>
- This is an optional element. The type attribute determines which
FileStrategy to user
- (revolving=RevolvingFileStrategy, unique=UniqueFileStrategy). The
required init and max attribute
- are used to determine the initial and maximum rotation to use on a
type="revolving" attribute. The
- optional pattern and suffix attribute are used to form filenames on a
type="unique" attribute.
+ This is an optional element. The type attribute determines which
FileStrategy to user
+ (revolving=RevolvingFileStrategy, unique=UniqueFileStrategy). The
required init and max attribute
+ are used to determine the initial and maximum rotation to use on a
type="revolving" attribute. The
+ optional pattern and suffix attribute are used to form filenames on a
type="unique" attribute.
The initial rotation can be set to -1 in which case the system will first
create the maximum number
of file rotations by selecting the next available rotation and thereafter
will overwrite the oldest log
file.
<or>
- uses the OrRotateStrategy to combine the children
+ uses the OrRotateStrategy to combine the children
<size>
- The number of bytes if no suffix used or kilo bytes (1024) if suffixed
with 'k' or mega bytes
- (1024k) if suffixed with 'm' when a file rotation should occur. It
doesn't make sense to specify more
- than one.
+ The number of bytes if no suffix used or kilo bytes (1024) if suffixed
with 'k' or mega bytes
+ (1024k) if suffixed with 'm' when a file rotation should occur. It
doesn't make sense to specify more
+ than one.
<time>
- The time as HH:MM:SS when a rotation should occur. If you like to
rotate a logfile more
- than once a day put an <or> element immediately after the <rotation>
element and specify the
- times (and one size, too) inside the <or> element.
+ The time as HH:MM:SS when a rotation should occur. If you like to rotate
a logfile more
+ than once a day put an <or> element immediately after the <rotation>
element and specify the
+ times (and one size, too) inside the <or> element.
<date>
- Rotation occur when string formatted date changed. Specify date
formatting pattern.
+ Rotation occur when string formatted date changed. Specify date
formatting pattern.
<interval>
- Interval at which a rotation should occur. The interval should be
given in the format ddd:
- hh:mm:ss.
+ Interval at which a rotation should occur. The interval should be given
in the format ddd:
+ hh:mm:ss.
-->
\ No newline at end of file
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=941297&r1=941296&r2=941297&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Wed May 5 14:04:22 2010
@@ -563,7 +563,7 @@ public class ProxyControl extends Generi
*/
private void addTransactionController(JMeterTreeModel model,
JMeterTreeNode node, String name)
throws IllegalUserActionException {
- TransactionController sc = new TransactionController();
+ TransactionController sc = new TransactionController();
sc.setProperty(TestElement.GUI_CLASS, TRANSACTION_CONTROLLER_GUI);
sc.setName(name);
model.addComponent(sc, node);
@@ -780,7 +780,7 @@ public class ProxyControl extends Generi
}
if (groupingMode == GROUPING_IN_SIMPLE_CONTROLLERS ||
- groupingMode == GROUPING_IN_TRANSACTION_CONTROLLERS) {
+ groupingMode == GROUPING_IN_TRANSACTION_CONTROLLERS) {
// Find the last controller in the target to store the
// sampler there:
for (int i = myTarget.getChildCount() - 1; i >= 0; i--) {
