Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 904 → Rev 905

/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>