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

Conflicts: src/main/resources/hibernate.cfg.xml src/main/webapp/WEB-INF/spring/root-context.xml
2014-05-12 08:44:06 +02:00
parent 1f1f053675 3f411eadd2
commit 4e2faa7c2c
63 changed files with 2154 additions and 124 deletions
@@ -7,6 +7,8 @@
    <session-factory>
        <mapping class="info.bukova.isspst.data.User"></mapping>
        <mapping class="info.bukova.isspst.data.Role"></mapping>
+        <mapping class="info.bukova.isspst.data.BaseData"></mapping>
+        <mapping class="info.bukova.isspst.data.Address"></mapping>
        <mapping class="info.bukova.isspst.data.Building"></mapping>
    </session-factory>
 </hibernate-configuration>