You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2016/01/16 16:03:43 UTC
svn commit: r1724987 - in /jmeter/trunk:
src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
src/jorphan/org/apache/jorphan/util/HeapDumper.java
xdocs/usermanual/component_reference.xml xdocs/usermanual/functions.xml
Author: fschumacher
Date: Sat Jan 16 15:03:43 2016
New Revision: 1724987
URL: http://svn.apache.org/viewvc?rev=1724987&view=rev
Log:
Update java 6 references to java 7
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/HeapDumper.java
jmeter/trunk/xdocs/usermanual/component_reference.xml
jmeter/trunk/xdocs/usermanual/functions.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java?rev=1724987&r1=1724986&r2=1724987&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java Sat Jan 16 15:03:43 2016
@@ -311,7 +311,7 @@ public final class JmeterKeyStore {
if(aliases.length>0) {
return aliases;
} else {
- // API expects null not empty array, see http://docs.oracle.com/javase/6/docs/api/javax/net/ssl/X509KeyManager.html
+ // API expects null not empty array, see http://docs.oracle.com/javase/7/docs/api/javax/net/ssl/X509KeyManager.html
return null;
}
}
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/HeapDumper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/HeapDumper.java?rev=1724987&r1=1724986&r2=1724987&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/HeapDumper.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/HeapDumper.java Sat Jan 16 15:03:43 2016
@@ -47,7 +47,7 @@ public class HeapDumper {
}
// This is the name of the HotSpot Diagnostic platform MBean (Sun Java 1.6)
- // See: http://download.oracle.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html
+ // See: http://docs.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html
private static final String HOTSPOT_BEAN_NAME =
"com.sun.management:type=HotSpotDiagnostic";
@@ -95,7 +95,7 @@ public class HeapDumper {
* Calls the dumpHeap() method of the HotSpotDiagnostic MXBean, if available.
* <p>
* See
- * <a href="http://download.oracle.com/javase/6/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html">
+ * <a href="http://docs.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html">
* HotSpotDiagnosticMXBean
* </a>
* @param fileName name of the heap dump file. Must be creatable, i.e. must not exist.
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1724987&r1=1724986&r2=1724987&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Jan 16 15:03:43 2016
@@ -4256,7 +4256,7 @@ however the <code>minimum</code> and <co
<property name="Maximum Value" required="Yes">The maximum value (<code>long</code>) of the generated random number.</property>
<property name="Random Seed" required="No">The seed for the random number generator. Default is the current time in milliseconds.
If you use the same seed value with Per Thread set to <code>true</code>, you will get the same value for each Thread as per
- <a href="http://docs.oracle.com/javase/6/docs/api/java/util/Random.html" >Random</a> class.
+ <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Random.html" >Random</a> class.
</property>
<property name="Per Thread(User)?" required="Yes">If <code>False</code>, the generator is shared between all threads in the thread group.
If <code>True</code>, then each thread has its own random generator.</property>
Modified: jmeter/trunk/xdocs/usermanual/functions.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1724987&r1=1724986&r2=1724987&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jmeter/trunk/xdocs/usermanual/functions.xml Sat Jan 16 15:03:43 2016
@@ -1239,7 +1239,7 @@ For example, the string <code>Word "
<code>Word+%22school%22+is+%22%C3%A9cole%22+in+french</code>.
</p>
<p>
- Uses Java class <a href="http://docs.oracle.com/javase/6/docs/api/java/net/URLEncoder.html">URLEncoder</a>.
+ Uses Java class <a href="http://docs.oracle.com/javase/7/docs/api/java/net/URLEncoder.html">URLEncoder</a>.
</p>
</description>