Index: lams_common/build.xml
===================================================================
diff -u -rec61f5d738bce3513b4e5204e011a68476a9c165 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_common/build.xml	(.../build.xml)	(revision ec61f5d738bce3513b4e5204e011a68476a9c165)
+++ lams_common/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -477,7 +477,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_common/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/User.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/lesson/Lesson.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/Transition.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/Activity.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/Competence.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/gradebook/GradeBookUserLesson.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/CompetenceMapping.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/ActivityEvaluation.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/gradebook/GradeBookUserActivity.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/tool/ToolSession.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/Group.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/tool/Tool.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/tool/SystemTool.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/License.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/themes/CSSStyle.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/themes/CSSProperty.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/Role.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/RolePrivilege.hbm.xml"/>
+		<mapping resource="org/lamsfoundation/lams/usermanagement/Privilege.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/build.xml
===================================================================
diff -u -reed7b3fd37f62db48a6ab1aec9896053ffcfb6ff -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_assessment/build.xml	(.../build.xml)	(revision eed7b3fd37f62db48a6ab1aec9896053ffcfb6ff)
+++ lams_tool_assessment/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -123,7 +123,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
@@ -227,7 +227,7 @@
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
-				<exclude name="**/hibernate.properties"/>
+				<exclude name="**/hibernate.cfg.xml"/>
 			</fileset>
 		</jar> 
 	</target>
Index: lams_tool_assessment/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_assessment/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_assessment/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_assessment/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_chat/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_chat/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -260,7 +260,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_chat/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_chat/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_chat/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_chat/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/build.xml
===================================================================
diff -u -r9924989af0a3715d8b754a400095d54dfc61e198 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_daco/build.xml	(.../build.xml)	(revision 9924989af0a3715d8b754a400095d54dfc61e198)
+++ lams_tool_daco/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -119,7 +119,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
@@ -223,7 +223,7 @@
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
-				<exclude name="**/hibernate.properties"/>
+				<exclude name="**/hibernate.cfg.xml"/>
 			</fileset>
 		</jar> 
 	</target>
Index: lams_tool_daco/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_daco/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_daco/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_daco/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_dimdim/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_dimdim/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_dimdim/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -260,7 +260,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_dimdim/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_dimdim/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_dimdim/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_dimdim/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_gmap/build.xml
===================================================================
diff -u -r9924989af0a3715d8b754a400095d54dfc61e198 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_gmap/build.xml	(.../build.xml)	(revision 9924989af0a3715d8b754a400095d54dfc61e198)
+++ lams_tool_gmap/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -279,7 +279,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_gmap/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_gmap/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_gmap/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_gmap/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_images/build.xml
===================================================================
diff -u -r3d6e8349bd30dda68fcba07e88b6d495f6df4116 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_images/build.xml	(.../build.xml)	(revision 3d6e8349bd30dda68fcba07e88b6d495f6df4116)
+++ lams_tool_images/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -125,7 +125,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
@@ -229,7 +229,7 @@
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
-				<exclude name="**/hibernate.properties"/>
+				<exclude name="**/hibernate.cfg.xml"/>
 			</fileset>
 		</jar> 
 	</target>
Index: lams_tool_images/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_images/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_images/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_images/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -ra82189db31f6fb6dd4a25a50a688b2812e93ddce -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision a82189db31f6fb6dd4a25a50a688b2812e93ddce)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -503,7 +503,9 @@
 		<echo message="Run the schema export for all hbm.xml files in ${conf.hibernate.mapping.dir}/hbm" />
 		<taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" classpathref="schemaexport.classpath">
 		</taskdef>
-		<schemaexport properties="${conf.hibernate.mapping.dir}/hibernate.properties" quiet="no" text="no" drop="no" delimiter=";" output="${db.scripts}/table-schema.sql">
+		<schemaexport
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
+			quiet="no" text="no" drop="no" delimiter=";" output="${db.scripts}/table-schema.sql">
 			<fileset dir="${conf.hibernate.mapping.dir}">
 				<include name="**/QaWizard*.hbm.xml" />
 				<include name="**/QaConfigItem.hbm.xml" />
Index: lams_tool_laqa/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_laqa/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_laqa/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -123,7 +123,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
@@ -227,7 +227,7 @@
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
-				<exclude name="**/hibernate.properties"/>
+				<exclude name="**/hibernate.cfg.xml"/>
 			</fileset>
 		</jar> 
 	</target>
Index: lams_tool_larsrc/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_larsrc/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_larsrc/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_larsrc/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/build.xml
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_mindmap/build.xml	(.../build.xml)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -305,7 +305,8 @@
 		<taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask"
 			classpathref="schemaexport.classpath">
 		</taskdef>
-		<schemaexport properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+		<schemaexport
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no" text="no" drop="no" delimiter=";"
 			output="${db.scripts}/table-schema.sql">
 			<fileset dir="${conf.hibernate.mapping.dir}">
Index: lams_tool_mindmap/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_mindmap/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_mindmap/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_mindmap/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_notebook/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_notebook/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -260,7 +260,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_notebook/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_notebook/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_notebook/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_notebook/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/db/sql/table-schema.sql
===================================================================
diff -u -r1d4d39bc99bceeb2f3400228a83823b8cd67c6da -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_notebook/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 1d4d39bc99bceeb2f3400228a83823b8cd67c6da)
+++ lams_tool_notebook/db/sql/table-schema.sql	(.../table-schema.sql)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -1,14 +1,26 @@
+alter table lams_text_search_condition drop foreign key FK69B884B21E70F543;
 alter table tl_lantbk11_attachment drop foreign key FK12090F57FC940906;
+alter table tl_lantbk11_conditions drop foreign key FK4F95ECEC3E8DC190;
+alter table tl_lantbk11_conditions drop foreign key FK4F95ECEC60201CA4;
 alter table tl_lantbk11_session drop foreign key FKB7C198E2FC940906;
 alter table tl_lantbk11_user drop foreign key FKCB8A58FFA3B0FADF;
+drop table if exists lams_branch_condition;
+drop table if exists lams_text_search_condition;
 drop table if exists tl_lantbk11_attachment;
+drop table if exists tl_lantbk11_conditions;
 drop table if exists tl_lantbk11_notebook;
 drop table if exists tl_lantbk11_session;
 drop table if exists tl_lantbk11_user;
+create table lams_branch_condition (condition_id bigint not null auto_increment, condition_ui_id integer, order_id integer, name varchar(255), display_name varchar(255), type varchar(255), start_value varchar(255), end_value varchar(255), exact_match_value varchar(255), primary key (condition_id));
+create table lams_text_search_condition (condition_id bigint not null, text_search_all_words varchar(255), text_search_phrase varchar(255), text_search_any_words varchar(255), text_search_excluded_words varchar(255), primary key (condition_id));
 create table tl_lantbk11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, notebook_uid bigint, primary key (uid));
+create table tl_lantbk11_conditions (condition_id bigint not null, content_uid bigint, primary key (condition_id));
 create table tl_lantbk11_notebook (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
 create table tl_lantbk11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), notebook_uid bigint, primary key (uid));
 create table tl_lantbk11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, notebook_session_uid bigint, entry_uid bigint, primary key (uid));
+alter table lams_text_search_condition add index FK69B884B21E70F543 (condition_id), add constraint FK69B884B21E70F543 foreign key (condition_id) references lams_branch_condition (condition_id);
 alter table tl_lantbk11_attachment add index FK12090F57FC940906 (notebook_uid), add constraint FK12090F57FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
+alter table tl_lantbk11_conditions add index FK4F95ECEC3E8DC190 (condition_id), add constraint FK4F95ECEC3E8DC190 foreign key (condition_id) references lams_text_search_condition (condition_id);
+alter table tl_lantbk11_conditions add index FK4F95ECEC60201CA4 (content_uid), add constraint FK4F95ECEC60201CA4 foreign key (content_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_session add index FKB7C198E2FC940906 (notebook_uid), add constraint FKB7C198E2FC940906 foreign key (notebook_uid) references tl_lantbk11_notebook (uid);
 alter table tl_lantbk11_user add index FKCB8A58FFA3B0FADF (notebook_session_uid), add constraint FKCB8A58FFA3B0FADF foreign key (notebook_session_uid) references tl_lantbk11_session (uid);
Index: lams_tool_notebook/web/WEB-INF/web.xml
===================================================================
diff -u -r0732f5d12802da95cf69e474b30630653924abc5 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision 0732f5d12802da95cf69e474b30630653924abc5)
+++ lams_tool_notebook/web/WEB-INF/web.xml	(.../web.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -10,16 +10,16 @@
 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
-	<param-value>
-				classpath:/org/lamsfoundation/lams/applicationContext.xml
-	            classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-            	classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
-				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
-				classpath:/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml			
-				classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml	
-	</param-value>
+	<param-value>classpath:/org/lamsfoundation/lams/tool/notebook/dbupdates/autopatchContext.xml</param-value>
 </context-param>
+<context-param>
+   <param-name>locatorFactorySelector</param-name>
+   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+</context-param>
+<context-param>
+	<param-name>parentContextKey</param-name>
+	<param-value>context.central</param-value>
+</context-param>
 
     <filter>
     <filter-name>SystemSessionFilter</filter-name>
@@ -34,7 +34,7 @@
     </filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
-		<param-value>notebookSessionFactory</param-value>
+		<param-value>coreSessionFactory</param-value>
 	</init-param>
    </filter>
 	<filter>
Index: lams_tool_pixlr/build.xml
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_pixlr/build.xml	(.../build.xml)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -260,7 +260,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_pixlr/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_pixlr/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_pixlr/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_pixlr/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -141,7 +141,7 @@
 					>
 				</taskdef>
 				<schemaexport
-					properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+					config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 					quiet="no"
 					text="no"
 					drop="no"
Index: lams_tool_sbmt/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_sbmt/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_sbmt/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_sbmt/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_scribe/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_scribe/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -260,7 +260,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_scribe/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_scribe/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_scribe/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_scribe/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/build.xml
===================================================================
diff -u -r3bbefa2d949693af2590808a9704ab5d905d6674 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_spreadsheet/build.xml	(.../build.xml)	(revision 3bbefa2d949693af2590808a9704ab5d905d6674)
+++ lams_tool_spreadsheet/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -119,7 +119,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
@@ -223,7 +223,7 @@
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
-				<exclude name="**/hibernate.properties"/>
+				<exclude name="**/hibernate.cfg.xml"/>
 			</fileset>
 		</jar> 
 	</target>
Index: lams_tool_spreadsheet/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_spreadsheet/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_spreadsheet/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_spreadsheet/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_survey/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_survey/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -120,7 +120,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
@@ -224,7 +224,7 @@
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
-				<exclude name="**/hibernate.properties"/>
+				<exclude name="**/hibernate.cfg.xml"/>
 			</fileset>
 		</jar> 
 	</target>
Index: lams_tool_survey/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_survey/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_survey/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_survey/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_task/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_task/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -124,7 +124,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
@@ -228,7 +228,7 @@
 			<fileset dir="${build.classes.java}">
 			</fileset>
 			<fileset dir="${conf.hibernate.mapping.dir}">
-				<exclude name="**/hibernate.properties"/>
+				<exclude name="**/hibernate.cfg.xml"/>
 			</fileset>
 		</jar> 
 	</target>
Index: lams_tool_task/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_task/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_task/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_videorecorder/build.xml
===================================================================
diff -u -r01f1d853607cc14f73aa2429275084f4890f92b7 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_videorecorder/build.xml	(.../build.xml)	(revision 01f1d853607cc14f73aa2429275084f4890f92b7)
+++ lams_tool_videorecorder/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -277,7 +277,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_videorecorder/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_videorecorder/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_videorecorder/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_videorecorder/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/build.xml
===================================================================
diff -u -r5a99fbbdf8c9f0bf8e429616f54078b212cc96b3 -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb
--- lams_tool_wiki/build.xml	(.../build.xml)	(revision 5a99fbbdf8c9f0bf8e429616f54078b212cc96b3)
+++ lams_tool_wiki/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -278,7 +278,7 @@
 			>
 		</taskdef>
 		<schemaexport
-			properties="${conf.hibernate.mapping.dir}/hibernate.properties"
+			config="${conf.hibernate.mapping.dir}/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
Index: lams_tool_wiki/conf/hibernate/mappings/hibernate.cfg.xml
===================================================================
diff -u
--- lams_tool_wiki/conf/hibernate/mappings/hibernate.cfg.xml	(revision 0)
+++ lams_tool_wiki/conf/hibernate/mappings/hibernate.cfg.xml	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration
+DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.username">lams</property>
+		<property name="connection.password">lamsdemo</property>
+		<property name="connection.url">jdbc:mysql://localhost/lams</property>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<mapping resource="org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
Fisheye: Tag d2057fdd8708c4c7e5665bdc3ee25b72212aaecb refers to a dead (removed) revision in file `lams_tool_wiki/conf/hibernate/mappings/hibernate.properties'.
Fisheye: No comparison available.  Pass `N' to diff?