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/webapp/WEB-INF/spring/mail-services.xml
This commit is contained in:
pepa
2014-07-06 22:12:40 +02:00
parent 4bfdb4929b 54edc0c4cf
commit c9bd62dc90
22 changed files with 392 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/spring/root-context.xml
+3 -2
View File
@@ -47,7 +47,7 @@
<property name="hibernateProperties">
<props>
<prop key="hibernate.dialect">${jdbc.dialect}</prop>
<prop key="hibernate.show_sql">true</prop>
<prop key="hibernate.show_sql">false</prop>
<prop key="hibernate.hbm2ddl.auto">update</prop>
</props>
</property>
@@ -223,7 +223,7 @@
<property name="validator" ref="validator"/>
</bean>
<bean id="reqTypeService" class="info.bukova.isspst.services.requirements.RequirementTypeServiceImpl">
<bean id="reqTypeService" class="info.bukova.isspst.services.requirement.RequirementTypeServiceImpl">
<property name="dao" ref="reqTypeDao"/>
<property name="validator" ref="validator"/>
</bean>
@@ -231,6 +231,7 @@
<bean id="requirementService" class="info.bukova.isspst.services.requirement.RequirementServiceImpl">
<property name="dao" ref="requirementDao" />
<property name="validator" ref="validator" />
<property name="numberSeriesService" ref="numericSeriesService" />
</bean>
<bean id="numericSeriesService" class="info.bukova.isspst.services.numberseries.NumberSeriesServiceImpl">