diff options
author | Nils Schwabe | 2014-04-08 14:47:39 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-04-08 14:47:39 +0200 |
commit | a423f9f5dc6abce0c26124e9df9dfc35c6469028 (patch) | |
tree | 6ef83ea12cf8b69cb12ad7543bd9b8bf0835a5bf /src/main/java/org/openslx | |
parent | LDAP functionallity (diff) | |
download | masterserver-a423f9f5dc6abce0c26124e9df9dfc35c6469028.tar.gz masterserver-a423f9f5dc6abce0c26124e9df9dfc35c6469028.tar.xz masterserver-a423f9f5dc6abce0c26124e9df9dfc35c6469028.zip |
added ftp server for testing
Diffstat (limited to 'src/main/java/org/openslx')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/App.java | 10 | ||||
-rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbSatellite.java | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java index 8040d35..9a5fd15 100644 --- a/src/main/java/org/openslx/imagemaster/App.java +++ b/src/main/java/org/openslx/imagemaster/App.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; +import org.openslx.imagemaster.server.MasterFtpServer; import org.openslx.imagemaster.thrift.server.BinaryListener; /** @@ -19,13 +20,20 @@ public class App public static void main( String[] args ) { // Init logging - log.info( "Starting Application" ); + log.info( "Starting Application" ); // Create binary listener Thread t; t = new Thread(new BinaryListener(), "BinaryListener"); servers.add(t); t.start(); + + // Create Ftp Server + Thread f; + f = new Thread(new MasterFtpServer(2221, "admin", "admin", "/home/nils/ftp"), "FtpServer"); + servers.add(f); + f.start(); + // Run more servers // ... // Wait for all servers to die diff --git a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java index da20fbc..037dfaa 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java @@ -1,10 +1,6 @@ package org.openslx.imagemaster.db; public class DbSatellite { - /* - * Get row from mysql db and - */ - private String organization, address, name; // needs to be public in order to be found by MySQL |