On Tue, Jan 23, 2018 at 10:29 PM, Felix Schumacher < felix.schumac...@internetallee.de> wrote:
> > > Am 23. Januar 2018 22:01:37 MEZ schrieb pmoua...@apache.org: > >Author: pmouawad > >Date: Tue Jan 23 21:01:37 2018 > >New Revision: 1822058 > > > >URL: http://svn.apache.org/viewvc?rev=1822058&view=rev > >Log: > >Bug 62039 - Distributed testing : Provide ability to use SSL > >Fix bad patching > >Add keystore for tests > >Bugzilla Id: 62039 > > > >Added: > > jmeter/trunk/bin/rmi_keystore.jks (with props) > > Should we really include a keystore? > It's only for tests. I excluded it in build.xml (At least I hope) > > Felix > > >Modified: > > jmeter/trunk/bin/create-rmi-keystore.bat > > jmeter/trunk/bin/create-rmi-keystore.sh > > jmeter/trunk/build.xml > > > >Modified: jmeter/trunk/bin/create-rmi-keystore.bat > >URL: > >http://svn.apache.org/viewvc/jmeter/trunk/bin/create-rmi- > keystore.bat?rev=1822058&r1=1822057&r2=1822058&view=diff > >=========================================================== > =================== > >--- jmeter/trunk/bin/create-rmi-keystore.bat (original) > >+++ jmeter/trunk/bin/create-rmi-keystore.bat Tue Jan 23 21:01:37 2018 > >@@ -18,23 +18,3 @@ rem > >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'" > >-@echo off > >- > >-rem Licensed to the Apache Software Foundation (ASF) under one or > >more > >-rem contributor license agreements. See the NOTICE file distributed > >with > >-rem this work for additional information regarding copyright > >ownership. > >-rem The ASF licenses this file to You under the Apache License, > >Version 2.0 > >-rem (the "License"); you may not use this file except in compliance > >with > >-rem the License. You may obtain a copy of the License at > >-rem > >-rem http://www.apache.org/licenses/LICENSE-2.0 > >-rem > >-rem Unless required by applicable law or agreed to in writing, > >software > >-rem distributed under the License is distributed on an "AS IS" > >BASIS, > >-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 > >- > >-echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or > >reference it in property 'server.rmi.ssl.keystore.file'" > >\ No newline at end of file > > > >Modified: jmeter/trunk/bin/create-rmi-keystore.sh > >URL: > >http://svn.apache.org/viewvc/jmeter/trunk/bin/create-rmi- > keystore.sh?rev=1822058&r1=1822057&r2=1822058&view=diff > >=========================================================== > =================== > >--- jmeter/trunk/bin/create-rmi-keystore.sh (original) > >+++ jmeter/trunk/bin/create-rmi-keystore.sh Tue Jan 23 21:01:37 2018 > >@@ -6,29 +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. > >-## 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 > >- > >-echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or > >reference it in property 'server.rmi.ssl.keystore.file'" > >-#!/bin/sh > >- > >-## Licensed to the Apache Software Foundation (ASF) under one or > >more > >-## contributor license agreements. See the NOTICE file distributed > >with > >-## this work for additional information regarding copyright > >ownership. > >-## 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. > >@@ -37,4 +17,4 @@ echo "Copy the generated rmi_keystore.jk > > ## > >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'" > >\ No newline at end of file > >+echo "Copy the generated rmi_keystore.jks to jmeter/bin folder or > >reference it in property 'server.rmi.ssl.keystore.file'" > > > >Added: jmeter/trunk/bin/rmi_keystore.jks > >URL: > >http://svn.apache.org/viewvc/jmeter/trunk/bin/rmi_keystore. > jks?rev=1822058&view=auto > >=========================================================== > =================== > >Binary file - no diff available. > > > >Propchange: jmeter/trunk/bin/rmi_keystore.jks > >----------------------------------------------------------- > ------------------- > > svn:mime-type = application/octet-stream > > > >Modified: jmeter/trunk/build.xml > >URL: > >http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev= > 1822058&r1=1822057&r2=1822058&view=diff > >=========================================================== > =================== > >--- jmeter/trunk/build.xml (original) > >+++ jmeter/trunk/build.xml Tue Jan 23 21:01:37 2018 > >@@ -1292,6 +1292,7 @@ run JMeter unless all the JMeter jars ar > > <include name="${dest.jar.jmeter}/user.properties"/> > ><!-- Exclude any files that might be present from testing the release > >--> > > <exclude name="${dest.jar.jmeter}/*.log"/> > >+ <exclude name="${dest.jar.jmeter}/rmi_keystore.jks"/> > > <include name="${dest.jar.jmeter}/examples/**"/> > > <include name="${dest.jar.jmeter}/templates/*.dtd"/> > > <!-- report-templates files which need to have native eol --> > >@@ -1340,6 +1341,7 @@ run JMeter unless all the JMeter jars ar > > <include name="${dest.jar.jmeter}/proxyserver.jks"/> > ><!-- Exclude any files that might be present from testing the release > >--> > > <exclude name="${dest.jar.jmeter}/*.log"/> > >+ <exclude name="${dest.jar.jmeter}/rmi_keystore.jks"/> > > <!-- report-template files non native --> > ><include > >name="${dest.jar.jmeter}/report-template/content/pages/*.png"/> > > <include name="${dest.jar.jmeter}/report-template/sbadmin2*/**"/> > -- Cordialement. Philippe Mouawad.
