Index: lams_build/build_base.xml =================================================================== diff -u -re1fa88a315d71d92edd258e0a2347804ed70feb8 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_build/build_base.xml (.../build_base.xml) (revision e1fa88a315d71d92edd258e0a2347804ed70feb8) +++ lams_build/build_base.xml (.../build_base.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -227,7 +227,7 @@ ${ant.project.name}: Building Hibernate XML files using XDoclet - + Index: lams_build/conf/xdoclet-hibernate-template.xml =================================================================== diff -u --- lams_build/conf/xdoclet-hibernate-template.xml (revision 0) +++ lams_build/conf/xdoclet-hibernate-template.xml (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -0,0 +1,268 @@ +"?> + +" + "http://hibernate.org/dtd/hibernate-mapping-3.0.dtd"> + + + schema="" + + + default-cascade="" + + + auto-import="" + +> + + + + name="" + + + table="" + + + schema="" + + + lazy="" + + + proxy="" + + + polymorphism="" + + + dynamic-update="" + + + dynamic-insert="" + + + select-before-update="" + + + optimistic-lock="" + + + mutable="" + + + discriminator-value="" + + + where="" + + + persister="" + + + batch-size="" + + > + + + " /> + + + + " /> + + + + + column="" + + type="" + + length="" + + + access="" + + + unsaved-value="" + + > + + '/>" + + length="" + + + unique-key="" + + + index="" + + + not-null="" + + + unique="" + + + sql-type="" + + /> + + "> + + name=""> + + + + + + + + + + + + + + + + + + " + + unsaved-value="" + + > + + + + " + column="" + + length="" + + /> + + + + " + column="" + /> + + + + + + + + + + column="" + + + not-null="" + + + type="" + + + length="" + + + force="" + + + insert="" + + /> + + + + + " + type="" + + access="" + + + unsaved-value="" + + /> + + + + + + " + + access="" + + + unsaved-value="" + + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_common/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_common/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_common/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml =================================================================== diff -u -r2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml (.../ExtCourseClassMap.hbm.xml) (revision 2f61f38a5a1acbb2fc8df5316d7b20617b08c9bb) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtCourseClassMap.hbm.xml (.../ExtCourseClassMap.hbm.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,7 +1,7 @@ + "http://hibernate.org/dtd/hibernate-mapping-3.0.dtd" > - + Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r57c6309187d8c559f1b273202c6b3a99e559edae -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 57c6309187d8c559f1b273202c6b3a99e559edae) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -14,7 +14,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml =================================================================== diff -u -r57c6309187d8c559f1b273202c6b3a99e559edae -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml (.../localApplicationContext.xml) (revision 57c6309187d8c559f1b273202c6b3a99e559edae) +++ lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml (.../localApplicationContext.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -46,7 +46,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml =================================================================== diff -u -r57c6309187d8c559f1b273202c6b3a99e559edae -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml (.../localCommonContext.xml) (revision 57c6309187d8c559f1b273202c6b3a99e559edae) +++ lams_common/src/java/org/lamsfoundation/lams/localCommonContext.xml (.../localCommonContext.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -25,7 +25,7 @@ "autodetectTransactionManager" defaults to true so we don't need to include it. But remember all application servers do not have the same JNDI name for their transaction manager! --> - + @@ -46,7 +46,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/util/CustomizedOpenSessionInViewFilter.java =================================================================== diff -u -rb9c003985a60c4aead1b25c3677704f68b9dea75 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_common/src/java/org/lamsfoundation/lams/util/CustomizedOpenSessionInViewFilter.java (.../CustomizedOpenSessionInViewFilter.java) (revision b9c003985a60c4aead1b25c3677704f68b9dea75) +++ lams_common/src/java/org/lamsfoundation/lams/util/CustomizedOpenSessionInViewFilter.java (.../CustomizedOpenSessionInViewFilter.java) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -52,7 +52,7 @@ * @param sessionFactory the SessionFactory that this filter uses * @return the Session to use * @throws DataAccessResourceFailureException if the Session could not be created - * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean) + * @see org.springframework.orm.hibernate4.SessionFactoryUtils#getSession(SessionFactory, boolean) * @see org.hibernate.FlushMode#NEVER */ protected Session openSession(SessionFactory sessionFactory) throws DataAccessResourceFailureException { Index: lams_learning/conf/xdoclet/filters.xml =================================================================== diff -u -rb600b6d036e00137bf23359f5ad27a24702f3550 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_learning/conf/xdoclet/filters.xml (.../filters.xml) (revision b600b6d036e00137bf23359f5ad27a24702f3550) +++ lams_learning/conf/xdoclet/filters.xml (.../filters.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -5,7 +5,7 @@ HibernateFilter - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter sessionFactoryBeanName coreSessionFactory Index: lams_tool_assessment/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_assessment/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_assessment/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_assessment/web/WEB-INF/web.xml =================================================================== diff -u -r55d2746e20873357395af07e7f2248de6c50d31b -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 55d2746e20873357395af07e7f2248de6c50d31b) +++ lams_tool_assessment/web/WEB-INF/web.xml (.../web.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -38,7 +38,7 @@ hibernateFilter - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter sessionFactoryBeanName Index: lams_tool_bbb/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_bbb/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_bbb/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_chat/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_chat/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_chat/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml =================================================================== diff -u -rcd0d0b28a7c27711a74ce2b41821f3ccf5c80df9 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml (.../ChatCondition.hbm.xml) (revision cd0d0b28a7c27711a74ce2b41821f3ccf5c80df9) +++ lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatCondition.hbm.xml (.../ChatCondition.hbm.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,7 +1,7 @@ + "http://hibernate.org/dtd/hibernate-mapping-3.0.dtd" > +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_daco/web/WEB-INF/web.xml =================================================================== diff -u -r55d2746e20873357395af07e7f2248de6c50d31b -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision 55d2746e20873357395af07e7f2248de6c50d31b) +++ lams_tool_daco/web/WEB-INF/web.xml (.../web.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -37,7 +37,7 @@ hibernateFilter - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter sessionFactoryBeanName Index: lams_tool_eadventure/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_eadventure/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_eadventure/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_eadventure/web/WEB-INF/web.xml =================================================================== diff -u -r55d2746e20873357395af07e7f2248de6c50d31b -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision 55d2746e20873357395af07e7f2248de6c50d31b) +++ lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -38,7 +38,7 @@ hibernateFilter - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter sessionFactoryBeanName Index: lams_tool_forum/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_forum/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_forum/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml =================================================================== diff -u -r9374b11565489857d973ec45bdcd8bd7ed1e5fa2 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml (.../ForumCondition.hbm.xml) (revision 9374b11565489857d973ec45bdcd8bd7ed1e5fa2) +++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumCondition.hbm.xml (.../ForumCondition.hbm.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,7 +1,7 @@ + "http://hibernate.org/dtd/hibernate-mapping-3.0.dtd" > +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_images/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_images/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_images/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_images/web/WEB-INF/web.xml =================================================================== diff -u -r55d2746e20873357395af07e7f2248de6c50d31b -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision 55d2746e20873357395af07e7f2248de6c50d31b) +++ lams_tool_images/web/WEB-INF/web.xml (.../web.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -38,7 +38,7 @@ hibernateFilter - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter sessionFactoryBeanName Index: lams_tool_imscc/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_imscc/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_imscc/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_imscc/web/WEB-INF/web.xml =================================================================== diff -u -r55d2746e20873357395af07e7f2248de6c50d31b -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision 55d2746e20873357395af07e7f2248de6c50d31b) +++ lams_tool_imscc/web/WEB-INF/web.xml (.../web.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -38,7 +38,7 @@ hibernateFilter - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + org.springframework.orm.hibernate4.support.OpenSessionInViewFilter sessionFactoryBeanName Index: lams_tool_kaltura/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_kaltura/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b) +++ lams_tool_kaltura/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_lamc/conf/hibernate/mappings/hibernate.cfg.xml =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_lamc/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision d56929f06ad90a63082d514e6521adc175f3de27) +++ lams_tool_lamc/conf/hibernate/mappings/hibernate.cfg.xml (.../hibernate.cfg.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,6 +1,6 @@ +DTD 3.0//EN" "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd"> @db.username@ Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml (.../McContent.hbm.xml) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml (.../McContent.hbm.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,7 +1,7 @@ + "http://hibernate.org/dtd/hibernate-mapping-3.0.dtd" > Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml =================================================================== diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a) @@ -1,7 +1,7 @@ + "http://hibernate.org/dtd/hibernate-mapping-3.0.dtd" >