From 564d2807b742b821c19d0601815c9e8df40f03cd Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Thu, 20 Sep 2012 19:14:53 +0200 Subject: [PATCH] remove code from email to pac-admin --- .../hsadmin/mods/pac/PacProcessorFactory.java | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java index f55b656..63629a6 100644 --- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java @@ -29,13 +29,11 @@ public class PacProcessorFactory implements EntityProcessorFactory { EntityManager em, T entity) throws ProcessorException { Pac pac = (Pac) entity; String pacName = pac.getName(); -// String customerEMail = pac.getCustomer().getContractualContact().getEmail(); Hive hive = pac.getHive(); UnixUser unixUser = getPacAdminUser(pac); String password = PasswordTool.generatePassword(); Map hiveValues = fillHiveValues(hive); List> pacValuesList = fillPacValuesList(hive, null); -// Map emailVars = fillEMailValues(pacName, customerEMail, password); Processor priProcessor = new CompoundProcessor( createAddUserProc(pacName, unixUser, password), createSetQuotaProc(pac), @@ -48,7 +46,6 @@ public class PacProcessorFactory implements EntityProcessorFactory { createIfUp(pacName), createHttpdVirtualProc(pacName, pacValuesList)); WaitingTasksProcessor secProcessor = new WaitingTasksProcessor(priProcessor); -// secProcessor.appendProcessor(pac.getHiveName(), createSendEMailProc(pacName, customerEMail, emailVars), "send email to customer"); return secProcessor; } @@ -168,16 +165,6 @@ public class PacProcessorFactory implements EntityProcessorFactory { ); } -// private Processor createSendEMailProc(String pacName, -// String customerEMail, Map emailVars) throws ProcessorException { -// return new MailerProcessor( -// customerEMail, -// "Zugangsdaten des neue Hostsharing Pakets " + pacName, -// "/de/hsadmin/mods/pac/email_new_pac_account.jtpl", -// emailVars -// ); -// } - private Processor createIfUp(String pacName) { return new ShellProcessor("ifup eth0:" + pacName); } @@ -224,13 +211,4 @@ public class PacProcessorFactory implements EntityProcessorFactory { return pacValuesList; } -// private Map fillEMailValues(String pacName, -// String customerEMail, String password) { -// Map emailVars = new HashMap(); -// emailVars.put("PAC", pacName); -// emailVars.put("PASSWORD", password); -// emailVars.put("CUST_EMAIL", customerEMail); -// return emailVars; -// } - }