Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 10 → Rev 11

/it-ru/trunk/webapp/WEB-INF/struts-config.xml
28,8 → 28,8
<form-property name="account" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
<form-property name="acts" type="ak.itru.core.form.EventActBean[]" size="1" />
<form-property name="apartments" type="ak.itru.core.form.EventApartmentBean[]" size="1" />
<form-property name="acts" type="ak.kickup.core.form.EventActBean[]" size="1" />
<form-property name="apartments" type="ak.kickup.core.form.EventApartmentBean[]" size="1" />
</form-bean>
 
<form-bean
103,8 → 103,8
<global-exceptions>
<exception
key="UserException"
type="ak.itru.util.UserException"
handler="ak.itru.core.action.UserExceptionHandler"
type="ak.kickup.util.UserException"
handler="ak.kickup.core.action.UserExceptionHandler"
/>
</global-exceptions>
 
125,7 → 125,7
 
<action
path="/admin/event/list"
type="ak.itru.core.action.AdminEventAction"
type="ak.kickup.core.action.AdminEventAction"
parameter="list"
>
<forward name="default" path="/admin/event/list.jsp" />
133,7 → 133,7
 
<action
path="/admin/event/delete"
type="ak.itru.core.action.AdminEventAction"
type="ak.kickup.core.action.AdminEventAction"
parameter="delete"
name="EventForm"
validate="true"
143,7 → 143,7
 
<action
path="/admin/event/edit"
type="ak.itru.core.action.AdminEventAction"
type="ak.kickup.core.action.AdminEventAction"
parameter="edit"
name="EventForm"
validate="true"
154,7 → 154,7
 
<action
path="/admin/event/submit"
type="ak.itru.core.action.AdminEventAction"
type="ak.kickup.core.action.AdminEventAction"
parameter="submit"
name="EventEditForm"
validate="true"
167,7 → 167,7
 
<action
path="/admin/act/list"
type="ak.itru.core.action.AdminActAction"
type="ak.kickup.core.action.AdminActAction"
parameter="list"
>
<forward name="default" path="/admin/act/list.jsp" />
175,7 → 175,7
 
<action
path="/admin/act/delete"
type="ak.itru.core.action.AdminActAction"
type="ak.kickup.core.action.AdminActAction"
parameter="delete"
name="ActForm"
validate="true"
185,7 → 185,7
 
<action
path="/admin/act/edit"
type="ak.itru.core.action.AdminActAction"
type="ak.kickup.core.action.AdminActAction"
parameter="edit"
name="ActForm"
validate="true"
196,7 → 196,7
 
<action
path="/admin/act/submit"
type="ak.itru.core.action.AdminActAction"
type="ak.kickup.core.action.AdminActAction"
parameter="submit"
name="ActEditForm"
validate="true"
209,7 → 209,7
 
<action
path="/admin/apartment/list"
type="ak.itru.core.action.AdminApartmentAction"
type="ak.kickup.core.action.AdminApartmentAction"
parameter="list"
>
<forward name="default" path="/admin/apartment/list.jsp" />
217,7 → 217,7
 
<action
path="/admin/apartment/delete"
type="ak.itru.core.action.AdminApartmentAction"
type="ak.kickup.core.action.AdminApartmentAction"
parameter="delete"
name="ApartmentForm"
validate="true"
227,7 → 227,7
 
<action
path="/admin/apartment/edit"
type="ak.itru.core.action.AdminApartmentAction"
type="ak.kickup.core.action.AdminApartmentAction"
parameter="edit"
name="ApartmentForm"
validate="true"
238,7 → 238,7
 
<action
path="/admin/apartment/submit"
type="ak.itru.core.action.AdminApartmentAction"
type="ak.kickup.core.action.AdminApartmentAction"
parameter="submit"
name="ApartmentEditForm"
validate="true"
251,7 → 251,7
 
<action
path="/admin/participant/list"
type="ak.itru.core.action.AdminParticipantAction"
type="ak.kickup.core.action.AdminParticipantAction"
parameter="list"
name="ParticipantListForm"
validate="true"
262,7 → 262,7
 
<action
path="/admin/participant/delete"
type="ak.itru.core.action.AdminParticipantAction"
type="ak.kickup.core.action.AdminParticipantAction"
parameter="delete"
name="ParticipantForm"
validate="true"
272,7 → 272,7
 
<action
path="/admin/participant/edit"
type="ak.itru.core.action.AdminParticipantAction"
type="ak.kickup.core.action.AdminParticipantAction"
parameter="edit"
name="ParticipantForm"
validate="true"
283,7 → 283,7
 
<action
path="/admin/participant/submit"
type="ak.itru.core.action.AdminParticipantAction"
type="ak.kickup.core.action.AdminParticipantAction"
parameter="submit"
name="ParticipantEditForm"
validate="true"
296,7 → 296,7
 
<controller processorClass="ak.strutsx.RequestProcessorX" />
 
<message-resources parameter="ak.itru.core.CoreResources" />
<message-resources parameter="ak.kickup.core.CoreResources" />
 
<!-- ========== Plug-Ins Configuration ================================== -->
 
/it-ru/trunk/webapp/WEB-INF/validation.xml
11,104 → 11,104
<formset>
<form name="EventForm">
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.event.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.event.edit.id.wrong" />
</field>
</form>
 
<form name="EventEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.event.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.event.edit.id.wrong" />
</field>
<field property="name" depends="required">
<msg name="required" key="ak.itru.core.event.edit.name.required" />
<msg name="required" key="ak.kickup.core.event.edit.name.required" />
</field>
<field property="start" depends="date">
<msg name="date" key="ak.itru.core.event.edit.start.wrong" />
<msg name="date" key="ak.kickup.core.event.edit.start.wrong" />
</field>
<field property="stop" depends="date">
<msg name="date" key="ak.itru.core.event.edit.stop.wrong" />
<msg name="date" key="ak.kickup.core.event.edit.stop.wrong" />
</field>
<field property="lastreg" depends="date">
<msg name="date" key="ak.itru.core.event.edit.lastreg.wrong" />
<msg name="date" key="ak.kickup.core.event.edit.lastreg.wrong" />
</field>
<field property="lastunreg" depends="date">
<msg name="date" key="ak.itru.core.event.edit.lastunreg.wrong" />
<msg name="date" key="ak.kickup.core.event.edit.lastunreg.wrong" />
</field>
<field property="price" depends="currency">
<msg name="currency" key="ak.itru.core.event.edit.price.wrong" />
<msg name="currency" key="ak.kickup.core.event.edit.price.wrong" />
</field>
</form>
 
<form name="ActForm">
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.act.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.act.edit.id.wrong" />
</field>
</form>
 
<form name="ActEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.act.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.act.edit.id.wrong" />
</field>
<field property="name" depends="required">
<msg name="required" key="ak.itru.core.act.edit.name.required" />
<msg name="required" key="ak.kickup.core.act.edit.name.required" />
</field>
</form>
 
<form name="ApartmentForm">
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.apartment.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.apartment.edit.id.wrong" />
</field>
</form>
 
<form name="ApartmentEditForm">
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.apartment.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.apartment.edit.id.wrong" />
</field>
<field property="name" depends="required">
<msg name="required" key="ak.itru.core.apartment.edit.name.required" />
<msg name="required" key="ak.kickup.core.apartment.edit.name.required" />
</field>
<field property="price" depends="currency">
<msg name="currency" key="ak.itru.core.apartment.edit.price.wrong" />
<msg name="currency" key="ak.kickup.core.apartment.edit.price.wrong" />
</field>
</form>
 
<form name="ParticipantListForm">
<field property="event" depends="long">
<msg name="long" key="ak.itru.core.participant.edit.event.wrong" />
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
</form>
 
<form name="ParticipantForm">
<field property="event" depends="long">
<msg name="long" key="ak.itru.core.participant.edit.event.wrong" />
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.participant.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.participant.edit.id.wrong" />
</field>
</form>
 
<form name="ParticipantEditForm">
<field property="event" depends="long">
<msg name="long" key="ak.itru.core.participant.edit.event.wrong" />
<msg name="long" key="ak.kickup.core.participant.edit.event.wrong" />
</field>
<field property="id" depends="long">
<msg name="long" key="ak.itru.core.participant.edit.id.wrong" />
<msg name="long" key="ak.kickup.core.participant.edit.id.wrong" />
</field>
<field property="nick" depends="required">
<msg name="required" key="ak.itru.core.participant.edit.nick.required" />
<msg name="required" key="ak.kickup.core.participant.edit.nick.required" />
</field>
<field property="email" depends="required,email">
<msg name="required" key="ak.itru.core.participant.edit.email.required" />
<msg name="email" key="ak.itru.core.participant.edit.email.wrong" />
<msg name="required" key="ak.kickup.core.participant.edit.email.required" />
<msg name="email" key="ak.kickup.core.participant.edit.email.wrong" />
</field>
<field property="persons" depends="integer">
<msg name="integer" key="ak.itru.core.participant.edit.persons.wrong" />
<msg name="integer" key="ak.kickup.core.participant.edit.persons.wrong" />
</field>
<field property="freeTransport" depends="integer">
<msg name="integer" key="ak.itru.core.participant.edit.freetransport.wrong" />
<msg name="integer" key="ak.kickup.core.participant.edit.freetransport.wrong" />
</field>
<field property="freeSleep" depends="integer">
<msg name="integer" key="ak.itru.core.participant.edit.freesleep.wrong" />
<msg name="integer" key="ak.kickup.core.participant.edit.freesleep.wrong" />
</field>
</form>
</formset>
/it-ru/trunk/webapp/WEB-INF/validator-rules.xml
984,7 → 984,7
</validator>
 
<validator name="number"
classname="ak.itru.util.Validator"
classname="ak.kickup.util.Validator"
method="validateNumber"
methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
996,7 → 996,7
/>
 
<validator name="currency"
classname="ak.itru.util.Validator"
classname="ak.kickup.util.Validator"
method="validateCurrency"
methodParams="java.lang.Object,
org.apache.commons.validator.ValidatorAction,
/it-ru/trunk/webapp/WEB-INF/web.xml
8,22 → 8,22
 
<filter>
<filter-name>Profiler Filter</filter-name>
<filter-class>ak.itru.core.servlet.ProfilerFilter</filter-class>
<filter-class>ak.kickup.core.servlet.ProfilerFilter</filter-class>
</filter>
<filter>
<filter-name>Encoding Filter</filter-name>
<filter-class>ak.itru.core.servlet.EncodingFilter</filter-class>
<filter-class>ak.kickup.core.servlet.EncodingFilter</filter-class>
</filter>
<filter>
<filter-name>Hibernate Filter</filter-name>
<filter-class>ak.itru.core.servlet.HibernateFilter</filter-class>
<filter-class>ak.kickup.core.servlet.HibernateFilter</filter-class>
<init-param>
<param-name>register</param-name>
<param-value>
ak.itru.core.model.EventManager;
ak.itru.core.model.ActManager;
ak.itru.core.model.ApartmentManager;
ak.itru.core.model.ParticipantManager;
ak.kickup.core.model.EventManager;
ak.kickup.core.model.ActManager;
ak.kickup.core.model.ApartmentManager;
ak.kickup.core.model.ParticipantManager;
</param-value>
</init-param>
</filter>
42,7 → 42,7
</filter-mapping>
 
<listener>
<listener-class>ak.itru.core.servlet.LocaleServlet</listener-class>
<listener-class>ak.kickup.core.servlet.LocaleServlet</listener-class>
</listener>
 
<!-- Standard Action Servlet Configuration (with debugging) -->
66,7 → 66,7
 
<servlet>
<servlet-name>LocaleService</servlet-name>
<servlet-class>ak.itru.core.servlet.LocaleServlet</servlet-class>
<servlet-class>ak.kickup.core.servlet.LocaleServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
 
121,20 → 121,20
<url-pattern>/admin/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>itru-admin</role-name>
<role-name>kickup-admin</role-name>
</auth-constraint>
</security-constraint>
 
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>it-ru Admin</realm-name>
<realm-name>kickup Admin</realm-name>
</login-config>
 
<security-role>
<description>
Administrator of it-ru
Administrator of kickup
</description>
<role-name>itru-admin</role-name>
<role-name>kickup-admin</role-name>
</security-role>
 
</web-app>
/it-ru/trunk/webapp/WEB-INF/ak-itru.tld
3,12 → 3,12
<taglib>
<tlibversion>1.0</tlibversion>
<jspversion>1.1</jspversion>
<shortname>itru</shortname>
<uri>http://26th.net/itru</uri>
<shortname>kickup</shortname>
<uri>http://26th.net/kickup</uri>
 
<tag>
<name>link</name>
<tagclass>ak.itru.core.taglib.ExtendedLinkTag</tagclass>
<tagclass>ak.kickup.core.taglib.ExtendedLinkTag</tagclass>
<attribute>
<name>accesskey</name>
<required>false</required>