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

Merge branch 'Verze_1.0'

Browse Source 
Conflicts:
	src/main/java/info/bukova/isspst/AppInitListener.java
	src/main/java/info/bukova/isspst/Constants.java
	src/main/java/info/bukova/isspst/data/Order.java
	src/main/java/info/bukova/isspst/data/OrderItem.java
	src/main/java/info/bukova/isspst/data/RequirementBase.java
	src/main/java/info/bukova/isspst/data/RequirementItem.java
	src/main/java/info/bukova/isspst/ui/settings/NumberSeriesVM.java
This commit is contained in:
František Přibyl
2015-01-19 13:29:41 +01:00
parent ee2539000c d37076cd27
commit 61a4b3ba82
78 changed files with 818 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/spring/root-context.xml
+9 -1
View File
@@ -187,6 +187,10 @@
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="dbInfoDao" class="info.bukova.isspst.dao.jpa.DbInfoDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="userDao" class="info.bukova.isspst.dao.jpa.UserDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
@@ -262,6 +266,10 @@
<!-- Business logic -->
<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
<bean id="dbInfoService" class="info.bukova.isspst.services.dbinfo.DbInfoServiceImpl">
<property name="dao" ref="dbInfoDao" />
</bean>
<bean id="userService" class="info.bukova.isspst.services.users.UserServiceImpl">
<constructor-arg name="marshaller" ref="marshallerUsrSettings"/>
<constructor-arg name="unmarshaller" ref="unmarshallerUsrSettings"/>
@@ -377,7 +385,7 @@
<property name="dao" ref="serviceItemDao" />
<property name="validator" ref="validator" />
</bean>
<bean id="settingsService" class="info.bukova.isspst.services.settings.GlobalSettingServiceImpl">
<constructor-arg name="marshaller" ref="marshallerSettings"/>
<constructor-arg name="unmarshaller" ref="unmarshallerSettings"/>