Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 904 → Rev 905

/sun/hostcaptain/trunk/webapp/user/edit.jsp
7,12 → 7,12
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.user.edit.title" /></title>
<title><bean:message key="ak.hostcaptain.page.user.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.user.edit.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.user.edit.title" /></h1>
 
<html:errors/>
 
20,21 → 20,21
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.webcontrol.page.user.edit.login" />:
<bean:message key="ak.hostcaptain.page.user.edit.login" />:
<html:text property="login" />
<br>
 
<bean:message key="ak.webcontrol.page.user.edit.password" />:
<bean:message key="ak.hostcaptain.page.user.edit.password" />:
<html:password property="password" redisplay="false" />
<br>
 
<bean:message key="ak.webcontrol.page.user.edit.password_again" />:
<bean:message key="ak.hostcaptain.page.user.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<br>
 
<html:submit><bean:message key="ak.webcontrol.page.user.edit.submit" /></html:submit>
<html:submit><bean:message key="ak.hostcaptain.page.user.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.webcontrol.page.user.edit.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.edit.back" /></backpath:backlink>
</html:form>
 
</body>
/sun/hostcaptain/trunk/webapp/user/password/change.jsp
7,12 → 7,12
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.user.password.change.title" /></title>
<title><bean:message key="ak.hostcaptain.page.user.password.change.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.user.password.change.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.user.password.change.title" /></h1>
 
<html:errors/>
 
22,7 → 22,7
<table border="0">
<tr>
<th class="right">
<bean:message key="ak.webcontrol.page.user.password.change.old_password" />
<bean:message key="ak.hostcaptain.page.user.password.change.old_password" />
</th>
<td class="left">
<html:password property="oldpassword" size="16" redisplay="false" />
30,7 → 30,7
</tr>
<tr>
<th class="right">
<bean:message key="ak.webcontrol.page.user.password.change.new_password" />
<bean:message key="ak.hostcaptain.page.user.password.change.new_password" />
</th>
<td class="left">
<html:password property="password" size="16" redisplay="false" />
38,7 → 38,7
</tr>
<tr>
<th class="right">
<bean:message key="ak.webcontrol.page.user.password.change.new_password_again" />
<bean:message key="ak.hostcaptain.page.user.password.change.new_password_again" />
</th>
<td class="left">
<html:password property="password2" size="16" redisplay="false" />
47,11 → 47,11
<tr>
<td class="right">
<html:submit>
<bean:message key="ak.webcontrol.page.user.password.change.submit" />
<bean:message key="ak.hostcaptain.page.user.password.change.submit" />
</html:submit>
</td>
<td class="right">
<backpath:backlink><bean:message key="ak.webcontrol.page.user.password.change.cancel" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.password.change.cancel" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/user/system/edit.jsp
7,12 → 7,12
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.user.system.edit.title" /></title>
<title><bean:message key="ak.hostcaptain.page.user.system.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.user.system.edit.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.user.system.edit.title" /></h1>
 
<html:errors/>
 
20,17 → 20,17
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.webcontrol.page.user.system.edit.uid" />:
<bean:message key="ak.hostcaptain.page.user.system.edit.uid" />:
<html:text property="uid" />
<br>
 
<bean:message key="ak.webcontrol.page.user.system.edit.name" />:
<bean:message key="ak.hostcaptain.page.user.system.edit.name" />:
<html:text property="name" />
<br>
 
<html:submit><bean:message key="ak.webcontrol.page.user.system.edit.submit" /></html:submit>
<html:submit><bean:message key="ak.hostcaptain.page.user.system.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.webcontrol.page.user.system.edit.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.system.edit.back" /></backpath:backlink>
</html:form>
 
</body>
/sun/hostcaptain/trunk/webapp/user/system/list.jsp
7,19 → 7,19
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.user.system.list.title" /></title>
<title><bean:message key="ak.hostcaptain.page.user.system.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.user.system.list.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.user.system.list.title" /></h1>
 
<html:errors/>
 
<table>
<tr>
<th><bean:message key="ak.webcontrol.page.user.system.list.uid" /></th>
<th><bean:message key="ak.webcontrol.page.user.system.list.name" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.uid" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.name" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
28,15 → 28,15
<tr>
<td><bean:write name="u" property="uid" /></td>
<td><bean:write name="u" property="name" /></td>
<td><backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.webcontrol.page.user.system.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/system/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.webcontrol.page.user.system.list.delete" /></backpath:link></td>
<td><backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/system/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.delete" /></backpath:link></td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/user/system/edit"><bean:message key="ak.webcontrol.page.user.system.list.add" /></backpath:link>
<backpath:link action="/user/system/edit"><bean:message key="ak.hostcaptain.page.user.system.list.add" /></backpath:link>
<br>
<backpath:backlink><bean:message key="ak.webcontrol.page.user.system.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.system.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/user/list.jsp
7,18 → 7,18
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.user.list.title" /></title>
<title><bean:message key="ak.hostcaptain.page.user.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.user.list.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.user.list.title" /></h1>
 
<html:errors/>
 
<table>
<tr>
<th><bean:message key="ak.webcontrol.page.user.list.login" /></th>
<th><bean:message key="ak.hostcaptain.page.user.list.login" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
26,15 → 26,15
<logic:iterate name="users" id="u">
<tr>
<td><bean:write name="u" property="login" /></td>
<td><backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.webcontrol.page.user.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.webcontrol.page.user.list.delete" /></backpath:link></td>
<td><backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.delete" /></backpath:link></td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/user/edit"><bean:message key="ak.webcontrol.page.user.list.add" /></backpath:link>
<backpath:link action="/user/edit"><bean:message key="ak.hostcaptain.page.user.list.add" /></backpath:link>
<br>
<backpath:backlink><bean:message key="ak.webcontrol.page.user.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/generalError.jsp
7,18 → 7,18
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.generalError.title" /></title>
<title><bean:message key="ak.hostcaptain.page.generalError.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.generalError.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.generalError.title" /></h1>
 
<p><bean:message key="ak.webcontrol.page.generalError.message" /></p>
<p><bean:message key="ak.hostcaptain.page.generalError.message" /></p>
 
<backpath:link><bean:message key="ak.webcontrol.page.generalError.index" /></backpath:link>
<backpath:link><bean:message key="ak.hostcaptain.page.generalError.index" /></backpath:link>
<br>
<backpath:backlink><bean:message key="ak.webcontrol.page.generalError.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.generalError.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/index.jsp
7,24 → 7,24
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.index.title" /></title>
<title><bean:message key="ak.hostcaptain.page.index.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.index.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.index.title" /></h1>
 
<ul>
<li><backpath:link action="/user/password/show"><bean:message key="ak.webcontrol.page.index.password_change" /></backpath:link></li>
<li><backpath:link action="/user/list"><bean:message key="ak.webcontrol.page.index.user_list" /></backpath:link></li>
<li><backpath:link action="/user/system/list"><bean:message key="ak.webcontrol.page.index.system_user_list" /></backpath:link></li>
<li><backpath:link action="/domain/list"><bean:message key="ak.webcontrol.page.index.domain_list" /></backpath:link></li>
<li><backpath:link action="/mail/box/list"><bean:message key="ak.webcontrol.page.index.mail_box_list" /></backpath:link></li>
<li><backpath:link action="/mail/alias/list"><bean:message key="ak.webcontrol.page.index.mail_alias_list" /></backpath:link></li>
<li><backpath:link action="/system/logout"><bean:message key="ak.webcontrol.page.index.logout" /></backpath:link></li>
<li><backpath:link action="/user/password/show"><bean:message key="ak.hostcaptain.page.index.password_change" /></backpath:link></li>
<li><backpath:link action="/user/list"><bean:message key="ak.hostcaptain.page.index.user_list" /></backpath:link></li>
<li><backpath:link action="/user/system/list"><bean:message key="ak.hostcaptain.page.index.system_user_list" /></backpath:link></li>
<li><backpath:link action="/domain/list"><bean:message key="ak.hostcaptain.page.index.domain_list" /></backpath:link></li>
<li><backpath:link action="/mail/box/list"><bean:message key="ak.hostcaptain.page.index.mail_box_list" /></backpath:link></li>
<li><backpath:link action="/mail/alias/list"><bean:message key="ak.hostcaptain.page.index.mail_alias_list" /></backpath:link></li>
<li><backpath:link action="/system/logout"><bean:message key="ak.hostcaptain.page.index.logout" /></backpath:link></li>
</ul>
 
<p><bean:message key="ak.webcontrol.page.index.login" />: <bean:write name="user" property="login" /></p>
<p><bean:message key="ak.hostcaptain.page.index.login" />: <bean:write name="user" property="login" /></p>
 
</body>
 
/sun/hostcaptain/trunk/webapp/mail/box/list.jsp
7,20 → 7,20
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.mail.box.list.title" /></title>
<title><bean:message key="ak.hostcaptain.page.mail.box.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.mail.box.list.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.mail.box.list.title" /></h1>
 
<html:errors/>
 
<table>
<tr>
<th><bean:message key="ak.webcontrol.page.mail.box.list.login" /></th>
<th><bean:message key="ak.webcontrol.page.mail.box.list.domain" /></th>
<th><bean:message key="ak.webcontrol.page.mail.box.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.login" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.domain" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.owner" /></th>
<th>&nbsp;</th>
</tr>
 
29,15 → 29,15
<td><bean:write name="mailbox" property="login" /></td>
<td><bean:write name="mailbox" property="domain.name" /></td>
<td><bean:write name="mailbox" property="owner.login" /></td>
<td><backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.webcontrol.page.mail.box.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/box/delete" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.webcontrol.page.mail.box.list.delete" /></backpath:link></td>
<td><backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/box/delete" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.delete" /></backpath:link></td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/mail/box/edit"><bean:message key="ak.webcontrol.page.mail.box.list.add" /></backpath:link>
<backpath:link action="/mail/box/edit"><bean:message key="ak.hostcaptain.page.mail.box.list.add" /></backpath:link>
<br>
<backpath:backlink><bean:message key="ak.webcontrol.page.mail.box.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.box.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/mail/box/edit.jsp
7,12 → 7,12
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.mail.box.edit.title" /></title>
<title><bean:message key="ak.hostcaptain.page.mail.box.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.mail.box.edit.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.mail.box.edit.title" /></h1>
 
<html:errors/>
 
20,7 → 20,7
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.webcontrol.page.mail.box.edit.login" />:
<bean:message key="ak.hostcaptain.page.mail.box.edit.login" />:
<html:text property="login" />
<br>
 
27,31 → 27,31
FIXME: checkbox to get password from owner
<br>
 
<bean:message key="ak.webcontrol.page.mail.box.edit.password" />:
<bean:message key="ak.hostcaptain.page.mail.box.edit.password" />:
<html:password property="password" redisplay="false" />
<br>
 
<bean:message key="ak.webcontrol.page.mail.box.edit.password_again" />:
<bean:message key="ak.hostcaptain.page.mail.box.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<br>
 
<bean:message key="ak.webcontrol.page.mail.box.edit.domain" />:
<bean:message key="ak.hostcaptain.page.mail.box.edit.domain" />:
<html:select property="domain">
<html:option value="" key="ak.webcontrol.page.mail.box.edit.domain.empty"/>
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
<br>
 
<bean:message key="ak.webcontrol.page.mail.box.edit.owner" />:
<bean:message key="ak.hostcaptain.page.mail.box.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.webcontrol.page.mail.box.edit.owner.empty"/>
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<bean:message key="ak.webcontrol.page.mail.box.edit.systemuser" />:
<bean:message key="ak.hostcaptain.page.mail.box.edit.systemuser" />:
<html:select property="systemuser">
<html:option value="" key="ak.webcontrol.page.mail.box.edit.systemuser.empty"/>
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.systemuser.empty"/>
<html:options collection="systemusers" property="id" labelProperty="name" />
</html:select>
FIXME: uid+name should be shown
58,16 → 58,16
<br>
 
<html:checkbox property="viruscheck" />
<bean:message key="ak.webcontrol.page.mail.box.edit.viruscheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.viruscheck" />
<br>
 
<html:checkbox property="spamcheck" />
<bean:message key="ak.webcontrol.page.mail.box.edit.spamcheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.spamcheck" />
<br>
 
<html:submit><bean:message key="ak.webcontrol.page.mail.box.edit.submit" /></html:submit>
<html:submit><bean:message key="ak.hostcaptain.page.mail.box.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.webcontrol.page.mail.box.edit.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.box.edit.back" /></backpath:backlink>
</html:form>
 
</body>
/sun/hostcaptain/trunk/webapp/mail/alias/edit.jsp
7,7 → 7,7
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.mail.alias.edit.title" /></title>
<title><bean:message key="ak.hostcaptain.page.mail.alias.edit.title" /></title>
<script>
function submitForm()
{
58,7 → 58,7
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.mail.alias.edit.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.mail.alias.edit.title" /></h1>
 
<html:errors/>
 
67,20 → 67,20
<html:hidden property="id" />
 
<p>
<bean:message key="ak.webcontrol.page.mail.alias.edit.address" />:
<bean:message key="ak.hostcaptain.page.mail.alias.edit.address" />:
<html:text property="address" />
<br>
 
<bean:message key="ak.webcontrol.page.mail.alias.edit.domain" />:
<bean:message key="ak.hostcaptain.page.mail.alias.edit.domain" />:
<html:select property="domain">
<html:option value="" key="ak.webcontrol.page.mail.alias.edit.domain.empty"/>
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
<br>
 
<bean:message key="ak.webcontrol.page.mail.alias.edit.owner" />:
<bean:message key="ak.hostcaptain.page.mail.alias.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.webcontrol.page.mail.alias.edit.owner.empty"/>
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
88,32 → 88,32
 
<table>
<tr>
<th><bean:message key="ak.webcontrol.page.mail.alias.edit.header.tomailbox" /></th>
<th><bean:message key="ak.webcontrol.page.mail.alias.edit.header.toexternal" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.header.tomailbox" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.edit.header.toexternal" /></th>
<th>&nbsp;</th>
</tr>
 
<logic:iterate name="ak.webcontrol.core.form.MailAliasEditForm" property="dests" id="dests" indexId="iid">
<logic:iterate name="ak.hostcaptain.core.form.MailAliasEditForm" property="dests" id="dests" indexId="iid">
<tr>
<td>
<html:hidden name="dests" property="id" indexed="true" />
<html:select name="dests" property="mailbox" indexed="true" onchange="mailboxChanged(this)">
<html:option value="" key="ak.webcontrol.page.mail.alias.edit.external"/>
<html:option value="" key="ak.hostcaptain.page.mail.alias.edit.external"/>
<html:options collection="mailboxes" property="id" labelProperty="login" />
</html:select>
</td>
<td><html:text name="dests" property="email" indexed="true" /></td>
<td><html:submit property="delete.dests" indexed="true"><bean:message key="ak.webcontrol.page.mail.alias.edit.delete" /></html:submit></td>
<td><html:submit property="delete.dests" indexed="true"><bean:message key="ak.hostcaptain.page.mail.alias.edit.delete" /></html:submit></td>
</tr>
</logic:iterate>
 
<tr>
<td colspan=3><html:submit property="add"><bean:message key="ak.webcontrol.page.mail.alias.edit.add" /></html:submit></td>
<td colspan=3><html:submit property="add"><bean:message key="ak.hostcaptain.page.mail.alias.edit.add" /></html:submit></td>
<tr>
</tr>
<td colspan=3>
<html:submit property="submit"><bean:message key="ak.webcontrol.page.mail.alias.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.webcontrol.page.mail.alias.edit.cancel" /></backpath:backlink>
<html:submit property="submit"><bean:message key="ak.hostcaptain.page.mail.alias.edit.submit" /></html:submit>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.edit.cancel" /></backpath:backlink>
</td>
</tr>
</table>
/sun/hostcaptain/trunk/webapp/mail/alias/list.jsp
7,18 → 7,18
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.mail.alias.list.title" /></title>
<title><bean:message key="ak.hostcaptain.page.mail.alias.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.mail.alias.list.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.mail.alias.list.title" /></h1>
 
<html:errors/>
 
<table>
<tr>
<th><bean:message key="ak.webcontrol.page.mail.alias.list.alias" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.alias" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
26,15 → 26,15
<logic:iterate name="aliases" id="alias">
<tr>
<td><bean:write name="alias" property="address" /></td>
<td><backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.webcontrol.page.mail.alias.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/alias/delete" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.webcontrol.page.mail.alias.list.delete" /></backpath:link></td>
<td><backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/alias/delete" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.delete" /></backpath:link></td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/mail/alias/edit"><bean:message key="ak.webcontrol.page.mail.alias.list.add" /></backpath:link>
<backpath:link action="/mail/alias/edit"><bean:message key="ak.hostcaptain.page.mail.alias.list.add" /></backpath:link>
<br>
<backpath:backlink><bean:message key="ak.webcontrol.page.mail.alias.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.alias.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/error.jsp
7,17 → 7,17
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.error.title" /></title>
<title><bean:message key="ak.hostcaptain.page.error.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.error.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.error.title" /></h1>
 
<html:errors/>
 
<br>
<backpath:backlink><bean:message key="ak.webcontrol.page.error.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.error.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/system/login.jsp
7,12 → 7,12
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.system.login.title" /></title>
<title><bean:message key="ak.hostcaptain.page.system.login.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.system.login.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.system.login.title" /></h1>
 
<html:errors/>
 
21,7 → 21,7
<table border="0">
<tr>
<th class="right">
<bean:message key="ak.webcontrol.page.system.login.login" />
<bean:message key="ak.hostcaptain.page.system.login.login" />
</th>
<td class="left">
<html:text property="login" size="16"/>
29,7 → 29,7
</tr>
<tr>
<th class="right">
<bean:message key="ak.webcontrol.page.system.login.password" />
<bean:message key="ak.hostcaptain.page.system.login.password" />
</th>
<td class="left">
<html:password property="password" size="16" redisplay="false" />
38,12 → 38,12
<tr>
<td class="right">
<html:submit>
<bean:message key="ak.webcontrol.page.system.login.submit" />
<bean:message key="ak.hostcaptain.page.system.login.submit" />
</html:submit>
</td>
<td class="right">
<html:reset>
<bean:message key="ak.webcontrol.page.system.login.reset" />
<bean:message key="ak.hostcaptain.page.system.login.reset" />
</html:reset>
</td>
</tr>
/sun/hostcaptain/trunk/webapp/system/logout.jsp
7,20 → 7,20
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.system.logout.title" /></title>
<title><bean:message key="ak.hostcaptain.page.system.logout.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.system.logout.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.system.logout.title" /></h1>
 
<html:errors/>
 
<p><bean:message key="ak.webcontrol.page.system.logout.message" /></p>
<p><bean:message key="ak.hostcaptain.page.system.logout.message" /></p>
 
<p><html:link action="/system/login"><bean:message key="ak.webcontrol.page.system.logout.login" /></html:link></p>
<p><html:link action="/system/login"><bean:message key="ak.hostcaptain.page.system.logout.login" /></html:link></p>
 
<backpath:backlink><bean:message key="ak.webcontrol.page.system.logout.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.system.logout.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/WEB-INF/struts-config.xml
7,7 → 7,7
<struts-config>
<form-beans>
<form-bean
name="ak.webcontrol.core.form.LoginForm"
name="ak.hostcaptain.core.form.LoginForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="login" type="java.lang.String" />
<form-property name="password" type="java.lang.String" />
14,8 → 14,8
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.ChangePasswordForm"
type="ak.webcontrol.core.form.UserPasswordForm">
name="ak.hostcaptain.core.form.ChangePasswordForm"
type="ak.hostcaptain.core.form.UserPasswordForm">
<form-property name="oldpassword" type="java.lang.String" />
<form-property name="password" type="java.lang.String" />
<form-property name="password2" type="java.lang.String" />
22,14 → 22,14
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.UserForm"
name="ak.hostcaptain.core.form.UserForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.UserEditForm"
type="ak.webcontrol.core.form.UserPasswordForm">
name="ak.hostcaptain.core.form.UserEditForm"
type="ak.hostcaptain.core.form.UserPasswordForm">
<form-property name="id" type="java.lang.String" />
<form-property name="login" type="java.lang.String" />
<form-property name="password" type="java.lang.String" />
37,13 → 37,13
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.SystemUserForm"
name="ak.hostcaptain.core.form.SystemUserForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.SystemUserEditForm"
name="ak.hostcaptain.core.form.SystemUserEditForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
<form-property name="uid" type="java.lang.String" />
51,13 → 51,13
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.InetDomainForm"
name="ak.hostcaptain.core.form.InetDomainForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.InetDomainEditForm"
name="ak.hostcaptain.core.form.InetDomainEditForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
<form-property name="name" type="java.lang.String" />
65,14 → 65,14
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.MailboxForm"
name="ak.hostcaptain.core.form.MailboxForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.MailboxEditForm"
type="ak.webcontrol.core.form.UserPasswordForm">
name="ak.hostcaptain.core.form.MailboxEditForm"
type="ak.hostcaptain.core.form.UserPasswordForm">
<form-property name="id" type="java.lang.String" />
<form-property name="login" type="java.lang.String" />
<form-property name="password" type="java.lang.String" />
85,19 → 85,19
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.MailAliasForm"
name="ak.hostcaptain.core.form.MailAliasForm"
type="org.apache.struts.validator.DynaValidatorForm">
<form-property name="id" type="java.lang.String" />
</form-bean>
 
<form-bean
name="ak.webcontrol.core.form.MailAliasEditForm"
name="ak.hostcaptain.core.form.MailAliasEditForm"
type="ak.strutsx.ResizeableDynaValidatorForm">
<form-property name="id" type="java.lang.String" />
<form-property name="address" type="java.lang.String" />
<form-property name="domain" type="java.lang.String" />
<form-property name="owner" type="java.lang.String" />
<form-property name="dests" type="ak.webcontrol.core.form.MailAliasDestBean[]"
<form-property name="dests" type="ak.hostcaptain.core.form.MailAliasDestBean[]"
size="1" />
</form-bean>
</form-beans>
112,8 → 112,8
 
<exception
key="UserException"
type="ak.webcontrol.util.UserException"
handler="ak.webcontrol.core.action.UserExceptionHandler"
type="ak.hostcaptain.util.UserException"
handler="ak.hostcaptain.core.action.UserExceptionHandler"
/>
</global-exceptions>
 
127,7 → 127,7
<action-mappings>
<action
path="/index"
type="ak.webcontrol.core.action.IndexAction"
type="ak.hostcaptain.core.action.IndexAction"
>
<forward name="success" path="/index.jsp" />
</action>
140,8 → 140,8
 
<action
path="/system/login/submit"
type="ak.webcontrol.core.action.LoginAction"
name="ak.webcontrol.core.form.LoginForm"
type="ak.hostcaptain.core.action.LoginAction"
name="ak.hostcaptain.core.form.LoginForm"
validate="true"
scope="request"
input="/system/login.jsp"
151,7 → 151,7
 
<action
path="/system/logout"
type="ak.webcontrol.core.action.LogoutAction"
type="ak.hostcaptain.core.action.LogoutAction"
>
<forward name="default" path="/system/logout.jsp" />
</action>
160,7 → 160,7
 
<action
path="/user/password/show"
type="ak.webcontrol.core.action.ChangePasswordAction"
type="ak.hostcaptain.core.action.ChangePasswordAction"
parameter="first"
>
<forward name="default" path="/user/password/change.jsp" />
168,9 → 168,9
 
<action
path="/user/password/submit"
type="ak.webcontrol.core.action.ChangePasswordAction"
type="ak.hostcaptain.core.action.ChangePasswordAction"
parameter="submit"
name="ak.webcontrol.core.form.ChangePasswordForm"
name="ak.hostcaptain.core.form.ChangePasswordForm"
validate="true"
scope="request"
input="/user/password/change.jsp"
179,7 → 179,7
 
<action
path="/user/list"
type="ak.webcontrol.core.action.UserAction"
type="ak.hostcaptain.core.action.UserAction"
parameter="list"
>
<forward name="default" path="/user/list.jsp" />
187,9 → 187,9
 
<action
path="/user/delete"
type="ak.webcontrol.core.action.UserAction"
type="ak.hostcaptain.core.action.UserAction"
parameter="delete"
name="ak.webcontrol.core.form.UserForm"
name="ak.hostcaptain.core.form.UserForm"
validate="true"
scope="request"
>
197,9 → 197,9
 
<action
path="/user/edit"
type="ak.webcontrol.core.action.UserAction"
type="ak.hostcaptain.core.action.UserAction"
parameter="edit"
name="ak.webcontrol.core.form.UserForm"
name="ak.hostcaptain.core.form.UserForm"
validate="true"
scope="request"
>
208,9 → 208,9
 
<action
path="/user/submit"
type="ak.webcontrol.core.action.UserAction"
type="ak.hostcaptain.core.action.UserAction"
parameter="submit"
name="ak.webcontrol.core.form.UserEditForm"
name="ak.hostcaptain.core.form.UserEditForm"
validate="true"
scope="request"
input="/user/edit.jsp"
221,7 → 221,7
 
<action
path="/user/system/list"
type="ak.webcontrol.core.action.SystemUserAction"
type="ak.hostcaptain.core.action.SystemUserAction"
parameter="list"
>
<forward name="default" path="/user/system/list.jsp" />
229,9 → 229,9
 
<action
path="/user/system/delete"
type="ak.webcontrol.core.action.SystemUserAction"
type="ak.hostcaptain.core.action.SystemUserAction"
parameter="delete"
name="ak.webcontrol.core.form.SystemUserForm"
name="ak.hostcaptain.core.form.SystemUserForm"
validate="true"
scope="request"
>
239,9 → 239,9
 
<action
path="/user/system/edit"
type="ak.webcontrol.core.action.SystemUserAction"
type="ak.hostcaptain.core.action.SystemUserAction"
parameter="edit"
name="ak.webcontrol.core.form.SystemUserForm"
name="ak.hostcaptain.core.form.SystemUserForm"
validate="true"
scope="request"
>
250,9 → 250,9
 
<action
path="/user/system/submit"
type="ak.webcontrol.core.action.SystemUserAction"
type="ak.hostcaptain.core.action.SystemUserAction"
parameter="submit"
name="ak.webcontrol.core.form.SystemUserEditForm"
name="ak.hostcaptain.core.form.SystemUserEditForm"
validate="true"
scope="request"
input="/user/system/edit.jsp"
263,7 → 263,7
 
<action
path="/domain/list"
type="ak.webcontrol.core.action.InetDomainAction"
type="ak.hostcaptain.core.action.InetDomainAction"
parameter="list"
>
<forward name="default" path="/domain/list.jsp" />
271,9 → 271,9
 
<action
path="/domain/delete"
type="ak.webcontrol.core.action.InetDomainAction"
type="ak.hostcaptain.core.action.InetDomainAction"
parameter="delete"
name="ak.webcontrol.core.form.InetDomainForm"
name="ak.hostcaptain.core.form.InetDomainForm"
validate="true"
scope="request"
>
281,9 → 281,9
 
<action
path="/domain/edit"
type="ak.webcontrol.core.action.InetDomainAction"
type="ak.hostcaptain.core.action.InetDomainAction"
parameter="edit"
name="ak.webcontrol.core.form.InetDomainForm"
name="ak.hostcaptain.core.form.InetDomainForm"
validate="true"
scope="request"
>
292,9 → 292,9
 
<action
path="/domain/submit"
type="ak.webcontrol.core.action.InetDomainAction"
type="ak.hostcaptain.core.action.InetDomainAction"
parameter="submit"
name="ak.webcontrol.core.form.InetDomainEditForm"
name="ak.hostcaptain.core.form.InetDomainEditForm"
validate="true"
scope="request"
input="/domain/edit.jsp"
305,7 → 305,7
 
<action
path="/mail/box/list"
type="ak.webcontrol.core.action.MailboxAction"
type="ak.hostcaptain.core.action.MailboxAction"
parameter="list"
>
<forward name="default" path="/mail/box/list.jsp" />
313,9 → 313,9
 
<action
path="/mail/box/delete"
type="ak.webcontrol.core.action.MailboxAction"
type="ak.hostcaptain.core.action.MailboxAction"
parameter="delete"
name="ak.webcontrol.core.form.MailboxForm"
name="ak.hostcaptain.core.form.MailboxForm"
validate="true"
scope="request"
>
323,9 → 323,9
 
<action
path="/mail/box/edit"
type="ak.webcontrol.core.action.MailboxAction"
type="ak.hostcaptain.core.action.MailboxAction"
parameter="edit"
name="ak.webcontrol.core.form.MailboxForm"
name="ak.hostcaptain.core.form.MailboxForm"
validate="true"
scope="request"
>
334,9 → 334,9
 
<action
path="/mail/box/submit"
type="ak.webcontrol.core.action.MailboxAction"
type="ak.hostcaptain.core.action.MailboxAction"
parameter="submit"
name="ak.webcontrol.core.form.MailboxEditForm"
name="ak.hostcaptain.core.form.MailboxEditForm"
validate="true"
scope="request"
input="/mail/box/edit.jsp"
347,7 → 347,7
 
<action
path="/mail/alias/list"
type="ak.webcontrol.core.action.MailAliasAction"
type="ak.hostcaptain.core.action.MailAliasAction"
parameter="list"
>
<forward name="default" path="/mail/alias/list.jsp" />
355,9 → 355,9
 
<action
path="/mail/alias/delete"
type="ak.webcontrol.core.action.MailAliasAction"
type="ak.hostcaptain.core.action.MailAliasAction"
parameter="delete"
name="ak.webcontrol.core.form.MailAliasForm"
name="ak.hostcaptain.core.form.MailAliasForm"
validate="true"
scope="request"
>
365,9 → 365,9
 
<action
path="/mail/alias/edit"
type="ak.webcontrol.core.action.MailAliasAction"
type="ak.hostcaptain.core.action.MailAliasAction"
parameter="edit"
name="ak.webcontrol.core.form.MailAliasForm"
name="ak.hostcaptain.core.form.MailAliasForm"
validate="true"
scope="request"
>
376,9 → 376,9
 
<action
path="/mail/alias/submit"
type="ak.webcontrol.core.action.MailAliasAction"
type="ak.hostcaptain.core.action.MailAliasAction"
parameter="submit"
name="ak.webcontrol.core.form.MailAliasEditForm"
name="ak.hostcaptain.core.form.MailAliasEditForm"
validate="true"
scope="request"
input="/mail/alias/edit.do"
390,7 → 390,7
 
<controller processorClass="ak.strutsx.RequestProcessorX" />
 
<message-resources parameter="ak.webcontrol.core.CoreResources" />
<message-resources parameter="ak.hostcaptain.core.CoreResources" />
 
<!-- ========== Plug-Ins Configuration ================================== -->
 
/sun/hostcaptain/trunk/webapp/WEB-INF/validation.xml
9,126 → 9,126
</global>
 
<formset>
<form name="ak.webcontrol.core.form.LoginForm">
<form name="ak.hostcaptain.core.form.LoginForm">
<field property="login" depends="required">
<msg name="required" key="ak.webcontrol.core.login.required" />
<msg name="required" key="ak.hostcaptain.core.login.required" />
</field>
<field property="password" depends="required">
<msg name="required" key="ak.webcontrol.core.password.required" />
<msg name="required" key="ak.hostcaptain.core.password.required" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.ChangePasswordForm">
<form name="ak.hostcaptain.core.form.ChangePasswordForm">
<field property="oldpassword" depends="required">
<msg name="required" key="ak.webcontrol.core.oldpassword.required" />
<msg name="required" key="ak.hostcaptain.core.oldpassword.required" />
</field>
<field property="password" depends="required">
<msg name="required" key="ak.webcontrol.core.password.required" />
<msg name="required" key="ak.hostcaptain.core.password.required" />
</field>
<field property="password2" depends="required">
<msg name="required" key="ak.webcontrol.core.password2.required" />
<msg name="required" key="ak.hostcaptain.core.password2.required" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.UserForm">
<form name="ak.hostcaptain.core.form.UserForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.user.password.change.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.user.password.change.id.wrong" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.UserEditForm">
<form name="ak.hostcaptain.core.form.UserEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.user.password.change.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.user.password.change.id.wrong" />
</field>
<field property="login" depends="required">
<msg name="required" key="ak.webcontrol.core.login.required" />
<msg name="required" key="ak.hostcaptain.core.login.required" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.SystemUserForm">
<form name="ak.hostcaptain.core.form.SystemUserForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.user.system.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.user.system.edit.id.wrong" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.SystemUserEditForm">
<form name="ak.hostcaptain.core.form.SystemUserEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.user.system.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.user.system.edit.id.wrong" />
</field>
<field property="uid" depends="required,integer">
<msg name="required" key="ak.webcontrol.core.user.system.edit.uid.wrong" />
<msg name="integer" key="ak.webcontrol.core.user.system.edit.uid.wrong" />
<msg name="required" key="ak.hostcaptain.core.user.system.edit.uid.wrong" />
<msg name="integer" key="ak.hostcaptain.core.user.system.edit.uid.wrong" />
</field>
<field property="name" depends="required">
<msg name="required" key="ak.webcontrol.core.user.system.edit.name.required" />
<msg name="required" key="ak.hostcaptain.core.user.system.edit.name.required" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.InetDomainForm">
<form name="ak.hostcaptain.core.form.InetDomainForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.domain.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.domain.edit.id.wrong" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.InetDomainEditForm">
<form name="ak.hostcaptain.core.form.InetDomainEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.domain.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.domain.edit.id.wrong" />
</field>
<field property="name" depends="required">
<msg name="required" key="ak.webcontrol.core.domain.edit.name.empty" />
<msg name="required" key="ak.hostcaptain.core.domain.edit.name.empty" />
</field>
<field property="owner" depends="required,long">
<msg name="long" key="ak.webcontrol.core.domain.edit.owner.wrong" />
<msg name="required" key="ak.webcontrol.core.domain.edit.owner.wrong" />
<msg name="long" key="ak.hostcaptain.core.domain.edit.owner.wrong" />
<msg name="required" key="ak.hostcaptain.core.domain.edit.owner.wrong" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.MailboxForm">
<form name="ak.hostcaptain.core.form.MailboxForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.mailbox.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.id.wrong" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.MailboxEditForm">
<form name="ak.hostcaptain.core.form.MailboxEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.mailbox.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.id.wrong" />
</field>
<field property="login" depends="required">
<msg name="required" key="ak.webcontrol.core.mailbox.edit.login.empty" />
<msg name="required" key="ak.hostcaptain.core.mailbox.edit.login.empty" />
</field>
<field property="domain" depends="required,long">
<msg name="long" key="ak.webcontrol.core.mailbox.edit.domain.wrong" />
<msg name="required" key="ak.webcontrol.core.mailbox.edit.domain.wrong" />
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.domain.wrong" />
<msg name="required" key="ak.hostcaptain.core.mailbox.edit.domain.wrong" />
</field>
<field property="owner" depends="required,long">
<msg name="long" key="ak.webcontrol.core.mailbox.edit.owner.wrong" />
<msg name="required" key="ak.webcontrol.core.mailbox.edit.owner.wrong" />
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.owner.wrong" />
<msg name="required" key="ak.hostcaptain.core.mailbox.edit.owner.wrong" />
</field>
<field property="systemuser" depends="long">
<msg name="long" key="ak.webcontrol.core.mailbox.edit.systemuser.wrong" />
<msg name="long" key="ak.hostcaptain.core.mailbox.edit.systemuser.wrong" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.MailAliasForm">
<form name="ak.hostcaptain.core.form.MailAliasForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.mail.alias.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.id.wrong" />
</field>
</form>
 
<form name="ak.webcontrol.core.form.MailAliasEditForm">
<form name="ak.hostcaptain.core.form.MailAliasEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.webcontrol.core.mail.alias.edit.id.wrong" />
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.id.wrong" />
</field>
<field property="address" depends="required">
<msg name="required" key="ak.webcontrol.core.mail.alias.edit.address.empty" />
<msg name="required" key="ak.hostcaptain.core.mail.alias.edit.address.empty" />
</field>
<field property="domain" depends="required,long">
<msg name="long" key="ak.webcontrol.core.mail.alias.edit.domain.wrong" />
<msg name="required" key="ak.webcontrol.core.mail.alias.edit.domain.wrong" />
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.domain.wrong" />
<msg name="required" key="ak.hostcaptain.core.mail.alias.edit.domain.wrong" />
</field>
<field property="owner" depends="required,long">
<msg name="long" key="ak.webcontrol.core.mail.alias.edit.owner.wrong" />
<msg name="required" key="ak.webcontrol.core.mail.alias.edit.owner.wrong" />
<msg name="long" key="ak.hostcaptain.core.mail.alias.edit.owner.wrong" />
<msg name="required" key="ak.hostcaptain.core.mail.alias.edit.owner.wrong" />
</field>
</form>
</formset>
/sun/hostcaptain/trunk/webapp/WEB-INF/web.xml
8,26 → 8,26
 
<filter>
<filter-name>Encoding Filter</filter-name>
<filter-class>ak.webcontrol.core.servlet.EncodingFilter</filter-class>
<filter-class>ak.hostcaptain.core.servlet.EncodingFilter</filter-class>
</filter>
<filter>
<filter-name>Hibernate Filter</filter-name>
<filter-class>ak.webcontrol.core.servlet.HibernateFilter</filter-class>
<filter-class>ak.hostcaptain.core.servlet.HibernateFilter</filter-class>
<init-param>
<param-name>register</param-name>
<param-value>
ak.webcontrol.core.model.UserManager;
ak.webcontrol.core.model.MailboxManager;
ak.webcontrol.core.model.MailAliasManager;
ak.webcontrol.core.model.MailAliasDestinationManager;
ak.webcontrol.core.model.SystemUserManager;
ak.webcontrol.core.model.InetDomainManager
ak.hostcaptain.core.model.UserManager;
ak.hostcaptain.core.model.MailboxManager;
ak.hostcaptain.core.model.MailAliasManager;
ak.hostcaptain.core.model.MailAliasDestinationManager;
ak.hostcaptain.core.model.SystemUserManager;
ak.hostcaptain.core.model.InetDomainManager
</param-value>
</init-param>
</filter>
<filter>
<filter-name>Login Filter</filter-name>
<filter-class>ak.webcontrol.core.servlet.LoginFilter</filter-class>
<filter-class>ak.hostcaptain.core.servlet.LoginFilter</filter-class>
<init-param>
<param-name>loginUrl</param-name>
<param-value>/system/login.do?backpath=</param-value>
/sun/hostcaptain/trunk/webapp/domain/list.jsp
7,19 → 7,19
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.domain.list.title" /></title>
<title><bean:message key="ak.hostcaptain.page.domain.list.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.domain.list.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.domain.list.title" /></h1>
 
<html:errors/>
 
<table>
<tr>
<th><bean:message key="ak.webcontrol.page.domain.list.name" /></th>
<th><bean:message key="ak.webcontrol.page.domain.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.domain.list.name" /></th>
<th><bean:message key="ak.hostcaptain.page.domain.list.owner" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
28,15 → 28,15
<tr>
<td><bean:write name="domain" property="name" /></td>
<td><bean:write name="domain" property="owner.login" /></td>
<td><backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.webcontrol.page.domain.list.edit" /></backpath:link></td>
<td><backpath:link action="/domain/delete" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.webcontrol.page.domain.list.delete" /></backpath:link></td>
<td><backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.edit" /></backpath:link></td>
<td><backpath:link action="/domain/delete" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.delete" /></backpath:link></td>
</tr>
</logic:iterate>
</table>
 
<backpath:link action="/domain/edit"><bean:message key="ak.webcontrol.page.domain.list.add" /></backpath:link>
<backpath:link action="/domain/edit"><bean:message key="ak.hostcaptain.page.domain.list.add" /></backpath:link>
<br>
<backpath:backlink><bean:message key="ak.webcontrol.page.domain.list.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.domain.list.back" /></backpath:backlink>
 
</body>
 
/sun/hostcaptain/trunk/webapp/domain/edit.jsp
7,12 → 7,12
 
<head>
<meta http-equiv="expires" content="0">
<title><bean:message key="ak.webcontrol.page.domain.edit.title" /></title>
<title><bean:message key="ak.hostcaptain.page.domain.edit.title" /></title>
</head>
 
<body>
 
<h1><bean:message key="ak.webcontrol.page.domain.edit.title" /></h1>
<h1><bean:message key="ak.hostcaptain.page.domain.edit.title" /></h1>
 
<html:errors/>
 
20,20 → 20,20
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.webcontrol.page.domain.edit.name" />:
<bean:message key="ak.hostcaptain.page.domain.edit.name" />:
<html:text property="name" />
<br>
 
<bean:message key="ak.webcontrol.page.domain.edit.owner" />:
<bean:message key="ak.hostcaptain.page.domain.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.webcontrol.page.domain.edit.owner.empty"/>
<html:option value="" key="ak.hostcaptain.page.domain.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<html:submit><bean:message key="ak.webcontrol.page.domain.edit.submit" /></html:submit>
<html:submit><bean:message key="ak.hostcaptain.page.domain.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.webcontrol.page.domain.edit.back" /></backpath:backlink>
<backpath:backlink><bean:message key="ak.hostcaptain.page.domain.edit.back" /></backpath:backlink>
</html:form>
 
</body>