Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1011 → Rev 1012

/hostadmiral/trunk/src/ak/hostadmiral/core/model/UserManager.java
20,7 → 20,7
 
protected static void register()
{
synchronized(MailboxManager.class) {
synchronized(UserManager.class) {
if(registered) return;
 
registered = true;
/hostadmiral/trunk/src/ak/hostadmiral/core/servlet/ListenerRegistratorServlet.java
18,7 → 18,7
public void init()
throws ServletException
{
// users
// -- user --------------------------------------------------------------------------------
register("UserCreatedListener", new Registrar() {
public void reg(Object o) {
UserManager.getInstance().addCreatedListener((UserCreatedListener)o);
39,6 → 39,98
UserManager.getInstance().addDeletedListener((UserDeletedListener)o);
}
});
 
// -- inet domain -------------------------------------------------------------------------
register("InetDomainCreatedListener", new Registrar() {
public void reg(Object o) {
InetDomainManager.getInstance().addCreatedListener((InetDomainCreatedListener)o);
}
});
register("InetDomainModifiedListener", new Registrar() {
public void reg(Object o) {
InetDomainManager.getInstance().addModifiedListener((InetDomainModifiedListener)o);
}
});
register("InetDomainBeforeDeleteListener", new Registrar() {
public void reg(Object o) {
InetDomainManager.getInstance().addBeforeDeleteListener(
(InetDomainBeforeDeleteListener)o);
}
});
register("InetDomainDeletedListener", new Registrar() {
public void reg(Object o) {
InetDomainManager.getInstance().addDeletedListener((InetDomainDeletedListener)o);
}
});
 
// -- system user -------------------------------------------------------------------------
register("SystemUserCreatedListener", new Registrar() {
public void reg(Object o) {
SystemUserManager.getInstance().addCreatedListener((SystemUserCreatedListener)o);
}
});
register("SystemUserModifiedListener", new Registrar() {
public void reg(Object o) {
SystemUserManager.getInstance().addModifiedListener((SystemUserModifiedListener)o);
}
});
register("SystemUserBeforeDeleteListener", new Registrar() {
public void reg(Object o) {
SystemUserManager.getInstance().addBeforeDeleteListener(
(SystemUserBeforeDeleteListener)o);
}
});
register("SystemUserDeletedListener", new Registrar() {
public void reg(Object o) {
SystemUserManager.getInstance().addDeletedListener((SystemUserDeletedListener)o);
}
});
 
// -- mailbox -----------------------------------------------------------------------------
register("MailboxCreatedListener", new Registrar() {
public void reg(Object o) {
MailboxManager.getInstance().addCreatedListener((MailboxCreatedListener)o);
}
});
register("MailboxModifiedListener", new Registrar() {
public void reg(Object o) {
MailboxManager.getInstance().addModifiedListener((MailboxModifiedListener)o);
}
});
register("MailboxBeforeDeleteListener", new Registrar() {
public void reg(Object o) {
MailboxManager.getInstance().addBeforeDeleteListener(
(MailboxBeforeDeleteListener)o);
}
});
register("MailboxDeletedListener", new Registrar() {
public void reg(Object o) {
MailboxManager.getInstance().addDeletedListener((MailboxDeletedListener)o);
}
});
 
// -- mail alias --------------------------------------------------------------------------
register("MailAliasCreatedListener", new Registrar() {
public void reg(Object o) {
MailAliasManager.getInstance().addCreatedListener((MailAliasCreatedListener)o);
}
});
register("MailAliasModifiedListener", new Registrar() {
public void reg(Object o) {
MailAliasManager.getInstance().addModifiedListener((MailAliasModifiedListener)o);
}
});
register("MailAliasBeforeDeleteListener", new Registrar() {
public void reg(Object o) {
MailAliasManager.getInstance().addBeforeDeleteListener(
(MailAliasBeforeDeleteListener)o);
}
});
register("MailAliasDeletedListener", new Registrar() {
public void reg(Object o) {
MailAliasManager.getInstance().addDeletedListener((MailAliasDeletedListener)o);
}
});
}
 
private void register(String paramName, Registrar registrar)
/hostadmiral/trunk/src/ak/hostadmiral/core/listener/file/FileListener.java
14,7 → 14,19
implements
UserCreatedListener,
UserModifiedListener,
UserDeletedListener
UserDeletedListener,
InetDomainCreatedListener,
InetDomainModifiedListener,
InetDomainDeletedListener,
SystemUserCreatedListener,
SystemUserModifiedListener,
SystemUserDeletedListener,
MailboxCreatedListener,
MailboxModifiedListener,
MailboxDeletedListener,
MailAliasCreatedListener,
MailAliasModifiedListener,
MailAliasDeletedListener
{
private static final Logger logger = Logger.getLogger(FileListener.class);
 
41,6 → 53,7
s = s.replaceAll("\\\\", "\\\\\\\\");
s = s.replaceAll("\t", "\\\\t");
s = s.replaceAll("\n", "\\\\n");
s = s.replaceAll("\r", "\\\\r");
return s;
}
 
160,7 → 173,8
+ escape(mailbox.getDomain().getName()) + "\t"
+ mailbox.getVirusCheck() + "\t"
+ mailbox.getSpamCheck() + "\t"
+ mailbox.getSystemUser().getUid() + "\t"
+ (mailbox.getSystemUser() == null ? "" : mailbox.getSystemUser().getUid().toString())
+ "\t"
+ mailbox.getEnabled() + "\t"
+ escape(mailbox.getComment()));
}
175,7 → 189,8
+ escape(mailbox.getDomain().getName()) + "\t"
+ mailbox.getVirusCheck() + "\t"
+ mailbox.getSpamCheck() + "\t"
+ mailbox.getSystemUser().getUid() + "\t"
+ (mailbox.getSystemUser() == null ? "" : mailbox.getSystemUser().getUid().toString())
+ "\t"
+ mailbox.getEnabled() + "\t"
+ escape(mailbox.getComment()));
}
/hostadmiral/trunk/src/ak/hostadmiral/core/action/InetDomainAction.java
3,6 → 3,7
import java.util.List;
import java.util.Collections;
import java.util.ArrayList;
import java.util.HashSet;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
84,6 → 85,18
else
return mapping.findForward("view");
}
else if("deleting".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long domainId = StringConverter.parseLong(theForm.get("id"));
InetDomain domain = InetDomainManager.getInstance().get(user, domainId);
 
request.setAttribute("action", "/domain/delete.do");
request.setAttribute("object", domain);
request.setAttribute("cascade",
InetDomainManager.getInstance().beforeDelete(user, domain, new HashSet()));
 
return mapping.findForward("default");
}
else if("delete".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long domainId = StringConverter.parseLong(theForm.get("id"));
/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailboxAction.java
3,6 → 3,7
import java.util.List;
import java.util.Collections;
import java.util.ArrayList;
import java.util.HashSet;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
93,6 → 94,18
else
return mapping.findForward("view");
}
else if("deleting".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long boxId = StringConverter.parseLong(theForm.get("id"));
Mailbox mailbox = MailboxManager.getInstance().get(user, boxId);
 
request.setAttribute("action", "/mail/box/delete.do");
request.setAttribute("object", mailbox);
request.setAttribute("cascade",
MailboxManager.getInstance().beforeDelete(user, mailbox, new HashSet()));
 
return mapping.findForward("default");
}
else if("delete".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long boxId = StringConverter.parseLong(theForm.get("id"));
/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailAliasAction.java
4,6 → 4,7
import java.util.Iterator;
import java.util.Collections;
import java.util.ArrayList;
import java.util.HashSet;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
111,6 → 112,18
else
return mapping.findForward("view");
}
else if("deleting".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long aliasId = StringConverter.parseLong(theForm.get("id"));
MailAlias alias = MailAliasManager.getInstance().get(user, aliasId);
 
request.setAttribute("action", "/mail/alias/delete.do");
request.setAttribute("object", alias);
request.setAttribute("cascade",
MailAliasManager.getInstance().beforeDelete(user, alias, new HashSet()));
 
return mapping.findForward("default");
}
else if("delete".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long aliasId = StringConverter.parseLong(theForm.get("id"));
/hostadmiral/trunk/src/ak/hostadmiral/core/action/SystemUserAction.java
3,6 → 3,7
import java.util.List;
import java.util.Collections;
import java.util.ArrayList;
import java.util.HashSet;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
85,6 → 86,18
else
return mapping.findForward("view");
}
else if("deleting".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long userId = StringConverter.parseLong(theForm.get("id"));
SystemUser u = SystemUserManager.getInstance().get(user, userId);
 
request.setAttribute("action", "/user/system/delete.do");
request.setAttribute("object", u);
request.setAttribute("cascade",
SystemUserManager.getInstance().beforeDelete(user, u, new HashSet()));
 
return mapping.findForward("default");
}
else if("delete".equals(mapping.getParameter())) {
DynaActionForm theForm = (DynaActionForm)form;
Long userId = StringConverter.parseLong(theForm.get("id"));