Skip to content

Commit

Permalink
Add parameter support for RMI keystore creation scripts.
Browse files Browse the repository at this point in the history
Contributed by Logan Mauzaize (t524467 at airfrance.fr). Closes #386 on github


git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1832303 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
FSchumacher committed May 26, 2018
1 parent 5039983 commit d33bd0b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bin/create-rmi-keystore.bat
Expand Up @@ -15,6 +15,6 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
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'"
2 changes: 1 addition & 1 deletion bin/create-rmi-keystore.sh
Expand Up @@ -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'"
2 changes: 2 additions & 0 deletions xdocs/changes.xml
Expand Up @@ -146,6 +146,7 @@ this behaviour, set <code>httpclient.reset_state_on_thread_group_iteration=false
<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>
Expand Down Expand Up @@ -247,6 +248,7 @@ this behaviour, set <code>httpclient.reset_state_on_thread_group_iteration=false
<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>
Expand Down

0 comments on commit d33bd0b

Please sign in to comment.