Skip to content

Commit 0cba004

Browse files
author
NoteFox
authored
Merge pull request #1 from OpenHistoricalDataMap/NoFileFoundBug
No file found bug - solved
2 parents 43d0b57 + 60a84d2 commit 0cba004

10 files changed

Lines changed: 254 additions & 26 deletions

File tree

‎LICENSE‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎ftpserver.jks‎

Whitespace-only changes.

‎maps/map/berlin.map‎

28.2 MB
Binary file not shown.

‎maps/map/testFile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
edit this

‎pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
<artifactId>spring-boot-starter-web-services</artifactId>
3333
</dependency>
3434

35+
<dependency>
36+
<groupId>org.apache.ftpserver</groupId>
37+
<artifactId>ftpserver-core</artifactId>
38+
<version>1.1.1</version>
39+
</dependency>
40+
41+
3542
<dependency>
3643
<groupId>org.springframework.boot</groupId>
3744
<artifactId>spring-boot-starter-test</artifactId>

‎src/main/java/Playground.java‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,45 @@
1+
import org.apache.ftpserver.FtpServer;
2+
import org.apache.ftpserver.FtpServerFactory;
3+
import org.apache.ftpserver.ftplet.FtpException;
4+
import org.apache.ftpserver.listener.ListenerFactory;
5+
import org.apache.ftpserver.ssl.SslConfigurationFactory;
6+
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
7+
18
import java.io.File;
29

310
public class Playground {
4-
public static void main(String[] args) {
5-
File file = new File("./maps/map/helluw.txt");
6-
System.out.println(file.exists());
11+
public static void main(String[] args) throws FtpException {
12+
FtpServerFactory serverFactory = new FtpServerFactory();
13+
14+
ListenerFactory factory = new ListenerFactory();
15+
16+
// set the port of the listener
17+
factory.setPort(2221);
18+
19+
// define SSL configuration
20+
SslConfigurationFactory ssl = new SslConfigurationFactory();
21+
ssl.setKeystoreFile(new File("ftpserver.jks"));
22+
ssl.setKeystorePassword("password");
23+
24+
// set the SSL configuration for the listener
25+
factory.setSslConfiguration(ssl.createSslConfiguration());
26+
factory.setImplicitSsl(true);
27+
28+
// replace the default listener
29+
serverFactory.addListener("default", factory.createListener());
30+
31+
PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory();
32+
userManagerFactory.setFile(new File("users.properties"));
33+
34+
serverFactory.setUserManager(userManagerFactory.createUserManager());
735

36+
// start the server
37+
FtpServer server = serverFactory.createServer();
38+
//mFtpServer = server;
39+
try {
40+
server.start();
41+
} catch (FtpException e) {
42+
e.printStackTrace();
43+
}
844
}
945
}

‎src/main/java/Server/FTPServer/FTPService.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -86,18 +86,12 @@ public void ftpServerSetUp() throws IOException {
8686
private void defineSSLConf() {
8787
// define SSL configuration
8888
SslConfigurationFactory ssl = new SslConfigurationFactory();
89-
ssl.setKeystoreFile(new File("src/main/resources/ftpServer.jks"));
89+
ssl.setKeystoreFile(new File("./ftp/ftpServer.jks"));
9090
ssl.setKeystorePassword("password");
9191

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) {

‎src/main/java/Server/Service.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
import static Server.StaticVariables.*;
1414

1515
public class Service implements Runnable, srvInterface{
16-
private String LISTEN_IP = "0.0.0.0"; // "::" ipv6 , "0.0.0.0" ipv4
17-
private int LISTEN_PORT = 5000;
16+
// this is currently not in use
17+
//private String LISTEN_IP = "0.0.0.0"; // "::" ipv6 , "0.0.0.0" ipv4
18+
//private int LISTEN_PORT = 5000;
1819

1920
//fetching DirStrings from StaticVariables Class
2021
private String OSM_DIR = osmDir;
2122
private String MAP_DIR = mapDir;
2223
private String OHDM_DIR = ohdmDir;
2324

24-
private boolean LOGGING = true;
25+
private boolean LOGGING = doesWebServiceLog;
26+
2527
// fetching ftpLogFile from StaticVariables Class
2628
private File logFile = new File(webServiceLogFile);
2729
private PrintStream logStream;

‎src/main/java/Server/SpringClass.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ public class SpringClass {
2828
public static Thread ftpThread;
2929

3030
public static void main(String[] args) {
31+
try {
32+
setUpLogger();
33+
} catch (IOException e) {
34+
System.err.println("wasn't able to create loggerFiles ");
35+
}
36+
3137
serviceInstance = new Service();
3238
serviceThread = new Thread(serviceInstance);
3339
serviceThread.start();
@@ -39,6 +45,18 @@ public static void main(String[] args) {
3945
SpringApplication.run(SpringClass.class, args);
4046
}
4147

48+
private static void setUpLogger() throws IOException {
49+
if (!(new File(StaticVariables.webServiceLogFile).exists())) {
50+
new File(StaticVariables.logDefaultDir).mkdirs();
51+
new File(StaticVariables.webServiceLogFile).createNewFile();
52+
}
53+
54+
if (!(new File(StaticVariables.ftpLogFile).exists())) {
55+
new File(StaticVariables.logDefaultDir).mkdirs();
56+
new File(StaticVariables.ftpLogFile);
57+
}
58+
}
59+
4260
/**
4361
* method to queue a map into the "REQUEST QUEUE"
4462
*/

‎src/main/java/Server/StaticVariables.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
package Server;
22

33
public class StaticVariables {
4-
public static final String ftpLogFile = "ftpLog.txt";
5-
public static final String webServiceLogFile = "webServiceLog.txt";
4+
public static final String logDefaultDir = "./log";
65

7-
public static final String osmDir = "./maps/osm";
8-
public static final String mapDir = "./maps/map";
6+
public static final boolean doesFTPServiceLog = true;
7+
public static final boolean doesWebServiceLog = true;
8+
9+
public static final String ftpLogFile = logDefaultDir + "/ftpLog.txt";
10+
public static final String webServiceLogFile = logDefaultDir + "/webServiceLog.txt";
11+
12+
public static final String mapsDefalutDir = "./maps";
13+
public static final String osmDir = mapsDefalutDir + "/osm";
14+
public static final String mapDir = mapsDefalutDir + "/map";
915
public static final String ohdmDir = "";
1016

1117
public static final String ftpServiceMapDir = mapDir;
12-
public static final String ftpServiceUserPropertiesFile = "./ftp/userList.properties";
18+
public static final String ftpDefaultDir = "./ftp";
19+
public static final String ftpServiceUserPropertiesFile = ftpDefaultDir + "/userList.properties";
20+
1321
public static final int ftpPort = 5000;
1422

1523
// will later be read from a File instead of being HardCoded

0 commit comments

Comments
 (0)