Author: orudyy
Date: Thu Nov 26 14:36:44 2015
New Revision: 1716698
URL: http://svn.apache.org/viewvc?rev=1716698&view=rev
Log:
QPID-6876: Fix typograhical errors in description text embedded in
AutoGeneratedSelfSigned#getClientTrustStore
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716608 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:36:44 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716607
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716608
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java?rev=1716698&r1=1716697&r2=1716698&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
(original)
+++
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStore.java
Thu Nov 26 14:36:44 2015
@@ -57,8 +57,8 @@ public interface AutoGeneratedSelfSigned
@ManagedOperation
void regenerateCertificate();
- @ManagedOperation(nonModifying = true, description = "Extract a Java
KeyStore containing the certificate for the autogenerated key. The KeyStore
can be used as a trust store by a JAva client connecting to the broker")
- Content getClientTrustStore(@Param(name="password", defaultValue = "",
description = "The password to use to secure the keystore (by default the empt
string is used).") String password);
+ @ManagedOperation(nonModifying = true, description = "Extract a Java
KeyStore containing the certificate for the autogenerated key. The KeyStore
can be used as a trust store by a Java client connecting to the broker")
+ Content getClientTrustStore(@Param(name="password", defaultValue = "",
description = "The password to use to secure the keystore (by default the empty
string is used).") String password);
@ManagedOperation(nonModifying = true, description = "Extract a PEM file
containing the certificate for the autogenerated key.")
Content getCertificate();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
