jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1457570 - in /jmeter/trunk: ./ extras/ xdocs/extending/ xdocs/localising/ xdocs/stylesheets/
Date Sun, 17 Mar 2013 21:48:24 GMT
Author: sebb
Date: Sun Mar 17 21:48:24 2013
New Revision: 1457570

URL: http://svn.apache.org/r1457570
Log:
Tab police

Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/extras/addons.xml
    jmeter/trunk/extras/build.xml
    jmeter/trunk/fb-excludes.xml
    jmeter/trunk/xdocs/extending/JMeter Extension Scenario.xml
    jmeter/trunk/xdocs/extending/index.xml
    jmeter/trunk/xdocs/localising/index.xml
    jmeter/trunk/xdocs/stylesheets/printable_project.xml
    jmeter/trunk/xdocs/stylesheets/project.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Mar 17 21:48:24 2013
@@ -42,10 +42,10 @@
 
     To build all and package up the files for distribution
       ant distribution -Djmeter.version=vvvv [-Dsvn.revision=nnnnn]
-  	
+
     Add -Ddisable-svnCheck=true to disable svn check, if you build from src archive or offline
-  	Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
-  	  if you want build your own custom JMeter package.
+    Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
+      if you want build your own custom JMeter package.
 
     To create a nightly build (separate bin/src/lib jars):
       ant nightly [-Dsvn.revision=nnnnn]
@@ -151,7 +151,7 @@
       <sourcePath path="${src.native}" />
       <sourcePath path="${src.mongodb}" />
       <sourcePath path="${src.report}" />
-      		
+
       <auxClasspath>
           <fileset dir="${lib.dir}">
               <include name="*.jar"/>
@@ -342,7 +342,7 @@
   <property file="build.properties"/> <!-- defines the library version numbers -->
 
   <property name="resources.meta-inf"      value="${build.res}/META-INF"/>
-	
+
   <patternset id="external.jars.notices">
         <include name="LICENSE"/>
         <include name="NOTICE"/>
@@ -380,8 +380,8 @@
     <include name="${lib.dir}/${jdom.jar}"/>
     <include name="${lib.dir}/${jms.jar}"/>
     <include name="${lib.dir}/${js_rhino.jar}"/>
-  	<include name="${lib.dir}/${jodd-core.jar}"/>
-  	<include name="${lib.dir}/${jodd-lagarto.jar}"/>
+    <include name="${lib.dir}/${jodd-core.jar}"/>
+    <include name="${lib.dir}/${jodd-lagarto.jar}"/>
     <include name="${lib.dir}/${jsoup.jar}"/>
     <include name="${lib.dir}/${junit.jar}"/>
     <include name="${lib.dir}/${logkit.jar}"/>
@@ -448,7 +448,7 @@
     <pathelement location="${lib.dir}/${jdom.jar}"/>
     <pathelement location="${lib.dir}/${jms.jar}"/>
     <pathelement location="${lib.dir}/${js_rhino.jar}"/>
-  	<pathelement location="${lib.dir}/${jodd-core.jar}"/>
+    <pathelement location="${lib.dir}/${jodd-core.jar}"/>
     <pathelement location="${lib.dir}/${jodd-lagarto.jar}"/>
     <pathelement location="${lib.dir}/${jsoup.jar}"/>
     <pathelement location="${lib.dir}/${junit.jar}"/>
@@ -492,7 +492,7 @@
   <filterset id="version.filters">
     <filter token="YEAR" value="${year}"/>
   </filterset>
-	
+
   <target name="init-version">
     <tstamp/>
     <!--
@@ -831,7 +831,7 @@
       </classpath>
     </javac>
   </target>
-	
+
   <target name="compile-native" depends="compile-jorphan,compile-core,compile-components"
         description="Compile components specific to Native sampling.">
     <mkdir dir="${build.native}"/>
@@ -845,7 +845,7 @@
       </classpath>
     </javac>
   </target>
-	
+
   <target name="compile-mongodb" depends="compile-jorphan,compile-core,compile-components"
         description="Compile components specific to MongoDB sampling.">
     <mkdir dir="${build.mongodb}"/>
@@ -880,7 +880,7 @@
   <target name="prepare-resources"
      description="Prepare some resources files, update date">
     <mkdir dir="${build.res}" />
-  	<mkdir dir="${resources.meta-inf}" />
+    <mkdir dir="${resources.meta-inf}" />
     <copy todir="${resources.meta-inf}" overwrite="yes" filtering="yes"
         encoding="${encoding}">
       <filterset refid="version.filters"/>
@@ -1148,7 +1148,7 @@ run JMeter unless all the JMeter jars ar
       <fileset dir="${build.mongodb}" includes="**/*.class" />
       <fileset dir="${src.mongodb}" includes="**/*.properties" />
     </jar>
-      	
+
     <jar jarfile="${lib.dir}/jorphan.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
         <zipfileset file="${resources.meta-inf}/default.notice"
           fullpath="META-INF/NOTICE" />
@@ -1302,8 +1302,8 @@ run JMeter unless all the JMeter jars ar
     <exclude name="**/*.jpg"/>
     <exclude name="**/*.png"/>
     <include name="${src.docs}/**"/>
-  	<!-- Include some resources -->
-  	<include name="${res.dir}/**"/>
+    <!-- Include some resources -->
+    <include name="${res.dir}/**"/>
     <!-- Exclude binary types (and JMX/JTL, which are not OS-dependent) -->
     <exclude name="${src.docs}/images/**"/>
     <exclude name="${src.docs}/**/*.jmx"/>
@@ -1417,7 +1417,7 @@ run JMeter unless all the JMeter jars ar
         <local         name="version.match"/>
         <condition property="version.match">
             <resourcecontains resource="${src.core}/org/apache/jmeter/util/JMeterVersion.java"
-            	substring='VERSION = "${jmeter.version}";'/>
+                substring='VERSION = "${jmeter.version}";'/>
         </condition>
         <fail message="jmeter.version must be same as JMeterVersion.VERSION" unless="version.match"/>
     </target>
@@ -2341,7 +2341,7 @@ run JMeter unless all the JMeter jars ar
             <antcall target="batchtest">
                 <param name="remote" value="-Rlocalhost:${rmi_port}"/>
                 <param name="taskname" value="client"/>
-            	<param name="batchtest.name" value="BatchTestLocalRemote"/>
+                <param name="batchtest.name" value="BatchTestLocalRemote"/>
             </antcall>
         </sequential>
     </parallel>
@@ -2483,9 +2483,9 @@ run JMeter unless all the JMeter jars ar
           <param name="batchtest.name" value="Bug52310"/>
       </antcall>
       <antcall target="batchtest">
-  	      <param name="batchtest.name" value="Bug52968"/>
-  	  </antcall>
-  	
+          <param name="batchtest.name" value="Bug52968"/>
+      </antcall>
+
       <antcall target="batchtest">
           <param name="batchtest.name" value="Bug50898"/>
       </antcall>
@@ -2755,14 +2755,14 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="jdom"/>
         <process_jarfile jarname="jms"/>
         <process_jarfile jarname="js_rhino"/>
-    	<process_jarfile jarname="jodd-core"/>
+        <process_jarfile jarname="jodd-core"/>
         <process_jarfile jarname="jodd-lagarto"/>
         <process_jarfile jarname="jsoup"/>
         <process_jarfile jarname="junit"/>
         <process_jarfile jarname="logkit"/>
         <process_jarfile jarname="mongo-java-driver"/>
         <process_jarfile jarname="serializer"/>
-    	<process_jarfile jarname="slf4j-api"/>
+        <process_jarfile jarname="slf4j-api"/>
         <process_jarfile jarname="soap"/>
         <process_jarfile jarname="tidy"/>
         <process_jarfile jarname="tika-core"/>

Modified: jmeter/trunk/extras/addons.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/addons.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/extras/addons.xml (original)
+++ jmeter/trunk/extras/addons.xml Sun Mar 17 21:48:24 2013
@@ -53,7 +53,7 @@
    <target name="package" depends="compile">
     <mkdir dir="${jar.dest}"/>
     <jar jarfile="${jar.dest}/${jar.file}" basedir="${build.addons}">
-    	<fileset dir="${src.addons}" includes="**/*.properties"/>
+        <fileset dir="${src.addons}" includes="**/*.properties"/>
     </jar>
   </target>
 

Modified: jmeter/trunk/extras/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/build.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/extras/build.xml (original)
+++ jmeter/trunk/extras/build.xml Sun Mar 17 21:48:24 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+    
        http://www.apache.org/licenses/LICENSE-2.0
- 
+    
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,103 +16,103 @@
    limitations under the License.
 -->
 <project name="ant-jmeter" default="all">
-	<description>
-	
-		Sample build file for use with ant-jmeter.jar
-		See http://www.programmerplanet.org/pages/projects/jmeter-ant-task.php
-		
-	To run a test and create the output report:
-		ant -Dtest=script
-	
-	To run a test only:
-		ant -Dtest=script run
-		
-	To run report on existing test output
-		ant -Dtest=script report
-	
-	The "script" parameter is the name of the script without the .jmx suffix.
-	
-	Additional options:
-		-Dshow-data=y - include response data in Failure Details
-		-Dtestpath=xyz - path to test file(s) (default user.dir).
-		                 N.B. Ant interprets relative paths against the build file
-		-Djmeter.home=.. - path to JMeter home directory (defaults to parent of this build file)
+    <description>
+
+        Sample build file for use with ant-jmeter.jar
+        See http://www.programmerplanet.org/pages/projects/jmeter-ant-task.php
+
+    To run a test and create the output report:
+        ant -Dtest=script
+
+    To run a test only:
+        ant -Dtest=script run
+
+    To run report on existing test output
+        ant -Dtest=script report
+
+    The "script" parameter is the name of the script without the .jmx suffix.
+
+    Additional options:
+        -Dshow-data=y - include response data in Failure Details
+        -Dtestpath=xyz - path to test file(s) (default user.dir).
+                         N.B. Ant interprets relative paths against the build file
+        -Djmeter.home=.. - path to JMeter home directory (defaults to parent of this build
file)
         -Dreport.title="My Report" - title for html report (default is 'Load Test Results')
 
-		Deprecated:
-		-Dformat=2.0 - use version 2.0 JTL files rather than 2.1
+        Deprecated:
+        -Dformat=2.0 - use version 2.0 JTL files rather than 2.1
 
-	</description>
-	
-	<property name="testpath" value="${user.dir}"/>
-	<property name="jmeter.home" value="${basedir}/.."/>
-	<property name="report.title" value="Load Test Results"/>
-		
-	<!-- Name of test (without .jmx) -->
-	<property name="test" value="Test"/>
-	
-	<!-- Should report include response data for failures? -->
-	<property name="show-data" value="n"/>
-
-	<property name="format" value="2.1"/>
-		
-	<condition property="style_version" value="">
-		<equals arg1="${format}" arg2="2.0"/>
-	</condition>
-
-	<condition property="style_version" value="_21">
-		<equals arg1="${format}" arg2="2.1"/>
-	</condition>
-
-	<condition property="funcMode">
-		<equals arg1="${show-data}" arg2="y"/>
-	</condition>
-	
-	<condition property="funcMode" value="false">
-	  <not>
-		<equals arg1="${show-data}" arg2="y"/>
-	  </not>
-	</condition>
+    </description>
+    
+    <property name="testpath" value="${user.dir}"/>
+    <property name="jmeter.home" value="${basedir}/.."/>
+    <property name="report.title" value="Load Test Results"/>
+    
+    <!-- Name of test (without .jmx) -->
+    <property name="test" value="Test"/>
+    
+    <!-- Should report include response data for failures? -->
+    <property name="show-data" value="n"/>
+
+    <property name="format" value="2.1"/>
+    
+    <condition property="style_version" value="">
+        <equals arg1="${format}" arg2="2.0"/>
+    </condition>
+
+    <condition property="style_version" value="_21">
+        <equals arg1="${format}" arg2="2.1"/>
+    </condition>
+
+    <condition property="funcMode">
+        <equals arg1="${show-data}" arg2="y"/>
+    </condition>
+    
+    <condition property="funcMode" value="false">
+      <not>
+        <equals arg1="${show-data}" arg2="y"/>
+      </not>
+    </condition>
 
-	<!-- Allow jar to be picked up locally -->
+    <!-- Allow jar to be picked up locally -->
     <path id="jmeter.classpath">
         <fileset dir="${basedir}">
           <include name="ant-jmeter*.jar"/>
         </fileset>
     </path>
 
-	<taskdef
-	    name="jmeter"
-	    classpathref="jmeter.classpath"
-	    classname="org.programmerplanet.ant.taskdefs.jmeter.JMeterTask"/>
-	
-	<target name="all" depends="run,report"/>
-
-	<target name="run">
-		<echo>funcMode = ${funcMode}</echo>
-		<delete file="${testpath}/${test}.html"/>
-		<jmeter
-		    jmeterhome="${jmeter.home}"
-		    testplan ="${testpath}/${test}.jmx"
-		    resultlog="${testpath}/${test}.jtl">
-		<!--
-			<jvmarg value="-Xincgc"/>
-			<jvmarg value="-Xmx128m"/>
-			<jvmarg value="-Dproperty=value"/>
-			<jmeterarg value="-qextra.properties"/>
-		-->
-			<!-- Force suitable defaults -->
-			<property name="jmeter.save.saveservice.output_format" value="xml"/>
-			<property name="jmeter.save.saveservice.assertion_results" value="all"/>
-			<property name="jmeter.save.saveservice.bytes" value="true"/>
-			<property name="file_format.testlog" value="${format}"/>
-			<property name="jmeter.save.saveservice.response_data.on_error" value="${funcMode}"/>
-		</jmeter>
-	</target>
-
-	<property name="lib.dir" value="${jmeter.home}/lib"/>
-	
-	<!-- Use xalan copy from JMeter lib directory to ensure consistent processing with Java
1.4+ -->
+    <taskdef
+        name="jmeter"
+        classpathref="jmeter.classpath"
+        classname="org.programmerplanet.ant.taskdefs.jmeter.JMeterTask"/>
+    
+    <target name="all" depends="run,report"/>
+
+    <target name="run">
+        <echo>funcMode = ${funcMode}</echo>
+        <delete file="${testpath}/${test}.html"/>
+        <jmeter
+            jmeterhome="${jmeter.home}"
+            testplan ="${testpath}/${test}.jmx"
+            resultlog="${testpath}/${test}.jtl">
+        <!--
+            <jvmarg value="-Xincgc"/>
+            <jvmarg value="-Xmx128m"/>
+            <jvmarg value="-Dproperty=value"/>
+            <jmeterarg value="-qextra.properties"/>
+        -->
+            <!-- Force suitable defaults -->
+            <property name="jmeter.save.saveservice.output_format" value="xml"/>
+            <property name="jmeter.save.saveservice.assertion_results" value="all"/>
+            <property name="jmeter.save.saveservice.bytes" value="true"/>
+            <property name="file_format.testlog" value="${format}"/>
+            <property name="jmeter.save.saveservice.response_data.on_error" value="${funcMode}"/>
+        </jmeter>
+    </target>
+
+    <property name="lib.dir" value="${jmeter.home}/lib"/>
+
+    <!-- Use xalan copy from JMeter lib directory to ensure consistent processing with
Java 1.4+ -->
     <path id="xslt.classpath">
         <fileset dir="${lib.dir}" includes="xalan*.jar"/>
         <fileset dir="${lib.dir}" includes="serializer*.jar"/>
@@ -122,19 +122,19 @@
         <echo>Report generated at ${report.datestamp}</echo>
     </target>
 
-	<target name="xslt-report" depends="_message_xalan">
-		<tstamp><format property="report.datestamp" pattern="yyyy/MM/dd HH:mm"/></tstamp>
-		<xslt
-			classpathref="xslt.classpath"
-			force="true"
-		    in="${testpath}/${test}.jtl"
-		    out="${testpath}/${test}.html"
-		    style="${basedir}/jmeter-results-detail-report${style_version}.xsl">
-			<param name="showData" expression="${show-data}"/>
-			<param name="titleReport" expression="${report.title}"/>
-			<param name="dateReport" expression="${report.datestamp}"/>
-		</xslt>
-	</target>
+    <target name="xslt-report" depends="_message_xalan">
+        <tstamp><format property="report.datestamp" pattern="yyyy/MM/dd HH:mm"/></tstamp>
+        <xslt
+            classpathref="xslt.classpath"
+            force="true"
+            in="${testpath}/${test}.jtl"
+            out="${testpath}/${test}.html"
+            style="${basedir}/jmeter-results-detail-report${style_version}.xsl">
+            <param name="showData" expression="${show-data}"/>
+            <param name="titleReport" expression="${report.title}"/>
+            <param name="dateReport" expression="${report.datestamp}"/>
+        </xslt>
+    </target>
 
     <!-- Copy report images if needed -->
     <target name="copy-images" depends="verify-images" unless="samepath">
@@ -148,20 +148,20 @@
         </condition>
     </target>
 
-	<!-- Check that the xalan libraries are present -->
-	<condition property="xalan.present">
-	  	<and>
-	  		<!-- No need to check all jars; just check a few -->
-	        <available classpathref="xslt.classpath" classname="org.apache.xalan.processor.TransformerFactoryImpl"/>
-	        <available classpathref="xslt.classpath" classname="org.apache.xml.serializer.ExtendedContentHandler"/>
-	  	</and>
-	</condition>
-
-	<target name="_message_xalan" unless="xalan.present">
-	  	<echo>Cannot find all xalan and/or serialiser jars</echo>
-		<echo>The XSLT formatting may not work correctly.</echo>
-		<echo>Check you have xalan and serializer jars in ${lib.dir}</echo>
-	</target>
+    <!-- Check that the xalan libraries are present -->
+    <condition property="xalan.present">
+          <and>
+              <!-- No need to check all jars; just check a few -->
+            <available classpathref="xslt.classpath" classname="org.apache.xalan.processor.TransformerFactoryImpl"/>
+            <available classpathref="xslt.classpath" classname="org.apache.xml.serializer.ExtendedContentHandler"/>
+          </and>
+    </condition>
+
+    <target name="_message_xalan" unless="xalan.present">
+          <echo>Cannot find all xalan and/or serialiser jars</echo>
+        <echo>The XSLT formatting may not work correctly.</echo>
+        <echo>Check you have xalan and serializer jars in ${lib.dir}</echo>
+    </target>
 
 
 </project>

Modified: jmeter/trunk/fb-excludes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/fb-excludes.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/fb-excludes.xml (original)
+++ jmeter/trunk/fb-excludes.xml Sun Mar 17 21:48:24 2013
@@ -15,21 +15,21 @@
    limitations under the License.
 -->
 <FindBugsFilter>
-	 <Match classregex=".*\.PackageTest">
-	 	<BugCode name="OS"/>
-	 </Match>
-	 <Match classregex=".*\$Test">
-	 	<BugCode name="OS"/>
-	 </Match> 
+     <Match classregex=".*\.PackageTest">
+        <BugCode name="OS"/>
+     </Match>
+     <Match classregex=".*\$Test">
+        <BugCode name="OS"/>
+     </Match> 
      <Match classregex=".*" >
-     	<!-- 
-     	EI,EI2 - may expose internal representation
-     	IS2 - Inconsistent synchronisation
-     	MS - mutable static field
-     	Se - serialisation
-     	SIC - should be static inner class?
-		HE - hashcode/equals
-     	-->  
+        <!--
+        EI,EI2 - may expose internal representation
+        IS2 - Inconsistent synchronisation
+        MS - mutable static field
+        Se - serialisation
+        SIC - should be static inner class?
+        HE - hashcode/equals
+        -->  
        <BugCode name="EI,EI2,HE" />
      </Match>
    
@@ -54,9 +54,9 @@
           <Bug pattern="NN_NAKED_NOTIFY" />
      </Match>
      <Match>
-	      <Class name="org.apache.jmeter.JMeter" />
-	      <Method name="start" />
-	      <Bug pattern="DM_EXIT" />
+          <Class name="org.apache.jmeter.JMeter" />
+          <Method name="start" />
+          <Bug pattern="DM_EXIT" />
     </Match>
      <Match>
           <Class name="org.apache.jmeter.JMeterReport" />

Modified: jmeter/trunk/xdocs/extending/JMeter Extension Scenario.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/extending/JMeter%20Extension%20Scenario.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/xdocs/extending/JMeter Extension Scenario.xml (original)
+++ jmeter/trunk/xdocs/extending/JMeter Extension Scenario.xml Sun Mar 17 21:48:24 2013
@@ -19,7 +19,7 @@
 
   <properties>
 
-	 <title>Extending JMeter</title>
+     <title>Extending JMeter</title>
 
   </properties>
 
@@ -81,11 +81,11 @@ needed to effectively interact with JMet
   step, define the appropriate accessor methods. The implementation of these
   accessors should usually delegate to <TT>AbstractConfigElement</TT>. For
   example: <PRE>   public void setHostname(String hostname)
-	{ setProperty(HOST_NAME, hostname); }
+    { setProperty(HOST_NAME, hostname); }
 
-	public String getHostname()
-	{ return (String)getProperty(HOST_NAME); }
-	</PRE>Some accessor implementations may be more complex. See the
+    public String getHostname()
+    { return (String)getProperty(HOST_NAME); }
+    </PRE>Some accessor implementations may be more complex. See the
   <TT>UrlConfig</TT> object for a more involved example.</LI>
   <LI><B><TT>String getClassLabel()</TT></B> - This is the
label that will
   display in the drop-down menu for adding your configuration element.</LI>
@@ -93,9 +93,9 @@ needed to effectively interact with JMet
   cloneable.</LI>
   <LI><B><TT>addConfigElement(ConfigElement)</TT></B> - A typical
implementation
   of this method looks like <PRE>   public void addConfigElement(ConfigElement config)
{
-		if (config instanceof MyConfig)
-			updatePropertyIfAbsent((MyConfig)config);
-	}</PRE>where <TT>updatePropertyIfAbsent</TT> is handled by the super class.</LI>
+        if (config instanceof MyConfig)
+            updatePropertyIfAbsent((MyConfig)config);
+    }</PRE>where <TT>updatePropertyIfAbsent</TT> is handled by the super
class.</LI>
   <LI><B><TT>getGuiClass</TT></B> - return the name of the
this class's <A
   href="#config-gui">corresponding GUI class</A>.
   </LI></OL>
@@ -176,12 +176,12 @@ extension.
   will soon be called) to debug, you will probably see way more than you need to
   know. You can filter the JMeter stuff by making the following modifications to
   <TT>log4j.conf</TT> in the JMeter's <TT>bin</TT> directory. The
<B>bold</B>
-  text is added/modified <PRE>	# Set the appenders for the categories
-	log4j.rootCategory=<B>info</B>,Root_Appender
-	<B>log4j.category.com.myfirm.jmeter=debug,</B>
-	log4j.category.org.apache.jmeter.control=debug
-	log4j.category.org.apache.jmeter.gui.tree.NonGuiTree=INFO,File_Appender
-	</PRE>Note that the root (default) debugging has been set to <B>info</B>.
+  text is added/modified <PRE>    # Set the appenders for the categories
+    log4j.rootCategory=<B>info</B>,Root_Appender
+    <B>log4j.category.com.myfirm.jmeter=debug,</B>
+    log4j.category.org.apache.jmeter.control=debug
+    log4j.category.org.apache.jmeter.gui.tree.NonGuiTree=INFO,File_Appender
+    </PRE>Note that the root (default) debugging has been set to <B>info</B>.
   This eliminates most log4j output from JMeter. The new line specifies the name
   of the package containing JMeter extensions. (<TT>com.yourfirm.jmeter</TT>)
in
   this example. Note that it is not necessary to specify a particular class

Modified: jmeter/trunk/xdocs/extending/index.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/extending/index.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/xdocs/extending/index.xml (original)
+++ jmeter/trunk/xdocs/extending/index.xml Sun Mar 17 21:48:24 2013
@@ -19,7 +19,7 @@
 
   <properties>
 
-	 <title>Extending JMeter</title>
+     <title>Extending JMeter</title>
 
   </properties>
 
@@ -38,23 +38,23 @@ to make this task easier.
 </p>
 
 <ul>
-	<li><a href="JMeter Extension Scenario.html">A good overview of the process
of extending JMeter</a></li>
+    <li><a href="JMeter Extension Scenario.html">A good overview of the process
of extending JMeter</a></li>
 <p/>
-	<li><a href="#timer">Creating your own Timer</a></li>
+    <li><a href="#timer">Creating your own Timer</a></li>
 
-	<li><a href="#listener">Creating your own SampleListener (such as a visualizer,
or reporter)</a></li>
+    <li><a href="#listener">Creating your own SampleListener (such as a visualizer,
or reporter)</a></li>
 
-	<li><a href="#config">Creating your own Config Element</a></li>
+    <li><a href="#config">Creating your own Config Element</a></li>
 
-	<li><a href="#logical">Creating your own logic SamplerController</a></li>
+    <li><a href="#logical">Creating your own logic SamplerController</a></li>
 
-	<li><a href="#testsample">Creating your own test sample SamplerController</a></li>
+    <li><a href="#testsample">Creating your own test sample SamplerController</a></li>
 
-	<li><a href="#sampler">Creating your own Sampler</a></li>
+    <li><a href="#sampler">Creating your own Sampler</a></li>
 
-	<li><a href="#uicomponent">Making your custom elements play nice as a JMeter
UI component</a></li>
+    <li><a href="#uicomponent">Making your custom elements play nice as a JMeter
UI component</a></li>
 
-	<li><a href="#saveable">Making your custom elements saveable and loadable from
within JMeter</a></li>
+    <li><a href="#saveable">Making your custom elements saveable and loadable
from within JMeter</a></li>
 
 </ul>
 
@@ -68,7 +68,7 @@ to make this task easier.
 
 <pre>
 
-	  public long delay();
+      public long delay();
 
 </pre>
 
@@ -90,11 +90,11 @@ same number every time it's called.  A r
 
 <pre>
 
-	  public void sampleOccurred(SampleEvent e);
+      public void sampleOccurred(SampleEvent e);
 
-	  public void sampleStarted(SampleEvent e);
+      public void sampleStarted(SampleEvent e);
 
-	  public void sampleStopped(SampleEvent e);
+      public void sampleStopped(SampleEvent e);
 
 </pre>
 
@@ -130,11 +130,11 @@ to begin again).
 
 <pre>
 
-	  public void addConfigElement(ConfigElement config);
+      public void addConfigElement(ConfigElement config);
 
-	  public boolean expectsModification();
+      public boolean expectsModification();
 
-	  public Object clone();
+      public Object clone();
 
 </pre>
 
@@ -228,15 +228,15 @@ for this possibility to avoid exceptions
 
 <pre>
 
-	  Entry nextEntry();
+      Entry nextEntry();
 
-	  Collection getListeners();
+      Collection getListeners();
 
-	  void addSamplerController(SamplerController controller);
+      void addSamplerController(SamplerController controller);
 
-	  void addConfigElement(ConfigElement config);
+      void addConfigElement(ConfigElement config);
 
-	  Object clone();
+      Object clone();
 
 </pre>
 
@@ -350,7 +350,7 @@ reference.</p>
 
 <pre>
 
-	  public SampleResult sample(Entry e)
+      public SampleResult sample(Entry e)
 
 </pre>
 
@@ -380,17 +380,17 @@ JMeterComponentModel interface:</p>
 
 <pre>
 
-	  Class getGuiClass();
+      Class getGuiClass();
 
-	  public String getName();
+      public String getName();
 
-	  public void setName(String name);
+      public void setName(String name);
 
-	  public Collection getAddList();
+      public Collection getAddList();
 
-	  public String getClassLabel();
+      public String getClassLabel();
 
-	  public void uncompile();
+      public void uncompile();
 
 </pre>
 
@@ -440,9 +440,9 @@ that implements the <b>ModelSupported</b
 
 <pre>
 
-	  void setModel(Object model);
+      void setModel(Object model);
 
-	  public void updateGui();
+      public void updateGui();
 
 </pre>
 
@@ -484,7 +484,7 @@ detected, and the Gui will not make them
 
 <pre>
 
-	  public Class getTagHandlerClass()
+      public Class getTagHandlerClass()
 
 </pre>
 
@@ -504,11 +504,11 @@ the Map from AbstractConfigElement.</p>
 
 <pre>
 
-	  public abstract void setAtts(Attributes atts) throws Exception
+      public abstract void setAtts(Attributes atts) throws Exception
 
-	  public String getPrimaryTagName()
+      public String getPrimaryTagName()
 
-	  public void save(Saveable objectToSave,Writer out) throws IOException
+      public void save(Saveable objectToSave,Writer out) throws IOException
 
 </pre>
 
@@ -574,211 +574,211 @@ public class AbstractConfigElementHandle
 
 {
 
-	private AbstractConfigElement config;
+    private AbstractConfigElement config;
 
-	private String currentProperty;
+    private String currentProperty;
 
 
 
-	public AbstractConfigElementHandler()
+    public AbstractConfigElementHandler()
 
-	{
+    {
 
-	}
+    }
 
 
 
-	<font color="blue">/**
+    <font color="blue">/**
 
-	 * Returns the AbstractConfigElement object parsed from the XML.  This method
+     * Returns the AbstractConfigElement object parsed from the XML.  This method
 
-	 * is required to fulfill the SaveHandler interface.  It is used by the XML
+     * is required to fulfill the SaveHandler interface.  It is used by the XML
 
-	 * routines to gather all the saved objects.
+     * routines to gather all the saved objects.
 
-	 */</font>
+     */</font>
 
-	public Object getModel()
+    public Object getModel()
 
-	{
+    {
 
-		return config;
+        return config;
 
-	}
+    }
 
 
 
-	<font color="blue">/**
+    <font color="blue">/**
 
-	 * This is called when a tag is first encountered for this handler class to handle.
+     * This is called when a tag is first encountered for this handler class to handle.
 
-	 * The attributes of the tag are passed, and the SaveHandler object is expected
+     * The attributes of the tag are passed, and the SaveHandler object is expected
 
-	 * to instantiate a new object.
+     * to instantiate a new object.
 
-	 */</font>
+     */</font>
 
-	public void setAtts(Attributes atts) throws Exception
+    public void setAtts(Attributes atts) throws Exception
 
-	{
+    {
 
-		String className = atts.getValue("type");
+        String className = atts.getValue("type");
 
-		config = (AbstractConfigElement)Class.forName(className).newInstance();
+        config = (AbstractConfigElement)Class.forName(className).newInstance();
 
-	}
+    }
 
 
 
-	<font color="blue">/**
+    <font color="blue">/**
 
-	 * Called by reflection when a &lt;property&gt; tag is encountered.  Again, the
+     * Called by reflection when a &lt;property&gt; tag is encountered.  Again, the
 
-	 * attributes are passed.
+     * attributes are passed.
 
-	 */</font>
+     */</font>
 
-	public void property(Attributes atts)
+    public void property(Attributes atts)
 
-	{
+    {
 
-		currentProperty = atts.getValue("name");
+        currentProperty = atts.getValue("name");
 
-	}
+    }
 
 
 
-	<font color="blue">/**
+    <font color="blue">/**
 
-	 * Called by reflection when text between the begin and end &lt;property&gt;
+     * Called by reflection when text between the begin and end &lt;property&gt;
 
-	 * tag is encountered.
+     * tag is encountered.
 
-	 */</font>
+     */</font>
 
-	public void property(String data)
+    public void property(String data)
 
-	{
+    {
 
 
 
-		if(data != null &amp;&amp; data.trim().length() &gt; 0)
+        if(data != null &amp;&amp; data.trim().length() &gt; 0)
 
-		{
+        {
 
-			config.putProperty(currentProperty,data);
+            config.putProperty(currentProperty,data);
 
-			currentProperty = null;
+            currentProperty = null;
 
-		}
+        }
 
-	}
+    }
 
 
 
-	<font color="blue">/**
+    <font color="blue">/**
 
-	 * Called by reflection when the &lt;property&gt; tag is ended.
+     * Called by reflection when the &lt;property&gt; tag is ended.
 
-	 */</font>
+     */</font>
 
-	public void propertyTagEnd()
+    public void propertyTagEnd()
 
-	{
+    {
 
-		<font color="blue">// Here's a tricky bit.  See below for explanation.</font>
+        <font color="blue">// Here's a tricky bit.  See below for explanation.</font>
 
-		List children = xmlParent.takeChildObjects(this);
+        List children = xmlParent.takeChildObjects(this);
 
-		if(children.size() == 1)
+        if(children.size() == 1)
 
-		{
+        {
 
-			config.putProperty(currentProperty,((TagHandler)children.get(0)).getModel());
+            config.putProperty(currentProperty,((TagHandler)children.get(0)).getModel());
 
-		}
+        }
 
-	}
+    }
 
 
 
 
 
-	  <font color="blue">/**
+      <font color="blue">/**
 
-	* Gets the tag name that will trigger the use of this object's TagHandler.
+    * Gets the tag name that will trigger the use of this object's TagHandler.
 
-	*/</font>
+    */</font>
 
-	public String getPrimaryTagName()
+    public String getPrimaryTagName()
 
-	{
+    {
 
-		return "ConfigElement";
+        return "ConfigElement";
 
-	}
+    }
 
 
 
   <font color="blue">/**
 
-	* Tells the object to save itself to the given output stream.
+    * Tells the object to save itself to the given output stream.
 
-	*/</font>
+    */</font>
 
-	public void save(Saveable obj,Writer out) throws IOException
+    public void save(Saveable obj,Writer out) throws IOException
 
-	{
+    {
 
-		AbstractConfigElement saved = (AbstractConfigElement)obj;
+        AbstractConfigElement saved = (AbstractConfigElement)obj;
 
-		out.write("&lt;ConfigElement type=\"");
+        out.write("&lt;ConfigElement type=\"");
 
-		out.write(saved.getClass().getName());
+        out.write(saved.getClass().getName());
 
-		out.write("\">\n");
+        out.write("\">\n");
 
-		Iterator iter = saved.getPropertyNames().iterator();
+        Iterator iter = saved.getPropertyNames().iterator();
 
-		while (iter.hasNext())
+        while (iter.hasNext())
 
-		{
+        {
 
-			String key = (String)iter.next();
+            String key = (String)iter.next();
 
-			Object value = saved.getProperty(key);
+            Object value = saved.getProperty(key);
 
-			writeProperty(out,key,value);
+            writeProperty(out,key,value);
 
-		}
+        }
 
-		out.write(&lt;/ConfigElement&gt;");
+        out.write(&lt;/ConfigElement&gt;");
 
-	}
+    }
 
 
 
-	<font color="blue">/**
+    <font color="blue">/**
 
-	 * Routine to write each property to xml.
+     * Routine to write each property to xml.
 
-	 */</font>
+     */</font>
 
-	private void writeProperty(Writer out,String key,Object value) throws IOException
+    private void writeProperty(Writer out,String key,Object value) throws IOException
 
-	{
+    {
 
-		out.write("&lt;property name=\"");
+        out.write("&lt;property name=\"");
 
-		out.write(key);
+        out.write(key);
 
-		out.write("\">\n");
+        out.write("\">\n");
 
-		JMeterHandler.writeObject(value,out);
+        JMeterHandler.writeObject(value,out);
 
-		out.write("\n&lt;/property&gt;\n");
+        out.write("\n&lt;/property&gt;\n");
 
-	}
+    }
 
 </pre>
 

Modified: jmeter/trunk/xdocs/localising/index.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/localising/index.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/xdocs/localising/index.xml (original)
+++ jmeter/trunk/xdocs/localising/index.xml Sun Mar 17 21:48:24 2013
@@ -22,9 +22,9 @@
 
   <properties>
 
-	 <author email="jsalvata@atg.com">Jordi Salvat i Alabart</author>
+     <author email="jsalvata@atg.com">Jordi Salvat i Alabart</author>
 
-	 <title>JMeter Localisation (Translator's Guide)</title>
+     <title>JMeter Localisation (Translator's Guide)</title>
 
   </properties>
 

Modified: jmeter/trunk/xdocs/stylesheets/printable_project.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/printable_project.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/printable_project.xml (original)
+++ jmeter/trunk/xdocs/stylesheets/printable_project.xml Sun Mar 17 21:48:24 2013
@@ -16,11 +16,11 @@
    limitations under the License.
 -->
 <project name="Apache JMeter"
-		  href="http://jmeter.apache.org/">
+          href="http://jmeter.apache.org/">
 
-	 <title>Apache JMeter</title>
-	 <logo width="221" height="102" href="../docs/images/logo.jpg">Apache JMeter</logo>
-	 <body>
+     <title>Apache JMeter</title>
+     <logo width="221" height="102" href="../docs/images/logo.jpg">Apache JMeter</logo>
+     <body>
 
-	 </body>
+     </body>
 </project>

Modified: jmeter/trunk/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/project.xml?rev=1457570&r1=1457569&r2=1457570&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/project.xml (original)
+++ jmeter/trunk/xdocs/stylesheets/project.xml Sun Mar 17 21:48:24 2013
@@ -16,52 +16,52 @@
    limitations under the License.
 -->
 <project name="Apache JMeter"
-		  href="http://jmeter.apache.org/">
+          href="http://jmeter.apache.org/">
 
-	 <title>Apache JMeter</title>
-	 <!---->
-	 <logo width="221" height="102" href="/images/logo.jpg">Apache JMeter</logo>
-	 <!---->
-	 <body>
-	 <menu name="About">
-	   <item name="Overview"            href="/index.html"/>
-	   <item name="Changes"             href="/changes.html"/>
+     <title>Apache JMeter</title>
+     <!---->
+     <logo width="221" height="102" href="/images/logo.jpg">Apache JMeter</logo>
+     <!---->
+     <body>
+     <menu name="About">
+       <item name="Overview"            href="/index.html"/>
+       <item name="Changes"             href="/changes.html"/>
        <item name="Subscribe to What's New" href="http://projects.apache.org/feeds/rss/jmeter.xml"/>
-	   <item name="Issues"              href="/issues.html"/>
-	   <item name="License"             href="http://www.apache.org/licenses/"/>
-	   <item name="Contributors"		href="http://wiki.apache.org/jmeter/JMeterCommitters"/>
-	 </menu>
-	 <menu name="Download">
-	 	<item name="Download Releases"    href="/download_jmeter.cgi"/>
-		<item name="Developer (Nightly) Builds"  	href="/nightly.html"/>
-	 </menu>
-	 <menu name="Documentation">
-		<item name="User Manual"         href="/usermanual/index.html"/>
+       <item name="Issues"              href="/issues.html"/>
+       <item name="License"             href="http://www.apache.org/licenses/"/>
+       <item name="Contributors"        href="http://wiki.apache.org/jmeter/JMeterCommitters"/>
+     </menu>
+     <menu name="Download">
+         <item name="Download Releases"    href="/download_jmeter.cgi"/>
+        <item name="Developer (Nightly) Builds"      href="/nightly.html"/>
+     </menu>
+     <menu name="Documentation">
+        <item name="User Manual"         href="/usermanual/index.html"/>
         <item name="Best Practices"         href="/usermanual/best-practices.html"/>
         <item name="Component Reference"         href="/usermanual/component_reference.html"/>
         <item name="Functions Reference"         href="/usermanual/functions.html"/>
-		<item name="Javadocs"		     href="/api/index.html"/>
+        <item name="Javadocs"             href="/api/index.html"/>
         <item name="Localisation (Translator's Guide)" href="/localising/index.html"></item>
-		<item name="Building JMeter and Add-Ons"     href="/building.html"/>
-		<item name="JMeter Wiki"		 href="http://wiki.apache.org/jmeter"/>
- 	    <item name="FAQ (Wiki)"			 href="http://wiki.apache.org/jmeter/JMeterFAQ"/>
-	 </menu>
-	 <menu name="Tutorials (PDF format)">
-		<item name="Distributed Testing" href="/usermanual/jmeter_distributed_testing_step_by_step.pdf"/>
-		<item name="Recording Tests"	 href="/usermanual/jmeter_proxy_step_by_step.pdf"/>
-		<item name="JUnit Sampler"		 href="/usermanual/junitsampler_tutorial.pdf"/>
-		<item name="Access Log Sampler"	 href="/usermanual/jmeter_accesslog_sampler_step_by_step.pdf"/>
-		<item name="Extending JMeter"	 href="/extending/jmeter_tutorial.pdf"/>
-	 </menu>
-	 <menu name="Community">
-		<item name="Get Involved"        href="http://www.apache.org/foundation/getinvolved.html"/>
-		<item name="Mailing Lists"       href="/mail.html"/>
-		<item name="SVN Repositories"    href="/svnindex.html"/>
-	 </menu>
+        <item name="Building JMeter and Add-Ons"     href="/building.html"/>
+        <item name="JMeter Wiki"         href="http://wiki.apache.org/jmeter"/>
+         <item name="FAQ (Wiki)"             href="http://wiki.apache.org/jmeter/JMeterFAQ"/>
+     </menu>
+     <menu name="Tutorials (PDF format)">
+        <item name="Distributed Testing" href="/usermanual/jmeter_distributed_testing_step_by_step.pdf"/>
+        <item name="Recording Tests"     href="/usermanual/jmeter_proxy_step_by_step.pdf"/>
+        <item name="JUnit Sampler"         href="/usermanual/junitsampler_tutorial.pdf"/>
+        <item name="Access Log Sampler"     href="/usermanual/jmeter_accesslog_sampler_step_by_step.pdf"/>
+        <item name="Extending JMeter"     href="/extending/jmeter_tutorial.pdf"/>
+     </menu>
+     <menu name="Community">
+        <item name="Get Involved"        href="http://www.apache.org/foundation/getinvolved.html"/>
+        <item name="Mailing Lists"       href="/mail.html"/>
+        <item name="SVN Repositories"    href="/svnindex.html"/>
+     </menu>
      <menu name="Foundation">
         <item name="ASF"                 href="http://www.apache.org/"/>
         <item name="Sponsorship"         href="http://www.apache.org/foundation/sponsorship.html"/>
         <item name="Thanks"              href="http://www.apache.org/foundation/thanks.html"/>
      </menu>
-	 </body>
+     </body>
 </project>



Mime
View raw message