Author: pmouawad
Date: Fri Oct  7 10:40:46 2011
New Revision: 1179992

URL: http://svn.apache.org/viewvc?rev=1179992&view=rev
Log:
Bug 51892 - Default mirror port should be different from default proxy port

Modified:
    jakarta/jmeter/trunk/bin/jmeter.properties
    
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
    
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
    jakarta/jmeter/trunk/xdocs/changes.xml
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/bin/jmeter.properties
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.properties?rev=1179992&r1=1179991&r2=1179992&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.properties (original)
+++ jakarta/jmeter/trunk/bin/jmeter.properties Fri Oct  7 10:40:46 2011
@@ -686,7 +686,7 @@ beanshell.server.file=../extras/startup.
 #---------------------------------------------------------------------------
 
 # If defined, then start the mirror server on the port
-#mirror.server.port=8080
+#mirror.server.port=8081
 
 # ORO PatternCacheLRU size
 #oro.patterncache.size=1000

Modified: 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java?rev=1179992&r1=1179991&r2=1179992&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
 Fri Oct  7 10:40:46 2011
@@ -33,7 +33,7 @@ public class HttpMirrorControl extends A
 
     private transient HttpMirrorServer server;
 
-    private static final int DEFAULT_PORT = 8080;
+    private static final int DEFAULT_PORT = 8081;
 
     // and as a string
     public static final String DEFAULT_PORT_S =

Modified: 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java?rev=1179992&r1=1179991&r2=1179992&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorServer.java
 Fri Oct  7 10:40:46 2011
@@ -116,7 +116,7 @@ public class HttpMirrorServer extends Th
     }
 
     public static void main(String args[]){
-        int port = 8080;
+        int port = 8081;
         if (args.length > 0){
             port = Integer.parseInt(args[0]);
         }

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1179992&r1=1179991&r2=1179992&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Oct  7 10:40:46 2011
@@ -73,6 +73,9 @@ JMeter versions since 2.1 failed to crea
 This has been corrected; can still revert to the Bug 51939 behaviour by 
setting the following property:
 <code>httpsampler.separate.container=false</code>
 </p>
+<p>
+Mirror server now uses default port 8081, was 8080 before 2.5.1.
+</p>
 
 <!-- =================== Bug fixes =================== -->
 
@@ -153,6 +156,7 @@ This has been corrected; can still rever
 
 <h3>General</h3>
 <ul>
+<li>Bug 51892 - Default mirror port should be different from default proxy 
port</li>
 </ul>
 
 <h2>Non-functional changes</h2>

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1179992&r1=1179991&r2=1179992&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Oct  7 
10:40:46 2011
@@ -5126,6 +5126,9 @@ either by copying the files there or by 
 The HTTP Mirrror Server is a very simple HTTP server - it simply mirrors the 
data sent to it.
 This is useful for checking the content of HTTP requests.
 </p>
+<p>
+It uses default port 8081 since 2.5.2. 
+</p>
 </description>
 </component>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to