@@ -32,7 +32,7 @@ public class FTPService implements Runnable {
3232 private UserManager um ;
3333 private PropertiesUserManagerFactory userManagerFactory ;
3434
35- private boolean LOGGING = true ;
35+ private boolean LOGGING = doesFTPServiceLog ;
3636 private File logFile = new File (ftpLogFile );
3737 private PrintStream logStream ;
3838
@@ -67,7 +67,7 @@ public void ftpServerSetUp() throws IOException {
6767 serverFactory = new FtpServerFactory ();
6868 listenerFactory = new ListenerFactory ();
6969
70- // defineSSLConf();
70+ defineSSLConf ();
7171 defineListener ();
7272 setUpUser ();
7373
@@ -92,12 +92,6 @@ private void defineSSLConf() {
9292 // set the SSL configuration for the listener
9393 listenerFactory .setSslConfiguration (ssl .createSslConfiguration ());
9494 listenerFactory .setImplicitSsl (true );
95-
96- // replace the default listener
97- serverFactory .addListener ("default" , listenerFactory .createListener ());
98- PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory ();
99- userManagerFactory .setFile (new File ("myusers.properties" ));
100- serverFactory .setUserManager (userManagerFactory .createUserManager ());
10195 }
10296
10397 private void defineListener () {
@@ -106,7 +100,7 @@ private void defineListener() {
106100 userManagerFactory = new PropertiesUserManagerFactory (); // adding a new UserManagementClass
107101 userManagerFactory .setFile (new File (ftpServiceUserPropertiesFile ));//choose any. We're telling the FTP-server where to read its user list
108102 userManagerFactory .setPasswordEncryptor (new PasswordEncryptorsImpl ()); // encrypts passwords of users by using the EncrImpl
109- serverFactory .setUserManager (userManagerFactory . createUserManager () );
103+ serverFactory .setUserManager (um );
110104 }
111105
112106 private void setUpUser () throws IOException {
@@ -124,14 +118,11 @@ private void setUpUser() throws IOException {
124118 try {
125119 um = userManagerFactory .createUserManager ();
126120 } catch (FtpServerConfigurationException e ) {
127- try {
121+ new File ( ftpDefaultDir ). mkdirs ();
128122 new File (ftpServiceUserPropertiesFile ).createNewFile ();
129- } catch (IOException ex ) {
130- new File ("./ftp" ).mkdir ();
131- new File (ftpServiceUserPropertiesFile ).createNewFile ();
132- }
133123 um = userManagerFactory .createUserManager ();
134124 }
125+
135126 try {
136127 um .save (user );//Save the user to the user list on the filesystem
137128 } catch (FtpException e1 ) {
0 commit comments