Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r6d0ec5db1add705fb9da59656aaa4916e1163893 -rda463361264d2a6fa4948cf8c089c649c2f7064a
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision da463361264d2a6fa4948cf8c089c649c2f7064a)
@@ -152,6 +152,16 @@
 				
 				<!-- needs to be lazy because each tool session contains user and
 				lesson -->
+				
+				<set name="competenceMappings" lazy="true" inverse="true" cascade="none" >
+			        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
+        												@hibernate.collection-key column="competence_mapping_id"
+        										        @hibernate.collection-one-to-many class="org.lamsfoundation.lams.learningdesign.CompetenceMapping"
+			        </meta>
+			        <key><column name="activity_id" /></key>
+			        <one-to-many class="org.lamsfoundation.lams.learningdesign.CompetenceMapping"/>
+			    </set>
+				
 				<set name="toolSessions" lazy="true" inverse="true" cascade="none" >
 			        <meta attribute="field-description">@hibernate.set lazy="false" inverse="true" cascade="none"
         												@hibernate.collection-key column="tool_session_id"
@@ -160,7 +170,7 @@
 			        <key><column name="activity_id" /></key>
 			        <one-to-many class="org.lamsfoundation.lams.tool.ToolSession"/>
 			    </set>
-                 
+
                  <!-- bi-directional many-to-one association to Tool-->
                  <many-to-one name="tool" class="org.lamsfoundation.lams.tool.Tool" lazy="false" >
                  	<column name="tool_id" not-null="false"/>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Competence.hbm.xml	(revision da463361264d2a6fa4948cf8c089c649c2f7064a)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.learningdesign.Competence"
+        table="lams_competence"
+    >
+
+        <id
+            name="competenceId"
+            column="competence_id"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-Competence.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+            length="255"
+            not-null="true"
+        />
+
+        <property
+            name="description"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="description"
+            length="65535"
+            not-null="false"
+        />
+
+        <many-to-one
+            name="learningDesign"
+            class="org.lamsfoundation.lams.learningdesign.LearningDesign"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="learning_design_id" 
+            />
+        </many-to-one>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-Competence.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml	(revision da463361264d2a6fa4948cf8c089c649c2f7064a)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping
+>
+    <class
+        name="org.lamsfoundation.lams.learningdesign.CompetenceMapping"
+        table="lams_competence_mapping"
+    >
+
+        <id
+            name="competenceMappingId"
+            column="competence_mapping_id"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-CompetenceMapping.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <many-to-one
+            name="competence"
+            class="org.lamsfoundation.lams.learningdesign.Competence"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="competence_id" 
+            />
+        </many-to-one>
+
+        <many-to-one
+            name="toolActivity"
+            class="org.lamsfoundation.lams.learningdesign.ToolActivity"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="activity_id" 
+            />
+        </many-to-one>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-CompetenceMapping.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -rda463361264d2a6fa4948cf8c089c649c2f7064a
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml	(.../LearningDesign.hbm.xml)	(revision da463361264d2a6fa4948cf8c089c649c2f7064a)
@@ -231,6 +231,11 @@
     	 <key><column name="learning_design_id" /></key>
          <one-to-many class="org.lamsfoundation.lams.learningdesign.Activity"/>
     </set>
+    
+    <set name="competences" lazy="false" inverse="true" cascade="all-delete-orphan" >
+    	 <key><column name="learning_design_id" /></key>
+         <one-to-many class="org.lamsfoundation.lams.learningdesign.Competence"/>
+    </set>
 
     <!-- bi-directional many-to-one association to the user who is editing -->
     <!-- this design as part of edit on fly. Should only be set if editOverrideLock = 1 -->
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -rda463361264d2a6fa4948cf8c089c649c2f7064a
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision 209087915bc219f430c282ad00e5d1e6462f9b5f)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision da463361264d2a6fa4948cf8c089c649c2f7064a)
@@ -1006,4 +1006,28 @@
                   REFERENCES lams_events (uid) ON DELETE CASCADE ON UPDATE CASCADE
 )TYPE=InnoDB;
 
+CREATE TABLE lams_competence (
+       competence_id BIGINT NOT NULL UNIQUE auto_increment
+     , learning_design_id BIGINT
+     , description TEXT
+     , title VARCHAR(255) 
+	 , UNIQUE KEY (learning_design_id, title)
+     , PRIMARY KEY (competence_id)
+     , CONSTRAINT LearningDesignCompetenceMap FOREIGN KEY (learning_design_id)
+                  REFERENCES lams_learning_design(learning_design_id) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
+CREATE TABLE lams_competence_mapping (
+       competence_mapping_id BIGINT NOT NULL UNIQUE auto_increment
+     , competence_id BIGINT
+     , activity_id BIGINT 
+     , PRIMARY KEY (competence_mapping_id)
+	 , INDEX (activity_id)
+	 , UNIQUE KEY (competence_id, activity_id)
+     , CONSTRAINT FK_lams_competence_mapping_1 FOREIGN KEY (activity_id)
+                  REFERENCES lams_learning_activity (activity_id) ON DELETE CASCADE ON UPDATE CASCADE
+	 , CONSTRAINT FK_lams_competence_mapping_2 FOREIGN KEY (competence_id)
+	                  REFERENCES lams_competence (competence_id) ON DELETE CASCADE ON UPDATE CASCADE
+)TYPE=InnoDB;
+
  
\ No newline at end of file