Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -rc8cc5634569081a7155793f609254e41fd632933 -rfcd6f2e0e64ffccf8c7bbfb60911c1bc5991c440
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision c8cc5634569081a7155793f609254e41fd632933)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision fcd6f2e0e64ffccf8c7bbfb60911c1bc5991c440)
@@ -11,7 +11,7 @@
     http://www.hibernate.org/
 -->
 
-<class name="org.lamsfoundation.lams.learningdesign.Activity" table="lams_learning_activity" discriminator-value="0" >
+<class name="org.lamsfoundation.lams.learningdesign.Activity" table="lams_learning_activity" discriminator-value="0">
     <meta attribute="class-description" inherit="false">@hibernate.class table="lams_learning_activity"</meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
@@ -84,9 +84,10 @@
     </property>
 
     <!-- Associations -->
-    <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"/>
     
+    <one-to-one name="transitionTo" class="org.lamsfoundation.lams.learningdesign.Transition" />
+    <one-to-one name="transitionFrom" class="org.lamsfoundation.lams.learningdesign.Transition" />
+    
     <!-- bi-directional many-to-one association to LearningLibrary -->
     <many-to-one name="learningLibrary" class="org.lamsfoundation.lams.learningdesign.LearningLibrary">
         <meta attribute="field-description">@hibernate.column name="learning_library_id"