Commit ba575c86 authored by Andre Freyssinet's avatar Andre Freyssinet

Allows to configure with properties from AgentServer configuration file (JORAM-312).

parent f1da2817
/* /*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging * JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2005 - 2009 ScalAgent Distributed Technologies * Copyright (C) 2005 - 2018 ScalAgent Distributed Technologies
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
...@@ -108,10 +108,10 @@ public class SSLTcpProxyService extends TcpProxyService { ...@@ -108,10 +108,10 @@ public class SSLTcpProxyService extends TcpProxyService {
} }
private static ServerSocketFactory createServerSocketFactory() throws Exception { private static ServerSocketFactory createServerSocketFactory() throws Exception {
char[] keyStorePass = System.getProperty(KS_PASS, "jorampass").toCharArray(); char[] keyStorePass = AgentServer.getProperty(KS_PASS, "jorampass").toCharArray();
String keystoreFile = System.getProperty(KS, "./joram_ks"); String keystoreFile = AgentServer.getProperty(KS, "./joram_ks");
String sslContext = System.getProperty(SSLCONTEXT, "SSL"); String sslContext = AgentServer.getProperty(SSLCONTEXT, "SSL");
String ksType = System.getProperty(KS_TYPE, "JKS"); String ksType = AgentServer.getProperty(KS_TYPE, "JKS");
if (logger.isLoggable(BasicLevel.DEBUG)) if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, logger.log(BasicLevel.DEBUG,
...@@ -157,7 +157,7 @@ public class SSLTcpProxyService extends TcpProxyService { ...@@ -157,7 +157,7 @@ public class SSLTcpProxyService extends TcpProxyService {
} }
private static String [] getCipherList() throws Exception { private static String [] getCipherList() throws Exception {
String cipherList = System.getProperty(CIPHER,null); String cipherList = AgentServer.getProperty(CIPHER,null);
String[] cipherTable = null; String[] cipherTable = null;
if ( cipherList != null ) { if ( cipherList != null ) {
StringTokenizer tokenizer = new StringTokenizer( cipherList,","); StringTokenizer tokenizer = new StringTokenizer( cipherList,",");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment