IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source 
Conflicts:
	src/main/java/info/bukova/isspst/Constants.java
	src/main/resources/ValidationMessages.properties
	src/main/resources/hibernate.cfg.xml
This commit is contained in:
Josef Rokos
2014-06-07 22:02:25 +02:00
parent 8db25ecdda 4451850603
commit 607139d790
22 changed files with 337 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/spring/root-context.xml
+10
View File
@@ -66,6 +66,7 @@
<security:intercept-url pattern="/admin/users/**" access="hasRole('ROLE_ADMIN')"/>
<security:intercept-url pattern="/admin/permissions/**" access="hasRole('ROLE_ADMIN')"/>
<security:intercept-url pattern="/admin/addressbook/**" access="hasRole('PERM_READ_ADDRESSBOOK')"/>
<security:intercept-url pattern="/munits/**" access="hasRole('PERM_READ_MUNITS')"/>
<security:form-login login-page="/login.zhtml"
authentication-failure-handler-ref="loginFail"/>
<security:http-basic/>
@@ -107,6 +108,10 @@
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="munitDao" class="info.bukova.isspst.dao.jpa.MUnitDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="addressDao" class="info.bukova.isspst.dao.jpa.AddressDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
@@ -136,6 +141,11 @@
<property name="validator" ref="validator" />
</bean>
<bean id="munitService" class="info.bukova.isspst.services.munits.MUnitServiceImpl">
<property name="dao" ref="munitDao" />
<property name="validator" ref="validator" />
</bean>
<bean id="adbService" class="info.bukova.isspst.services.addressbook.AdbServiceImpl">
<property name="dao" ref="addressDao" />
<property name="validator" ref="validator" />