Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r2870ba9d3f788670624a32d6e5a1fe05c026d47a -r3e89b82b097c8b6b944e8711c91e016d0a9fcc5d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 2870ba9d3f788670624a32d6e5a1fe05c026d47a)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 3e89b82b097c8b6b944e8711c91e016d0a9fcc5d)
@@ -90,8 +90,8 @@
 
     <!-- Associations -->
     
-    <one-to-one name="transitionTo" class="org.lamsfoundation.lams.learningdesign.Transition" />
-    <one-to-one name="transitionFrom" class="org.lamsfoundation.lams.learningdesign.Transition" />
+    <one-to-one name="transitionTo" class="org.lamsfoundation.lams.learningdesign.Transition" property-ref="toActivity"/>
+    <one-to-one name="transitionFrom" class="org.lamsfoundation.lams.learningdesign.Transition" property-ref="fromActivity"/>
     
     <!-- bi-directional many-to-one association to LearningLibrary -->
     <many-to-one name="learningLibrary" class="org.lamsfoundation.lams.learningdesign.LearningLibrary">
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
===================================================================
diff -u -r38de116f5df9c5b8c2194651ae2f2dba88bc3146 -r3e89b82b097c8b6b944e8711c91e016d0a9fcc5d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 38de116f5df9c5b8c2194651ae2f2dba88bc3146)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml	(.../Transition.hbm.xml)	(revision 3e89b82b097c8b6b944e8711c91e016d0a9fcc5d)
@@ -103,7 +103,7 @@
         </meta>
         <column name="from_activity_id" />
     </many-to-one>
-    
+
     <!-- bi-directional many-to-one association to LearningDesign -->
     <many-to-one
         name="learningDesign"