/hostadmiral/trunk/src/ak/hostadmiral/version |
---|
File deleted |
\ No newline at end of file |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailboxDeletingListener.java |
---|
File deleted |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/UserDeletingListener.java |
---|
File deleted |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/SystemUserDeletingListener.java |
---|
File deleted |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/InetDomainDeletingListener.java |
---|
File deleted |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAliasDeletingListener.java |
---|
File deleted |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/UserManager.java |
---|
8,9 → 8,7 |
import ak.hostadmiral.util.ModelSecurityException; |
public class UserManager |
implements |
UserBeforeDeleteListener, |
UserDeletingListener |
implements UserBeforeDeleteListener |
{ |
private static UserManager userManager = null; |
private static boolean registered = false; |
27,7 → 25,7 |
registered = true; |
try { |
/* FIMXE: do the same for all classes |
/* |
HibernateUtil.getConfiguration().addResource( |
"ak/hostadmiral/core/model/User.hbm.xml"); |
HibernateUtil.getConfiguration().addResource( |
49,7 → 47,6 |
private Collection createdListeners = new ArrayList(); |
private Collection modifiedListeners = new ArrayList(); |
private Collection beforeDeleteListeners = new ArrayList(); |
private Collection deletingListeners = new ArrayList(); |
private Collection deletedListeners = new ArrayList(); |
private Map loggedinUsers = new WeakHashMap(); |
56,7 → 53,6 |
private UserManager() |
{ |
addBeforeDeleteListener(this); |
addDeletingListener(this); |
} |
public User create(User editor) |
222,16 → 218,6 |
deletedListeners.remove(listener); |
} |
public void addDeletingListener(UserDeletingListener listener) |
{ |
deletingListeners.add(listener); |
} |
public void removeDeletingListener(UserDeletingListener listener) |
{ |
deletingListeners.remove(listener); |
} |
public Collection beforeDelete(User editor, User user, Collection known) |
throws ModelException |
{ |
254,12 → 240,6 |
if(!user.deleteableBy(editor)) |
throw new ModelSecurityException(); |
// inform deleting listeners |
for(Iterator i = deletingListeners.iterator(); i.hasNext(); ) { |
UserDeletingListener listener = (UserDeletingListener)i.next(); |
listener.userDeleting(editor, user); |
} |
// backup copy |
User oldUser = new User(user); |
271,7 → 251,7 |
throw new ModelException(ex); |
} |
// inform delete listeners |
// inform listeners |
for(Iterator i = deletedListeners.iterator(); i.hasNext(); ) { |
UserDeletedListener listener = (UserDeletedListener)i.next(); |
listener.userDeleted(editor, oldUser); |
393,25 → 373,6 |
return cascade; |
} |
public void userDeleting(User editor, User user) |
throws ModelException |
{ |
Collection subusers; |
try { |
subusers = HibernateUtil.currentSession().find( |
"from User where boss = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) { |
throw new ModelException(ex); |
} |
for(Iterator i = subusers.iterator(); i.hasNext(); ) { |
delete(editor, (User)i.next()); |
} |
} |
public static final Comparator LOGIN_COMPARATOR = new LoginComparator(); |
public static final Comparator LOGINS_TIME_COMPARATOR = new LoginsTimeComparator(); |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/InetDomainManager.java |
---|
8,9 → 8,7 |
import ak.hostadmiral.util.ModelSecurityException; |
public class InetDomainManager |
implements |
UserBeforeDeleteListener, |
UserDeletingListener |
implements UserBeforeDeleteListener |
{ |
private static InetDomainManager inetDomainManager = null; |
private static boolean registered = false; |
46,13 → 44,11 |
private Collection createdListeners = new ArrayList(); |
private Collection modifiedListeners = new ArrayList(); |
private Collection beforeDeleteListeners = new ArrayList(); |
private Collection deletingListeners = new ArrayList(); |
private Collection deletedListeners = new ArrayList(); |
private InetDomainManager() |
{ |
UserManager.getInstance().addBeforeDeleteListener(this); |
UserManager.getInstance().addDeletingListener(this); |
} |
public InetDomain create(User editor) |
194,16 → 190,6 |
beforeDeleteListeners.remove(listener); |
} |
public void addDeletingListener(InetDomainDeletingListener listener) |
{ |
deletingListeners.add(listener); |
} |
public void removeDeletingListener(InetDomainDeletingListener listener) |
{ |
deletingListeners.remove(listener); |
} |
public void addDeletedListener(InetDomainDeletedListener listener) |
{ |
deletedListeners.add(listener); |
236,12 → 222,6 |
if(!domain.deleteableBy(editor)) |
throw new ModelSecurityException(); |
// inform deleting listeners |
for(Iterator i = deletingListeners.iterator(); i.hasNext(); ) { |
InetDomainDeletingListener listener = (InetDomainDeletingListener)i.next(); |
listener.inetDomainDeleting(editor, domain); |
} |
// backup copy |
InetDomain oldDomain = new InetDomain(domain); |
255,7 → 235,7 |
throw new ModelException(ex); |
} |
// inform deleted listeners |
// inform listeners |
for(Iterator i = deletedListeners.iterator(); i.hasNext(); ) { |
InetDomainDeletedListener listener = (InetDomainDeletedListener)i.next(); |
listener.inetDomainDeleted(editor, oldDomain); |
329,26 → 309,6 |
return cascade; |
} |
public void userDeleting(User editor, User user) |
throws ModelException |
{ |
Collection domains; |
try { |
domains = HibernateUtil.currentSession().find( |
"from InetDomain where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
for(Iterator i = domains.iterator(); i.hasNext(); ) { |
delete(editor, (InetDomain)i.next()); |
} |
} |
public static final Comparator NAME_COMPARATOR = new NameComparator(); |
private static class NameComparator |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAliasManager.java |
---|
8,11 → 8,7 |
import ak.hostadmiral.util.ModelSecurityException; |
public class MailAliasManager |
implements |
UserBeforeDeleteListener, |
UserDeletingListener, |
InetDomainBeforeDeleteListener, |
InetDomainDeletingListener |
implements UserBeforeDeleteListener |
{ |
private static MailAliasManager mailAliasManager = null; |
private static boolean registered = false; |
49,7 → 45,6 |
private Collection createdListeners = new ArrayList(); |
private Collection modifiedListeners = new ArrayList(); |
private Collection beforeDeleteListeners = new ArrayList(); |
private Collection deletingListeners = new ArrayList(); |
private Collection deletedListeners = new ArrayList(); |
private MailAliasManager() |
202,16 → 197,6 |
beforeDeleteListeners.remove(listener); |
} |
public void addDeletingListener(MailAliasDeletingListener listener) |
{ |
deletingListeners.add(listener); |
} |
public void removeDeletingListener(MailAliasDeletingListener listener) |
{ |
deletingListeners.remove(listener); |
} |
public void addDeletedListener(MailAliasDeletedListener listener) |
{ |
deletedListeners.add(listener); |
244,12 → 229,6 |
if(!mailAlias.deleteableBy(editor)) |
throw new ModelSecurityException(); |
// inform deleting listeners |
for(Iterator i = deletingListeners.iterator(); i.hasNext(); ) { |
MailAliasDeletingListener listener = (MailAliasDeletingListener)i.next(); |
listener.mailAliasDeleting(editor, mailAlias); |
} |
// backup copy |
MailAlias oldMailAlias = new MailAlias(mailAlias); |
262,7 → 241,7 |
throw new ModelException(ex); |
} |
// inform deleted listeners |
// inform listeners |
for(Iterator i = deletedListeners.iterator(); i.hasNext(); ) { |
MailAliasDeletedListener listener = (MailAliasDeletedListener)i.next(); |
listener.mailAliasDeleted(editor, oldMailAlias); |
330,64 → 309,6 |
return iterateBeforeDelete(editor, mailAliases, known); |
} |
public void userDeleting(User editor, User user) |
throws ModelException |
{ |
Collection mailAliases; |
try { |
mailAliases = HibernateUtil.currentSession().find( |
"from MailAlias where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
for(Iterator i = mailAliases.iterator(); i.hasNext(); ) { |
delete(editor, (MailAlias)i.next()); |
} |
} |
public Collection inetDomainBeforeDelete(User editor, InetDomain domain, Collection known) |
throws ModelException |
{ |
Collection mailAliases; |
try { |
mailAliases = HibernateUtil.currentSession().find( |
"from MailAlias where domain = ?", |
domain, Hibernate.entity(InetDomain.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
return iterateBeforeDelete(editor, mailAliases, known); |
} |
public void inetDomainDeleting(User editor, InetDomain domain) |
throws ModelException |
{ |
Collection mailAliases; |
try { |
mailAliases = HibernateUtil.currentSession().find( |
"from MailAlias where domain = ?", |
domain, Hibernate.entity(InetDomain.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
for(Iterator i = mailAliases.iterator(); i.hasNext(); ) { |
delete(editor, (MailAlias)i.next()); |
} |
} |
private Collection iterateBeforeDelete(User editor, Collection mailAliases, Collection known) |
throws ModelException |
{ |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/SystemUserManager.java |
---|
8,9 → 8,7 |
import ak.hostadmiral.util.ModelSecurityException; |
public class SystemUserManager |
implements |
UserBeforeDeleteListener, |
UserDeletingListener |
implements UserBeforeDeleteListener |
{ |
private static SystemUserManager systemUserManager = null; |
private static boolean registered = false; |
46,7 → 44,6 |
private Collection createdListeners = new ArrayList(); |
private Collection modifiedListeners = new ArrayList(); |
private Collection beforeDeleteListeners = new ArrayList(); |
private Collection deletingListeners = new ArrayList(); |
private Collection deletedListeners = new ArrayList(); |
private SystemUserManager() |
232,16 → 229,6 |
beforeDeleteListeners.remove(listener); |
} |
public void addDeletingListener(SystemUserDeletingListener listener) |
{ |
deletingListeners.add(listener); |
} |
public void removeDeletingListener(SystemUserDeletingListener listener) |
{ |
deletingListeners.remove(listener); |
} |
public void addDeletedListener(SystemUserDeletedListener listener) |
{ |
deletedListeners.add(listener); |
274,12 → 261,6 |
if(!systemUser.deleteableBy(editor)) |
throw new ModelSecurityException(); |
// inform deleting listeners |
for(Iterator i = deletingListeners.iterator(); i.hasNext(); ) { |
SystemUserDeletingListener listener = (SystemUserDeletingListener)i.next(); |
listener.systemUserDeleting(editor, systemUser); |
} |
// backup copy |
SystemUser oldSystemUser = new SystemUser(systemUser); |
292,7 → 273,7 |
throw new ModelException(ex); |
} |
// inform deleted listeners |
// inform listeners |
for(Iterator i = deletedListeners.iterator(); i.hasNext(); ) { |
SystemUserDeletedListener listener = (SystemUserDeletedListener)i.next(); |
listener.systemUserDeleted(editor, oldSystemUser); |
369,26 → 350,6 |
return cascade; |
} |
public void userDeleting(User editor, User user) |
throws ModelException |
{ |
Collection systemUsers; |
try { |
systemUsers = HibernateUtil.currentSession().find( |
"from SystemUser where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
for(Iterator i = systemUsers.iterator(); i.hasNext(); ) { |
delete(editor, (SystemUser)i.next()); |
} |
} |
public static final Comparator UID_COMPARATOR = new UidComparator(); |
public static final Comparator NAME_COMPARATOR = new NameComparator(); |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailboxManager.java |
---|
10,11 → 10,8 |
public class MailboxManager |
implements |
UserBeforeDeleteListener, |
UserDeletingListener, |
SystemUserBeforeDeleteListener, |
SystemUserDeletingListener, |
InetDomainBeforeDeleteListener, |
InetDomainDeletingListener |
InetDomainBeforeDeleteListener |
{ |
private static MailboxManager mailboxManager = null; |
private static boolean registered = false; |
50,7 → 47,6 |
private Collection createdListeners = new ArrayList(); |
private Collection modifiedListeners = new ArrayList(); |
private Collection beforeDeleteListeners = new ArrayList(); |
private Collection deletingListeners = new ArrayList(); |
private Collection deletedListeners = new ArrayList(); |
private MailboxManager() |
203,16 → 199,6 |
beforeDeleteListeners.remove(listener); |
} |
public void addDeletingListener(MailboxDeletingListener listener) |
{ |
deletingListeners.add(listener); |
} |
public void removeDeletingListener(MailboxDeletingListener listener) |
{ |
deletingListeners.remove(listener); |
} |
public void addDeletedListener(MailboxDeletedListener listener) |
{ |
deletedListeners.add(listener); |
245,12 → 231,6 |
if(!mailbox.deleteableBy(editor)) |
throw new ModelSecurityException(); |
// inform deleting listeners |
for(Iterator i = deletingListeners.iterator(); i.hasNext(); ) { |
MailboxDeletingListener listener = (MailboxDeletingListener)i.next(); |
listener.mailboxDeleting(editor, mailbox); |
} |
// backup copy |
Mailbox oldMailbox = new Mailbox(mailbox); |
263,7 → 243,7 |
throw new ModelException(ex); |
} |
// inform deleted listeners |
// inform listeners |
for(Iterator i = deletedListeners.iterator(); i.hasNext(); ) { |
MailboxDeletedListener listener = (MailboxDeletedListener)i.next(); |
listener.mailboxDeleted(editor, oldMailbox); |
331,26 → 311,6 |
return iterateBeforeDelete(editor, mailboxes, known); |
} |
public void userDeleting(User editor, User user) |
throws ModelException |
{ |
Collection mailboxes; |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"from Mailbox where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
for(Iterator i = mailboxes.iterator(); i.hasNext(); ) { |
delete(editor, (Mailbox)i.next()); |
} |
} |
public Collection inetDomainBeforeDelete(User editor, InetDomain domain, Collection known) |
throws ModelException |
{ |
369,26 → 329,6 |
return iterateBeforeDelete(editor, mailboxes, known); |
} |
public void inetDomainDeleting(User editor, InetDomain domain) |
throws ModelException |
{ |
Collection mailboxes; |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"from Mailbox where domain = ?", |
domain, Hibernate.entity(InetDomain.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
for(Iterator i = mailboxes.iterator(); i.hasNext(); ) { |
delete(editor, (Mailbox)i.next()); |
} |
} |
public Collection systemUserBeforeDelete(User editor, SystemUser user, Collection known) |
throws ModelException |
{ |
407,26 → 347,6 |
return iterateBeforeDelete(editor, mailboxes, known); |
} |
public void systemUserDeleting(User editor, SystemUser user) |
throws ModelException |
{ |
Collection mailboxes; |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"from Mailbox where systemUser = ?", |
user, Hibernate.entity(SystemUser.class) ); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
for(Iterator i = mailboxes.iterator(); i.hasNext(); ) { |
delete(editor, (Mailbox)i.next()); |
} |
} |
private Collection iterateBeforeDelete(User editor, Collection mailboxes, Collection known) |
throws ModelException |
{ |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/ActionUtils.java |
---|
File deleted |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/InetDomainAction.java |
---|
37,7 → 37,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if("submit".equals(mapping.getParameter())) { |
User user = (User)request.getSession().getAttribute("user"); |
initUserList(request, user); |
48,7 → 47,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
if("list".equals(mapping.getParameter())) { |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailboxAction.java |
---|
39,7 → 39,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if("submit".equals(mapping.getParameter())) { |
User user = (User)request.getSession().getAttribute("user"); |
initLists(request, user); |
50,7 → 49,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
if("list".equals(mapping.getParameter())) { |
List list = new ArrayList(MailboxManager.getInstance().listMailboxes(user)); |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailAliasAction.java |
---|
46,7 → 46,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if("submit".equals(mapping.getParameter())) { |
User user = (User)request.getSession().getAttribute("user"); |
initLists(request, user); |
57,7 → 56,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
if("list".equals(mapping.getParameter())) { |
List list = new ArrayList(MailAliasManager.getInstance().listMailAliases(user)); |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/SystemUserAction.java |
---|
37,7 → 37,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if("submit".equals(mapping.getParameter())) { |
User user = (User)request.getSession().getAttribute("user"); |
initUserList(request, user); |
48,7 → 47,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
if("list".equals(mapping.getParameter())) { |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/UserAction.java |
---|
35,7 → 35,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if("submit".equals(mapping.getParameter())) { |
User user = (User)request.getSession().getAttribute("user"); |
initUserList(request, user); |
64,7 → 63,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
if("list".equals(mapping.getParameter())) { |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/IndexAction.java |
---|
8,7 → 8,6 |
import org.apache.struts.action.ActionForm; |
import org.apache.struts.action.ActionForward; |
import ak.hostadmiral.util.ProjectVersion; |
import ak.hostadmiral.core.model.User; |
import ak.hostadmiral.core.model.SystemUserManager; |
import ak.hostadmiral.core.model.InetDomainManager; |
22,7 → 21,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
request.setAttribute("showSystemUsers", |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/LoginAction.java |
---|
26,16 → 26,11 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if("show".equals(mapping.getParameter())) { |
return mapping.findForward("default"); |
} |
else if("submit".equals(mapping.getParameter())) { |
DynaActionForm theForm = (DynaActionForm)form; |
User user = UserManager.getInstance().loginUser((String)theForm.get("login"), |
(String)theForm.get("password"), request.getRemoteAddr()); |
User user = UserManager.getInstance().loginUser( |
(String)theForm.get("login"), (String)theForm.get("password"), request.getRemoteAddr()); |
if(user == null) { |
Thread.sleep(1000); // FIXME: make this delay configurable |
59,8 → 54,4 |
} |
} |
} |
else { |
throw new Exception("unknown mapping parameter"); |
} |
} |
} |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/UserLoginsAction.java |
---|
24,7 → 24,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
DynaActionForm theForm = (DynaActionForm)form; |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/FailedLoginsAction.java |
---|
24,7 → 24,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
User user = (User)request.getSession().getAttribute("user"); |
List logins = new ArrayList(UserManager.getInstance().listFailedLogins(user)); |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/ChangePasswordAction.java |
---|
25,7 → 25,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if("first".equals(mapping.getParameter())) { |
return mapping.findForward("default"); |
} |
/hostadmiral/trunk/src/ak/hostadmiral/core/action/LogoutAction.java |
---|
19,7 → 19,6 |
HttpServletRequest request, HttpServletResponse response) |
throws Exception |
{ |
ActionUtils.prepare(request, response); |
if(request.getSession() != null) |
request.getSession().invalidate(); |
/hostadmiral/trunk/src/ak/hostadmiral/core/CoreResources.properties |
---|
58,7 → 58,6 |
ak.hostadmiral.core.mail.alias.edit.id.wrong=Please select an alias from the list |
ak.hostadmiral.page.general.errors=There are errors in you input |
ak.hostadmiral.page.general.version=Project version |
ak.hostadmiral.page.error.title=Host Admiral - error |
ak.hostadmiral.page.error.back=back |
/hostadmiral/trunk/src/ak/hostadmiral/util/ProjectVersion.java |
---|
File deleted |
/hostadmiral/trunk/webapp/user/system/list.jsp |
---|
86,11 → 86,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.system.list.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/system/edit.jsp |
---|
68,11 → 68,6 |
</html:form> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/system/view.jsp |
---|
70,11 → 70,6 |
</tr> |
</table> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/edit.jsp |
---|
95,9 → 95,6 |
<td colspan=2> |
<html:submit><bean:message key="ak.hostadmiral.page.user.edit.submit" /></html:submit> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.edit.back" /></backpath:backlink> |
<logic:notEmpty name="u" property="id"> |
<backpath:link action="/user/logins" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.edit.logins" /></backpath:link> |
</logic:notEmpty> |
</td> |
</tr> |
</table> |
105,8 → 102,7 |
</html:form> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
<backpath:link action="/user/logins" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.edit.logins" /></backpath:link> |
</p> |
</body> |
/hostadmiral/trunk/webapp/user/list.jsp |
---|
1,4 → 1,4 |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> |
97,11 → 97,6 |
</logic:equal> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.list.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/failedLogins.jsp |
---|
57,11 → 57,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.failedLogins.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/password/change.jsp |
---|
67,11 → 67,6 |
</table> |
</html:form> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/view.jsp |
---|
81,11 → 81,6 |
<backpath:link action="/user/logins" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.view.logins" /></backpath:link> |
</p> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/logins.jsp |
---|
55,11 → 55,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.user.logins.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/user/partedit.jsp |
---|
96,11 → 96,6 |
<backpath:link action="/user/logins" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostadmiral.page.user.partedit.logins" /></backpath:link> |
</p> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/mail/box/list.jsp |
---|
79,11 → 79,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.box.list.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/mail/box/edit.jsp |
---|
1,4 → 1,4 |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> |
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> |
104,11 → 104,6 |
</html:form> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/mail/box/view.jsp |
---|
99,11 → 99,6 |
</tr> |
</table> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/mail/alias/list.jsp |
---|
84,11 → 84,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.mail.alias.list.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/mail/alias/edit.jsp |
---|
163,11 → 163,6 |
</html:form> |
<script>loadForm();</script> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/mail/alias/editdests.jsp |
---|
160,11 → 160,6 |
</html:form> |
<script>loadForm();</script> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/mail/alias/view.jsp |
---|
38,11 → 38,6 |
</tr> |
</table> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/WEB-INF/struts-config.xml |
---|
163,16 → 163,11 |
<action |
path="/system/login" |
type="ak.hostadmiral.core.action.LoginAction" |
parameter="show" |
> |
<forward name="default" path="/system/login.jsp" /> |
</action> |
forward="/system/login.jsp" /> |
<action |
path="/system/login/submit" |
type="ak.hostadmiral.core.action.LoginAction" |
parameter="submit" |
name="LoginForm" |
validate="true" |
scope="request" |
/hostadmiral/trunk/webapp/WEB-INF/web.xml |
---|
85,6 → 85,7 |
<param-name>UserCreatedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
91,6 → 92,7 |
<param-name>UserModifiedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
97,6 → 99,7 |
<param-name>UserDeletedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
103,6 → 106,7 |
<param-name>InetDomainCreatedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
109,6 → 113,7 |
<param-name>InetDomainModifiedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
115,6 → 120,7 |
<param-name>InetDomainDeletedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
121,6 → 127,7 |
<param-name>SystemUserCreatedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
127,6 → 134,7 |
<param-name>SystemUserModifiedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
133,6 → 141,7 |
<param-name>SystemUserDeletedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
139,6 → 148,7 |
<param-name>MailboxCreatedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
145,6 → 155,7 |
<param-name>MailboxModifiedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
151,6 → 162,7 |
<param-name>MailboxDeletedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
157,6 → 169,7 |
<param-name>MailAliasCreatedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
163,6 → 176,7 |
<param-name>MailAliasModifiedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<init-param> |
169,6 → 183,7 |
<param-name>MailAliasDeletedListener</param-name> |
<param-value> |
ak.hostadmiral.core.listener.dummy.DummyListener; |
ak.hostadmiral.core.listener.file.FileListener; |
</param-value> |
</init-param> |
<load-on-startup>1</load-on-startup> |
/hostadmiral/trunk/webapp/domain/list.jsp |
---|
77,11 → 77,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.domain.list.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/domain/view.jsp |
---|
59,11 → 59,6 |
</tr> |
</table> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/domain/edit.jsp |
---|
64,11 → 64,6 |
</html:form> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/deleting.jsp |
---|
1,4 → 1,4 |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ page contentType="text/html;charset=UTF-8" language="java" %> |
<%@ page import="java.util.*,ak.hostadmiral.core.model.*" %> |
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> |
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> |
52,11 → 52,6 |
<backpath:currentlink action="<%= (String)request.getAttribute("action") %>" paramId="id" paramName="object" paramProperty="id"><bean:message key="ak.hostadmiral.page.deleting.delete" /></backpath:currentlink> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.deleting.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/system/login.jsp |
---|
64,11 → 64,6 |
<html:javascript formName="LoginForm" /> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/system/logout.jsp |
---|
34,11 → 34,6 |
<backpath:backlink><bean:message key="ak.hostadmiral.page.system.logout.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/generalError.jsp |
---|
23,11 → 23,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.generalError.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/webapp/index.jsp |
---|
48,10 → 48,6 |
/ <core:country /> |
</logic:notEmpty> |
</p> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
/hostadmiral/trunk/webapp/error.jsp |
---|
31,11 → 31,6 |
<br> |
<backpath:backlink><bean:message key="ak.hostadmiral.page.error.back" /></backpath:backlink> |
<p> |
<bean:message key="ak.hostadmiral.page.general.version" />: |
<bean:write name="projectVersion" /> |
</p> |
</body> |
</html> |
/hostadmiral/trunk/build.xml |
---|
75,20 → 75,6 |
<fileset dir="${classes}" /> |
</copy> |
<!-- set build number --> |
<exec executable="svnversion" logError="true" outputproperty="svn.revision"> |
<arg value="-n" /> |
<arg path="." /> |
</exec> |
<copy todir="${classes.deploy}" overwrite="true"> |
<fileset dir="${src}"> |
<include name="ak/hostadmiral/version" /> |
</fileset> |
<filterset> |
<filter token="BUILD" value="${svn.revision}"/> |
</filterset> |
</copy> |
<copy todir="${classes.deploy}"> |
<fileset |
dir="${classes}" |