1 files changed, 13 insertions, 5 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
index ac164f0cab..12489ad70e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
@@ -70,13 +70,21 @@ public class ConnectorConfiguration
                 defaultValue = "false")
     public boolean enableDirectBuffers;
 
-    @Configured(path = "connector.ssl",
+    @Configured(path = "connector.ssl.enabled",
                 defaultValue = "false")
     public boolean enableSSL;
-
-    @Configured(path = "connector.nonssl",
-                defaultValue = "true")
-    public boolean enableNonSSL;
+    
+    @Configured(path = "connector.ssl.keystorePath",
+    			defaultValue = "none")
+    public String keystorePath;
+    
+    @Configured(path = "connector.ssl.keystorePassword",
+    			defaultValue = "none")
+    public String keystorePassword;
+    
+    @Configured(path = "connector.ssl.certType",
+    			defaultValue = "SunX509")
+    public String certType;
 
     public IoAcceptor createAcceptor()
     {