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 2018/05/26 11:13:37 UTC

svn commit: r1832303 - in /jmeter/trunk: bin/create-rmi-keystore.bat bin/create-rmi-keystore.sh xdocs/changes.xml

Author: fschumacher
Date: Sat May 26 11:13:36 2018
New Revision: 1832303

URL: http://svn.apache.org/viewvc?rev=1832303&view=rev
Log:
Add parameter support for RMI keystore creation scripts.

Contributed by Logan Mauzaize (t524467 at airfrance.fr). Closes #386 on github

Modified:
    jmeter/trunk/bin/create-rmi-keystore.bat
    jmeter/trunk/bin/create-rmi-keystore.sh
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/create-rmi-keystore.bat
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/create-rmi-keystore.bat?rev=1832303&r1=1832302&r2=1832303&view=diff
==============================================================================
--- jmeter/trunk/bin/create-rmi-keystore.bat (original)
+++ jmeter/trunk/bin/create-rmi-keystore.bat Sat May 26 11:13:36 2018
@@ -15,6 +15,6 @@ rem   WITHOUT WARRANTIES OR CONDITIONS O
 rem   See the License for the specific language governing permissions and
 rem   limitations under the License.
 rem
-keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048
+keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048 %*
 
 echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or reference it in property 'server.rmi.ssl.keystore.file'"

Modified: jmeter/trunk/bin/create-rmi-keystore.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/create-rmi-keystore.sh?rev=1832303&r1=1832302&r2=1832303&view=diff
==============================================================================
--- jmeter/trunk/bin/create-rmi-keystore.sh (original)
+++ jmeter/trunk/bin/create-rmi-keystore.sh Sat May 26 11:13:36 2018
@@ -15,6 +15,6 @@
 ##   See the License for the specific language governing permissions and
 ##   limitations under the License.
 ##
-keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048
+keytool -genkey -keyalg RSA -alias rmi -keystore rmi_keystore.jks -storepass changeit -validity 7 -keysize 2048 "$@"
 
 echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or reference it in property 'server.rmi.ssl.keystore.file'"

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1832303&r1=1832302&r2=1832303&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat May 26 11:13:36 2018
@@ -146,6 +146,7 @@ this behaviour, set <code>httpclient.res
   <li><bug>61714</bug>Update Real-time results documentation</li>
   <li><bug>62354</bug>Correct calculation and usage of units for second per user (reported by jffagot05 at gmail.com)</li>
   <li><pr>382</pr>Correct typo in documentation. Reported by Perze Ababa (perze.ababa at gmail.com>)</li>
+  <li><pr>386</pr>Add parameter support for RMI keystore creation scripts. Contributed by Logan Mauzaize (t524467 at airfrance.fr)</li>
 </ul>
 
 <ch_section>Non-functional changes</ch_section>
@@ -247,6 +248,7 @@ this behaviour, set <code>httpclient.res
     <li>jffagot05 (jffagot05 at gmail.com)</li>
     <li>Perze Ababa (perze.ababa at gmail.com)</li>
     <li>Martha Laks (laks.martha at gmail.com)</li>
+    <li>Logan Mauzaize (t524467 at airfrance.fr)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <p>