Index: win_installer/updater/src/ant/update-23.xml
===================================================================
diff -u -refaf8f2b1527f59a03ba9a00ccd4b2815db231c1 -re0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf
--- win_installer/updater/src/ant/update-23.xml	(.../update-23.xml)	(revision efaf8f2b1527f59a03ba9a00ccd4b2815db231c1)
+++ win_installer/updater/src/ant/update-23.xml	(.../update-23.xml)	(revision e0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf)
@@ -16,4 +16,16 @@
 		</copy>
 	</target>
 	
+	<target name="update-lams-tool-table"  description="Updates the lams tool table so new tools can deploy" >
+        <sql driver="com.mysql.jdbc.Driver" 
+            classpath="${DEPLOYDIR}/lams.ear/mysql-connector-java-5.0.8-bin.jar" 
+            url="jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${DB_NAME}?autoReconnect=true" 
+            userid="${DB_USER}" 
+            password="${DB_PASS}"
+            encoding="utf8"
+            onerror="abort">
+            <transaction src="${TEMP}/lams/update23_lamstool.sql" />
+        </sql>
+    </target>
+	
 </project>
\ No newline at end of file
Index: win_installer/updater/src/ant/update-deploy-tools.xml
===================================================================
diff -u -refaf8f2b1527f59a03ba9a00ccd4b2815db231c1 -re0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf
--- win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision efaf8f2b1527f59a03ba9a00ccd4b2815db231c1)
+++ win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision e0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf)
@@ -16,7 +16,7 @@
 		<mkdir dir="${build.deploy}/filtered"/>
 		<copy overwrite="yes" todir="${build.deploy}/filtered"> 
 			<fileset dir="${build.deploy}">
-                <include name="deploy.xml" />
+                <include name="deploy_template.xml" />
             </fileset>
 			<filterset>  
 				<filter token="dbUsername" value="${db.username}" />
@@ -28,7 +28,7 @@
 			</filterset>
 		</copy>
 		
-		<move file="${build.deploy}/filtered/deploy.xml" tofile="${build.deploy}/deploy.xml"/>
+		<move file="${build.deploy}/filtered/deploy_template.xml" tofile="${build.deploy}/deploy.xml"/>
 		
 	    <echo>Deploy packaqe for ${signature} created.</echo>
 	              
Index: win_installer/updater/src/sql/removeConfigs.sql
===================================================================
diff -u -r4133d4a50a076876e19024fe114838a542442256 -re0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf
--- win_installer/updater/src/sql/removeConfigs.sql	(.../removeConfigs.sql)	(revision 4133d4a50a076876e19024fe114838a542442256)
+++ win_installer/updater/src/sql/removeConfigs.sql	(.../removeConfigs.sql)	(revision e0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf)
@@ -12,7 +12,7 @@
 -- From 2.2 onwards. Ensure dimdim tool is set to disabled
 update lams_learning_library set valid_flag=0 where title="Dimdim";
 
--- From 2.2 onwards. Remove lams_qtz event entires
+-- From 2.2 onwards. Remove lams_qtz event entries
 delete from lams_qtz_SIMPLE_TRIGGERS;
 delete from lams_qtz_TRIGGERS;
 delete from lams_qtz_JOB_DETAILS;
@@ -31,3 +31,7 @@
 rename table lams_qtz_triggers to lams_qtz_TRIGGERS;
 rename table lams_qtz_trigger_listeners to lams_qtz_TRIGGER_LISTENERS;
 
+-- From 2.3 onwards. Remove any red5 configs
+update lams_configuration set config_value="" where config_key="Red5ServerUrl";
+update lams_configuration set config_value="" where config_key="Red5RecordingsUrl";
+
Index: win_installer/updater/src/sql/update23_lamstool.sql
===================================================================
diff -u
--- win_installer/updater/src/sql/update23_lamstool.sql	(revision 0)
+++ win_installer/updater/src/sql/update23_lamstool.sql	(revision e0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf)
@@ -0,0 +1 @@
+ALTER TABLE lams_tool ADD COLUMN pedagogical_planner_url TEXT;
\ No newline at end of file
Index: win_installer/updater/src/updater.nsi
===================================================================
diff -u -r884d2f8842ff218c63fd99cc027415da661c4fd1 -re0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf
--- win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision 884d2f8842ff218c63fd99cc027415da661c4fd1)
+++ win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision e0a6c0ebbb7175fd9dc07bbae37716a58a27dbaf)
@@ -1074,8 +1074,9 @@
     ############################################################################
     detailprint "Updating mysql-ds.xml for 2.3"
     setoutpath "$TEMP\lams"
-    File "${TEMPLATES}\mysql-ds.xml"
-    File "${ANT}\update-23.xml"
+    file "${TEMPLATES}\mysql-ds.xml"
+    file "${ANT}\update-23.xml"
+    file "${SQL}\update23_lamstool.sql"
     
     # generate a properties file 
     ClearErrors
@@ -1128,11 +1129,32 @@
     Pop $2 #Number of lines found in
     StrCmp $3 yes 0 +2
         goto error    
+        
+    # Running the ant scripts to update the lams_tool table
+    strcpy $0 '"$INSTDIR\apache-ant-1.6.5\bin\newAnt.bat" -logfile "$INSTDIR\update-logs\update-lams-tool-table.log" -propertyfile "$TEMP\lams\update-23.properties"  -buildfile "$TEMP\lams\update-23.xml" update-lams-tool-table'
+    DetailPrint $0
+    nsExec::ExecToStack $0
+    Pop $0 ; return code, 0=success, error=fail
+    Pop $1 ; console output
+    ${if} $0 == "error"
+    ${orif} $0 == 1
+        goto error
+    ${endif}
+    DetailPrint "Result: $1"
     
+    push "$INSTDIR\update-logs\ant-update-core-database.log"
+    push "Failed"
+    Call FileSearch
+    Pop $0 #Number of times found throughout
+    Pop $3 #Found at all? yes/no
+    Pop $2 #Number of lines found in
+    StrCmp $3 yes 0 +2
+        goto error    
+    
     goto done
     error:
-        DetailPrint "Error updating mysql-ds.xml"
-        MessageBox MB_OK|MB_ICONSTOP "LAMS mysql-ds.xml update failed, check update logs in the installation directory for details $\r$\nError:$\r$\n$\r$\n$1"
+        DetailPrint "Error updating mysql-ds.xml or updating the lams-tool table"
+        MessageBox MB_OK|MB_ICONSTOP "LAMS mysql-ds.xml or lams_tool table update failed, check update logs in the installation directory for details $\r$\nError:$\r$\n$\r$\n$1"
         Abort "LAMS configuration failed"
     done:
 FunctionEnd
@@ -1607,7 +1629,7 @@
     SetoutPath "$1\build\deploy\"
     File "${BASE_PROJECT_DIR}\lams_tool_assessment\build\lib\*.jar"
     File "${BASE_PROJECT_DIR}\lams_tool_assessment\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_assessment\build\deploy\deploy.xml"
+    File "${BASE_PROJECT_DIR}\lams_tool_assessment\build\deploy\*.xml"
     
     SetoutPath "$1\build\deploy\sql"
     File /r "${BASE_PROJECT_DIR}\lams_tool_assessment\build\deploy\sql\*"
@@ -1627,7 +1649,7 @@
     SetoutPath "$1\build\deploy\"
     File "${BASE_PROJECT_DIR}\lams_tool_pixlr\build\lib\*.jar"
     File "${BASE_PROJECT_DIR}\lams_tool_pixlr\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_pixlr\build\deploy\deploy.xml"
+    File "${BASE_PROJECT_DIR}\lams_tool_pixlr\build\deploy\*.xml"
     
     SetoutPath "$1\build\deploy\sql"
     File /r "${BASE_PROJECT_DIR}\lams_tool_pixlr\build\deploy\sql\*"
@@ -1647,7 +1669,7 @@
     SetoutPath "$1\build\deploy\"
     File "${BASE_PROJECT_DIR}\lams_tool_mindmap\build\lib\*.jar"
     File "${BASE_PROJECT_DIR}\lams_tool_mindmap\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_mindmap\build\deploy\deploy.xml"
+    File "${BASE_PROJECT_DIR}\lams_tool_mindmap\build\deploy\*.xml"
     
     SetoutPath "$1\build\deploy\sql"
     File /r "${BASE_PROJECT_DIR}\lams_tool_mindmap\build\deploy\sql\*"
@@ -1667,7 +1689,7 @@
     SetoutPath "$1\build\deploy\"
     File "${BASE_PROJECT_DIR}\lams_tool_images\build\lib\*.jar"
     File "${BASE_PROJECT_DIR}\lams_tool_images\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_images\build\deploy\deploy.xml"
+    File "${BASE_PROJECT_DIR}\lams_tool_images\build\deploy\*.xml"
     
     SetoutPath "$1\build\deploy\sql"
     File /r "${BASE_PROJECT_DIR}\lams_tool_images\build\deploy\sql\*"
@@ -1687,7 +1709,7 @@
     SetoutPath "$1\build\deploy\"
     File "${BASE_PROJECT_DIR}\lams_tool_videorecorder\build\lib\*.jar"
     File "${BASE_PROJECT_DIR}\lams_tool_videorecorder\build\lib\*.war"
-    File "${BASE_PROJECT_DIR}\lams_tool_videorecorder\build\deploy\deploy.xml"
+    File "${BASE_PROJECT_DIR}\lams_tool_videorecorder\build\deploy\*.xml"
     
     SetoutPath "$1\build\deploy\sql"
     File /r "${BASE_PROJECT_DIR}\lams_tool_videorecorder\build\deploy\sql\*"