From 69e76169c501652ec77b0808387c18b4fa191b4a Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Thu, 1 Mar 2012 09:39:31 +0000 Subject: QPID-2159: Remove create-example-ssl-stores script from Java Broker. Removed create-example-ssl-stores(.bat|.sh). Removed references to script from code, config and docbook. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295486 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/doc/book/src/Management-Console-Security.xml | 5 ++- qpid/java/broker/bin/create-example-ssl-stores.bat | 36 -------------------- qpid/java/broker/bin/create-example-ssl-stores.sh | 38 ---------------------- qpid/java/broker/etc/config.xml | 3 +- .../management/JMXManagedObjectRegistry.java | 4 +-- 5 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 qpid/java/broker/bin/create-example-ssl-stores.bat delete mode 100755 qpid/java/broker/bin/create-example-ssl-stores.sh diff --git a/qpid/doc/book/src/Management-Console-Security.xml b/qpid/doc/book/src/Management-Console-Security.xml index aa7bebb09e..31f63c70da 100644 --- a/qpid/doc/book/src/Management-Console-Security.xml +++ b/qpid/doc/book/src/Management-Console-Security.xml @@ -57,8 +57,7 @@ The broker configuration must be updated before the broker will start. This can be done either by disabling the SSL support, utilizing a purchased SSL certificate to create a keystore of - your own, or using the example 'create-example-ssl-stores' script - in the brokers bin/ directory to generate a self-signed keystore. + your own, or generating a self-signed keystore. The broker must be configured with a keystore containing the private and public keys associated with its SSL certificate. This @@ -76,7 +75,7 @@ <ssl> <enabled>true</enabled> <!-- Update below path to your keystore location, eg ${conf}/qpid.keystore --> - <keyStorePath>${prefix}/../test_resources/ssl/keystore.jks</keyStorePath> + <keyStorePath>${conf}/qpid.keystore</keyStorePath> <keyStorePassword>password</keyStorePassword> </ssl> </management> diff --git a/qpid/java/broker/bin/create-example-ssl-stores.bat b/qpid/java/broker/bin/create-example-ssl-stores.bat deleted file mode 100644 index 5419c098d5..0000000000 --- a/qpid/java/broker/bin/create-example-ssl-stores.bat +++ /dev/null @@ -1,36 +0,0 @@ -@REM -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with 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, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM - -@REM Create example keystore for broker and trust store for client/management console. -@REM -@REM Use generated qpid.keystore as the brokers keystore -@REM Use generated qpid.truststore as client/consoles truststore -@REM All passwords have value: password - -@REM Create Broker Keystore: -keytool -genkey -alias qpidBroker -keyalg RSA -validity 365 -keystore qpid.keystore -storepass password -keypass password -dname "CN=hostname, OU=OrgUnit, O=Org, L=City, C=US" - -@REM Export Self Signed Cert: -keytool -export -alias qpidBroker -keystore qpid.keystore -file qpidBroker.cer -storepass password - -@REM Import Broker Cert Into MC TrustStore: -keytool -import -alias qpidBrokerCert -file qpidBroker.cer -keystore qpid.truststore -storepass password -noprompt - -@REM Delete the cert -del qpidBroker.cer \ No newline at end of file diff --git a/qpid/java/broker/bin/create-example-ssl-stores.sh b/qpid/java/broker/bin/create-example-ssl-stores.sh deleted file mode 100755 index bfcb3dfecf..0000000000 --- a/qpid/java/broker/bin/create-example-ssl-stores.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# -# 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. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# Create example keystore for broker and trust store for client/management console. -# -# Use generated qpid.keystore as the brokers keystore -# Use generated qpid.truststore as client/consoles truststore -# All passwords have value: password - -#Create Broker Keystore: -keytool -genkey -alias qpidBroker -keyalg RSA -validity 365 -keystore qpid.keystore \ --storepass password -keypass password -dname "CN=hostname, OU=OrgUnit, O=Org, L=City, C=US" - -#Export Self Signed Cert: -keytool -export -alias qpidBroker -keystore qpid.keystore -file qpidBroker.cer -storepass password - -#Import Broker Cert Into MC TrustStore: -keytool -import -alias qpidBrokerCert -file qpidBroker.cer -keystore qpid.truststore -storepass password -noprompt - -#Delete the cert -rm qpidBroker.cer diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml index 6839f8cf9f..e1aacd43b5 100644 --- a/qpid/java/broker/etc/config.xml +++ b/qpid/java/broker/etc/config.xml @@ -53,8 +53,7 @@ false - + ${conf}/qpid.keystore password diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java index b6623bbd09..04a5b27991 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java @@ -157,9 +157,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry if (!ksf.exists()) { - throw new FileNotFoundException("Cannot find JMX management SSL keystore file " + ksf + "\n" - + "Check broker configuration, or see create-example-ssl-stores script" - + "in the bin/ directory if you need to generate an example store."); + throw new FileNotFoundException("Cannot find JMX management SSL keystore file: " + ksf); } if (!ksf.canRead()) { -- cgit v1.2.1