/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/Mailbox.java |
---|
131,7 → 131,7 |
/** |
* |
* @hibernate.set cascade="all" lazy="true" |
* @hibernate.set cascade="all" |
* @hibernate.collection-key column="obj" |
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.PasswordStoreAbstract" |
*/ |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/MailAlias.java |
---|
118,7 → 118,7 |
/** |
* @return Collection(MailAliasDestination) |
* |
* @hibernate.bag inverse="true" cascade="all-delete-orphan" lazy="true" |
* @hibernate.bag inverse="true" cascade="all-delete-orphan" |
* @hibernate.collection-key column="alias" |
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.MailAliasDestination" |
*/ |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/User.java |
---|
174,7 → 174,7 |
/** |
* |
* @hibernate.set cascade="all" lazy="true" |
* @hibernate.set cascade="all" |
* @hibernate.collection-key column="obj" |
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.PasswordStoreAbstract" |
*/ |
301,7 → 301,7 |
/** |
* |
* @hibernate.set lazy="true" |
* @hibernate.set |
* @hibernate.collection-key column="usr" |
* @hibernate.collection-one-to-many class="ak.hostadmiral.core.model.UserLogin" |
*/ |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/MailboxManager.java |
---|
261,7 → 261,7 |
{ |
Collection mailboxes = store.listOwnMailboxes(user); |
return iterateBeforeDelete(editor, mailboxes, known); |
return iterateBeforeDelete(editor, mailboxes, known, CascadeDeleteElement.DELETE); |
} |
public void userDeleting(User editor, User user) |
279,7 → 279,7 |
{ |
Collection mailboxes = store.listMailboxesForDomain(domain); |
return iterateBeforeDelete(editor, mailboxes, known); |
return iterateBeforeDelete(editor, mailboxes, known, CascadeDeleteElement.DELETE); |
} |
public void inetDomainDeleting(User editor, InetDomain domain) |
297,7 → 297,7 |
{ |
Collection mailboxes = store.listMailboxesForSystemUser(user); |
return iterateBeforeDelete(editor, mailboxes, known); |
return iterateBeforeDelete(editor, mailboxes, known, CascadeDeleteElement.CHANGE); |
} |
public void systemUserDeleting(User editor, SystemUser user) |
306,12 → 306,13 |
Collection mailboxes = store.listMailboxesForSystemUser(user); |
for(Iterator i = mailboxes.iterator(); i.hasNext(); ) { |
// FIXME do not delete, just reset system user (?) |
delete(editor, (Mailbox)i.next()); |
Mailbox mailbox = (Mailbox)i.next(); |
mailbox.setSystemUser(null); |
save(editor, mailbox); |
} |
} |
private Collection iterateBeforeDelete(User editor, Collection mailboxes, Collection known) |
private Collection iterateBeforeDelete(User editor, Collection mailboxes, Collection known, int action) |
throws ModelException |
{ |
Collection cascade = new ArrayList(); |
321,7 → 322,9 |
known.add(mailbox); |
if(mailbox.viewableBy(editor)) { |
if(mailbox.deleteableBy(editor)) |
if(action == CascadeDeleteElement.CHANGE && mailbox.editableBy(editor)) |
cascade.add(new CascadeDeleteElement(mailbox, CascadeDeleteElement.CHANGE, null)); |
else if(action == CascadeDeleteElement.DELETE && mailbox.deleteableBy(editor)) |
cascade.add(new CascadeDeleteElement(mailbox, CascadeDeleteElement.DELETE, |
this.beforeDelete(editor, mailbox, known))); |
else |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/store/hibernate/MailAliasDestinationHibernate.java |
---|
5,9 → 5,9 |
import java.util.Map; |
import java.util.HashMap; |
import net.sf.hibernate.Hibernate; |
import net.sf.hibernate.HibernateException; |
import net.sf.hibernate.type.Type; |
import org.hibernate.Hibernate; |
import org.hibernate.HibernateException; |
import org.hibernate.type.Type; |
import ak.hostadmiral.util.CollectionInfo; |
import ak.hostadmiral.util.ModelStoreException; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/store/hibernate/UserHibernate.java |
---|
5,9 → 5,9 |
import java.util.Map; |
import java.util.HashMap; |
import net.sf.hibernate.Hibernate; |
import net.sf.hibernate.HibernateException; |
import net.sf.hibernate.type.Type; |
import org.hibernate.Hibernate; |
import org.hibernate.HibernateException; |
import org.hibernate.type.Type; |
import ak.hostadmiral.util.CollectionInfo; |
import ak.hostadmiral.util.ModelStoreException; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/store/hibernate/SystemUserHibernate.java |
---|
5,9 → 5,9 |
import java.util.Map; |
import java.util.HashMap; |
import net.sf.hibernate.Hibernate; |
import net.sf.hibernate.HibernateException; |
import net.sf.hibernate.type.Type; |
import org.hibernate.Hibernate; |
import org.hibernate.HibernateException; |
import org.hibernate.type.Type; |
import ak.hostadmiral.util.CollectionInfo; |
import ak.hostadmiral.util.ModelStoreException; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/store/hibernate/InetDomainHibernate.java |
---|
5,9 → 5,9 |
import java.util.Map; |
import java.util.HashMap; |
import net.sf.hibernate.Hibernate; |
import net.sf.hibernate.HibernateException; |
import net.sf.hibernate.type.Type; |
import org.hibernate.Hibernate; |
import org.hibernate.HibernateException; |
import org.hibernate.type.Type; |
import ak.hostadmiral.util.CollectionInfo; |
import ak.hostadmiral.util.ModelStoreException; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/store/hibernate/MailboxHibernate.java |
---|
5,9 → 5,9 |
import java.util.Map; |
import java.util.HashMap; |
import net.sf.hibernate.Hibernate; |
import net.sf.hibernate.HibernateException; |
import net.sf.hibernate.type.Type; |
import org.hibernate.Hibernate; |
import org.hibernate.HibernateException; |
import org.hibernate.type.Type; |
import ak.hostadmiral.util.CollectionInfo; |
import ak.hostadmiral.util.ModelStoreException; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/model/store/hibernate/MailAliasHibernate.java |
---|
5,9 → 5,9 |
import java.util.Map; |
import java.util.HashMap; |
import net.sf.hibernate.Hibernate; |
import net.sf.hibernate.HibernateException; |
import net.sf.hibernate.type.Type; |
import org.hibernate.Hibernate; |
import org.hibernate.HibernateException; |
import org.hibernate.type.Type; |
import ak.hostadmiral.util.CollectionInfo; |
import ak.hostadmiral.util.ModelStoreException; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/servlet/LoginFilter.java |
---|
111,7 → 111,7 |
if(!(request instanceof HttpServletRequest)) |
throw new ServletException("Do not know how to handle non-HTTP requests"); |
if(!(response instanceof HttpServletResponse)) |
throw new ServletException("Do not know how to handle non-HTTP response"); |
throw new ServletException("Do not know how to handle non-HTTP responses"); |
HttpServletRequest httpRequest = (HttpServletRequest)request; |
HttpServletResponse httpResponse = (HttpServletResponse)response; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/servlet/HibernateFilter.java |
---|
20,7 → 20,7 |
import org.apache.log4j.Logger; |
import net.sf.hibernate.HibernateException; |
import org.hibernate.HibernateException; |
import ak.hostadmiral.util.ModelException; |
import ak.hostadmiral.util.hibernate.HibernateUtil; |
/hostadmiral/branches/hibernate3/src/ak/hostadmiral/core/config/Configurator.java |
---|
9,7 → 9,7 |
import org.apache.log4j.Logger; |
import org.apache.commons.digester.Digester; |
import net.sf.hibernate.HibernateException; |
import org.hibernate.HibernateException; |
import ak.hostadmiral.util.ConfigInit; |
import ak.hostadmiral.util.ModelException; |