Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml
===================================================================
diff -u -r5eaa43d63738b6e4bfa6d42f3c8842cdacb9c798 -rd4869e34ba40698c7e14c7b65cea6d3a09fbac26
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml	(.../ConfigurationItem.hbm.xml)	(revision 5eaa43d63738b6e4bfa6d42f3c8842cdacb9c798)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/config/ConfigurationItem.hbm.xml	(.../ConfigurationItem.hbm.xml)	(revision d4869e34ba40698c7e14c7b65cea6d3a09fbac26)
@@ -17,11 +17,20 @@
             type="java.lang.String"
             length="30"
         >
+            <generator class="assigned">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-ConfigurationItem.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
         </id>
 
         <property
             name="value"
             type="java.lang.String"
+            update="true"
+            insert="true"
             column="config_value"
             length="255"
             not-null="false"
@@ -30,30 +39,45 @@
         <property
             name="descriptionKey"
             type="java.lang.String"
+            update="true"
+            insert="true"
             column="description_key"
             length="255"
         />
 
         <property
             name="headerName"
             type="java.lang.String"
+            update="true"
+            insert="true"
             column="header_name"
             length="255"
         />
 
         <property
             name="format"
             type="java.lang.String"
+            update="true"
+            insert="true"
             column="format"
             length="30"
         />
-        
-        <property name="required" 
-        	type="java.lang.Boolean" 
-        	column="required" 
-        	not-null="true">
-    </property>
-        
+
+        <property
+            name="required"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="required"
+            not-null="true"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ConfigurationItem.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
     </class>
 
 </hibernate-mapping>
Index: lams_common/src/java/org/lamsfoundation/lams/config/ConfigurationItem.java
===================================================================
diff -u -r7248fb9335792be231dcc498f37b28ffa0c794dc -rd4869e34ba40698c7e14c7b65cea6d3a09fbac26
--- lams_common/src/java/org/lamsfoundation/lams/config/ConfigurationItem.java	(.../ConfigurationItem.java)	(revision 7248fb9335792be231dcc498f37b28ffa0c794dc)
+++ lams_common/src/java/org/lamsfoundation/lams/config/ConfigurationItem.java	(.../ConfigurationItem.java)	(revision d4869e34ba40698c7e14c7b65cea6d3a09fbac26)
@@ -69,9 +69,8 @@
     	this.required = required;
     }
 
-    /** 
-     * @hibernate.id type="java.lang.String" length="30"
-     *             	 column="config_key"      
+    /**
+     * @hibernate.id generator-class="assigned" type="java.lang.String" length="30" column="config_key"
      */
     public String getKey() {
         return this.key;
@@ -94,7 +93,7 @@
     }
 
     /** 
-     * @hibernate.property column="description" length="255"
+     * @hibernate.property column="description_key" length="255"
      */
 	public String getDescriptionKey() {
 		return descriptionKey;