diff options
| author | Nils Schwabe | 2014-04-09 15:40:16 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-04-09 15:40:16 +0200 |
| commit | b30da021d491ace47c1b6a7b5ad11e595a2399c9 (patch) | |
| tree | a90ccc1f2a7833df6727c181a885cc56dc2e463a /src/main/java/org/openslx/imagemaster/db | |
| parent | fixed config dir (examples etc) (diff) | |
| download | masterserver-b30da021d491ace47c1b6a7b5ad11e595a2399c9.tar.gz masterserver-b30da021d491ace47c1b6a7b5ad11e595a2399c9.tar.xz masterserver-b30da021d491ace47c1b6a7b5ad11e595a2399c9.zip | |
Added Globals.java and global properties
Added Ftpserver test
Created some ftp testign in App.java (needs to be removed)
Added Ftplet to trigger on FTP Commands
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbSatellite.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/LDAPUser.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java index 037dfaa..7e9ef54 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/DbSatellite.java @@ -10,7 +10,7 @@ public class DbSatellite { this.name = name; } - public static DbSatellite createDbSatellite(String organization) { + public static DbSatellite fromOrganization(String organization) { return MySQL .findUniqueOrNull( DbSatellite.class, diff --git a/src/main/java/org/openslx/imagemaster/db/LDAPUser.java b/src/main/java/org/openslx/imagemaster/db/LDAPUser.java index ae8d38d..1034116 100644 --- a/src/main/java/org/openslx/imagemaster/db/LDAPUser.java +++ b/src/main/java/org/openslx/imagemaster/db/LDAPUser.java @@ -104,7 +104,7 @@ public class LDAPUser extends User { lastName = entry.get("sn").getString(); eMail = entry.get("rufPreferredMail").getString(); // get the satellite address from db - DbSatellite dbSatellite = DbSatellite.createDbSatellite(organization); + DbSatellite dbSatellite = DbSatellite.fromOrganization(organization); if (dbSatellite != null) { satelliteAddress = dbSatellite.getAddress(); } else { |